fix

Author: bobhan1

be/src/cloud/cloud_meta_mgr.cpp

@@ -2483,7 +2483,9 @@ Status CloudMetaMgr::get_cluster_status(
     GetClusterStatusResponse resp;
     req.add_cloud_unique_ids(config::cloud_unique_id);
 
-    Status s = retry_rpc("get cluster status", req, &resp, &MetaService_Stub::get_cluster_status);
+    Status s = retry_rpc(MetaServiceRPC::GET_CLUSTER_STATUS, req, &resp,
+                         &MetaService_Stub::get_cluster_status,
+                         {.host_limiters = host_level_ms_rpc_rate_limiters_});
     if (!s.ok()) {
         return s;
     }

be/src/cloud/cloud_ms_rpc_rate_limiters.h

@@ -57,6 +57,7 @@ namespace doris::cloud {
     X(COMMIT_RESTORE_JOB, commit_restore_job, "commit restore job")       \
     X(FINISH_RESTORE_JOB, finish_restore_job, "finish restore job")       \
     X(LIST_SNAPSHOTS, list_snapshots, "list snapshots")                   \
+    X(GET_CLUSTER_STATUS, get_cluster_status, "get cluster status")       \
     X(UPDATE_PACKED_FILE_INFO, update_packed_file_info, "update packed file info")
 
 // Enum class for Meta Service RPC types

be/src/cloud/config.cpp

@@ -201,6 +201,7 @@ DEFINE_mInt32(ms_rpc_qps_prepare_restore_job, "-1");
 DEFINE_mInt32(ms_rpc_qps_commit_restore_job, "-1");
 DEFINE_mInt32(ms_rpc_qps_finish_restore_job, "-1");
 DEFINE_mInt32(ms_rpc_qps_list_snapshots, "-1");
+DEFINE_mInt32(ms_rpc_qps_get_cluster_status, "-1");
 DEFINE_mInt32(ms_rpc_qps_update_packed_file_info, "-1");
 
 // Table-level backpressure handling config

be/src/cloud/config.h

@@ -245,6 +245,7 @@ DECLARE_mInt32(ms_rpc_qps_prepare_restore_job);
 DECLARE_mInt32(ms_rpc_qps_commit_restore_job);
 DECLARE_mInt32(ms_rpc_qps_finish_restore_job);
 DECLARE_mInt32(ms_rpc_qps_list_snapshots);
+DECLARE_mInt32(ms_rpc_qps_get_cluster_status);
 DECLARE_mInt32(ms_rpc_qps_update_packed_file_info);
 
 // ============== Table-level backpressure handling config ==============

be/src/io/cache/cached_remote_file_reader.cpp

@@ -38,8 +38,8 @@
 #include "cloud/config.h"
 #include "common/compiler_util.h" // IWYU pragma: keep
 #include "common/config.h"
-#include "cpp/s3_rate_limiter.h"
 #include "cpp/sync_point.h"
+#include "cpp/token_bucket_rate_limiter.h"
 #include "io/cache/block_file_cache.h"
 #include "io/cache/block_file_cache_factory.h"
 #include "io/cache/block_file_cache_profile.h"

be/src/runtime/exec_env.h

@@ -61,7 +61,8 @@ struct RuntimeFilterTimerQueue;
 } // namespace pipeline
 class WorkloadGroupMgr;
 struct WriteCooldownMetaExecutors;
-class S3RateLimiterHolder;
+class TokenBucketRateLimiterHolder;
+using S3RateLimiterHolder = TokenBucketRateLimiterHolder;
 namespace io {
 class FileCacheFactory;
 class HdfsMgr;

be/src/runtime/exec_env_init.cpp

@@ -46,7 +46,7 @@
 #include "common/kerberos/kerberos_ticket_mgr.h"
 #include "common/logging.h"
 #include "common/status.h"
-#include "cpp/s3_rate_limiter.h"
+#include "cpp/token_bucket_rate_limiter.h"
 #include "io/cache/block_file_cache_downloader.h"
 #include "io/cache/block_file_cache_factory.h"
 #include "io/cache/fs_file_cache_storage.h"

be/test/cloud/cloud_ms_rpc_rate_limiters_test.cpp

@@ -191,6 +191,8 @@ TEST_F(HostLevelMSRpcRateLimitersTest, DisplayNames) {
     EXPECT_EQ(meta_service_rpc_display_name(MetaServiceRPC::FINISH_RESTORE_JOB),
               "finish restore job");
     EXPECT_EQ(meta_service_rpc_display_name(MetaServiceRPC::LIST_SNAPSHOTS), "list snapshots");
+    EXPECT_EQ(meta_service_rpc_display_name(MetaServiceRPC::GET_CLUSTER_STATUS),
+              "get cluster status");
     EXPECT_EQ(meta_service_rpc_display_name(MetaServiceRPC::UPDATE_PACKED_FILE_INFO),
               "update packed file info");
 }