StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Change the cache partition size check into warnings.

Browse Source 
For some old builds, we may not define cache partition size. Change the
exception into a warning to make the script backward compatible.

Change-Id: Ia90531e3455d4888cfac6510cab879c50883be53
(cherry picked from commit 575d68a48e)
This commit is contained in:
Tao Bao
2015-08-07 19:49:45 -07:00
committed by Rom Lemarchand
parent 60ad0cdc22
commit 116977c7db
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/blockimgdiff.py
View File

@@ -483,7 +483,7 @@ class BlockImageDiff(object):
if free_string: if free_string:
out.append("".join(free_string)) out.append("".join(free_string))
if self.version >= 2: if self.version >= 2 and common.OPTIONS.cache_size is not None:
# Sanity check: abort if we're going to need more stash space than # Sanity check: abort if we're going to need more stash space than
# the allowed size (cache_size * threshold). There are two purposes # the allowed size (cache_size * threshold). There are two purposes
# of having a threshold here. a) Part of the cache may have been # of having a threshold here. a) Part of the cache may have been
@@ -524,10 +524,16 @@ class BlockImageDiff(object):
if self.version >= 2: if self.version >= 2:
max_stashed_size = max_stashed_blocks * self.tgt.blocksize max_stashed_size = max_stashed_blocks * self.tgt.blocksize
max_allowed = common.OPTIONS.cache_size * common.OPTIONS.stash_threshold OPTIONS = common.OPTIONS
print("max stashed blocks: %d (%d bytes), limit: %d bytes (%.2f%%)\n" % ( if OPTIONS.cache_size is not None:
max_allowed = OPTIONS.cache_size * OPTIONS.stash_threshold
print("max stashed blocks: %d (%d bytes), "
"limit: %d bytes (%.2f%%)\n" % (
max_stashed_blocks, max_stashed_size, max_allowed, max_stashed_blocks, max_stashed_size, max_allowed,
max_stashed_size * 100.0 / max_allowed)) max_stashed_size * 100.0 / max_allowed))
else:
print("max stashed blocks: %d (%d bytes), limit: <unknown>\n" % (
max_stashed_blocks, max_stashed_size))
def ReviseStashSize(self): def ReviseStashSize(self):
print("Revising stash size...") print("Revising stash size...")

3
tools/releasetools/common.py
View File

@@ -62,6 +62,9 @@ class Options(object):
self.source_info_dict = None self.source_info_dict = None
self.target_info_dict = None self.target_info_dict = None
self.worker_threads = None self.worker_threads = None
# Stash size cannot exceed cache_size * threshold.
self.cache_size = None
self.stash_threshold = 0.8
OPTIONS = Options() OPTIONS = Options()

2
tools/releasetools/ota_from_target_files.py
View File

@@ -1634,7 +1634,7 @@ def main(argv):
cache_size = OPTIONS.info_dict.get("cache_size", None) cache_size = OPTIONS.info_dict.get("cache_size", None)
if cache_size is None: if cache_size is None:
raise RuntimeError("can't determine the cache partition size") print "--- can't determine the cache partition size ---"
OPTIONS.cache_size = cache_size OPTIONS.cache_size = cache_size
if OPTIONS.incremental_source is None: if OPTIONS.incremental_source is None: