X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b68187fc95272d0d940e2fa6eb9ef8c4efd25048..ab4b82d3ca1eb1be198b331203f3505c4a043b59:/cookbooks/planet/files/default/replication-bin/replicate-changesets diff --git a/cookbooks/planet/files/default/replication-bin/replicate-changesets b/cookbooks/planet/files/default/replication-bin/replicate-changesets index 87334f21a..0c53856d9 100755 --- a/cookbooks/planet/files/default/replication-bin/replicate-changesets +++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets @@ -128,10 +128,7 @@ end # to guarantee sync for newly created directories. def fdirsync(d) while d != "/" - Dir.open(d) do |dh| - io = IO.for_fd(dh.fileno) - io.fsync - end + fsync(d) d = File.dirname(d) end end @@ -263,9 +260,11 @@ class Replicator if @config["s3_dir"] s3_file = s3_stem + ".osm.gz" s3_state_file = s3_stem + ".state.txt" + s3_state_config_file = @config["s3_dir"] + "/state.yaml" - system("/opt/awscli/v2/current/bin/aws", "--profile=osm-pds-upload", "s3", "cp", "--storage-class=INTELLIGENT_TIERING", data_file, s3_file) - system("/opt/awscli/v2/current/bin/aws", "--profile=osm-pds-upload", "s3", "cp", "--storage-class=INTELLIGENT_TIERING", data_state_file, s3_state_file) + system("/opt/awscli/v2/current/bin/aws", "--profile=osm-pds-upload", "s3", "cp", "--storage-class=INTELLIGENT_TIERING", "--no-progress", data_file, s3_file) + system("/opt/awscli/v2/current/bin/aws", "--profile=osm-pds-upload", "s3", "cp", "--storage-class=INTELLIGENT_TIERING", "--no-progress", data_state_file, s3_state_file) + system("/opt/awscli/v2/current/bin/aws", "--profile=osm-pds-upload", "s3", "cp", "--storage-class=INTELLIGENT_TIERING", "--no-progress", @config["state_file"], s3_state_config_file) end end