Skip to content

Commit c643b91

Browse files
committed
skip pdeathsigger for versions
1 parent 6588841 commit c643b91

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

executable.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ RUN if grep -q "CentOS Linux 7" /etc/os-release ; then \
212212
RUN ./node_builder_glibc_env.sh
213213
COPY scripts/build_node_package.sh .
214214
RUN ./build_node_package.sh
215-
216215
# needed for hadolint
217216
WORKDIR /app
218217
USER 1001
@@ -264,7 +263,6 @@ COPY --from=async-profiler-builder-musl /tmp/async-profiler/build/lib/libasyncPr
264263
COPY --from=node-package-builder-musl /tmp/module_build gprofiler/resources/node/module/musl
265264
COPY --from=node-package-builder-glibc /tmp/module_build gprofiler/resources/node/module/glibc
266265

267-
268266
COPY --from=burn-builder /tmp/burn/burn gprofiler/resources/burn
269267

270268
COPY gprofiler gprofiler

gprofiler/metadata/versions.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ def get_exe_version(
3535
exe_path = f"/proc/{get_process_nspid(process.pid)}/exe"
3636

3737
def _run_get_version() -> "CompletedProcess[bytes]":
38-
return run_process([exe_path, version_arg], stop_event=stop_event, timeout=get_version_timeout)
38+
return run_process(
39+
[exe_path, version_arg], stop_event=stop_event, timeout=get_version_timeout, pdeathsigger=False
40+
)
3941

4042
try:
4143
cp = run_in_ns(["pid", "mnt"], _run_get_version, process.pid)

gprofiler/profilers/java.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@ def _run_java_version() -> "CompletedProcess[bytes]":
350350
],
351351
stop_event=stop_event,
352352
timeout=_JAVA_VERSION_TIMEOUT,
353+
pdeathsigger=False,
353354
)
354355

355356
# doesn't work without changing PID NS as well (I'm getting ENOENT for libjli.so)

gprofiler/utils/fs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def is_rw_exec_dir(path: Path) -> bool:
5757

5858
# try executing
5959
try:
60-
run_process([str(test_script)], suppress_log=True)
60+
run_process([str(test_script)], suppress_log=True, pdeathsigger=False)
6161
except PermissionError:
6262
# noexec
6363
return False

0 commit comments

Comments
 (0)