refactor: modify the rpc addr startup args of all components

cmd/initializer/internal/config_generator.go

@@ -114,14 +114,14 @@ func (c *ConfigGenerator) generateDatanodeConfig(initConfig []byte) ([]byte, err
 	if len(podIP) == 0 {
 		return nil, fmt.Errorf("empty pod ip")
 	}
-	datanodeCfg.RPCAddr = ptr.To(fmt.Sprintf("%s:%d", podIP, c.DatanodeRPCPort))
+	datanodeCfg.RPCBindAddr = ptr.To(fmt.Sprintf("%s:%d", podIP, c.DatanodeRPCPort))
 
 	podName := os.Getenv(deployer.EnvPodName)
 	if len(podName) == 0 {
 		return nil, fmt.Errorf("empty pod name")
 	}
 
-	datanodeCfg.RPCHostName = ptr.To(fmt.Sprintf("%s.%s.%s:%d", podName,
+	datanodeCfg.RPCServerAddr = ptr.To(fmt.Sprintf("%s.%s.%s:%d", podName,
 		c.DatanodeServiceName, c.Namespace, c.DatanodeRPCPort))
 
 	configData, err := dbconfig.Marshal(cfg)
@@ -157,14 +157,14 @@ func (c *ConfigGenerator) generateFlownodeConfig(initConfig []byte) ([]byte, err
 	if len(podIP) == 0 {
 		return nil, fmt.Errorf("empty pod ip")
 	}
-	flownodeCfg.Addr = ptr.To(fmt.Sprintf("%s:%d", podIP, c.RPCPort))
+	flownodeCfg.RPCBindAddr = ptr.To(fmt.Sprintf("%s:%d", podIP, c.RPCPort))
 
 	podName := os.Getenv(deployer.EnvPodName)
 	if len(podName) == 0 {
 		return nil, fmt.Errorf("empty pod name")
 	}
 
-	flownodeCfg.Hostname = ptr.To(fmt.Sprintf("%s.%s.%s:%d", podName,
+	flownodeCfg.RPCServerAddr = ptr.To(fmt.Sprintf("%s.%s.%s:%d", podName,
 		c.ServiceName, c.Namespace, c.RPCPort))
 
 	configData, err := dbconfig.Marshal(cfg)

cmd/initializer/internal/config_generator_test.go

@@ -80,22 +80,22 @@ func TestDatanodeConfigGenerator(t *testing.T) {
 		t.Fatalf("nodeID is not equal, want: '%d', got: '%d'", testPodIndex, nodeID)
 	}
 
-	rpcAddr, ok := tree.Get("rpc_addr").(string)
+	rpcBindAddr, ok := tree.Get("rpc_bind_addr").(string)
 	if !ok {
-		t.Fatalf("rpc_addr is not string")
+		t.Fatalf("rpc_bind_addr is not string")
 	}
 	wantRPCAddr := fmt.Sprintf("%s:%d", testPodIP, testRPCPort)
-	if !reflect.DeepEqual(wantRPCAddr, rpcAddr) {
-		t.Fatalf("RPCAddr is not equal, want: '%s', got: '%s'", wantRPCAddr, rpcAddr)
+	if !reflect.DeepEqual(wantRPCAddr, rpcBindAddr) {
+		t.Fatalf("RPCBindAddr is not equal, want: '%s', got: '%s'", wantRPCAddr, rpcBindAddr)
 	}
 
-	rpcHostName, ok := tree.Get("rpc_hostname").(string)
+	rpcServerAddr, ok := tree.Get("rpc_server_addr").(string)
 	if !ok {
-		t.Fatalf("rpc_hostname is not string")
+		t.Fatalf("rpc_server_addr is not string")
 	}
-	wantRPCHostname := fmt.Sprintf("%s.%s.%s:%d", testDatanodePodName, testClusterService, testClusterNamespace, testRPCPort)
-	if !reflect.DeepEqual(wantRPCHostname, rpcHostName) {
-		t.Fatalf("RPCHostName is not equal, want: '%s', got: '%s'", wantRPCHostname, rpcHostName)
+	wantRPCServerAddr := fmt.Sprintf("%s.%s.%s:%d", testDatanodePodName, testClusterService, testClusterNamespace, testRPCPort)
+	if !reflect.DeepEqual(wantRPCServerAddr, rpcServerAddr) {
+		t.Fatalf("RPCServerAddr is not equal, want: '%s', got: '%s'", wantRPCServerAddr, rpcServerAddr)
 	}
 }
 
@@ -141,22 +141,22 @@ func TestFlownodeConfigGenerator(t *testing.T) {
 		t.Fatalf("nodeID is not equal, want: '%d', got: '%d'", testPodIndex, nodeID)
 	}
 
-	rpcAddr, ok := tree.Get("grpc.addr").(string)
+	rpcBindAddr, ok := tree.Get("grpc.bind_addr").(string)
 	if !ok {
-		t.Fatalf("rpc_addr is not string")
+		t.Fatalf("rpc_bind_addr is not string")
 	}
 	wantRPCAddr := fmt.Sprintf("%s:%d", testPodIP, testRPCPort)
-	if !reflect.DeepEqual(wantRPCAddr, rpcAddr) {
-		t.Fatalf("RPCAddr is not equal, want: '%s', got: '%s'", wantRPCAddr, rpcAddr)
+	if !reflect.DeepEqual(wantRPCAddr, rpcBindAddr) {
+		t.Fatalf("RPCBindAddr is not equal, want: '%s', got: '%s'", wantRPCAddr, rpcBindAddr)
 	}
 
-	rpcHostName, ok := tree.Get("grpc.hostname").(string)
+	rpcServerAddr, ok := tree.Get("grpc.server_addr").(string)
 	if !ok {
-		t.Fatalf("rpc_hostname is not string")
+		t.Fatalf("rpc_server_addr is not string")
 	}
-	wantRPCHostname := fmt.Sprintf("%s.%s.%s:%d", testFlownodePodName, testClusterService, testClusterNamespace, testRPCPort)
-	if !reflect.DeepEqual(wantRPCHostname, rpcHostName) {
-		t.Fatalf("RPCHostName is not equal, want: '%s', got: '%s'", wantRPCHostname, rpcHostName)
+	wantRPCServerAddr := fmt.Sprintf("%s.%s.%s:%d", testFlownodePodName, testClusterService, testClusterNamespace, testRPCPort)
+	if !reflect.DeepEqual(wantRPCServerAddr, rpcServerAddr) {
+		t.Fatalf("RPCServerAddr is not equal, want: '%s', got: '%s'", wantRPCServerAddr, rpcServerAddr)
 	}
 }
 

cmd/initializer/internal/testdata/datanode-config.toml

@@ -1,8 +1,8 @@
 mode = 'distributed'
 enable_memory_catalog = false
 node_id = 42
-rpc_addr = '127.0.0.1:3001'
-rpc_hostname = '127.0.0.1'
+rpc_bind_addr = '127.0.0.1:3001'
+rpc_server_addr = '127.0.0.1'
 rpc_runtime_size = 8
 
 [meta_client_options]

cmd/initializer/internal/testdata/flownode-config.toml

@@ -2,8 +2,8 @@ mode = "distributed"
 node_id = 14
 
 [grpc]
-addr = "127.0.0.1:6800"
-hostname = "127.0.0.1"
+bind_addr = "127.0.0.1:6800"
+server_addr = "127.0.0.1"
 runtime_size = 2
 max_recv_message_size = "512MB"
 max_send_message_size = "512MB"

controllers/greptimedbcluster/deployers/frontend.go

@@ -247,7 +247,7 @@ func (b *frontendBuilder) Generate() ([]client.Object, error) {
 func (b *frontendBuilder) generateMainContainerArgs() []string {
 	var args = []string{
 		"frontend", "start",
-		"--rpc-addr", fmt.Sprintf("0.0.0.0:%d", b.Cluster.Spec.Frontend.RPCPort),
+		"--rpc-bind-addr", fmt.Sprintf("0.0.0.0:%d", b.Cluster.Spec.Frontend.RPCPort),
 		"--metasrv-addrs", fmt.Sprintf("%s.%s:%d", common.ResourceName(b.Cluster.Name, v1alpha1.MetaComponentKind),
 			b.Cluster.Namespace, b.Cluster.Spec.Meta.RPCPort),
 		"--http-addr", fmt.Sprintf("0.0.0.0:%d", b.Cluster.Spec.Frontend.HTTPPort),

controllers/greptimedbcluster/deployers/meta.go

@@ -354,9 +354,9 @@ func (b *metaBuilder) generatePodTemplateSpec() *corev1.PodTemplateSpec {
 func (b *metaBuilder) generateMainContainerArgs() []string {
 	return []string{
 		"metasrv", "start",
-		"--bind-addr", fmt.Sprintf("0.0.0.0:%d", b.Cluster.Spec.Meta.RPCPort),
+		"--rpc-bind-addr", fmt.Sprintf("0.0.0.0:%d", b.Cluster.Spec.Meta.RPCPort),
 		"--http-addr", fmt.Sprintf("0.0.0.0:%d", b.Cluster.Spec.Meta.HTTPPort),
-		"--server-addr", fmt.Sprintf("$(%s):%d", deployer.EnvPodIP, b.Cluster.Spec.Meta.RPCPort),
+		"--rpc-server-addr", fmt.Sprintf("$(%s):%d", deployer.EnvPodIP, b.Cluster.Spec.Meta.RPCPort),
 		"--store-addr", b.Cluster.Spec.Meta.EtcdEndpoints[0],
 		"--config-file", path.Join(constant.GreptimeDBConfigDir, constant.GreptimeDBConfigFileName),
 	}

controllers/greptimedbstandalone/deployer.go

@@ -397,7 +397,7 @@ func (b *standaloneBuilder) containerPorts() []corev1.ContainerPort {
 func (b *standaloneBuilder) generateMainContainerArgs() []string {
 	var args = []string{
 		"standalone", "start",
-		"--rpc-addr", fmt.Sprintf("0.0.0.0:%d", b.standalone.Spec.RPCPort),
+		"--rpc-bind-addr", fmt.Sprintf("0.0.0.0:%d", b.standalone.Spec.RPCPort),
 		"--mysql-addr", fmt.Sprintf("0.0.0.0:%d", b.standalone.Spec.MySQLPort),
 		"--http-addr", fmt.Sprintf("0.0.0.0:%d", b.standalone.Spec.HTTPPort),
 		"--postgres-addr", fmt.Sprintf("0.0.0.0:%d", b.standalone.Spec.PostgreSQLPort),

pkg/dbconfig/datanode_config.go

@@ -24,9 +24,9 @@ var _ Config = &DatanodeConfig{}
 
 // DatanodeConfig is the configuration for the datanode.
 type DatanodeConfig struct {
-	NodeID      *uint64 `tomlmapping:"node_id"`
-	RPCAddr     *string `tomlmapping:"rpc_addr"`
-	RPCHostName *string `tomlmapping:"rpc_hostname"`
+	NodeID        *uint64 `tomlmapping:"node_id"`
+	RPCBindAddr   *string `tomlmapping:"rpc_bind_addr"`
+	RPCServerAddr *string `tomlmapping:"rpc_server_addr"`
 
 	// StorageConfig is the configuration for the storage.
 	StorageConfig `tomlmapping:",inline"`

pkg/dbconfig/flownode_config.go

@@ -22,9 +22,9 @@ var _ Config = &FlownodeConfig{}
 
 // FlownodeConfig is the configuration for the datanode.
 type FlownodeConfig struct {
-	NodeID   *uint64 `tomlmapping:"node_id"`
-	Addr     *string `tomlmapping:"grpc.addr"`
-	Hostname *string `tomlmapping:"grpc.hostname"`
+	NodeID        *uint64 `tomlmapping:"node_id"`
+	RPCBindAddr   *string `tomlmapping:"grpc.bind_addr"`
+	RPCServerAddr *string `tomlmapping:"grpc.server_addr"`
 
 	// LoggingConfig is the configuration for the logging.
 	LoggingConfig `tomlmapping:",inline"`