This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new aa0f8935673 branch-4.1 [fix](be) Avoid installing CDC SIGCHLD handler
in unit tests (#70468)
aa0f8935673 is described below
commit aa0f893567387dc245dc60cf0a230a29cecc84b2
Author: TengJianPing <[email protected]>
AuthorDate: Sat Nov 21 05:00:58 2026 +0800
branch-4.1 [fix](be) Avoid installing CDC SIGCHLD handler in unit tests
(#70468)
### Background
<!-- How the feature or module this PR touches works today, in two to
four plain sentences, for a reviewer who doesn't know it. Link the user
doc if there is one. Leave the problem and the fix to Problem Summary.
-->
### What problem does this PR solve?
<!-- Issue Number: "close #N" if this PR resolves the issue, "#N" if it
only relates to it, "None" if there is none. A Feature needs an issue.
-->
<!-- Related PR: "#N (relation)" for each PR a reviewer should know
about, such as "#123 (introduced the bug)", separated by commas. Write
"None" if no related PR is known. -->
<!-- PR Type: Bugfix, Performance, Feature, Enhancement, Refactor, Test,
Build/CI/Chore, Revert, Release/Dependency, or Other. -->
Issue Number:
Related PR:
PR Type:
Problem Summary:
<!-- Two to five sentences: the problem or need and who is affected; the
approach in one sentence; when the diff is larger than that suggests,
what else it had to handle, or that most of it is tests; and what
existing users see after an upgrade. -->
### Details
<!--
For a diff of more than about 300 changed lines, start with "- **Change
map:**": how many lines are production code, tests, generated files, and
docs, then the code in parts, each with the problem it handles and its
size.
Then answer each field of your PR type on its own line, as "- **Field:**
answer", in this order:
Bugfix: Frequency, Root cause, Why existing tests missed it, Fix, Other
paths and branches
Performance: Why it was slow, Optimization, Results, Applicability and
cost
Feature: Scope, Design, Usage, Default behavior, Compatibility
Enhancement: Before and after, Configs and defaults, Impact on existing
users
Refactor: Moves vs. logic changes, Behavior change, Compatibility,
Performance impact, Rollback
Test, adding tests: Scenarios, What existing tests miss, Fails when
broken
Test, fixing a test: Failure, Cause, Stability evidence
Build/CI/Chore: Affected, Developer and release impact, License and
third-party, Rollback
Revert: Why not fix forward, Original author notified, Follow-up
Release/Dependency: Versions, Upstream changes, Compatibility, Rollback
Other: Why Other
"None" is a valid answer when it is true. Don't restate the diff.
-->
### Testing
<!-- The tests, suites, or commands that ran, what each shows, and where
it ran (locally or in CI). For a fix, the test that fails before it and
passes after. -->
### Notes for Reviewers
<!-- Optional; delete this section if there is nothing to say. Why each
non-obvious edit was made, what you are unsure about, and where to start
reading if Details has no Change map. -->
### Release note
<!-- One paragraph on what users will notice, or None. -->
### Check List (For Author)
<!-- Behavior changed: "No", or "Yes (see Details)" with a Behavior
change field in Details. -->
<!-- Does this need documentation: "No", or "Yes" with the
apache/doris-website PR or the plan. -->
<!-- Pre-submission status: "Ready"; "Partially verified: " and what is
not verified; or "Not ready: " and why, for a Draft PR. -->
- Behavior changed:
- Does this need documentation:
- Pre-submission status:
### AI Disclosure
<!-- Tool: the agent and model, or None. Generated: the parts it wrote
(code, tests, this description), or None. Human review: what you
reviewed of the generated parts, or "Not applicable" without AI tools.
You may add "- Prompts:" to summarize how you directed the agent. -->
- Tool:
- Generated:
- Human review:
---
be/src/runtime/cdc_client_mgr.cpp | 12 +++++++-----
be/test/runtime/cdc_client_mgr_test.cpp | 17 +++++++++++++++++
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/be/src/runtime/cdc_client_mgr.cpp
b/be/src/runtime/cdc_client_mgr.cpp
index b60c2c60bb1..e47bd4afd5b 100644
--- a/be/src/runtime/cdc_client_mgr.cpp
+++ b/be/src/runtime/cdc_client_mgr.cpp
@@ -50,6 +50,7 @@
namespace doris {
namespace {
+#ifndef BE_TEST
// Handle SIGCHLD signal to prevent zombie processes
void handle_sigchld(int sig_no) {
int status = 0;
@@ -59,7 +60,6 @@ void handle_sigchld(int sig_no) {
}
// Check CDC client health
-#ifndef BE_TEST
Status check_cdc_client_health(int retry_times, int sleep_time, std::string&
health_response) {
const std::string cdc_health_url =
"http://127.0.0.1:" +
std::to_string(doris::config::cdc_client_port) +
@@ -234,16 +234,18 @@ Status
CdcClientMgr::start_cdc_client(PRequestCdcClientResult* result) {
const std::string cdc_out_file = std::string(log_dir) + "/cdc-client.out";
- struct sigaction act;
- act.sa_flags = 0;
- act.sa_handler = handle_sigchld;
- sigaction(SIGCHLD, &act, NULL);
LOG(INFO) << "Start to fork cdc client process with " << path;
#ifdef BE_TEST
_child_pid.store(99999);
st = Status::OK();
return st;
#else
+ // Only install the reaper when forking a real child. Mock starts must not
+ // reap subprocesses owned by other tests, such as popen()/pclose()
callers.
+ struct sigaction act {};
+ sigemptyset(&act.sa_mask);
+ act.sa_handler = handle_sigchld;
+ sigaction(SIGCHLD, &act, nullptr);
pid_t pid = fork();
if (pid < 0) {
st = Status::InternalError("Fork cdc client failed.");
diff --git a/be/test/runtime/cdc_client_mgr_test.cpp
b/be/test/runtime/cdc_client_mgr_test.cpp
index c68e71956ad..30a5689f901 100644
--- a/be/test/runtime/cdc_client_mgr_test.cpp
+++ b/be/test/runtime/cdc_client_mgr_test.cpp
@@ -263,6 +263,23 @@ TEST_F(CdcClientMgrTest, StartCdcClientMultipleTimes) {
EXPECT_EQ(mgr.get_child_pid(), pid_after_first); // PID should not change!
}
+TEST_F(CdcClientMgrTest, MockStartPreservesSigchldHandler) {
+ struct sigaction original_action {};
+ ASSERT_EQ(sigaction(SIGCHLD, nullptr, &original_action), 0);
+
+ CdcClientMgr mgr;
+ PRequestCdcClientResult result;
+ ASSERT_TRUE(mgr.start_cdc_client(&result).ok());
+ EXPECT_GT(mgr.get_child_pid(), 0);
+
+ struct sigaction current_action {};
+ ASSERT_EQ(sigaction(SIGCHLD, nullptr, ¤t_action), 0);
+ // Restore the original action even if this check detects a regression.
+ ASSERT_EQ(sigaction(SIGCHLD, &original_action, nullptr), 0);
+ EXPECT_EQ(current_action.sa_handler, original_action.sa_handler);
+ EXPECT_EQ(current_action.sa_flags, original_action.sa_flags);
+}
+
// Test destructor calls stop
TEST_F(CdcClientMgrTest, DestructorCallsStop) {
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]