Skip to content

Commit f7c2335

Browse files
committed
format
1 parent d714c00 commit f7c2335

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

be/src/agent/utils.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ Status MasterServerClient::finish_task(const TFinishTaskRequest& request, TMaste
122122
Status MasterServerClient::report(const TReportRequest& request, TMasterResult* result) {
123123
#ifdef BE_TEST
124124
if (config::enable_debug_points &&
125-
DebugPoints::instance()->is_enable(
126-
"MasterServerClient::report.fail")) [[unlikely]] {
125+
DebugPoints::instance()->is_enable("MasterServerClient::report.fail")) [[unlikely]] {
127126
return Status::InternalError("debug report fail");
128127
}
129128
result->status.__set_status_code(TStatusCode::OK);

be/test/agent/task_worker_pool_test.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ TEST(TaskWorkerPoolTest, ReportTabletCallbackWithDebugPoint) {
150150
"WorkPoolReportTablet.report_tablet_callback.skip"));
151151
report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_local(), &cluster_info);
152152
EXPECT_EQ(DorisMetrics::instance()->report_all_tablets_requests_skip->value(), 1);
153-
EXPECT_EQ(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(), 0);
153+
EXPECT_EQ(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(),
154+
0);
154155
// debug point report_tablet_callback.skip is removed
155156
DebugPoints::instance()->remove("WorkPoolReportTablet.report_tablet_callback.skip");
156157
EXPECT_FALSE(DebugPoints::instance()->is_enable(
@@ -162,18 +163,21 @@ TEST(TaskWorkerPoolTest, ReportTabletCallbackWithDebugPoint) {
162163
DebugPoints::instance()->add("MasterServerClient::report.fail");
163164
EXPECT_TRUE(DebugPoints::instance()->is_enable("MasterServerClient::report.fail"));
164165
report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_local(), &cluster_info);
165-
EXPECT_GT(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(), 0);
166+
EXPECT_GT(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(),
167+
0);
166168
std::this_thread::sleep_for(std::chrono::seconds(1));
167169
report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_local(), &cluster_info);
168-
EXPECT_GT(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(), 0);
170+
EXPECT_GT(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(),
171+
0);
169172
// debug point report.fail is removed
170173
DebugPoints::instance()->remove("MasterServerClient::report.fail");
171174
EXPECT_FALSE(DebugPoints::instance()->is_enable("MasterServerClient::report.fail"));
172175
}
173176

174177
{
175178
report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_local(), &cluster_info);
176-
EXPECT_EQ(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(), 0);
179+
EXPECT_EQ(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(),
180+
0);
177181
}
178182

179183
config::enable_debug_points = original_enable_debug_points;

be/test/cloud/cloud_task_worker_pool_test.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ TEST(CloudTaskWorkerPoolTest, ReportTabletCallbackWithDebugPoint) {
4343
"WorkPoolCloudReportTablet.report_tablet_callback.skip"));
4444
report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_cloud(), &cluster_info);
4545
EXPECT_EQ(DorisMetrics::instance()->report_all_tablets_requests_skip->value(), 1);
46-
EXPECT_EQ(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(), 0);
46+
EXPECT_EQ(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(),
47+
0);
4748
// debug point report_tablet_callback.skip is removed
4849
DebugPoints::instance()->remove("WorkPoolCloudReportTablet.report_tablet_callback.skip");
4950
EXPECT_FALSE(DebugPoints::instance()->is_enable(
@@ -55,18 +56,21 @@ TEST(CloudTaskWorkerPoolTest, ReportTabletCallbackWithDebugPoint) {
5556
DebugPoints::instance()->add("MasterServerClient::report.fail");
5657
EXPECT_TRUE(DebugPoints::instance()->is_enable("MasterServerClient::report.fail"));
5758
report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_cloud(), &cluster_info);
58-
EXPECT_GT(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(), 0);
59+
EXPECT_GT(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(),
60+
0);
5961
std::this_thread::sleep_for(std::chrono::seconds(1));
6062
report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_cloud(), &cluster_info);
61-
EXPECT_GT(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(), 0);
63+
EXPECT_GT(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(),
64+
0);
6265
// debug point report.fail is removed
6366
DebugPoints::instance()->remove("MasterServerClient::report.fail");
6467
EXPECT_FALSE(DebugPoints::instance()->is_enable("MasterServerClient::report.fail"));
6568
}
6669

6770
{
6871
report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_cloud(), &cluster_info);
69-
EXPECT_EQ(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(), 0);
72+
EXPECT_EQ(DorisMetrics::instance()->tablet_report_continuous_failure_duration_s->value(),
73+
0);
7074
}
7175

7276
config::enable_debug_points = original_enable_debug_points;

0 commit comments

Comments
 (0)