mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-54732 fixed validate cachedir debug type issue and turn on globally.

Browse Source
This commit is contained in:
Daniel Moody 2021-04-21 16:43:01 +00:00 committed by Evergreen Agent
parent 574020b007
commit 44e6740a3f
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildscripts/generate_compile_expansions.py
View File

@ -95,8 +95,9 @@ def generate_scons_cache_expansions():
scons_cache_mode = "nolinked"
if os.getenv("USE_SCONS_CACHE") not in (None, False, "false", ""):
expansions["scons_cache_args"] = "--cache={0} --cache-dir={1}".format(
scons_cache_mode, shlex.quote(default_cache_path))
expansions[
"scons_cache_args"] = "--cache={0} --cache-signature-mode=validate --cache-dir={1}".format(
scons_cache_mode, shlex.quote(default_cache_path))
return expansions

10
buildscripts/generate_compile_expansions_shared_cache.py
View File

@ -100,8 +100,9 @@ def generate_scons_cache_expansions():
shared_mount_root = '/efs'
default_cache_path = os.path.join(shared_mount_root, system_uuid, "scons-cache")
expansions["scons_cache_path"] = default_cache_path
expansions["scons_cache_args"] = "--cache={0} --cache-dir={1}".format(
scons_cache_mode, shlex.quote(default_cache_path))
expansions[
"scons_cache_args"] = "--cache={0} --cache-signature-mode=validate --cache-dir={1}".format(
scons_cache_mode, shlex.quote(default_cache_path))
# Local shared cache - host-based
elif os.getenv("SCONS_CACHE_SCOPE") == "local":
@ -113,8 +114,9 @@ def generate_scons_cache_expansions():
default_cache_path = os.path.join(default_cache_path_base, system_uuid)
expansions["scons_cache_path"] = default_cache_path
expansions["scons_cache_args"] = "--cache={0} --cache-dir={1}".format(
scons_cache_mode, shlex.quote(default_cache_path))
expansions[
"scons_cache_args"] = "--cache={0} --cache-signature-mode=validate --cache-dir={1}".format(
scons_cache_mode, shlex.quote(default_cache_path))
# No cache
else:
# Anything else is 'none'

2
etc/evergreen.yml
View File

@ -12417,7 +12417,7 @@ buildvariants:
display_name: "~ Shared Library RHEL 8.0 (visibility test)"
expansions:
<<: *enterprise-rhel-80-64-bit-dynamic-required-expansions
compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --experimental-visibility-support=on --cache-signature-mode=validate
compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --experimental-visibility-support=on
- name: windows-dynamic-visibility-test
display_name: "~ Shared Library Windows (visibility test)"

9
site_scons/site_tools/validate_cache_dir.py
View File

@ -134,7 +134,14 @@ class CacheDirValidate(SCons.CacheDir.CacheDir):
return False
def CacheDebug(self, fmt, target, cachefile):
super().CacheDebug(fmt, target, cachefile + self.get_ext())
# The target cachefile will live in a directory with the special
# extension for this cachedir class. Check if this cachefile is
# in a directory like that and customize the debug logs.
cksum_cachefile = str(pathlib.Path(cachefile).parent)
if cksum_cachefile.endswith(self.get_ext()):
super().CacheDebug(fmt, target, cksum_cachefile)
else:
super().CacheDebug(fmt, target, cachefile)
def print_cache_issue(self, node, msg):