Merge "Change the cache partition size check into warnings."
This commit is contained in:
@@ -461,7 +461,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
|
||||||
@@ -502,10 +502,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 ComputePatches(self, prefix):
|
def ComputePatches(self, prefix):
|
||||||
print("Reticulating splines...")
|
print("Reticulating splines...")
|
||||||
|
@@ -57,6 +57,9 @@ class Options(object):
|
|||||||
self.extras = {}
|
self.extras = {}
|
||||||
self.info_dict = None
|
self.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()
|
||||||
|
@@ -125,9 +125,6 @@ OPTIONS.updater_binary = None
|
|||||||
OPTIONS.oem_source = None
|
OPTIONS.oem_source = None
|
||||||
OPTIONS.fallback_to_full = True
|
OPTIONS.fallback_to_full = True
|
||||||
OPTIONS.full_radio = False
|
OPTIONS.full_radio = False
|
||||||
# Stash size cannot exceed cache_size * threshold.
|
|
||||||
OPTIONS.cache_size = None
|
|
||||||
OPTIONS.stash_threshold = 0.8
|
|
||||||
|
|
||||||
|
|
||||||
def MostPopularKey(d, default):
|
def MostPopularKey(d, default):
|
||||||
@@ -1594,7 +1591,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:
|
||||||
|
Reference in New Issue
Block a user