This is an automated email from the ASF dual-hosted git repository.
deardeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 5748cbc7a77 [fix](cloud) Retire unused cloud management RPCs (#70494)
5748cbc7a77 is described below
commit 5748cbc7a77bd84c3509f7456f1944d4c471c91f
Author: deardeng <[email protected]>
AuthorDate: Mon Nov 16 16:51:49 2026 +0800
[fix](cloud) Retire unused cloud management RPCs (#70494)
### Background
Cloud management operations can be registered as protobuf RPCs and as
HTTP routes. The authenticated Recycler HTTP route is used to enqueue
instances for recycling.
---
cloud/src/common/bvars.cpp | 7 --
cloud/src/common/bvars.h | 5 --
cloud/src/common/http_helper.cpp | 14 +---
cloud/src/common/http_helper.h | 2 -
cloud/src/meta-service/meta_service.h | 8 ---
cloud/src/meta-service/meta_service_resource.cpp | 90 ------------------------
cloud/src/recycler/recycler_service.cpp | 21 +++---
cloud/src/recycler/recycler_service.h | 10 +--
cloud/test/meta_service_http_test.cpp | 30 ++++----
cloud/test/meta_service_test.cpp | 68 +-----------------
cloud/test/rpc_kv_bvar_test.cpp | 43 -----------
gensrc/proto/cloud.proto | 13 ----
12 files changed, 33 insertions(+), 278 deletions(-)
diff --git a/cloud/src/common/bvars.cpp b/cloud/src/common/bvars.cpp
index 4d39a60892b..2f5c5d77c50 100644
--- a/cloud/src/common/bvars.cpp
+++ b/cloud/src/common/bvars.cpp
@@ -79,7 +79,6 @@ BvarLatencyRecorderWithTag g_bvar_ms_create_stage("ms",
"create_stage");
BvarLatencyRecorderWithTag g_bvar_ms_get_stage("ms", "get_stage");
BvarLatencyRecorderWithTag g_bvar_ms_drop_stage("ms", "drop_stage");
BvarLatencyRecorderWithTag g_bvar_ms_get_iam("ms", "get_iam");
-BvarLatencyRecorderWithTag g_bvar_ms_alter_iam("ms", "alter_iam");
BvarLatencyRecorderWithTag g_bvar_ms_update_ak_sk("ms", "update_ak_sk");
BvarLatencyRecorderWithTag g_bvar_ms_alter_ram_user("ms", "alter_ram_user");
BvarLatencyRecorderWithTag g_bvar_ms_begin_copy("ms", "begin_copy");
@@ -434,9 +433,6 @@ mBvarInt64Adder
g_bvar_rpc_kv_create_stage_put_counter("rpc_kv_create_stage_put_
mBvarInt64Adder
g_bvar_rpc_kv_get_stage_get_counter("rpc_kv_get_stage_get_counter",{"instance_id"});
// get_iam
mBvarInt64Adder
g_bvar_rpc_kv_get_iam_get_counter("rpc_kv_get_iam_get_counter",{"instance_id"});
-// alter_iam
-mBvarInt64Adder
g_bvar_rpc_kv_alter_iam_get_counter("rpc_kv_alter_iam_get_counter",{"instance_id"});
-mBvarInt64Adder
g_bvar_rpc_kv_alter_iam_put_counter("rpc_kv_alter_iam_put_counter",{"instance_id"});
// alter_ram_user
mBvarInt64Adder
g_bvar_rpc_kv_alter_ram_user_get_counter("rpc_kv_alter_ram_user_get_counter",{"instance_id"});
mBvarInt64Adder
g_bvar_rpc_kv_alter_ram_user_put_counter("rpc_kv_alter_ram_user_put_counter",{"instance_id"});
@@ -646,9 +642,6 @@ mBvarInt64Adder
g_bvar_rpc_kv_create_stage_put_bytes("rpc_kv_create_stage_put_by
mBvarInt64Adder
g_bvar_rpc_kv_get_stage_get_bytes("rpc_kv_get_stage_get_bytes",{"instance_id"});
// get_iam
mBvarInt64Adder
g_bvar_rpc_kv_get_iam_get_bytes("rpc_kv_get_iam_get_bytes",{"instance_id"});
-// alter_iam
-mBvarInt64Adder
g_bvar_rpc_kv_alter_iam_get_bytes("rpc_kv_alter_iam_get_bytes",{"instance_id"});
-mBvarInt64Adder
g_bvar_rpc_kv_alter_iam_put_bytes("rpc_kv_alter_iam_put_bytes",{"instance_id"});
// alter_ram_user
mBvarInt64Adder
g_bvar_rpc_kv_alter_ram_user_get_bytes("rpc_kv_alter_ram_user_get_bytes",{"instance_id"});
mBvarInt64Adder
g_bvar_rpc_kv_alter_ram_user_put_bytes("rpc_kv_alter_ram_user_put_bytes",{"instance_id"});
diff --git a/cloud/src/common/bvars.h b/cloud/src/common/bvars.h
index 44e2c66d1ee..c7df10945c3 100644
--- a/cloud/src/common/bvars.h
+++ b/cloud/src/common/bvars.h
@@ -651,7 +651,6 @@ extern BvarLatencyRecorderWithTag g_bvar_ms_get_stage;
extern BvarLatencyRecorderWithTag g_bvar_ms_drop_stage;
extern BvarLatencyRecorderWithTag g_bvar_ms_get_iam;
extern BvarLatencyRecorderWithTag g_bvar_ms_update_ak_sk;
-extern BvarLatencyRecorderWithTag g_bvar_ms_alter_iam;
extern BvarLatencyRecorderWithTag g_bvar_ms_alter_ram_user;
extern BvarLatencyRecorderWithTag g_bvar_ms_begin_copy;
extern BvarLatencyRecorderWithTag g_bvar_ms_finish_copy;
@@ -926,8 +925,6 @@ extern mBvarInt64Adder
g_bvar_rpc_kv_create_stage_get_counter;
extern mBvarInt64Adder g_bvar_rpc_kv_create_stage_put_counter;
extern mBvarInt64Adder g_bvar_rpc_kv_get_stage_get_counter;
extern mBvarInt64Adder g_bvar_rpc_kv_get_iam_get_counter;
-extern mBvarInt64Adder g_bvar_rpc_kv_alter_iam_get_counter;
-extern mBvarInt64Adder g_bvar_rpc_kv_alter_iam_put_counter;
extern mBvarInt64Adder g_bvar_rpc_kv_alter_ram_user_get_counter;
extern mBvarInt64Adder g_bvar_rpc_kv_alter_ram_user_put_counter;
extern mBvarInt64Adder g_bvar_rpc_kv_begin_copy_get_counter;
@@ -1071,8 +1068,6 @@ extern mBvarInt64Adder
g_bvar_rpc_kv_create_stage_get_bytes;
extern mBvarInt64Adder g_bvar_rpc_kv_create_stage_put_bytes;
extern mBvarInt64Adder g_bvar_rpc_kv_get_stage_get_bytes;
extern mBvarInt64Adder g_bvar_rpc_kv_get_iam_get_bytes;
-extern mBvarInt64Adder g_bvar_rpc_kv_alter_iam_get_bytes;
-extern mBvarInt64Adder g_bvar_rpc_kv_alter_iam_put_bytes;
extern mBvarInt64Adder g_bvar_rpc_kv_alter_ram_user_get_bytes;
extern mBvarInt64Adder g_bvar_rpc_kv_alter_ram_user_put_bytes;
extern mBvarInt64Adder g_bvar_rpc_kv_begin_copy_get_bytes;
diff --git a/cloud/src/common/http_helper.cpp b/cloud/src/common/http_helper.cpp
index fea8c7aa371..0e8525b4305 100644
--- a/cloud/src/common/http_helper.cpp
+++ b/cloud/src/common/http_helper.cpp
@@ -354,10 +354,6 @@ const std::unordered_map<std::string_view,
HttpHandlerInfo>& get_http_handlers()
{.handler = [](void* s,
brpc::Controller* c) { return
process_alter_ram_user((MS*)s, c); },
.role = HttpRole::META_SERVICE}},
- {"alter_iam",
- {.handler = [](void* s,
- brpc::Controller* c) { return
process_alter_iam((MS*)s, c); },
- .role = HttpRole::META_SERVICE}},
{"adjust_rate_limit",
{.handler =
[](void* s, brpc::Controller* c) {
@@ -620,14 +616,6 @@ HttpResponse process_alter_ram_user(MetaServiceImpl*
service, brpc::Controller*
return http_json_reply(resp.status());
}
-HttpResponse process_alter_iam(MetaServiceImpl* service, brpc::Controller*
ctrl) {
- AlterIamRequest req;
- PARSE_MESSAGE_OR_RETURN(ctrl, req);
- AlterIamResponse resp;
- service->alter_iam(ctrl, &req, &resp, nullptr);
- return http_json_reply(resp.status());
-}
-
HttpResponse process_adjust_rate_limit(MetaServiceImpl* service,
brpc::Controller* cntl) {
const auto& uri = cntl->http_request().uri();
auto qps_limit_str = std::string {http_query(uri, "qps_limit")};
@@ -771,7 +759,7 @@ HttpResponse process_recycle_instance(RecyclerServiceImpl*
service, brpc::Contro
"failed to parse RecycleInstanceRequest");
}
RecycleInstanceResponse res;
- service->recycle_instance(cntl, &req, &res, nullptr);
+ service->recycle_instance(*cntl, req, res);
return http_text_reply(res.status(), res.status().msg());
}
diff --git a/cloud/src/common/http_helper.h b/cloud/src/common/http_helper.h
index f7cd58084d8..d81b8559380 100644
--- a/cloud/src/common/http_helper.h
+++ b/cloud/src/common/http_helper.h
@@ -116,8 +116,6 @@ const std::unordered_map<std::string_view,
HttpHandlerInfo>& get_http_handlers()
[[maybe_unused]] HttpResponse process_alter_ram_user(MetaServiceImpl* service,
brpc::Controller* ctrl);
-[[maybe_unused]] HttpResponse process_alter_iam(MetaServiceImpl* service,
brpc::Controller* ctrl);
-
[[maybe_unused]] HttpResponse process_adjust_rate_limit(MetaServiceImpl*
service,
brpc::Controller*
cntl);
diff --git a/cloud/src/meta-service/meta_service.h
b/cloud/src/meta-service/meta_service.h
index 368676c9cbd..80b87dfdc41 100644
--- a/cloud/src/meta-service/meta_service.h
+++ b/cloud/src/meta-service/meta_service.h
@@ -308,9 +308,6 @@ public:
void get_iam(google::protobuf::RpcController* controller, const
GetIamRequest* request,
GetIamResponse* response, ::google::protobuf::Closure* done)
override;
- void alter_iam(google::protobuf::RpcController* controller, const
AlterIamRequest* request,
- AlterIamResponse* response, ::google::protobuf::Closure*
done) override;
-
void alter_ram_user(google::protobuf::RpcController* controller,
const AlterRamUserRequest* request,
AlterRamUserResponse* response,
::google::protobuf::Closure* done) override;
@@ -872,11 +869,6 @@ public:
call_impl(&cloud::MetaService::get_iam, controller, request, response,
done);
}
- void alter_iam(google::protobuf::RpcController* controller, const
AlterIamRequest* request,
- AlterIamResponse* response, ::google::protobuf::Closure*
done) override {
- call_impl(&cloud::MetaService::alter_iam, controller, request,
response, done);
- }
-
void alter_ram_user(google::protobuf::RpcController* controller,
const AlterRamUserRequest* request,
AlterRamUserResponse* response,
::google::protobuf::Closure* done) override {
diff --git a/cloud/src/meta-service/meta_service_resource.cpp
b/cloud/src/meta-service/meta_service_resource.cpp
index 792d05fb90c..b0b5b1db74d 100644
--- a/cloud/src/meta-service/meta_service_resource.cpp
+++ b/cloud/src/meta-service/meta_service_resource.cpp
@@ -4614,96 +4614,6 @@ void
MetaServiceImpl::get_iam(google::protobuf::RpcController* controller,
}
}
-void MetaServiceImpl::alter_iam(google::protobuf::RpcController* controller,
- const AlterIamRequest* request,
AlterIamResponse* response,
- ::google::protobuf::Closure* done) {
- RPC_PREPROCESS(alter_iam, get, put);
- std::string arn_id = request->has_account_id() ? request->account_id() :
"";
- std::string arn_ak = request->has_ak() ? request->ak() : "";
- std::string arn_sk = request->has_sk() ? request->sk() : "";
- if (arn_id.empty() || arn_ak.empty() || arn_sk.empty()) {
- code = MetaServiceCode::INVALID_ARGUMENT;
- msg = "invalid argument";
- return;
- }
- RPC_RATE_LIMIT(alter_iam)
-
- // for metric, give it a common instance id
- instance_id = "alter_iam_instance";
-
- std::string key = system_meta_service_arn_info_key();
- std::string val;
- TxnErrorCode err = txn_kv_->create_txn(&txn);
- if (err != TxnErrorCode::TXN_OK) {
- code = cast_as<ErrCategory::CREATE>(err);
- msg = "failed to create txn";
- LOG(WARNING) << msg << " err=" << err;
- return;
- }
- err = txn->get(key, &val);
- if (err != TxnErrorCode::TXN_OK && err != TxnErrorCode::TXN_KEY_NOT_FOUND)
{
- code = cast_as<ErrCategory::READ>(err);
- ss << "fail to arn_info_key, err=" << err;
- msg = ss.str();
- return;
- }
-
- bool is_add_req = err == TxnErrorCode::TXN_KEY_NOT_FOUND;
- EncryptionInfoPB encryption_info;
- AkSkPair cipher_ak_sk_pair;
- if (encrypt_ak_sk_helper(arn_ak, arn_sk, &encryption_info,
&cipher_ak_sk_pair, code, msg) !=
- 0) {
- return;
- }
- const auto& [ak, sk] = cipher_ak_sk_pair;
- RamUserPB iam_user;
- std::string old_ak;
- std::string old_sk;
- if (!is_add_req) {
- if (!iam_user.ParseFromString(val)) {
- code = MetaServiceCode::PROTOBUF_PARSE_ERR;
- ss << "failed to parse RamUserPB";
- msg = ss.str();
- return;
- }
-
- if (arn_id == iam_user.user_id() && ak == iam_user.ak() && sk ==
iam_user.sk()) {
- code = MetaServiceCode::INVALID_ARGUMENT;
- ss << "already has the same arn info";
- msg = ss.str();
- return;
- }
- old_ak = iam_user.ak();
- old_sk = iam_user.sk();
- }
- iam_user.set_user_id(arn_id);
- iam_user.set_ak(std::move(cipher_ak_sk_pair.first));
- iam_user.set_sk(std::move(cipher_ak_sk_pair.second));
- iam_user.mutable_encryption_info()->CopyFrom(encryption_info);
- val = iam_user.SerializeAsString();
- if (val.empty()) {
- code = MetaServiceCode::PROTOBUF_SERIALIZE_ERR;
- ss << "failed to serialize";
- msg = ss.str();
- return;
- }
- txn->put(key, val);
- err = txn->commit();
- if (err != TxnErrorCode::TXN_OK) {
- code = cast_as<ErrCategory::COMMIT>(err);
- ss << "txn->commit failed() err=" << err;
- msg = ss.str();
- return;
- }
- if (is_add_req) {
- LOG(INFO) << "add new iam info, cipher ak: " << iam_user.ak()
- << " cipher sk: " << iam_user.sk();
- } else {
- LOG(INFO) << "alter iam info, old: cipher ak: " << old_ak << " cipher
sk" << old_sk
- << " new: cipher ak: " << iam_user.ak() << " cipher sk:" <<
iam_user.sk();
- }
-}
-
void MetaServiceImpl::alter_ram_user(google::protobuf::RpcController*
controller,
const AlterRamUserRequest* request,
AlterRamUserResponse* response,
diff --git a/cloud/src/recycler/recycler_service.cpp
b/cloud/src/recycler/recycler_service.cpp
index e6559c4e8bc..289dd7a0a83 100644
--- a/cloud/src/recycler/recycler_service.cpp
+++ b/cloud/src/recycler/recycler_service.cpp
@@ -298,24 +298,21 @@ void
RecyclerServiceImpl::statistics_recycle(StatisticsRecycleRequest& req, Meta
msg = ss.str();
}
-void RecyclerServiceImpl::recycle_instance(::google::protobuf::RpcController*
controller,
- const
::doris::cloud::RecycleInstanceRequest* request,
-
::doris::cloud::RecycleInstanceResponse* response,
- ::google::protobuf::Closure* done) {
- auto ctrl = static_cast<brpc::Controller*>(controller);
- LOG(INFO) << "rpc from " << ctrl->remote_side() << " request=" <<
request->ShortDebugString();
- brpc::ClosureGuard closure_guard(done);
+void RecyclerServiceImpl::recycle_instance(const brpc::Controller& ctrl,
+ const RecycleInstanceRequest&
request,
+ RecycleInstanceResponse& response) {
+ LOG(INFO) << "http from " << ctrl.remote_side() << " request=" <<
request.ShortDebugString();
MetaServiceCode code = MetaServiceCode::OK;
std::string msg = "OK";
DORIS_CLOUD_DEFER {
- response->mutable_status()->set_code(code);
- response->mutable_status()->set_msg(msg);
+ response.mutable_status()->set_code(code);
+ response.mutable_status()->set_msg(msg);
LOG(INFO) << (code == MetaServiceCode::OK ? "succ to " : "failed to ")
<< "recycle_instance"
- << " " << ctrl->remote_side() << " " << msg;
+ << " " << ctrl.remote_side() << " " << msg;
};
std::vector<InstanceInfoPB> instances;
- instances.reserve(request->instance_ids_size());
+ instances.reserve(request.instance_ids_size());
std::unique_ptr<Transaction> txn;
TxnErrorCode err = txn_kv_->create_txn(&txn);
@@ -325,7 +322,7 @@ void
RecyclerServiceImpl::recycle_instance(::google::protobuf::RpcController* co
return;
}
- for (auto& id : request->instance_ids()) {
+ for (const auto& id : request.instance_ids()) {
InstanceKeyInfo key_info {id};
std::string key;
instance_key(key_info, &key);
diff --git a/cloud/src/recycler/recycler_service.h
b/cloud/src/recycler/recycler_service.h
index 01849dd8b08..fd94cf99780 100644
--- a/cloud/src/recycler/recycler_service.h
+++ b/cloud/src/recycler/recycler_service.h
@@ -23,6 +23,10 @@
#include "meta-service/txn_lazy_committer.h"
#include "meta-store/txn_kv.h"
+namespace brpc {
+class Controller;
+} // namespace brpc
+
namespace doris::cloud {
class Recycler;
@@ -36,10 +40,8 @@ public:
std::shared_ptr<TxnLazyCommitter> txn_lazy_committer);
~RecyclerServiceImpl() override;
- void recycle_instance(::google::protobuf::RpcController* controller,
- const ::doris::cloud::RecycleInstanceRequest*
request,
- ::doris::cloud::RecycleInstanceResponse* response,
- ::google::protobuf::Closure* done) override;
+ void recycle_instance(const brpc::Controller& ctrl, const
RecycleInstanceRequest& request,
+ RecycleInstanceResponse& response);
void http(::google::protobuf::RpcController* controller,
const ::doris::cloud::MetaServiceHttpRequest* request,
diff --git a/cloud/test/meta_service_http_test.cpp
b/cloud/test/meta_service_http_test.cpp
index 6fdeee2bdcd..9b7c05c125c 100644
--- a/cloud/test/meta_service_http_test.cpp
+++ b/cloud/test/meta_service_http_test.cpp
@@ -1120,12 +1120,26 @@ TEST(MetaServiceHttpTest, AbortTxnTest) {
}
}
-TEST(MetaServiceHttpTest, AlterIamTest) {
+TEST(MetaServiceHttpTest, RetiredServiceMethods) {
+ ASSERT_EQ(MetaService::descriptor()->FindMethodByName("alter_iam"),
nullptr);
+
ASSERT_EQ(RecyclerService::descriptor()->FindMethodByName("recycle_instance"),
nullptr);
+
+ HttpContext ctx;
+ auto [status_code, body] = ctx.query<std::string>("alter_iam", "");
+ ASSERT_EQ(status_code, 404) << body;
+
+ const auto& handlers = get_http_handlers();
+ auto it = handlers.find("recycle_instance");
+ ASSERT_NE(it, handlers.end());
+ ASSERT_EQ(it->second.role, HttpRole::RECYCLER);
+}
+
+TEST(MetaServiceHttpTest, AlterRamUserTest) {
HttpContext ctx;
brpc::Controller cntl;
auto cloud_unique_id = "test_cloud_unique_id";
- std::string instance_id = "alter_iam_test_instance_id";
+ std::string instance_id = "alter_ram_user_test_instance_id";
[[maybe_unused]] auto sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
SyncPoint::get_instance()->clear_all_call_backs();
@@ -1201,18 +1215,6 @@ TEST(MetaServiceHttpTest, AlterIamTest) {
ASSERT_EQ(status_code, 200);
ASSERT_EQ(resp.code(), MetaServiceCode::OK);
- // alter iam
- {
- AlterIamRequest alter_iam_request;
- alter_iam_request.set_ak("new_ak");
- alter_iam_request.set_sk("new_sk");
- alter_iam_request.set_account_id("account_id");
- auto [status_code, resp] =
- ctx.forward<MetaServiceResponseStatus>("alter_iam",
alter_iam_request);
- ASSERT_EQ(status_code, 200);
- ASSERT_EQ(resp.code(), MetaServiceCode::OK);
- }
-
// get iam and ram user
ctx.meta_service_->get_iam(reinterpret_cast<::google::protobuf::RpcController*>(&cntl),
&request, &response, nullptr);
diff --git a/cloud/test/meta_service_test.cpp b/cloud/test/meta_service_test.cpp
index 8442eee2f6e..944d6983419 100644
--- a/cloud/test/meta_service_test.cpp
+++ b/cloud/test/meta_service_test.cpp
@@ -5766,7 +5766,7 @@ TEST(MetaServiceTest, AlterRamTest) {
auto meta_service = get_meta_service();
brpc::Controller cntl;
auto cloud_unique_id = "test_cloud_unique_id";
- std::string instance_id = "alter_iam_test_instance_id";
+ std::string instance_id = "alter_ram_user_test_instance_id";
[[maybe_unused]] auto sp = SyncPoint::get_instance();
DORIS_CLOUD_DEFER {
SyncPoint::get_instance()->clear_all_call_backs();
@@ -12391,72 +12391,6 @@ TEST(MetaServiceTest, UpdateAkSkTest) {
sp->clear_all_call_backs();
}
-TEST(MetaServiceTest, AlterIamTest) {
- auto meta_service = get_meta_service();
-
- auto sp = SyncPoint::get_instance();
- sp->enable_processing();
- sp->set_call_back("encrypt_ak_sk:get_encryption_key", [](auto&& args) {
- auto* ret = try_any_cast<int*>(args[0]);
- *ret = 0;
- auto* key = try_any_cast<std::string*>(args[1]);
- *key = "selectdbselectdbselectdbselectdb";
- auto* key_id = try_any_cast<int64_t*>(args[2]);
- *key_id = 1;
- });
-
- std::string cipher_sk =
"JUkuTDctR+ckJtnPkLScWaQZRcOtWBhsLLpnCRxQLxr734qB8cs6gNLH6grE1FxO";
- std::string plain_sk = "Hx60p12123af234541nsVsffdfsdfghsdfhsdf34t";
-
- auto get_arn_info_key = [&](RamUserPB& i) {
- std::string val;
- std::unique_ptr<Transaction> txn;
- ASSERT_EQ(meta_service->txn_kv()->create_txn(&txn),
TxnErrorCode::TXN_OK);
- ASSERT_EQ(txn->get(system_meta_service_arn_info_key(), &val),
TxnErrorCode::TXN_OK);
- i.ParseFromString(val);
- };
-
- // add new system_meta_service_arn_info_key
- {
- AlterIamRequest req;
- req.set_account_id("123");
- req.set_ak("ak1");
- req.set_sk(plain_sk);
-
- brpc::Controller cntl;
- AlterIamResponse res;
-
meta_service->alter_iam(reinterpret_cast<::google::protobuf::RpcController*>(&cntl),
&req,
- &res, nullptr);
- ASSERT_EQ(res.status().code(), MetaServiceCode::OK);
- RamUserPB ram_user;
- get_arn_info_key(ram_user);
- ASSERT_EQ(ram_user.user_id(), "123");
- ASSERT_EQ(ram_user.ak(), "ak1");
- ASSERT_EQ(ram_user.sk(), cipher_sk);
- }
- // with old system_meta_service_arn_info_key
- {
- AlterIamRequest req;
- req.set_account_id("321");
- req.set_ak("ak2");
- req.set_sk(plain_sk);
-
- brpc::Controller cntl;
- AlterIamResponse res;
-
meta_service->alter_iam(reinterpret_cast<::google::protobuf::RpcController*>(&cntl),
&req,
- &res, nullptr);
- ASSERT_EQ(res.status().code(), MetaServiceCode::OK);
- RamUserPB ram_user;
- get_arn_info_key(ram_user);
- ASSERT_EQ(ram_user.user_id(), "321");
- ASSERT_EQ(ram_user.ak(), "ak2");
- ASSERT_EQ(ram_user.sk(), cipher_sk);
- }
-
- SyncPoint::get_instance()->disable_processing();
- SyncPoint::get_instance()->clear_all_call_backs();
-}
-
TEST(MetaServiceTest, UpdateTmpRowsetTest) {
auto meta_service = get_meta_service();
diff --git a/cloud/test/rpc_kv_bvar_test.cpp b/cloud/test/rpc_kv_bvar_test.cpp
index 2b32cb79773..ce4c0e1286e 100644
--- a/cloud/test/rpc_kv_bvar_test.cpp
+++ b/cloud/test/rpc_kv_bvar_test.cpp
@@ -2501,49 +2501,6 @@ TEST(RpcKvBvarTest, GetIam) {
sp->disable_processing();
}
-// alter_iam
-TEST(RpcKvBvarTest, AlterIam) {
- auto syncpoint_guard = setup_notify_refresh_syncpoint();
- auto meta_service = get_meta_service();
- auto mem_kv = std::dynamic_pointer_cast<MemTxnKv>(meta_service->txn_kv());
-
- auto* sp = SyncPoint::get_instance();
- sp->enable_processing();
- sp->set_call_back("encrypt_ak_sk:get_encryption_key", [](auto&& args) {
- auto* ret = try_any_cast<int*>(args[0]);
- *ret = 0;
- auto* key = try_any_cast<std::string*>(args[1]);
- *key = "selectdbselectdbselectdbselectdb";
- auto* key_id = try_any_cast<int64_t*>(args[2]);
- *key_id = 1;
- });
-
- std::string cipher_sk =
"JUkuTDctR+ckJtnPkLScWaQZRcOtWBhsLLpnCRxQLxr734qB8cs6gNLH6grE1FxO";
- std::string plain_sk = "Hx60p12123af234541nsVsffdfsdfghsdfhsdf34t";
-
- AlterIamRequest req;
- req.set_account_id("123");
- req.set_ak("ak1");
- req.set_sk(plain_sk);
-
- brpc::Controller cntl;
- AlterIamResponse res;
-
- clear_memkv_count_bytes(mem_kv.get());
-
-
meta_service->alter_iam(reinterpret_cast<::google::protobuf::RpcController*>(&cntl),
&req, &res,
- nullptr);
- ASSERT_EQ(res.status().code(), MetaServiceCode::OK);
-
- LOG(INFO) << "AlterIam: " << mem_kv->get_count_ << ", " <<
mem_kv->put_count_ << ", "
- << mem_kv->del_count_ << ", " << mem_kv->get_bytes_ << ", " <<
mem_kv->put_bytes_
- << ", " << mem_kv->del_bytes_;
- ASSERT_EQ(mem_kv->get_bytes_,
g_bvar_rpc_kv_alter_iam_get_bytes.get({"alter_iam_instance"}));
- ASSERT_EQ(mem_kv->put_bytes_,
g_bvar_rpc_kv_alter_iam_put_bytes.get({"alter_iam_instance"}));
- ASSERT_EQ(mem_kv->get_count_,
g_bvar_rpc_kv_alter_iam_get_counter.get({"alter_iam_instance"}));
- ASSERT_EQ(mem_kv->put_count_,
g_bvar_rpc_kv_alter_iam_put_counter.get({"alter_iam_instance"}));
-}
-
// alter_ram_user
TEST(RpcKvBvarTest, AlterRamUser) {
auto syncpoint_guard = setup_notify_refresh_syncpoint();
diff --git a/gensrc/proto/cloud.proto b/gensrc/proto/cloud.proto
index 3771a04e9b2..fdcd850390c 100644
--- a/gensrc/proto/cloud.proto
+++ b/gensrc/proto/cloud.proto
@@ -1808,17 +1808,6 @@ message GetIamResponse {
optional RamUserPB ram_user = 3;
}
-message AlterIamRequest {
- optional string account_id = 1;
- optional string ak = 2;
- optional string sk = 3;
- optional string request_ip = 4;
-}
-
-message AlterIamResponse {
- optional MetaServiceResponseStatus status = 1;
-}
-
message AlterRamUserRequest {
optional string instance_id = 1;
optional RamUserPB ram_user = 2;
@@ -2532,7 +2521,6 @@ service MetaService {
rpc get_stage(GetStageRequest) returns (GetStageResponse);
rpc drop_stage(DropStageRequest) returns (DropStageResponse);
rpc get_iam(GetIamRequest) returns (GetIamResponse);
- rpc alter_iam(AlterIamRequest) returns (AlterIamResponse);
rpc alter_ram_user(AlterRamUserRequest) returns (AlterRamUserResponse);
// copy into
rpc begin_copy(BeginCopyRequest) returns (BeginCopyResponse);
@@ -2574,7 +2562,6 @@ service MetaService {
};
service RecyclerService {
- rpc recycle_instance(RecycleInstanceRequest) returns
(RecycleInstanceResponse);
rpc http(MetaServiceHttpRequest) returns (MetaServiceHttpResponse);
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]