a couple of small issues in s3 error handling (#821)

Author: oavdeev

metaflow/datatools/s3op.py

@@ -89,7 +89,7 @@ def normalize_client_error(err):
     try:
         return int(error_code)
     except ValueError:
-        if error_code == "AccessDenied":
+        if error_code in ("AccessDenied", "AllAccessDisabled"):
             return 403
         if error_code == "NoSuchKey":
             return 404
@@ -400,7 +400,7 @@ def list_prefix(self, prefix_url, delimiter=""):
         except self.s3.exceptions.NoSuchBucket:
             return False, prefix_url, ERROR_URL_NOT_FOUND
         except self.client_error as err:
-            if err.response["Error"]["Code"] == "AccessDenied":
+            if err.response["Error"]["Code"] in ("AccessDenied", "AllAccessDisabled"):
                 return False, prefix_url, ERROR_URL_ACCESS_DENIED
             else:
                 raise

metaflow/datatools/s3tail.py

@@ -18,6 +18,11 @@ def __init__(self, s3url):
         self._pos = 0
         self._tail = b""
 
+    def reset_client(self, hard_reset=False):
+        # This method is required by @aws_retry
+        if hard_reset or self.s3 is None:
+            self.s3, self.ClientError = get_s3_client()
+
     def clone(self, s3url):
         tail = S3Tail(s3url)
         tail._pos = self._pos

metaflow/mflog/__init__.py

@@ -119,8 +119,7 @@ def _available_logs(tail, stream, echo, should_persist=False):
                 echo(line.strip().decode("utf-8", errors="replace"), stream)
         except Exception as ex:
             echo(
-                "%s[ temporary error in fetching logs: %s ]" % to_unicode(prefix),
-                ex,
+                "%s[ temporary error in fetching logs: %s ]" % (to_unicode(prefix), ex),
                 "stderr",
             )