Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When copying uncompressed images, compress on them on-the-fly #420

Merged
merged 1 commit into from
Apr 30, 2024
Merged

When copying uncompressed images, compress on them on-the-fly #420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 20 additions & 12 deletions mtda/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import tempfile
import time
import zerorpc
import zstandard as zstd

from mtda.main import MultiTenantDeviceAccess
import mtda.constants as CONSTS
Expand Down Expand Up @@ -468,9 +469,9 @@ def prepare(self, output_size=None, compression=None):
compr = self.compression() if compression is None else compression
self._inputsize = self.size()
self._outputsize = output_size
if output_size is None:
if compr == CONSTS.IMAGE.RAW.value:
self._outputsize = self._inputsize
# if image is uncompressed, we compress on the fly
if compr == CONSTS.IMAGE.RAW.value:
compr = CONSTS.IMAGE.ZST.value
self._agent.storage_compression(compr, self._session)
self._lastreport = time.time()
self._totalread = 0
Expand Down Expand Up @@ -509,11 +510,18 @@ def copy(self):
raise IOError(f'{self._path}: image not found!')

image = open(self._path, 'rb')
comp_on_the_fly = False
if self.compression() == CONSTS.IMAGE.RAW.value:
cctx = zstd.ZstdCompressor(level=1)
comp_on_the_fly = True
inputstream = cctx.stream_reader(image)
else:
inputstream = image

try:
data = image.read(self._blksz)
dataread = len(data)
while self._totalread < self._inputsize:
self._totalread += dataread
data = inputstream.read(self._blksz)
while data:
self._totalread = image.tell()
self.progress()

# Write block to shared storage device
Expand All @@ -525,16 +533,16 @@ def copy(self):
'shared storage')
elif bytes_wanted > 0:
# Read next block
data = image.read(bytes_wanted)
dataread = len(data)
data = inputstream.read(bytes_wanted)
else:
# Agent may continue without further data
data = b''
dataread = 0

finally:
# Close the local image
image.close()
if comp_on_the_fly:
inputstream.close()
else:
image.close()

def size(self):
st = os.stat(self._path)
Expand Down