fix: rename files during the transfer, adding the .partial extension

rock-core · Feb 25, 2025 · 58fd381 · 58fd381
1 parent 85baa6d
commit 58fd381
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/syskit/cli/log_runtime_archive.rb b/lib/syskit/cli/log_runtime_archive.rb
@@ -176,9 +176,14 @@ def self.transfer_dataset(
                     end
 
                 transfer_results = candidates.map do |child_path|
-                    result = transfer_file(child_path, server, root)
-                    child_path.unlink if result.success?
-
+                    child_partial_path = Pathname.new("#{child_path}.partial")
+                    File.rename(child_path, child_partial_path)
+                    result = transfer_file(child_partial_path, server, root)
+                    if result.success?
+                        child_partial_path.unlink
+                    else
+                        File.rename(child_partial_path, child_path)
+                    end
                     result
                 end
 

diff --git a/lib/syskit/roby_app/log_transfer_server/ftp_upload.rb b/lib/syskit/roby_app/log_transfer_server/ftp_upload.rb
@@ -94,6 +94,9 @@ def transfer(ftp, root)
                             rate_limit(buf.size, now, last)
                             last = Time.now
                         end
+                        partial_file = @file
+                        renamed_file = Pathname.new(partial_file.to_s.sub(/\.partial$/, ''))
+                        ftp.rename(@file, renamed_file)
                     end
                 end