cnvrg 1.10.17 → 1.10.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29b4ab96b94066d5e799cbd5e648eaae0871a634ac6383a66ca3c82a3af9a038
-  data.tar.gz: aca3f52a3959cf6db6614bed5b7669c41e9607f0abf25ec83e870783c997f484
+  metadata.gz: 8009827a102d9ea4bda3e07d95ad52a23fe7202b2670850952fb345acac7b906
+  data.tar.gz: aa91b22c83120d50f0631945d06f4d878e1cea4d2f9d950f6e29fbba17305f21
 SHA512:
-  metadata.gz: 96fbd5de39c5aa44d93e24c529b5e149cbd8f689c56329e7c5b4a6f9990d19ca8a7d1fdb1f5f00b8abc05c8dccc061a74de65ac8c81524c27f65b0e349dfdc23
-  data.tar.gz: 2412c51b6926725be234c022faca6191110caf45de2c83381b171e411f7d7bee78e74d519b91f42e01d07b69413df5df009747f35bd34e480d5733718ccd824c
+  metadata.gz: 2159ce3f1e3b55390b599a72b80c1b6de559554380d5b294922ddd001cff2c944cf6614bb582f184c62be6299826f4a1860257a5426c6534a254ea195bb9910c
+  data.tar.gz: ccb989d604602dbcfcee6f40725ae8a45875744f222b7aa717ddfe2760483361d03a16f6e016179acf82c0c493d9a3518a548d18dbb850a7cf0fc0b99aef0120

data/lib/cnvrg/datafiles.rb

@@ -316,21 +316,21 @@ module Cnvrg
           #Cnvrg::Logger.log_method(bind: binding)
           retry_count += 1
 
-          puts "Failed request upload files: #{Time.current}"
-          puts upload_resp
+          Cnvrg::Logger.log_info("Failed request upload files: #{Time.current}, retry: #{retry_count}")
 
-          if retry_count > 5
-            raise Exception.new("Got an error message from server, #{upload_resp.try(:fetch, "message")}")
+          if retry_count > 20
+            puts "Failed to upload files: #{Time.current}, trying next chunk"
+            return nil
           end
           sleep 5
           next
         end
         return upload_resp['result'].with_indifferent_access
       end
-
     end
 
     def upload_multiple_files_optimized(files, commit_sha1, threads: 15, chunk_size: 1000, override: false, new_branch: false, prefix: '', partial_commit: nil)
+      Thread.report_on_exception = false
       cli = CLI.new
       cli.log_message("Using #{threads} threads with chunk size of #{chunk_size}.", Thor::Shell::Color::GREEN)
 
@@ -342,6 +342,7 @@ module Cnvrg
       file_queue = Queue.new
       progress_queue = Queue.new
       worker_threads = []
+      progress_threads = []
 
       # Vars to keep track of uploaded files and directories
       dirs = []
@@ -359,45 +360,69 @@ module Cnvrg
                 cli.log_message("Error while uploading file: #{file[:absolute_path]}", Thor::Shell::Color::RED)
                 Cnvrg::Logger.log_error_message("Error while upload single file #{file["path"]}")
               end
+              while progress_queue.size > 15000
+                sleep(0.1)
+              end
               progress_queue << file
             end
           end
         end
 
         # init the thread that handles the file upload progress and saving them in the server
-        progress_thread = Thread.new do
-          loop do
-            file = progress_queue.deq(non_block: true) rescue nil # to prevent deadlocks
-            unless file.nil?
-              progress_mutex.synchronize {
-                progressbar.progress += 1
-                uploaded_files.append(file) if file[:success]
-              }
-
-              if uploaded_files.size == chunk_size or progressbar.finished?
-                refresh_storage_token
-                Cnvrg::Logger.info("Finished upload chunk of #{chunk_size} files")
-                Cnvrg::Logger.info("Sending Upload files save")
-                blob_ids = uploaded_files.map {|f| f['bv_id']}
-                Cnvrg::Logger.info("Sending chunk to server")
-                upload_resp = Cnvrg::API.request(@base_resource + "upload_files_save", "POST", {commit: commit_sha1, blob_ids: blob_ids, dirs: dirs})
-                unless Cnvrg::CLI.is_response_success(upload_resp, false)
-                  Cnvrg::Logger.log_method(bind: binding)
-                  raise Exception.new("Got an error message from server, #{upload_resp.try(:fetch, "message")}")
+        threads.times do |i|
+          progress_threads[i] = Thread.new do
+            loop do
+              file = progress_queue.deq(non_block: true) rescue nil # to prevent deadlocks
+              unless file.nil?
+                blob_ids = []
+                dirs_to_upload = []
+
+                progress_mutex.synchronize {
+                  progressbar.progress += 1
+                  uploaded_files.append(file) if file[:success]
+
+                  if uploaded_files.size >= chunk_size or progressbar.finished?
+                    blob_ids = uploaded_files.map {|f| f['bv_id']}
+                    dirs_to_upload = dirs.clone
+                    uploaded_files = []
+                    dirs = []
+                  end
+                }
+
+                if blob_ids.present?
+                  refresh_storage_token
+                  Cnvrg::Logger.info("Finished upload chunk of #{chunk_size} files, Sending Upload files save")
+
+
+                  retry_count = 0
+                  loop do
+                    upload_resp = Cnvrg::API.request(@base_resource + "upload_files_save", "POST", {commit: commit_sha1, blob_ids: blob_ids, dirs: dirs_to_upload})
+
+                    if not (Cnvrg::CLI.is_response_success(upload_resp, false))
+                      retry_count += 1
+                      Cnvrg::Logger.log_error_message("Failed request save files: #{Time.current}, retry: #{retry_count}")
+                      Cnvrg::Logger.info("Got an error message from server, #{upload_resp.try(:fetch, "message")}")
+                      if retry_count > 20
+                        puts "Failed to save files: #{Time.current}, trying next chunk"
+                        break
+                      end
+                      sleep 5
+                      next
+                    end
+                    Cnvrg::Logger.info("Chunk saved on server")
+                    break
+                  end
                 end
-                Cnvrg::Logger.info("Chunk saved on server")
-                uploaded_files = []
-                dirs = []
+              else
+                sleep(0.1)
               end
-            else
-              sleep(0.1)
-            end
 
-            if progressbar.finished?
-              Cnvrg::Logger.info("Progress bar finished closing queues")
-              file_queue.close()
-              progress_queue.close()
-              Thread.exit
+              if progressbar.finished?
+                Cnvrg::Logger.info("Progress bar finished closing queues")
+                file_queue.close()
+                progress_queue.close()
+                Thread.exit
+              end
             end
           end
         end
@@ -409,6 +434,7 @@ module Cnvrg
           tree = @dataset.generate_chunked_idx(files_chunk, prefix: prefix, threads: threads)
           Cnvrg::Logger.info("Getting files info from server")
           results = request_upload_files(commit_sha1, tree, override, new_branch, partial_commit)
+          next unless results
 
           if results['files'].blank?
             progress_mutex.synchronize { progressbar.progress += tree.keys.length }
@@ -431,12 +457,11 @@ module Cnvrg
             file_queue.push tree[key].merge(files_to_upload[key])
           end
         end
-        Cnvrg::Logger.info("Finishing sub processes of datasets' upload")
-        progress_thread.join()
+        Cnvrg::Logger.info("Waiting to progress and workers to finish")
+        progress_threads.each(&:join)
         worker_threads.each(&:join)
-
+        Thread.report_on_exception = true
       rescue => e
-        puts e
         Cnvrg::Logger.log_method(bind: binding)
         Cnvrg::Logger.log_error(e)
         raise e
@@ -500,7 +525,7 @@ module Cnvrg
         upload_resp = Cnvrg::API.request(@base_resource + "upload_file", 'POST_FILE', {absolute_path: absolute_path, relative_path: relative_path,
                                                                                        commit_sha1: commit_sha1, file_name: file_name,
                                                                                        file_size: file_size, file_content_type: content_type, sha1: sha1})
-        puts upload_resp
+
 
       end
 
@@ -547,7 +572,7 @@ module Cnvrg
           return false
         end
       rescue => e
-        puts e.message
+        #puts e.message
         return false
       end
     end
@@ -792,7 +817,7 @@ module Cnvrg
         return resp
 
       rescue => e
-        puts e.message
+        #puts e.message
         return false
 
       end

data/lib/cnvrg/dataset.rb

@@ -557,7 +557,12 @@ module Cnvrg
         if File.directory? file
           tree[label + "/"] = nil
         else
-          sha1 = OpenSSL::Digest::SHA1.file(file).hexdigest
+          begin
+            sha1 = OpenSSL::Digest::SHA1.file(file).hexdigest
+          rescue => e
+            #puts "Could'nt calculate sha1 for: #{file}, Error: #{e.message}"
+            next
+          end
           file_name = File.basename file
           file_size = File.size(file).to_f
           mime_type = MimeMagic.by_path(file)

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.10.17'
+  VERSION = '1.10.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.10.17
+  version: 1.10.18
 platform: ruby
 authors:
 - Yochay Ettun