Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

skip import when persisted data exists #360

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+7 −0
Open

skip import when persisted data exists #360

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c18f03
skip import when persisted data exists
Jan 23, 2023
afd6778
do not fail if importing for existing datbase
curtisy1 Jan 23, 2023
39e137b
remove wrong negate
curtisy1 Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ if [ ! -f /data/style/mapnik.xml ]; then
fi

if [ "$1" == "import" ]; then
if [ -f /var/lib/postgresql/14/main/.databaseImported ]; then
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, how about just using the already existing "complete" file?

Suggested change
if [ -f /var/lib/postgresql/14/main/.databaseImported ]; then
if [ -f /data/database/planet-import-complete ]; then

I.E.:
https://github.com/Overv/openstreetmap-tile-server/pull/360/files#diff-d31ce0453051853c17ba2a5225b3d1bfab548e095bab0967d6acfd1b3ce1b35dR130

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or /data/database/postgres/.databaseImported instead, because 14 was already changed to 15 in the master branch.

echo "database already initialized"
exit 0
fi

# Ensure that database directory is in right state
mkdir -p /data/database/postgres/
chown renderer: /data/database/
Expand Down Expand Up @@ -126,6 +131,8 @@ if [ "$1" == "import" ]; then

service postgresql stop

touch /var/lib/postgresql/14/main/.databaseImported
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder whether we should set this much earlier. That would prevent all these issues with half -imported data.


exit 0
fi

Expand Down