set system name on mgmt rpcs

Features: pool Allow-unstable-test: true Signed-off-by: Tom Nabarro <[email protected]>
daos-stack · Feb 3, 2025 · 1810850 · 1810850
1 parent 37fd8dc
commit 1810850
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/control/lib/control/pool.go b/src/control/lib/control/pool.go
@@ -843,6 +843,7 @@ func PoolExclude(ctx context.Context, rpcClient UnaryInvoker, req *PoolRanksReq)
 	if err := convert.Types(req, pbReq); err != nil {
 		return nil, errors.Wrapf(err, "convert %T->%T", req, pbReq)
 	}
+	pbReq.Sys = req.getSystem(rpcClient)
 
 	req.setRPC(func(ctx context.Context, conn *grpc.ClientConn) (proto.Message, error) {
 		return mgmtpb.NewMgmtSvcClient(conn).PoolExclude(ctx, pbReq)
@@ -874,6 +875,7 @@ func PoolDrain(ctx context.Context, rpcClient UnaryInvoker, req *PoolRanksReq) (
 	if err := convert.Types(req, pbReq); err != nil {
 		return nil, errors.Wrapf(err, "convert %T->%T", req, pbReq)
 	}
+	pbReq.Sys = req.getSystem(rpcClient)
 
 	req.setRPC(func(ctx context.Context, conn *grpc.ClientConn) (proto.Message, error) {
 		return mgmtpb.NewMgmtSvcClient(conn).PoolDrain(ctx, pbReq)
@@ -934,6 +936,7 @@ func PoolReintegrate(ctx context.Context, rpcClient UnaryInvoker, req *PoolRanks
 	if err := convert.Types(req, pbReq); err != nil {
 		return nil, errors.Wrapf(err, "convert %T->%T", req, pbReq)
 	}
+	pbReq.Sys = req.getSystem(rpcClient)
 
 	req.setRPC(func(ctx context.Context, conn *grpc.ClientConn) (proto.Message, error) {
 		return mgmtpb.NewMgmtSvcClient(conn).PoolReintegrate(ctx, pbReq)

diff --git a/src/mgmt/tests/srv_drpc_tests.c b/src/mgmt/tests/srv_drpc_tests.c
@@ -1795,21 +1795,6 @@ setup_exclude_drpc_call(Drpc__Call *call, char *uuid, uint32_t rank)
 	pack_pool_exclude_req(call, &req);
 }
 
-static void
-expect_drpc_ranks_resp_with_error(Drpc__Response *resp, int exp_error)
-{
-	Mgmt__PoolRanksResp *pc_resp = NULL;
-
-	assert_int_equal(resp->status, DRPC__STATUS__SUCCESS);
-	assert_non_null(resp->body.data);
-
-	pc_resp = mgmt__pool_ranks_resp__unpack(NULL, resp->body.len, resp->body.data);
-	assert_non_null(pc_resp);
-	assert_int_equal(pc_resp->status, exp_error);
-
-	mgmt__pool_ranks_resp__free_unpacked(pc_resp, NULL);
-}
-
 static void
 test_drpc_exclude_bad_uuid(void **state)
 {