Fix indent and add logging in case of QuotaError

diff --git a/snf-pithos-backend/pithos/backends/modular.py b/snf-pithos-backend/pithos/backends/modular.py
index b4c55fc..d1ea11b 100644 (file)
--- a/snf-pithos-backend/pithos/backends/modular.py
+++ b/snf-pithos-backend/pithos/backends/modular.py
@@ -825,14 +825,24 @@ class ModularBackend(BaseBackend):
 
         del_size = self._apply_versioning(account, container, pre_version_id)
         size_delta = size - del_size
-        if not quotaholder_url:        # Check quota.
-        if size_delta > 0:
-            account_quota = long(self._get_policy(account_node)['quota'])
-            container_quota = long(self._get_policy(container_node)['quota'])
-            if (account_quota > 0 and self._get_statistics(account_node)[1] + size_delta > account_quota) or \
-               (container_quota > 0 and self._get_statistics(container_node)[1] + size_delta > container_quota):
-                # This must be executed in a transaction, so the version is never created if it fails.
-                raise QuotaError
+        if not self.quotaholder_url: # Check quota.
+            if size_delta > 0:
+                account_quota = long(self._get_policy(account_node)['quota'])
+                account_usage = self._get_statistics(account_node)[1] + size_delta
+                container_quota = long(self._get_policy(container_node)['quota'])
+                container_usage = self._get_statistics(container_node)[1] + size_delta
+                if (account_quota > 0 and account_usage > account_quota):
+                    logger.error('account_quota: %s, account_usage: %s' % (
+                        account_quota, account_usage
+                    ))
+                    raise QuotaError
+                if (container_quota > 0 and container_usage > container_quota):
+                    # This must be executed in a transaction, so the version is
+                    # never created if it fails.
+                    logger.error('container_quota: %s, container_usage: %s' % (
+                        container_quota, container_usage
+                    ))
+                    raise QuotaError
         self._report_size_change(user, account, size_delta,
                                  {'action': 'object update', 'path': path,
                                   'versions': ','.join([str(dest_version_id)])})