Publish global state for changesets after local state

[chef.git] / 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 5d47266e62ba3eac96d9e99ac0a7a8d257d8c7d1..0c53856d984f1aae58f754cc10a135ba8db27d83 100755 (executable)
--- 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 != "/"
 # 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
     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"
     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", "--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", 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
 
     end
   end