Skip to content

Commit db523c3

Browse files
iddqdexOleg Geller
andcommitted
Use other env variables for internal breakpad and switch it on in ydbd (#17282)
Co-authored-by: Oleg Geller <iddqd@qavm-932f8cde.qemu>
1 parent f885a05 commit db523c3

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

ydb/apps/ydbd/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ PEERDIR(
6969
yql/essentials/udfs/common/url_base
7070
yql/essentials/udfs/common/yson2
7171
yql/essentials/udfs/logs/dsv
72-
# ydb/library/breakpad
72+
ydb/library/breakpad
7373
ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs
7474
)
7575

ydb/library/breakpad/minidumps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
class TMinidumper {
88
public:
99
TMinidumper() {
10-
if(const char* path = getenv("BREAKPAD_MINIDUMPS_PATH")) {
10+
if(const char* path = getenv("INTERNAL_BREAKPAD_MINIDUMPS_PATH")) {
1111
using namespace google_breakpad;
1212
Handler = MakeHolder<ExceptionHandler>(MinidumpDescriptor(path), nullptr, DumpCallback, nullptr, true, -1, true);
1313
}
1414
}
1515

1616
private:
1717
static bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* /*context*/, bool succeeded) {
18-
if (char* script = getenv("BREAKPAD_MINIDUMPS_SCRIPT")) {
18+
if (char* script = getenv("INTERNAL_BREAKPAD_MINIDUMPS_SCRIPT")) {
1919
if (auto pid = fork()) {
2020
waitpid(pid, 0, 0);
2121
} else {

ydb/tests/functional/minidumps/test_break.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
def test_create_minidump():
77
dump_path = os.path.join(yatest.common.tempfile.gettempdir(), 'dumps1')
88
os.makedirs(dump_path, exist_ok=True)
9-
os.environ['BREAKPAD_MINIDUMPS_PATH'] = dump_path
9+
os.environ['INTERNAL_BREAKPAD_MINIDUMPS_PATH'] = dump_path
1010
cluster = KiKiMR()
1111
cluster.start()
1212
for node in cluster.nodes.values():
@@ -31,8 +31,8 @@ def test_minidump_script():
3131
'echo $SUCCESS >${PATH}.success\n'
3232
)
3333
os.chmod(script_path, 0o777)
34-
os.environ['BREAKPAD_MINIDUMPS_SCRIPT'] = script_path
35-
os.environ['BREAKPAD_MINIDUMPS_PATH'] = dump_path
34+
os.environ['INTERNAL_BREAKPAD_MINIDUMPS_SCRIPT'] = script_path
35+
os.environ['INTERNAL_BREAKPAD_MINIDUMPS_PATH'] = dump_path
3636
cluster = KiKiMR()
3737
cluster.start()
3838
for node in cluster.nodes.values():

ydb/tests/functional/minidumps/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ IF (OS_LINUX AND NOT SANITIZER_TYPE)
33
PY3TEST()
44

55
TEST_SRCS(
6-
# test_break.py
6+
test_break.py
77
)
88

99
SIZE(MEDIUM)

0 commit comments

Comments
 (0)