summaryrefslogtreecommitdiff
path: root/site_scons/site_tools
diff options
context:
space:
mode:
Diffstat (limited to 'site_scons/site_tools')
-rw-r--r--site_scons/site_tools/validate_cache_dir.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/site_scons/site_tools/validate_cache_dir.py b/site_scons/site_tools/validate_cache_dir.py
index bf2075daa41..a1235483cc4 100644
--- a/site_scons/site_tools/validate_cache_dir.py
+++ b/site_scons/site_tools/validate_cache_dir.py
@@ -192,11 +192,13 @@ class CacheDirValidate(SCons.CacheDir.CacheDir):
cksum_dir = pathlib.Path(self.cachepath(node)[1]).parent
if cksum_dir.is_dir():
- rm_path = f"{cksum_dir}.{SCons.CacheDir.cache_tmp_uuid}.del"
- cksum_dir.replace(rm_path)
- shutil.rmtree(rm_path)
+ # TODO: Turn this back on and fix the error message when the race condition
+ # has been resolved in SERVER-56625
+ #rm_path = f"{cksum_dir}.{SCons.CacheDir.cache_tmp_uuid}.del"
+ #cksum_dir.replace(rm_path)
+ #shutil.rmtree(rm_path)
- clean_msg = f"Removed bad cachefile {cksum_dir} from cache."
+ clean_msg = f"Bad cachefile {cksum_dir} found in cache."
print(clean_msg)
self.CacheDebug(clean_msg + cache_debug_suffix, node, cksum_dir)
self.CacheDebugJson({