diff options
| author | Clarisse Cheah <clarisse.cheah@mongodb.com> | 2022-10-16 23:44:15 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-10-17 00:18:57 +0000 |
| commit | 0639b3fbacc7e9da34170f9aed8754668955c577 (patch) | |
| tree | 6898a0349bd90a9d33801dd29bb0ed0cdb2ada2f | |
| parent | 31547026b14608a2a3608be29f8d344ccb844933 (diff) | |
| download | mongo-0639b3fbacc7e9da34170f9aed8754668955c577.tar.gz | |
Import wiredtiger: 2fce34ed092977c670a4e7682c5574b4e269e231 from branch mongodb-master
ref: 2426972d3a..2fce34ed09
for: 6.2.0-rc0
WT-8562 Ignore permission failures in hang analyzer and fix error logging (#8371)
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/wt_hang_analyzer/wt_hang_analyzer.py | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 7c7b62af70c..77953a1a1de 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "2426972d3aac50b2c94ef25a90af3d2d1021360a" + "commit": "2fce34ed092977c670a4e7682c5574b4e269e231" } diff --git a/src/third_party/wiredtiger/test/wt_hang_analyzer/wt_hang_analyzer.py b/src/third_party/wiredtiger/test/wt_hang_analyzer/wt_hang_analyzer.py index 4afb9a06ea7..e217d77dedc 100644 --- a/src/third_party/wiredtiger/test/wt_hang_analyzer/wt_hang_analyzer.py +++ b/src/third_party/wiredtiger/test/wt_hang_analyzer/wt_hang_analyzer.py @@ -39,8 +39,8 @@ Currently only supports Linux. There are two issues with the MacOS and Windows i 2. WT-6919 - Windows cannot find the debug symbols. """ -import csv, glob, itertools, logging, re, tempfile, traceback -import os, sys, platform, signal, subprocess, threading, time +import csv, glob, itertools, logging, tempfile, traceback +import os, sys, platform, subprocess, threading from distutils import spawn from io import BytesIO, TextIOWrapper from optparse import OptionParser @@ -614,15 +614,17 @@ def main(): try: avoid_asan_dump(pid) except Exception as err: - root_logger.warn("Error encountered when removing ASAN mappings from core dump", err) - trapped_exceptions.append(traceback.format_exc()) + root_logger.warning("Error encountered when removing ASAN mappings from core dump: %s", err) + # Ignore permission failures caused by processes we are not interested in + if 'Permission denied' not in str(err): + trapped_exceptions.append(traceback.format_exc()) process_logger = get_process_logger(options.debugger_output, pid, process_name) try: dbg.dump_info(root_logger, process_logger, pid, process_name, options.dump_core and check_dump_quota(max_dump_size_bytes, dbg.get_dump_ext())) except Exception as err: - root_logger.info("Error encountered when invoking debugger %s", err) + root_logger.info("Error encountered when invoking debugger: %s", err) trapped_exceptions.append(traceback.format_exc()) root_logger.info("Done analyzing all processes for hangs") |