Revert "Use google breakpad in ydbd (#12894)" (#12980)

ydb-platform · Dec 25, 2024 · fd6bcad · fd6bcad
1 parent 97167eb
commit fd6bcad
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 94 deletions.
diff --git a/ydb/apps/ydbd/ya.make b/ydb/apps/ydbd/ya.make
@@ -67,7 +67,6 @@ PEERDIR(
     yql/essentials/udfs/common/url_base
     yql/essentials/udfs/common/yson2
     yql/essentials/udfs/logs/dsv
-    ydb/library/breakpad
     ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs
 )
 

diff --git a/ydb/deploy/docker/Dockerfile b/ydb/deploy/docker/Dockerfile
@@ -24,20 +24,30 @@ COPY --chmod=0644 /liblibaio-dynamic.so /lib/liblibaio-dynamic.so
 ###
 # Base image with google brekpad assets
 ###
-
 FROM ${BREAKPAD_INIT_IMAGE}:${BREAKPAD_INIT_IMAGE_TAG} AS breakpad_init
+
+
+FROM base AS breakpad-setuid
+COPY --from=breakpad_init /usr/lib/libbreakpad_init.so /usr/lib/libbreakpad_init.so
+# workaround for old docker versions
+# https://github.com/moby/buildkit/issues/3920
+RUN /usr/bin/chmod 4644 /usr/lib/libbreakpad_init.so
+
 FROM base AS base-breakpad
 RUN \
     apt-get -yqq update && \
     apt-get -yqq install --no-install-recommends binutils gdb strace linux-tools-generic && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
+ENV LD_PRELOAD=libbreakpad_init.so
 ENV BREAKPAD_MINIDUMPS_PATH=/opt/ydb/volumes/coredumps
 ENV BREAKPAD_MINIDUMPS_SCRIPT=/opt/ydb/bin/minidump_script.py
 # breakpad binaries
 COPY --chmod=0755 --from=breakpad_init /usr/bin/minidump_stackwalk /usr/bin/minidump_stackwalk
 COPY --chmod=0755 --from=breakpad_init /usr/bin/minidump-2-core /usr/bin/minidump-2-core
 # minidump callback script
 COPY --chmod=0755 --chown=ydb /minidump_script.py /opt/ydb/bin/minidump_script.py
+# minidump init library
+COPY --link --from=breakpad-setuid /usr/lib/libbreakpad_init.so /usr/lib/libbreakpad_init.so
 
 FROM base AS ydbd-setcap
 COPY --chmod=0755 --chown=ydb /ydbd /opt/ydb/bin/ydbd

diff --git a/ydb/library/breakpad/minidumps.cpp b/ydb/library/breakpad/minidumps.cpp
diff --git a/ydb/library/breakpad/ya.make b/ydb/library/breakpad/ya.make
diff --git a/ydb/library/ya.make b/ydb/library/ya.make
@@ -7,7 +7,6 @@ RECURSE(
     arrow_parquet
     backup
     benchmarks
-    breakpad
     chunks_limiter
     folder_service
     formats

diff --git a/ydb/tests/functional/minidumps/test_break.py b/ydb/tests/functional/minidumps/test_break.py
diff --git a/ydb/tests/functional/minidumps/ya.make b/ydb/tests/functional/minidumps/ya.make
diff --git a/ydb/tests/functional/ya.make b/ydb/tests/functional/ya.make
@@ -16,7 +16,6 @@ RECURSE(
     kv_workload
     large_serializable
     limits
-    minidumps
     postgresql
     query_cache
     rename