save

Author: xy720

be/src/agent/utils.cpp

@@ -119,6 +119,10 @@ Status MasterServerClient::finish_task(const TFinishTaskRequest& request, TMaste
 }
 
 Status MasterServerClient::report(const TReportRequest& request, TMasterResult* result) {
+#ifdef BE_TEST
+    result->status.__set_status_code(TStatusCode::OK);
+    return Status::OK();
+#else
     Status client_status;
     FrontendServiceConnection client(_client_cache.get(), _cluster_info->master_fe_addr,
                                      config::thrift_rpc_timeout_ms, &client_status);
@@ -173,6 +177,7 @@ Status MasterServerClient::report(const TReportRequest& request, TMasterResult*
     }
 
     return Status::OK();
+#endif
 }
 
 Status MasterServerClient::confirm_unused_remote_files(

be/test/agent/task_worker_pool_test.cpp

@@ -132,4 +132,34 @@ TEST(TaskWorkerPoolTest, ReportWorkerPool) {
     EXPECT_EQ(count.load(), 3);
 }
 
+TEST(TaskWorkerPoolTest, ReportTabletCallbackWithDebugPoint) {
+    bool original_enable_debug_points = config::enable_debug_points;
+    config::enable_debug_points = true;
+
+    ExecEnv::GetInstance()->set_storage_engine(std::make_unique<StorageEngine>(EngineOptions {}));
+
+    ClusterInfo cluster_info;
+    cluster_info.master_fe_addr.__set_port(9030);
+
+    Defer defer {[] {
+        ExecEnv::GetInstance()->set_storage_engine(nullptr);
+    }};
+
+    {
+        // debug point is enabled
+        DebugPoints::instance()->add("WorkPoolReportTablet.report_tablet_callback.skip");
+        EXPECT_TRUE(DebugPoints::instance()->is_enable("WorkPoolReportTablet.report_tablet_callback.skip"));
+        report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_local(), &cluster_info);
+    }
+
+    {
+        // debug point is removed
+        DebugPoints::instance()->remove("WorkPoolReportTablet.report_tablet_callback.skip");
+        EXPECT_FALSE(DebugPoints::instance()->is_enable("WorkPoolReportTablet.report_tablet_callback.skip"));
+        report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_local(), &cluster_info);
+    }
+
+    config::enable_debug_points = original_enable_debug_points;
+}
+
 } // namespace doris

be/test/cloud/cloud_task_worker_pool_test.cpp

@@ -0,0 +1,58 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "agent/task_worker_pool.h"
+
+#include <gtest/gtest.h>
+
+#include "olap/options.h"
+#include "cloud/cloud_storage_engine.h"
+#include "runtime/cluster_info.h"
+
+namespace doris {
+
+TEST(CloudTaskWorkerPoolTest, ReportTabletCallbackWithDebugPoint) {
+    bool original_enable_debug_points = config::enable_debug_points;
+    config::enable_debug_points = true;
+
+    ExecEnv::GetInstance()->set_storage_engine(std::make_unique<CloudStorageEngine>(EngineOptions {}));
+
+    ClusterInfo cluster_info;
+    cluster_info.master_fe_addr.__set_port(9030);
+
+    Defer defer {[] {
+        ExecEnv::GetInstance()->set_storage_engine(nullptr);
+    }};
+
+    {
+        // debug point is enabled
+        DebugPoints::instance()->add("WorkPoolCloudReportTablet.report_tablet_callback.skip");
+        EXPECT_TRUE(DebugPoints::instance()->is_enable("WorkPoolCloudReportTablet.report_tablet_callback.skip"));
+        report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_cloud(), &cluster_info);
+    }
+
+    {
+        // debug point is removed
+        DebugPoints::instance()->remove("WorkPoolCloudReportTablet.report_tablet_callback.skip");
+        EXPECT_FALSE(DebugPoints::instance()->is_enable("WorkPoolCloudReportTablet.report_tablet_callback.skip"));
+        report_tablet_callback(ExecEnv::GetInstance()->storage_engine().to_cloud(), &cluster_info);
+    }
+
+    config::enable_debug_points = original_enable_debug_points;
+}
+
+} // namespace doris