mcs: remove advertise backend endpoint parameters (#6215)

ref #5836, ref #6212 Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Mar 23, 2023 · f15257a · f15257a
1 parent 3150c85
commit f15257a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/cmd/pd-server/main.go b/cmd/pd-server/main.go
@@ -81,7 +81,6 @@ func NewTSOServiceCommand() *cobra.Command {
 	cmd.Flags().BoolP("version", "V", false, "print version information and exit")
 	cmd.Flags().StringP("config", "", "", "config file")
 	cmd.Flags().StringP("backend-endpoints", "", "", "url for etcd client")
-	cmd.Flags().StringP("advertise-backend-endpoints", "", "", "advertise urls for backend endpoints (default '${backend-endpoints}')")
 	cmd.Flags().StringP("listen-addr", "", "", "listen address for tso service")
 	cmd.Flags().StringP("advertise-listen-addr", "", "", "advertise urls for listen address (default '${listen-addr}')")
 	cmd.Flags().StringP("cacert", "", "", "path of file that contains list of trusted TLS CAs")
@@ -100,7 +99,6 @@ func NewResourceManagerServiceCommand() *cobra.Command {
 	cmd.Flags().BoolP("version", "V", false, "print version information and exit")
 	cmd.Flags().StringP("config", "", "", "config file")
 	cmd.Flags().StringP("backend-endpoints", "", "", "url for etcd client")
-	cmd.Flags().StringP("advertise-backend-endpoints", "", "", "advertise urls for backend endpoints (default '${backend-endpoints}')")
 	cmd.Flags().StringP("listen-addr", "", "", "listen address for resource management service")
 	cmd.Flags().StringP("advertise-listen-addr", "", "", "advertise urls for listen address (default '${listen-addr}')")
 	cmd.Flags().StringP("cacert", "", "", "path of file that contains list of trusted TLS CAs")

diff --git a/pkg/mcs/resource_manager/server/config.go b/pkg/mcs/resource_manager/server/config.go
@@ -55,13 +55,12 @@ const (
 
 // Config is the configuration for the resource manager.
 type Config struct {
-	BackendEndpoints          string `toml:"backend-endpoints" json:"backend-endpoints"`
-	AdvertiseBackendEndpoints string `toml:"advertise-backend-endpoints" json:"advertise-backend-endpoints"`
-	ListenAddr                string `toml:"listen-addr" json:"listen-addr"`
-	AdvertiseListenAddr       string `toml:"advertise-listen-addr" json:"advertise-listen-addr"`
-	Name                      string `toml:"name" json:"name"`
-	DataDir                   string `toml:"data-dir" json:"data-dir"` // TODO: remove this after refactoring
-	EnableGRPCGateway         bool   `json:"enable-grpc-gateway"`      // TODO: use it
+	BackendEndpoints    string `toml:"backend-endpoints" json:"backend-endpoints"`
+	ListenAddr          string `toml:"listen-addr" json:"listen-addr"`
+	AdvertiseListenAddr string `toml:"advertise-listen-addr" json:"advertise-listen-addr"`
+	Name                string `toml:"name" json:"name"`
+	DataDir             string `toml:"data-dir" json:"data-dir"` // TODO: remove this after refactoring
+	EnableGRPCGateway   bool   `json:"enable-grpc-gateway"`      // TODO: use it
 
 	Metric metricutil.MetricConfig `toml:"metric" json:"metric"`
 
@@ -171,7 +170,6 @@ func (c *Config) Parse(flagSet *pflag.FlagSet) error {
 	configutil.AdjustCommandlineString(flagSet, &c.Security.CertPath, "cert")
 	configutil.AdjustCommandlineString(flagSet, &c.Security.KeyPath, "key")
 	configutil.AdjustCommandlineString(flagSet, &c.BackendEndpoints, "backend-endpoints")
-	configutil.AdjustCommandlineString(flagSet, &c.AdvertiseBackendEndpoints, "advertise-backend-endpoints")
 	configutil.AdjustCommandlineString(flagSet, &c.ListenAddr, "listen-addr")
 	configutil.AdjustCommandlineString(flagSet, &c.AdvertiseListenAddr, "advertise-listen-addr")
 
@@ -202,7 +200,6 @@ func (c *Config) Adjust(meta *toml.MetaData, reloading bool) error {
 	}
 
 	configutil.AdjustString(&c.BackendEndpoints, defaultBackendEndpoints)
-	configutil.AdjustString(&c.AdvertiseBackendEndpoints, c.BackendEndpoints)
 	configutil.AdjustString(&c.ListenAddr, defaultListenAddr)
 	configutil.AdjustString(&c.AdvertiseListenAddr, c.ListenAddr)
 

diff --git a/pkg/mcs/resource_manager/server/testutil.go b/pkg/mcs/resource_manager/server/testutil.go
@@ -52,14 +52,12 @@ func GenerateConfig(c *Config) (*Config, error) {
 		"--listen-addr=" + c.ListenAddr,
 		"--advertise-listen-addr=" + c.AdvertiseListenAddr,
 		"--backend-endpoints=" + c.BackendEndpoints,
-		"--advertise-backend-endpoints=" + c.AdvertiseBackendEndpoints,
 	}
 
 	flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
 	flagSet.BoolP("version", "V", false, "print version information and exit")
 	flagSet.StringP("config", "", "", "config file")
 	flagSet.StringP("backend-endpoints", "", "", "url for etcd client")
-	flagSet.StringP("advertise-backend-endpoints", "", "", "advertise urls for backend endpoints (default '${backend-endpoints}')")
 	flagSet.StringP("listen-addr", "", "", "listen address for tso service")
 	flagSet.StringP("advertise-listen-addr", "", "", "advertise urls for listen address (default '${listen-addr}')")
 	flagSet.StringP("cacert", "", "", "path of file that contains list of trusted TLS CAs")

diff --git a/pkg/mcs/tso/server/config.go b/pkg/mcs/tso/server/config.go
@@ -48,10 +48,9 @@ const (
 
 // Config is the configuration for the TSO.
 type Config struct {
-	BackendEndpoints          string `toml:"backend-endpoints" json:"backend-endpoints"`
-	AdvertiseBackendEndpoints string `toml:"advertise-backend-endpoints" json:"advertise-backend-endpoints"`
-	ListenAddr                string `toml:"listen-addr" json:"listen-addr"`
-	AdvertiseListenAddr       string `toml:"advertise-listen-addr" json:"advertise-listen-addr"`
+	BackendEndpoints    string `toml:"backend-endpoints" json:"backend-endpoints"`
+	ListenAddr          string `toml:"listen-addr" json:"listen-addr"`
+	AdvertiseListenAddr string `toml:"advertise-listen-addr" json:"advertise-listen-addr"`
 
 	Name              string `toml:"name" json:"name"`
 	DataDir           string `toml:"data-dir" json:"data-dir"`
@@ -142,7 +141,6 @@ func (c *Config) Parse(flagSet *pflag.FlagSet) error {
 	configutil.AdjustCommandlineString(flagSet, &c.Security.CertPath, "cert")
 	configutil.AdjustCommandlineString(flagSet, &c.Security.KeyPath, "key")
 	configutil.AdjustCommandlineString(flagSet, &c.BackendEndpoints, "backend-endpoints")
-	configutil.AdjustCommandlineString(flagSet, &c.AdvertiseBackendEndpoints, "advertise-backend-endpoints")
 	configutil.AdjustCommandlineString(flagSet, &c.ListenAddr, "listen-addr")
 	configutil.AdjustCommandlineString(flagSet, &c.AdvertiseListenAddr, "advertise-listen-addr")
 
@@ -170,7 +168,6 @@ func (c *Config) Adjust(meta *toml.MetaData, reloading bool) error {
 	}
 
 	configutil.AdjustString(&c.BackendEndpoints, defaultBackendEndpoints)
-	configutil.AdjustString(&c.AdvertiseBackendEndpoints, c.BackendEndpoints)
 	configutil.AdjustString(&c.ListenAddr, defaultListenAddr)
 	configutil.AdjustString(&c.AdvertiseListenAddr, c.ListenAddr)
 

diff --git a/pkg/mcs/tso/server/testutil.go b/pkg/mcs/tso/server/testutil.go
@@ -62,14 +62,12 @@ func GenerateConfig(c *Config) (*Config, error) {
 		"--listen-addr=" + c.ListenAddr,
 		"--advertise-listen-addr=" + c.AdvertiseListenAddr,
 		"--backend-endpoints=" + c.BackendEndpoints,
-		"--advertise-backend-endpoints=" + c.AdvertiseBackendEndpoints,
 	}
 
 	flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
 	flagSet.BoolP("version", "V", false, "print version information and exit")
 	flagSet.StringP("config", "", "", "config file")
 	flagSet.StringP("backend-endpoints", "", "", "url for etcd client")
-	flagSet.StringP("advertise-backend-endpoints", "", "", "advertise urls for backend endpoints (default '${backend-endpoints}')")
 	flagSet.StringP("listen-addr", "", "", "listen address for tso service")
 	flagSet.StringP("advertise-listen-addr", "", "", "advertise urls for listen address (default '${listen-addr}')")
 	flagSet.StringP("cacert", "", "", "path of file that contains list of trusted TLS CAs")

diff --git a/tests/mcs/tso/server_test.go b/tests/mcs/tso/server_test.go
@@ -341,6 +341,5 @@ func TestAdvertiseAddr(t *testing.T) {
 	defer cleanup()
 
 	tsoServerConf := s.GetConfig()
-	re.Equal(leader.GetAddr(), tsoServerConf.AdvertiseBackendEndpoints)
 	re.Equal(u, tsoServerConf.AdvertiseListenAddr)
 }