swift 2.31.1__py2.py3-none-any.whl → 2.32.1__py2.py3-none-any.whl

swift/obj/ssync_sender.py

@@ -21,6 +21,7 @@ from swift.common import bufferedhttp
 from swift.common import exceptions
 from swift.common import http
 from swift.common import utils
+from swift.common.swob import wsgi_to_bytes
 
 
 def encode_missing(object_hash, ts_data, ts_meta=None, ts_ctype=None,
@@ -42,9 +43,13 @@ def encode_missing(object_hash, ts_data, ts_meta=None, ts_ctype=None,
     if ts_meta and ts_meta != ts_data:
         delta = ts_meta.raw - ts_data.raw
         extra_parts.append('m:%x' % delta)
+        if ts_meta.offset:
+            extra_parts[-1] += '__%x' % ts_meta.offset
         if ts_ctype and ts_ctype != ts_data:
             delta = ts_ctype.raw - ts_data.raw
             extra_parts.append('t:%x' % delta)
+            if ts_ctype.offset:
+                extra_parts[-1] += '__%x' % ts_ctype.offset
     if 'durable' in kwargs and kwargs['durable'] is False:
         # only send durable in the less common case that it is False
         extra_parts.append('durable:%s' % kwargs['durable'])
@@ -262,7 +267,7 @@ class Sender(object):
                 self.daemon.node_timeout, 'connect receive'):
             response = connection.getresponse()
             if response.status != http.HTTP_OK:
-                err_msg = response.read()[:1024]
+                err_msg = utils.cap_length(response.read(), 1024)
                 raise exceptions.ReplicationException(
                     'Expected status %s; got %s (%s)' %
                     (http.HTTP_OK, response.status, err_msg))
@@ -354,7 +359,7 @@ class Sender(object):
                     except UnicodeDecodeError:
                         pass
                 raise exceptions.ReplicationException(
-                    'Unexpected response: %r' % line[:1024])
+                    'Unexpected response: %r' % utils.cap_length(line, 1024))
         while True:
             with exceptions.MessageTimeout(
                     self.daemon.http_timeout, 'missing_check line wait'):
@@ -443,7 +448,7 @@ class Sender(object):
                     except UnicodeDecodeError:
                         pass
                 raise exceptions.ReplicationException(
-                    'Unexpected response: %r' % line[:1024])
+                    'Unexpected response: %r' % utils.cap_length(line, 1024))
         while True:
             with exceptions.MessageTimeout(
                     self.daemon.http_timeout, 'updates line wait'):
@@ -460,17 +465,12 @@ class Sender(object):
                     except UnicodeDecodeError:
                         pass
                 raise exceptions.ReplicationException(
-                    'Unexpected response: %r' % line[:1024])
+                    'Unexpected response: %r' % utils.cap_length(line, 1024))
 
     def send_subrequest(self, connection, method, url_path, headers, df):
         msg = [b'%s %s' % (method.encode('ascii'), url_path.encode('utf8'))]
         for key, value in sorted(headers.items()):
-            if six.PY2:
-                msg.append(b'%s: %s' % (key, value))
-            else:
-                msg.append(b'%s: %s' % (
-                    key.encode('utf8', 'surrogateescape'),
-                    str(value).encode('utf8', 'surrogateescape')))
+            msg.append(wsgi_to_bytes('%s: %s' % (key, value)))
         msg = b'\r\n'.join(msg) + b'\r\n\r\n'
         with exceptions.MessageTimeout(self.daemon.node_timeout,
                                        'send_%s' % method.lower()):

swift/proxy/controllers/account.py

@@ -21,7 +21,7 @@ from swift.common.utils import public
 from swift.common.constraints import check_metadata
 from swift.common.http import HTTP_NOT_FOUND, HTTP_GONE
 from swift.proxy.controllers.base import Controller, clear_info_cache, \
-    set_info_cache
+    set_info_cache, NodeIter
 from swift.common.middleware import listing_formats
 from swift.common.swob import HTTPBadRequest, HTTPMethodNotAllowed
 from swift.common.request_helpers import get_sys_meta_prefix
@@ -63,8 +63,8 @@ class AccountController(Controller):
         partition = self.app.account_ring.get_part(self.account_name)
         concurrency = self.app.account_ring.replica_count \
             if self.app.get_policy_options(None).concurrent_gets else 1
-        node_iter = self.app.iter_nodes(self.app.account_ring, partition,
-                                        self.logger, req)
+        node_iter = NodeIter(self.app, self.app.account_ring, partition,
+                             self.logger, req)
         params = req.params
         params['format'] = 'json'
         req.params = params
@@ -96,7 +96,7 @@ class AccountController(Controller):
         # up-to-date information for the account.
         resp.headers['X-Backend-Recheck-Account-Existence'] = str(
             self.app.recheck_account_existence)
-        set_info_cache(self.app, req.environ, self.account_name, None, resp)
+        set_info_cache(req.environ, self.account_name, None, resp)
 
         if req.environ.get('swift_owner'):
             self.add_acls_from_sys_metadata(resp)
@@ -124,7 +124,7 @@ class AccountController(Controller):
         account_partition, accounts = \
             self.app.account_ring.get_nodes(self.account_name)
         headers = self.generate_request_headers(req, transfer=True)
-        clear_info_cache(self.app, req.environ, self.account_name)
+        clear_info_cache(req.environ, self.account_name)
         resp = self.make_requests(
             req, self.app.account_ring, account_partition, 'PUT',
             req.swift_entity_path, [headers] * len(accounts))
@@ -146,7 +146,7 @@ class AccountController(Controller):
         account_partition, accounts = \
             self.app.account_ring.get_nodes(self.account_name)
         headers = self.generate_request_headers(req, transfer=True)
-        clear_info_cache(self.app, req.environ, self.account_name)
+        clear_info_cache(req.environ, self.account_name)
         resp = self.make_requests(
             req, self.app.account_ring, account_partition, 'POST',
             req.swift_entity_path, [headers] * len(accounts))
@@ -173,7 +173,7 @@ class AccountController(Controller):
         account_partition, accounts = \
             self.app.account_ring.get_nodes(self.account_name)
         headers = self.generate_request_headers(req)
-        clear_info_cache(self.app, req.environ, self.account_name)
+        clear_info_cache(req.environ, self.account_name)
         resp = self.make_requests(
             req, self.app.account_ring, account_partition, 'DELETE',
             req.swift_entity_path, [headers] * len(accounts))