common/populate: support multiple cached images

Enhance the populated fs metadump image cache to support multiple
configurations per filesystem so that we reduce the image creation
overhead even further.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2019-03-19 17:45:35 -07:00
committed by Eryu Guan
parent 5034ff6c1f
commit c2cda723f6
+4 -2
View File
@@ -805,10 +805,12 @@ _scratch_populate_restore_cached() {
# Populate a scratch FS from scratch or from a cached image.
_scratch_populate_cached() {
local meta_descr="$(_scratch_populate_cache_tag "$@")"
local meta_tag="$(echo "${meta_descr}" | md5sum - | cut -d ' ' -f 1)"
local metadump_stem="${TEST_DIR}/__populate.${FSTYP}.${meta_tag}"
# These variables are shared outside this function
POPULATE_METADUMP="${TEST_DIR}/__populate.${FSTYP}"
POPULATE_METADUMP_DESCR="${TEST_DIR}/__populate.${FSTYP}.txt"
POPULATE_METADUMP="${metadump_stem}.metadump"
POPULATE_METADUMP_DESCR="${metadump_stem}.txt"
# Don't keep metadata images cached for more 48 hours...
rm -rf "$(find "${POPULATE_METADUMP}" -mtime +2 2>/dev/null)"