Skip to content

Commit fd6bcad

Browse files
authored
Revert "Use google breakpad in ydbd (#12894)" (#12980)
1 parent 97167eb commit fd6bcad

File tree

8 files changed

+11
-94
lines changed

8 files changed

+11
-94
lines changed

ydb/apps/ydbd/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ PEERDIR(
6767
yql/essentials/udfs/common/url_base
6868
yql/essentials/udfs/common/yson2
6969
yql/essentials/udfs/logs/dsv
70-
ydb/library/breakpad
7170
ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs
7271
)
7372

ydb/deploy/docker/Dockerfile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,30 @@ COPY --chmod=0644 /liblibaio-dynamic.so /lib/liblibaio-dynamic.so
2424
###
2525
# Base image with google brekpad assets
2626
###
27-
2827
FROM ${BREAKPAD_INIT_IMAGE}:${BREAKPAD_INIT_IMAGE_TAG} AS breakpad_init
28+
29+
30+
FROM base AS breakpad-setuid
31+
COPY --from=breakpad_init /usr/lib/libbreakpad_init.so /usr/lib/libbreakpad_init.so
32+
# workaround for old docker versions
33+
# https://github.com/moby/buildkit/issues/3920
34+
RUN /usr/bin/chmod 4644 /usr/lib/libbreakpad_init.so
35+
2936
FROM base AS base-breakpad
3037
RUN \
3138
apt-get -yqq update && \
3239
apt-get -yqq install --no-install-recommends binutils gdb strace linux-tools-generic && \
3340
apt-get clean && rm -rf /var/lib/apt/lists/*
41+
ENV LD_PRELOAD=libbreakpad_init.so
3442
ENV BREAKPAD_MINIDUMPS_PATH=/opt/ydb/volumes/coredumps
3543
ENV BREAKPAD_MINIDUMPS_SCRIPT=/opt/ydb/bin/minidump_script.py
3644
# breakpad binaries
3745
COPY --chmod=0755 --from=breakpad_init /usr/bin/minidump_stackwalk /usr/bin/minidump_stackwalk
3846
COPY --chmod=0755 --from=breakpad_init /usr/bin/minidump-2-core /usr/bin/minidump-2-core
3947
# minidump callback script
4048
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
4151

4252
FROM base AS ydbd-setcap
4353
COPY --chmod=0755 --chown=ydb /ydbd /opt/ydb/bin/ydbd

ydb/library/breakpad/minidumps.cpp

Lines changed: 0 additions & 34 deletions
This file was deleted.

ydb/library/breakpad/ya.make

Lines changed: 0 additions & 14 deletions
This file was deleted.

ydb/library/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ RECURSE(
77
arrow_parquet
88
backup
99
benchmarks
10-
breakpad
1110
chunks_limiter
1211
folder_service
1312
formats

ydb/tests/functional/minidumps/test_break.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

ydb/tests/functional/minidumps/ya.make

Lines changed: 0 additions & 24 deletions
This file was deleted.

ydb/tests/functional/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ RECURSE(
1616
kv_workload
1717
large_serializable
1818
limits
19-
minidumps
2019
postgresql
2120
query_cache
2221
rename

0 commit comments

Comments
 (0)