feat(all): change type of ClusterID from uint32 to int32 (#566)

kakao · Oct 4, 2023 · ac89e40 · ac89e40
2 parents f494c98 + 500a4bb
commit ac89e40
Show file tree

Hide file tree

Showing 15 changed files with 274 additions and 274 deletions.
diff --git a/cmd/varlogadm/cli.go b/cmd/varlogadm/cli.go
@@ -88,7 +88,7 @@ func start(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	logger = logger.Named("adm").With(zap.Uint32("cid", uint32(clusterID)))
+	logger = logger.Named("adm").With(zap.Int32("cid", int32(clusterID)))
 	defer func() {
 		_ = logger.Sync()
 	}()

diff --git a/cmd/varlogsn/varlogsn.go b/cmd/varlogsn/varlogsn.go
@@ -92,7 +92,7 @@ func start(c *cli.Context) error {
 		return fmt.Errorf("flagReplicationClientWriteBufferSize: %w", err)
 	}
 
-	logger = logger.Named("sn").With(zap.Uint32("cid", uint32(clusterID)), zap.Int32("snid", int32(storageNodeID)))
+	logger = logger.Named("sn").With(zap.Int32("cid", int32(clusterID)), zap.Int32("snid", int32(storageNodeID)))
 
 	meterProviderOpts, err := flags.ParseTelemetryFlags(context.Background(), c, "sn", storageNodeID.String(), clusterID)
 	if err != nil {

diff --git a/internal/metarepos/config.go b/internal/metarepos/config.go
@@ -127,7 +127,7 @@ func newConfig(opts []Option) (config, error) {
 	}
 
 	cfg.logger = cfg.logger.Named("mr").With(
-		zap.Uint32("cid", uint32(cfg.clusterID)),
+		zap.Int32("cid", int32(cfg.clusterID)),
 		zap.Uint64("nodeid", uint64(cfg.nodeID)),
 	)
 

diff --git a/internal/storagenode/volume/volume.go b/internal/storagenode/volume/volume.go
@@ -45,7 +45,7 @@ func (dd *DataDir) String() string {
 // Valid if the cluster ID and storage node ID are correct and the data directory is writable.
 func (dd *DataDir) Valid(cid types.ClusterID, snid types.StorageNodeID) error {
 	if dd.ClusterID != cid {
-		return fmt.Errorf("unexpected cluster id %d", uint32(dd.ClusterID))
+		return fmt.Errorf("unexpected cluster id %d", dd.ClusterID)
 	}
 	if dd.StorageNodeID != snid {
 		return fmt.Errorf("unexpected storage node id %d", int32(dd.StorageNodeID))

diff --git a/pkg/types/types.go b/pkg/types/types.go
@@ -10,17 +10,17 @@ import (
 	"sync/atomic"
 )
 
-type ClusterID uint32
+type ClusterID int32
 
 var _ fmt.Stringer = (*ClusterID)(nil)
 
 func ParseClusterID(s string) (ClusterID, error) {
-	id, err := strconv.ParseUint(s, 10, 32)
+	id, err := strconv.ParseInt(s, 10, 32)
 	return ClusterID(id), err
 }
 
 func (cid ClusterID) String() string {
-	return strconv.FormatUint(uint64(cid), 10)
+	return strconv.FormatInt(int64(cid), 10)
 }
 
 type StorageNodeID int32

diff --git a/proto/mrpb/management.pb.go b/proto/mrpb/management.pb.go
diff --git a/proto/mrpb/management.proto b/proto/mrpb/management.proto
@@ -15,7 +15,7 @@ option (gogoproto.goproto_unrecognized_all) = false;
 option (gogoproto.goproto_sizecache_all) = false;
 
 message AddPeerRequest {
-  uint32 cluster_id = 1 [
+  int32 cluster_id = 1 [
     (gogoproto.casttype) = "github.com/kakao/varlog/pkg/types.ClusterID",
     (gogoproto.customname) = "ClusterID"
   ];
@@ -29,7 +29,7 @@ message AddPeerRequest {
 }
 
 message RemovePeerRequest {
-  uint32 cluster_id = 1 [
+  int32 cluster_id = 1 [
     (gogoproto.casttype) = "github.com/kakao/varlog/pkg/types.ClusterID",
     (gogoproto.customname) = "ClusterID"
   ];
@@ -41,7 +41,7 @@ message RemovePeerRequest {
 }
 
 message GetClusterInfoRequest {
-  uint32 cluster_id = 1 [
+  int32 cluster_id = 1 [
     (gogoproto.casttype) = "github.com/kakao/varlog/pkg/types.ClusterID",
     (gogoproto.customname) = "ClusterID"
   ];
@@ -54,7 +54,7 @@ message ClusterInfo {
     bool learner = 3;
   }
 
-  uint32 cluster_id = 1 [
+  int32 cluster_id = 1 [
     (gogoproto.casttype) = "github.com/kakao/varlog/pkg/types.ClusterID",
     (gogoproto.customname) = "ClusterID",
     (gogoproto.jsontag) = "clusterId"