diff options
| author | Олег <150132506+iddqdex@users.noreply.github.com> | 2025-04-16 17:43:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-16 17:43:27 +0300 |
| commit | 68489d0839fb4e98a7d573508c0bdee7d1dc066c (patch) | |
| tree | 7b6490403501070ed73a60947f6ea6a4819cdde4 | |
| parent | a9a959bfb44b719196b2aa860c1bf164f403c72f (diff) | |
| download | ydb-68489d0839fb4e98a7d573508c0bdee7d1dc066c.tar.gz | |
Use other env variables for internal breakpad and switch it on in ydbd (#17282)
Co-authored-by: Oleg Geller <iddqd@qavm-932f8cde.qemu>
| -rw-r--r-- | ydb/apps/ydbd/ya.make | 2 | ||||
| -rw-r--r-- | ydb/library/breakpad/minidumps.cpp | 4 | ||||
| -rw-r--r-- | ydb/tests/functional/minidumps/test_break.py | 6 | ||||
| -rw-r--r-- | ydb/tests/functional/minidumps/ya.make | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ydb/apps/ydbd/ya.make b/ydb/apps/ydbd/ya.make index 51323ee07c3..46ad9ac608c 100644 --- a/ydb/apps/ydbd/ya.make +++ b/ydb/apps/ydbd/ya.make @@ -69,7 +69,7 @@ PEERDIR( yql/essentials/udfs/common/url_base yql/essentials/udfs/common/yson2 yql/essentials/udfs/logs/dsv -# ydb/library/breakpad + ydb/library/breakpad ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs ) diff --git a/ydb/library/breakpad/minidumps.cpp b/ydb/library/breakpad/minidumps.cpp index 1e87f953d83..c88875d840a 100644 --- a/ydb/library/breakpad/minidumps.cpp +++ b/ydb/library/breakpad/minidumps.cpp @@ -7,7 +7,7 @@ class TMinidumper { public: TMinidumper() { - if(const char* path = getenv("BREAKPAD_MINIDUMPS_PATH")) { + if(const char* path = getenv("INTERNAL_BREAKPAD_MINIDUMPS_PATH")) { using namespace google_breakpad; Handler = MakeHolder<ExceptionHandler>(MinidumpDescriptor(path), nullptr, DumpCallback, nullptr, true, -1, true); } @@ -15,7 +15,7 @@ public: private: static bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* /*context*/, bool succeeded) { - if (char* script = getenv("BREAKPAD_MINIDUMPS_SCRIPT")) { + if (char* script = getenv("INTERNAL_BREAKPAD_MINIDUMPS_SCRIPT")) { if (auto pid = fork()) { waitpid(pid, 0, 0); } else { diff --git a/ydb/tests/functional/minidumps/test_break.py b/ydb/tests/functional/minidumps/test_break.py index d04c79911a5..56d726f4c14 100644 --- a/ydb/tests/functional/minidumps/test_break.py +++ b/ydb/tests/functional/minidumps/test_break.py @@ -6,7 +6,7 @@ from ydb.tests.library.harness.kikimr_runner import KiKiMR def test_create_minidump(): dump_path = os.path.join(yatest.common.tempfile.gettempdir(), 'dumps1') os.makedirs(dump_path, exist_ok=True) - os.environ['BREAKPAD_MINIDUMPS_PATH'] = dump_path + os.environ['INTERNAL_BREAKPAD_MINIDUMPS_PATH'] = dump_path cluster = KiKiMR() cluster.start() for node in cluster.nodes.values(): @@ -31,8 +31,8 @@ def test_minidump_script(): 'echo $SUCCESS >${PATH}.success\n' ) os.chmod(script_path, 0o777) - os.environ['BREAKPAD_MINIDUMPS_SCRIPT'] = script_path - os.environ['BREAKPAD_MINIDUMPS_PATH'] = dump_path + os.environ['INTERNAL_BREAKPAD_MINIDUMPS_SCRIPT'] = script_path + os.environ['INTERNAL_BREAKPAD_MINIDUMPS_PATH'] = dump_path cluster = KiKiMR() cluster.start() for node in cluster.nodes.values(): diff --git a/ydb/tests/functional/minidumps/ya.make b/ydb/tests/functional/minidumps/ya.make index efe9645bb7b..554c6ef4561 100644 --- a/ydb/tests/functional/minidumps/ya.make +++ b/ydb/tests/functional/minidumps/ya.make @@ -3,7 +3,7 @@ IF (OS_LINUX AND NOT SANITIZER_TYPE) PY3TEST() TEST_SRCS( -# test_break.py + test_break.py ) SIZE(MEDIUM) |