discovery,election(engine): remove unused code (#7166)

ref #6849

deployments/engine/docker-compose/config/master.toml

@@ -1,5 +1,3 @@
-etcd-endpoints = ["etcd-standalone:2379"]
-
 [framework-meta]
 endpoints = ["mysql-standalone:3306"]
 schema = "test_framework"

deployments/engine/docker-compose/config/master_with_tls.toml

@@ -1,5 +1,3 @@
-etcd-endpoints = ["etcd-standalone:2379"]
-
 [framework-meta]
 endpoints = ["mysql-standalone:3306"]
 schema = "test_framework"

deployments/engine/docker-compose/config/template_master.toml

@@ -2,7 +2,6 @@
 name = "master-test"                 # Corresponding command line:  --name
 addr = "127.0.0.1:10240"             # Corresponding command line:  --addr
 advertise-addr = "127.0.0.1:10240"   # Corresponding command line:  --advertise-addr
-etcd-endpoints = ["127.0.0.1:2379"]  # Corresponding command line:  ---etcd-endpoints
 
 [log] 
 level = "info"            # Corresponding command line:  --log-level

deployments/engine/helm/tiflow/templates/_helpers.tpl

@@ -19,7 +19,6 @@
 
 {{- define "tiflow.configmap.data" -}}
 server-master: |-
-    etcd-endpoints = ["{{ include "tiflow.name" . }}-metastore-etcd:12479"]
     framework-meta.endpoints = ["{{ include "tiflow.name" . }}-metastore-mysql:3306"]
     business-meta.endpoints = ["{{ include "tiflow.name" . }}-metastore-mysql:3306"]
     {{- if .Values.master.config }}

engine/model/cluster.go

@@ -13,13 +13,6 @@
 
 package model
 
-import (
-	"encoding/json"
-
-	"github.com/pingcap/errors"
-	"github.com/pingcap/tiflow/engine/pkg/adapter"
-)
-
 // RescUnit is the min unit of resource that we count.
 type RescUnit int
 
@@ -29,28 +22,6 @@ type DeployNodeID string
 // ExecutorID is an alias for executor when NodeType is NodeTypeExecutor.
 type ExecutorID = DeployNodeID
 
-// NodeInfo describes the information of server instance.
-// Deprecated: only used for servermaster and will be removed soon.
-type NodeInfo struct {
-	ID   DeployNodeID `json:"id"`
-	Addr string       `json:"addr"`
-	Name string       `json:"name"`
-}
-
-// EtcdKey return encoded key for a node used in service discovery etcd
-func (e *NodeInfo) EtcdKey() string {
-	return adapter.NodeInfoKeyAdapter.Encode(string(e.ID))
-}
-
-// ToJSON returns json marshal of a node info
-func (e *NodeInfo) ToJSON() (string, error) {
-	data, err := json.Marshal(e)
-	if err != nil {
-		return "", errors.Trace(err)
-	}
-	return string(data), nil
-}
-
 // ExecutorStatus describes the node aliveness status of an executor
 type ExecutorStatus int32
 

engine/pkg/cmd/master/master.go

@@ -52,7 +52,6 @@ func (o *options) addFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVar(&o.masterConfig.Addr, "addr", o.masterConfig.Addr, "Set the listening address for server master")
 	cmd.Flags().StringVar(&o.masterConfig.AdvertiseAddr, "advertise-addr", o.masterConfig.AdvertiseAddr, "Set the advertise listening address for client communication")
 
-	cmd.Flags().StringSliceVar(&o.masterConfig.ETCDEndpoints, "etcd-endpoints", o.masterConfig.ETCDEndpoints, "etcd endpoints")
 	cmd.Flags().StringSliceVar(&o.masterConfig.FrameworkMeta.Endpoints, "framework-meta-endpoints", o.masterConfig.FrameworkMeta.Endpoints, "framework metastore endpoint")
 	cmd.Flags().StringSliceVar(&o.masterConfig.BusinessMeta.Endpoints, "business-meta-endpoints", o.masterConfig.BusinessMeta.Endpoints, "business metastore endpoint")
 
@@ -112,8 +111,6 @@ func (o *options) complete(cmd *cobra.Command) error {
 			cfg.Addr = o.masterConfig.Addr
 		case "advertise-addr":
 			cfg.AdvertiseAddr = o.masterConfig.AdvertiseAddr
-		case "etcd-endpoints":
-			cfg.ETCDEndpoints = o.masterConfig.ETCDEndpoints
 		case "framework-meta-endpoints":
 			cfg.FrameworkMeta.Endpoints = o.masterConfig.FrameworkMeta.Endpoints
 		case "business-meta-endpoints":