8568: Enhance image_hash parsing when using Docker 1.10+

[arvados.git] / sdk / python / arvados / commands / put.py

diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py
index 8fa1c8f66b9dbd456d3c661884a4052ca4b239c1..5cb699f49f7a21eb8d7789a52bd0aea7bdd056f0 100644 (file)
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@ -197,25 +197,10 @@ class ResumeCacheConflict(Exception):
 class ResumeCache(object):
     CACHE_DIR = '.cache/arvados/arv-put'
 
-    def __init__(self, file_spec, api_client=None, num_retries=0):
+    def __init__(self, file_spec):
         self.cache_file = open(file_spec, 'a+')
         self._lock_file(self.cache_file)
         self.filename = self.cache_file.name
-        try:
-            state = self.load()
-            locator = None
-            try:
-                if "_finished_streams" in state and len(state["_finished_streams"]) > 0:
-                    locator = state["_finished_streams"][0][1][0]
-                elif "_current_stream_locators" in state and len(state["_current_stream_locators"]) > 0:
-                    locator = state["_current_stream_locators"][0]
-                if locator is not None:
-                    kc = arvados.keep.KeepClient(api_client=api_client)
-                    kc.head(locator, num_retries=num_retries)
-            except Exception as e:
-                raise arvados.errors.KeepRequestError("Head request error for {}: {}".format(locator, e))
-        except (ValueError):
-            pass
 
     @classmethod
     def make_path(cls, args):
@@ -241,6 +226,23 @@ class ResumeCache(object):
         self.cache_file.seek(0)
         return json.load(self.cache_file)
 
+    def check_cache(self, api_client=None, num_retries=0):
+        try:
+            state = self.load()
+            locator = None
+            try:
+                if "_finished_streams" in state and len(state["_finished_streams"]) > 0:
+                    locator = state["_finished_streams"][0][1][0]
+                elif "_current_stream_locators" in state and len(state["_current_stream_locators"]) > 0:
+                    locator = state["_current_stream_locators"][0]
+                if locator is not None:
+                    kc = arvados.keep.KeepClient(api_client=api_client)
+                    kc.head(locator, num_retries=num_retries)
+            except Exception as e:
+                self.restart()
+        except (ValueError):
+            pass
+
     def save(self, data):
         try:
             new_cache_fd, new_cache_name = tempfile.mkstemp(
@@ -452,14 +454,10 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
     resume_cache = None
     if args.resume:
         try:
-            cachepath = ResumeCache.make_path(args)
-            resume_cache = ResumeCache(cachepath, api_client=api_client, num_retries=args.retries)
+            resume_cache = ResumeCache(ResumeCache.make_path(args))
+            resume_cache.check_cache(api_client=api_client, num_retries=args.retries)
         except (IOError, OSError, ValueError):
             pass  # Couldn't open cache directory/file.  Continue without it.
-        except arvados.errors.KeepRequestError:
-            # delete the cache and create a new one
-            shutil.rmtree(cachepath)
-            resume_cache = ResumeCache(cachepath)
         except ResumeCacheConflict:
             print >>stderr, "\n".join([
                 "arv-put: Another process is already uploading this data.",
@@ -510,6 +508,7 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
     if args.progress:  # Print newline to split stderr from stdout for humans.
         print >>stderr
 
+    output = None
     if args.stream:
         output = writer.manifest_text()
         if args.normalize:
@@ -550,9 +549,12 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
             status = 1
 
     # Print the locator (uuid) of the new collection.
-    stdout.write(output)
-    if not output.endswith('\n'):
-        stdout.write('\n')
+    if output is None:
+        status = status or 1
+    else:
+        stdout.write(output)
+        if not output.endswith('\n'):
+            stdout.write('\n')
 
     for sigcode, orig_handler in orig_signal_handlers.items():
         signal.signal(sigcode, orig_handler)