Skip to content

Commit f6ee6f9

Browse files
iddqdexblinkov
authored andcommitted
Use Breakpad in ydbd (#14649)
1 parent bc2aa96 commit f6ee6f9

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
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/deploy/docker/Dockerfile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,18 @@ COPY --chmod=0644 /liblibaio-dynamic.so /lib/liblibaio-dynamic.so
2626
###
2727

2828
FROM ${BREAKPAD_INIT_IMAGE}:${BREAKPAD_INIT_IMAGE_TAG} AS breakpad_init
29-
FROM base AS breakpad-setuid
30-
COPY --from=breakpad_init /usr/lib/libbreakpad_init.so /usr/lib/libbreakpad_init.so
31-
# workaround for old docker versions
32-
# https://github.com/moby/buildkit/issues/3920
33-
RUN /usr/bin/chmod 4644 /usr/lib/libbreakpad_init.so
34-
35-
3629
FROM base AS base-breakpad
3730
RUN \
3831
apt-get -yqq update && \
3932
apt-get -yqq install --no-install-recommends binutils gdb strace linux-tools-generic && \
4033
apt-get clean && rm -rf /var/lib/apt/lists/*
41-
ENV LD_PRELOAD=libbreakpad_init.so
4234
ENV BREAKPAD_MINIDUMPS_PATH=/opt/ydb/volumes/coredumps
4335
ENV BREAKPAD_MINIDUMPS_SCRIPT=/opt/ydb/bin/minidump_script.py
4436
# breakpad binaries
4537
COPY --chmod=0755 --from=breakpad_init /usr/bin/minidump_stackwalk /usr/bin/minidump_stackwalk
4638
COPY --chmod=0755 --from=breakpad_init /usr/bin/minidump-2-core /usr/bin/minidump-2-core
4739
# minidump callback script
4840
COPY --chmod=0755 --chown=ydb /minidump_script.py /opt/ydb/bin/minidump_script.py
49-
# minidump init library
50-
COPY --link --from=breakpad-setuid /usr/lib/libbreakpad_init.so /usr/lib/libbreakpad_init.so
5141

5242
FROM base AS ydbd-setcap
5343
COPY --chmod=0755 --chown=ydb /ydbd /opt/ydb/bin/ydbd

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)
33
PY3TEST()
44

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

99
SIZE(MEDIUM)

0 commit comments

Comments
 (0)