summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJake Yip <jake.yip@unimelb.edu.au>2017-10-31 12:13:05 +1100
committerJake Yip <jake.yip@unimelb.edu.au>2017-12-15 16:37:08 +1100
commit3e5c72f54e44231d165dcb02eccece70a0ddf7ec (patch)
tree4c22edcf5bd38e68895d2701f22dbee173699c84
parent013f4de73109d2a99924f254f512ebe0ed6eb824 (diff)
downloadglance_store-3e5c72f54e44231d165dcb02eccece70a0ddf7ec.tar.gz
Fix BufferedReader writing zero size chunks
BufferedReader loops constantly writing zero-size chunks. This fixes the bug writing zero sized chunks and terminates correctly. Closes-Bug: #1738331 Change-Id: I7a480b366c9a9d56303f402915f13f1c76128e5c
-rw-r--r--glance_store/_drivers/swift/buffered.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/glance_store/_drivers/swift/buffered.py b/glance_store/_drivers/swift/buffered.py
index fd35d3b..02c0594 100644
--- a/glance_store/_drivers/swift/buffered.py
+++ b/glance_store/_drivers/swift/buffered.py
@@ -102,7 +102,7 @@ class BufferedReader(object):
self._tmpfile = tempfile.TemporaryFile(dir=buffer_dir)
self._buffered = False
- self.is_zero_size = True
+ self.is_zero_size = False
self._buffer()
# Setting the file pointer back to the beginning of file
self._tmpfile.seek(0)
@@ -142,7 +142,7 @@ class BufferedReader(object):
if len(buf) == 0:
self._tmpfile.seek(0)
self._buffered = True
- self.is_zero_size = False
+ self.is_zero_size = True
break
self._tmpfile.write(buf)
to_buffer -= len(buf)