diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-09-22 11:13:39 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-09-22 11:13:39 +0000 |
commit | 71680b2059681292c856f1dbfdd00d0ce7993237 (patch) | |
tree | 008e1b0031b423e35d50311341dd9d517f92fc91 | |
parent | 6a0c147c5da0d57a5653e247518a144a9be72c70 (diff) | |
parent | c3c5b75b49ab2218a5fbd2d8313e434ac9ca92fb (diff) | |
download | glance_store-71680b2059681292c856f1dbfdd00d0ce7993237.tar.gz |
Merge "Expand sz to size"
-rw-r--r-- | glance_store/_drivers/swift/buffered.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/glance_store/_drivers/swift/buffered.py b/glance_store/_drivers/swift/buffered.py index 950c95f..fd35d3b 100644 --- a/glance_store/_drivers/swift/buffered.py +++ b/glance_store/_drivers/swift/buffered.py @@ -21,7 +21,7 @@ from glance_store import exceptions from glance_store.i18n import _ LOG = logging.getLogger(__name__) -READ_SZ = 65536 +READ_SIZE = 65536 BUFFERING_OPTS = [ cfg.StrOpt('swift_upload_buffer_dir', @@ -107,12 +107,12 @@ class BufferedReader(object): # Setting the file pointer back to the beginning of file self._tmpfile.seek(0) - def read(self, sz): + def read(self, size): """Read up to a chunk's worth of data from the input stream into a file buffer. Then return data out of that buffer. """ remaining = self.total - self._tmpfile.tell() - read_size = min(remaining, sz) + read_size = min(remaining, size) # read out of the buffered chunk result = self._tmpfile.read(read_size) # update the checksum and verifier with only the bytes @@ -130,9 +130,9 @@ class BufferedReader(object): LOG.debug("Buffering %s bytes of image segment" % to_buffer) while not self._buffered: - read_sz = min(to_buffer, READ_SZ) + read_size = min(to_buffer, READ_SIZE) try: - buf = self.fd.read(read_sz) + buf = self.fd.read(read_size) except IOError as e: # We actually don't know what exactly self.fd is. And as a # result we don't know which exception it may raise. To pass |