Merge pull request #842 from kakao/add_peerinfo

refactor(mr): add PeerInfo to proto/mrpb/management.proto
kakao · Jul 30, 2024 · a36dce6 · a36dce6
2 parents 6c1ef52 + 65059ea
commit a36dce6
Show file tree

Hide file tree

Showing 5 changed files with 282 additions and 107 deletions.
diff --git a/internal/metarepos/management_service.go b/internal/metarepos/management_service.go
@@ -26,7 +26,7 @@ func (s *ManagementService) Register(server *grpc.Server) {
 }
 
 func (s *ManagementService) AddPeer(ctx context.Context, req *mrpb.AddPeerRequest) (*types.Empty, error) {
-	err := s.m.AddPeer(ctx, req.ClusterID, req.NodeID, req.Url)
+	err := s.m.AddPeer(ctx, req.ClusterID, req.NodeID, req.URL)
 	return &types.Empty{}, err
 }
 

diff --git a/internal/metarepos/raft_metadata_repository_test.go b/internal/metarepos/raft_metadata_repository_test.go
@@ -3086,9 +3086,11 @@ func TestMetadataRepository_AddPeer(t *testing.T) {
 			name: "InvalidNodeID",
 			testf: func(t *testing.T, _ *RaftMetadataRepository, client mrpb.ManagementClient) {
 				_, err := client.AddPeer(context.Background(), &mrpb.AddPeerRequest{
-					ClusterID: clusterID,
-					NodeID:    types.InvalidNodeID,
-					Url:       "http://127.0.0.1:11000",
+					PeerInfo: mrpb.PeerInfo{
+						ClusterID: clusterID,
+						NodeID:    types.InvalidNodeID,
+						URL:       "http://127.0.0.1:11000",
+					},
 				})
 				require.Error(t, err)
 				require.Equal(t, codes.InvalidArgument, status.Code(err))
@@ -3098,9 +3100,11 @@ func TestMetadataRepository_AddPeer(t *testing.T) {
 			name: "AlreadyExists",
 			testf: func(t *testing.T, server *RaftMetadataRepository, client mrpb.ManagementClient) {
 				_, err := client.AddPeer(context.Background(), &mrpb.AddPeerRequest{
-					ClusterID: clusterID,
-					NodeID:    server.nodeID,
-					Url:       server.raftNode.url,
+					PeerInfo: mrpb.PeerInfo{
+						ClusterID: clusterID,
+						NodeID:    server.nodeID,
+						URL:       server.raftNode.url,
+					},
 				})
 				require.Error(t, err)
 				require.Equal(t, codes.AlreadyExists, status.Code(err))

diff --git a/pkg/mrc/metadata_repository_management_client.go b/pkg/mrc/metadata_repository_management_client.go
@@ -70,9 +70,11 @@ func (c *metadataRepositoryManagementClient) AddPeer(ctx context.Context, cluste
 	}
 
 	req := &mrpb.AddPeerRequest{
-		ClusterID: clusterID,
-		NodeID:    nodeID,
-		Url:       url,
+		PeerInfo: mrpb.PeerInfo{
+			ClusterID: clusterID,
+			NodeID:    nodeID,
+			URL:       url,
+		},
 	}
 
 	_, err := c.client.AddPeer(ctx, req)