Attempt to fix a "directory not empty" error on EFS in create_zip_file()

medusa-project · Mar 5, 2024 · c20011a · c20011a
1 parent c771c15
commit c20011a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/models/bitstream.rb b/app/models/bitstream.rb
@@ -246,7 +246,10 @@ def self.create_zip_file(bitstreams:,
     task&.update!(indeterminate: false,
                   started_at:    Time.now,
                   status_text:   status_text)
-    Dir.mktmpdir do |tmpdir|
+    # We should be able to use a block with mktmpdir, but when using an EFS
+    # filesystem, we get an error about "directory not empty".
+    tmpdir = Dir.mktmpdir
+    begin
       bitstreams.each_with_index do |bs, index|
         tmpfile = bs.download_to_temp_file
         FileUtils.mv(tmpfile.path, File.join(tmpdir, bs.filename))
@@ -263,6 +266,8 @@ def self.create_zip_file(bitstreams:,
         ObjectStore.instance.put_object(key:  dest_key,
                                         file: file)
       end
+    ensure
+      FileUtils.rm_rf(tmpdir)
     end
   end