Преглед изворни кода

HUE-8583 [fb] Surface too many buckets error

jdesjean пре 7 година
родитељ
комит
cc69a1535f
2 измењених фајлова са 3 додато и 9 уклоњено
  1. 2 8
      apps/filebrowser/src/filebrowser/views.py
  2. 1 1
      desktop/libs/aws/src/aws/s3/s3fs.py

+ 2 - 8
apps/filebrowser/src/filebrowser/views.py

@@ -1064,16 +1064,10 @@ def generic_op(form_class, request, op, parameter_names, piggyback=None, templat
                 if is_admin(request.user) and not _is_hdfs_superuser(request):
                     msg += _(' Note: you are a Hue admin but not a HDFS superuser, "%(superuser)s" or part of HDFS supergroup, "%(supergroup)s".') \
                            % {'superuser': request.fs.superuser, 'supergroup': request.fs.supergroup}
-                if request.is_ajax():
-                    return HttpResponseForbidden(smart_str(e))
-                else:
-                    raise PopupException(msg, detail=e)
+                raise PopupException(msg, detail=e)
             except S3FileSystemException, e:
               msg = _("S3 filesystem exception.")
-              if request.is_ajax():
-                  return HttpResponseForbidden(smart_str(e))
-              else:
-                  raise PopupException(msg, detail=e)
+              raise PopupException(msg, detail=e)
             except NotImplementedError, e:
                 msg = _("Cannot perform operation.")
                 raise PopupException(msg, detail=e)

+ 1 - 1
desktop/libs/aws/src/aws/s3/s3fs.py

@@ -349,7 +349,7 @@ class S3FileSystem(object):
     except S3FileSystemException, e:
       raise e
     except S3ResponseError, e:
-      raise S3FileSystemException(_('Failed to create S3 bucket "%s": %s') % (bucket_name, e.reason))
+      raise S3FileSystemException(_('Failed to create S3 bucket "%s": %s: %s') % (bucket_name, e.reason, e.body))
     except Exception, e:
       raise S3FileSystemException(_('Failed to create S3 bucket "%s": %s') % (bucket_name, e))