feat: optimize cluster

samshi · samshi · commit 0fab75bca648 · 2021-11-24T16:05:34.000+08:00
1. remove useless code.
2. rename name to id
diff --git a/cluster/impl/configfile/cluster.go b/cluster/impl/configfile/cluster.go
@@ -37,24 +37,24 @@ func New(filePath string) (base.Cluster, error) {
 	return cluster, nil
 }
 
-// RegInstance 注册本地实例，name传空则默认使用ip作为name，否则请保证该名称与配置文件中的name保持一致
-func (cluster *Cluster) RegInstance(ctx context.Context, name string) (base.Instance, error) {
-	if name == "" {
+// RegInstance 注册本地实例，id传空则默认使用ip作为id，只有配置文件中的id才能注册成功，否则反错
+func (cluster *Cluster) RegInstance(ctx context.Context, id string) (base.Instance, error) {
+	if id == "" {
 		var err error
-		name, err = base.GetLocalIP()
+		id, err = base.GetLocalIP()
 		if err != nil {
 			return nil, err
 		}
 	}
 	for _, ins := range cluster.baseInsList {
 		// 查找本机是否在配置的ins列表，如果在，则注册成功
-		if ins.GetName() == name {
+		if ins.GetID() == id {
 			cluster.localInstance = ins
 			return ins, nil
 		}
 	}
 	// 本机不在配置中，返回失败
-	return nil, fmt.Errorf("invalid instance. name:%v", name)
+	return nil, fmt.Errorf("invalid instance. id:%v", id)
 }
 
 // UnregInstance 注销本地实例
diff --git a/cluster/impl/configfile/cluster_config.yaml b/cluster/impl/configfile/cluster_config.yaml
@@ -1,4 +1,4 @@
 instance_list:
-  - name: 192.168.0.1
-  - name: 192.168.0.2
-  - name: 192.168.0.3
+  - id: 192.168.0.1
+  - id: 192.168.0.2
+  - id: 192.168.0.3
diff --git a/cluster/impl/configfile/example/cluster_config.yaml b/cluster/impl/configfile/example/cluster_config.yaml
@@ -1,4 +1,4 @@
 instance_list:
-  - name: 192.168.0.1
-  - name: 192.168.0.2
-  - name: 192.168.0.3
+  - id: 192.168.0.1
+  - id: 192.168.0.2
+  - id: 192.168.0.3
diff --git a/cluster/impl/configfile/example/go.mod b/cluster/impl/configfile/example/go.mod
@@ -7,6 +7,6 @@ replace github.com/tencent-connect/botgo-plugins/cluster/base => ../../../base
 replace github.com/tencent-connect/botgo-plugins/cluster/impl/configfile => ../
 
 require (
-	github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7
+	github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913
 	github.com/tencent-connect/botgo-plugins/cluster/impl/configfile v0.0.0-00010101000000-000000000000
 )
diff --git a/cluster/impl/configfile/example/main.go b/cluster/impl/configfile/example/main.go
@@ -27,7 +27,7 @@ func main() {
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
-	// 注册当前实例，name传空，默认使用ip作为名称
+	// 注册当前实例，id传空，默认使用ip作为名称
 	ins, err := cluster.RegInstance(ctx, "")
 	if err != nil {
 		fmt.Printf("reg failed. err:%v\n", err)
@@ -80,7 +80,7 @@ func getAllInstance(cluster base.Cluster) {
 	}
 	fmt.Printf("get all ins num:%v\n", len(all))
 	for _, ins := range all {
-		fmt.Printf("ins=====>:%v\n", ins.GetName())
+		fmt.Printf("ins=====>:%v\n", ins.GetID())
 	}
 }
 
diff --git a/cluster/impl/configfile/go.mod b/cluster/impl/configfile/go.mod
@@ -4,6 +4,6 @@ go 1.15
 
 require (
 	github.com/agiledragon/gomonkey/v2 v2.3.1
-	github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7
+	github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
diff --git a/cluster/impl/configfile/go.sum b/cluster/impl/configfile/go.sum
@@ -12,6 +12,10 @@ github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211123172531-daee
 github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211123172531-daee3d202d89/go.mod h1:Mqc/VXp1cMJehHB6TC0EWf2sXsDTZwliNOkytByuxjI=
 github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7 h1:Fz+8sKChKw66LkT8LsDLro3G1BGWPfEDEtX9HkGs78Q=
 github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7/go.mod h1:Mqc/VXp1cMJehHB6TC0EWf2sXsDTZwliNOkytByuxjI=
+github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124045614-539d45c4107b h1:ptGDEqMFJ8FnfodszqrdPARqMCE3LfCmeWRCXdxVbME=
+github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124045614-539d45c4107b/go.mod h1:Mqc/VXp1cMJehHB6TC0EWf2sXsDTZwliNOkytByuxjI=
+github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913 h1:IsBPvxKKdZBqLpnm0EbgxwD3dQnnmeWSZwWpOo4McTs=
+github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913/go.mod h1:Mqc/VXp1cMJehHB6TC0EWf2sXsDTZwliNOkytByuxjI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/cluster/impl/configfile/instance.go b/cluster/impl/configfile/instance.go
@@ -1,25 +1,18 @@
 // Package configfile 基于配置文件实现的集群实例
 package configfile
 
-import "github.com/tencent-connect/botgo-plugins/cluster/base"
-
 // Instance 实例配置
 type Instance struct {
-	// Name 实例名称，需要保证唯一
-	Name string `yaml:"name"`
+	// ID 实例ID，需要保证唯一
+	ID string `yaml:"id"`
 }
 
-// GetName 获取实例名称
-func (ins *Instance) GetName() string {
-	return ins.Name
+// GetID 获取实例名称
+func (ins *Instance) GetID() string {
+	return ins.ID
 }
 
 // IsValid 是否是有效实例
 func (ins *Instance) IsValid() bool {
-	return ins.Name != ""
-}
-
-// IsSame 是否是相同实例
-func (ins *Instance) IsSame(i base.Instance) bool {
-	return ins.Name == i.GetName()
+	return ins.ID != ""
 }
diff --git a/cluster/impl/etcd/README.md b/cluster/impl/etcd/README.md
@@ -1,10 +1,10 @@
 # 概要说明
 * 本模块实现基于ETCD的分布式集群管理器；
-* 每个实例以自身ip作为实例唯一标识；
+* 每个实例默认以自身ip作为实例唯一标识，在容器场景，由于ip可能有重复，请在注册时指定id（例如使用容器id）；
 * 本模块主要用于搭配 schedule 模块，实现机器人集群实例的分区调度。
 
 # 使用方法
 参见example。
 
 # 注意事项
-如果是容器场景，可能存在容器ip相同情况，此时请在RegInstance是指定实例名称（例如使用容器id），而不要使用默认的ip作为名称。
+如果是容器场景，可能存在容器ip相同情况，此时请在RegInstance是指定实例id（例如使用容器id），而不要使用默认的ip作为id。
diff --git a/cluster/impl/etcd/cluster.go b/cluster/impl/etcd/cluster.go
@@ -73,14 +73,14 @@ func NewArgs(clusterName string, endpoints []string) *Args {
 	}
 }
 
-// RegInstance 注册实例，如果name为空，则自动使用ip作为名称，完整实例名称为 clusterName_name
-func (cluster *Cluster) RegInstance(ctx context.Context, name string) (base.Instance, error) {
+// RegInstance 注册实例，如果id为空，则自动使用ip作为id，完整实例名称为 clusterName_id
+func (cluster *Cluster) RegInstance(ctx context.Context, id string) (base.Instance, error) {
 	if cluster.localInstance != nil {
 		// 已注册，直接返回
 		return cluster.localInstance, nil
 	}
 	// 创建实例
-	ins, err := newInstance(cluster.args.ClusterName, name)
+	ins, err := newInstance(cluster.args.ClusterName, id)
 	if err != nil {
 		return nil, err
 	}
@@ -131,7 +131,7 @@ func (cluster *Cluster) GetAllInstances(ctx context.Context) ([]base.Instance, e
 	}
 	var instances []base.Instance
 	for _, item := range rsp.Kvs {
-		ins, err := newInstanceWithName(string(item.Key))
+		ins, err := newInstanceWithID(string(item.Key))
 		if err != nil {
 			continue
 		}
@@ -208,7 +208,7 @@ func (cluster *Cluster) startHeartBeat(ins *Instance) error {
 			if r := recover(); r != nil {
 				buf := make([]byte, 4096)
 				buf = buf[:runtime.Stack(buf, false)]
-				fmt.Printf("[HeartBeatPanic]ins:%v, err:%v, stack:\n%s\n", ins.GetName(), r, buf)
+				fmt.Printf("[HeartBeatPanic]ins:%v, err:%v, stack:\n%s\n", ins.GetID(), r, buf)
 				// 如果故障，则退出进程（通常不可能进入到这里）
 				os.Exit(-1)
 			}
@@ -272,7 +272,7 @@ func delNode(ctx context.Context, cli *clientv3.Client, ins *Instance) error {
 	if !ins.IsValid() {
 		return errors.New("invalid instance")
 	}
-	_, err := cli.Delete(ctx, ins.GetName())
+	_, err := cli.Delete(ctx, ins.GetID())
 	_, _ = cli.Revoke(ctx, ins.leaseID)
 	ins.clear()
 	return err
@@ -289,7 +289,7 @@ func putNode(ctx context.Context, cli *clientv3.Client, ins *Instance, ttl int64
 		return err
 	}
 	// 写入etcd节点，节点内容暂无实际意义，暂且写入1
-	_, err = cli.Put(ctx, ins.GetName(), "1", clientv3.WithLease(rsp.ID))
+	_, err = cli.Put(ctx, ins.GetID(), "1", clientv3.WithLease(rsp.ID))
 	if err != nil {
 		return err
 	}
diff --git a/cluster/impl/etcd/cluster_test.go b/cluster/impl/etcd/cluster_test.go
@@ -78,7 +78,7 @@ func applyEtcd() *gomonkey.Patches {
 		{Values: gomonkey.Params{nil, nil}, Times: 10000},
 	}).ApplyMethodSeq(reflect.TypeOf(clientv3.NewKV(testClientV3)), "Get", []gomonkey.OutputCell{
 		{
-			Values: gomonkey.Params{&clientv3.GetResponse{Kvs: []*mvccpb.KeyValue{{Key: []byte(testInsName)}}}, nil},
+			Values: gomonkey.Params{&clientv3.GetResponse{Kvs: []*mvccpb.KeyValue{{Key: []byte(testInsID)}}}, nil},
 			Times:  10000,
 		},
 	})
diff --git a/cluster/impl/etcd/example/go.mod b/cluster/impl/etcd/example/go.mod
@@ -8,6 +8,6 @@ replace github.com/tencent-connect/botgo-plugins/cluster/impl/etcd => ../
 
 require (
 	github.com/hanjm/etcd v0.7.0
-	github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7
+	github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913
 	github.com/tencent-connect/botgo-plugins/cluster/impl/etcd v0.0.0-00010101000000-000000000000
 )
diff --git a/cluster/impl/etcd/example/main.go b/cluster/impl/etcd/example/main.go
@@ -30,7 +30,7 @@ func main() {
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
-	// 注册当前实例，name传空，则默认使用ip作为name
+	// 注册当前实例，id传空，则默认使用ip来拼接clusterName作为最终id
 	ins, err := cluster.RegInstance(ctx, "")
 	if err != nil {
 		fmt.Printf("reg failed. err:%v\n", err)
@@ -83,7 +83,7 @@ func getAllInstance(cluster base.Cluster) {
 	}
 	fmt.Printf("get all ins num:%v\n", len(all))
 	for _, ins := range all {
-		fmt.Printf("ins=====>:%v\n", ins.GetName())
+		fmt.Printf("ins=====>:%v\n", ins.GetID())
 	}
 }
 
diff --git a/cluster/impl/etcd/go.mod b/cluster/impl/etcd/go.mod
@@ -6,5 +6,5 @@ require (
 	github.com/agiledragon/gomonkey/v2 v2.3.1
 	github.com/hanjm/etcd v0.7.0
 	github.com/tencent-connect/botgo v0.0.0-20211122124126-a4936f507e42
-	github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7
+	github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913
 )
diff --git a/cluster/impl/etcd/go.sum b/cluster/impl/etcd/go.sum
@@ -150,6 +150,8 @@ github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211123165230-8024
 github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211123165230-802400d0f54e/go.mod h1:Mqc/VXp1cMJehHB6TC0EWf2sXsDTZwliNOkytByuxjI=
 github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7 h1:Fz+8sKChKw66LkT8LsDLro3G1BGWPfEDEtX9HkGs78Q=
 github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7/go.mod h1:Mqc/VXp1cMJehHB6TC0EWf2sXsDTZwliNOkytByuxjI=
+github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913 h1:IsBPvxKKdZBqLpnm0EbgxwD3dQnnmeWSZwWpOo4McTs=
+github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913/go.mod h1:Mqc/VXp1cMJehHB6TC0EWf2sXsDTZwliNOkytByuxjI=
 github.com/tidwall/gjson v1.9.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
diff --git a/cluster/impl/etcd/instance.go b/cluster/impl/etcd/instance.go
@@ -8,10 +8,10 @@ import (
 	"github.com/tencent-connect/botgo-plugins/cluster/base"
 )
 
-// Instance 实例，以name作为区分
+// Instance 实例，以id作为唯一标识
 type Instance struct {
-	// 实例名称，需要保证唯一
-	name string
+	// 实例id，需要保证唯一
+	id string
 	// ctx 生命周期控制ctx
 	ctx context.Context
 	// ctxCancel 用于反注册时销毁ctx
@@ -20,51 +20,46 @@ type Instance struct {
 	leaseID clientv3.LeaseID
 }
 
-// newInstanceWithName 返回instance
-func newInstanceWithName(name string) (*Instance, error) {
-	if name == "" {
-		return nil, errors.New("invalid name")
+// newInstanceWithID 返回instance
+func newInstanceWithID(id string) (*Instance, error) {
+	if id == "" {
+		return nil, errors.New("invalid id")
 	}
 	return &Instance{
-		name: name,
+		id: id,
 	}, nil
 }
 
 // newInstance 创建集群实例
-func newInstance(clusterName string, name string) (*Instance, error) {
+func newInstance(clusterName string, id string) (*Instance, error) {
 	if clusterName == "" {
 		return nil, errors.New("invalid cluster name")
 	}
-	if name == "" {
-		// 如果没有指定名字，则自动使用ip作为实例名称
+	if id == "" {
+		// 如果没有指定id，则自动使用ip作为实例id
 		// TODO 需要兼容容器场景，考虑使用设备id而非ip，避免ip重复
 		var err error
-		name, err = base.GetLocalIP()
+		id, err = base.GetLocalIP()
 		if err != nil {
 			return nil, err
 		}
 	}
 	ctxLocal, cancel := context.WithCancel(context.Background())
 	return &Instance{
-		name:      clusterName + "_" + name,
+		id:        clusterName + "_" + id,
 		ctx:       ctxLocal,
 		ctxCancel: cancel,
 	}, nil
 }
 
-// GetName 获取实例名称
-func (ins *Instance) GetName() string {
-	return ins.name
+// GetID 获取实例ID
+func (ins *Instance) GetID() string {
+	return ins.id
 }
 
 // IsValid 是否是有效实例
 func (ins *Instance) IsValid() bool {
-	return ins.name != ""
-}
-
-// IsSame 是否是相同实例
-func (ins *Instance) IsSame(i base.Instance) bool {
-	return ins.name == i.GetName()
+	return ins.id != ""
 }
 
 // cancel 停止
@@ -74,6 +69,6 @@ func (ins *Instance) cancel() {
 
 // clear 清理ins
 func (ins *Instance) clear() {
-	ins.name = ""
+	ins.id = ""
 	ins.leaseID = 0
 }
diff --git a/cluster/impl/etcd/instance_test.go b/cluster/impl/etcd/instance_test.go
@@ -6,13 +6,13 @@ import (
 )
 
 var (
-	testInsName        = "test"
+	testInsID          = "test"
 	testInsClusterName = "testInsCluster"
 )
 
-func Test_newInstanceWithName(t *testing.T) {
+func Test_newInstanceWithID(t *testing.T) {
 	type args struct {
-		name string
+		id string
 	}
 	tests := []struct {
 		name    string
@@ -22,25 +22,25 @@ func Test_newInstanceWithName(t *testing.T) {
 	}{
 		{
 			name:    "c1",
-			args:    args{name: ""},
+			args:    args{id: ""},
 			want:    nil,
 			wantErr: true,
 		}, {
 			name:    "c2",
-			args:    args{name: testInsName},
-			want:    &Instance{name: testInsName},
+			args:    args{id: testInsID},
+			want:    &Instance{id: testInsID},
 			wantErr: false,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := newInstanceWithName(tt.args.name)
+			got, err := newInstanceWithID(tt.args.id)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("newInstanceWithName() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("newInstanceWithID() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("newInstanceWithName() = %v, want %v", got, tt.want)
+				t.Errorf("newInstanceWithID() = %v, want %v", got, tt.want)
 			}
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -37,24 +37,24 @@ func New(filePath string) (base.Cluster, error) {`
`37`	`37`	`return cluster, nil`
`38`	`38`	`}`
`39`	`39`
`40`		`-// RegInstance 注册本地实例，name传空则默认使用ip作为name，否则请保证该名称与配置文件中的name保持一致`
`41`		`-func (cluster *Cluster) RegInstance(ctx context.Context, name string) (base.Instance, error) {`
`42`		`- if name == "" {`
	`40`	`+// RegInstance 注册本地实例，id传空则默认使用ip作为id，只有配置文件中的id才能注册成功，否则反错`
	`41`	`+func (cluster *Cluster) RegInstance(ctx context.Context, id string) (base.Instance, error) {`
	`42`	`+ if id == "" {`
`43`	`43`	`var err error`
`44`		`- name, err = base.GetLocalIP()`
	`44`	`+ id, err = base.GetLocalIP()`
`45`	`45`	`if err != nil {`
`46`	`46`	`return nil, err`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`for _, ins := range cluster.baseInsList {`
`50`	`50`	`// 查找本机是否在配置的ins列表，如果在，则注册成功`
`51`		`- if ins.GetName() == name {`
	`51`	`+ if ins.GetID() == id {`
`52`	`52`	`cluster.localInstance = ins`
`53`	`53`	`return ins, nil`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`// 本机不在配置中，返回失败`
`57`		`- return nil, fmt.Errorf("invalid instance. name:%v", name)`
	`57`	`+ return nil, fmt.Errorf("invalid instance. id:%v", id)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// UnregInstance 注销本地实例`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ replace github.com/tencent-connect/botgo-plugins/cluster/base => ../../../base`
`7`	`7`	`replace github.com/tencent-connect/botgo-plugins/cluster/impl/configfile => ../`
`8`	`8`
`9`	`9`	`require (`
`10`		`- github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7`
	`10`	`+ github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913`
`11`	`11`	`github.com/tencent-connect/botgo-plugins/cluster/impl/configfile v0.0.0-00010101000000-000000000000`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func main() {`
`27`	`27`	`}`
`28`	`28`	`ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)`
`29`	`29`	`defer cancel()`
`30`		`- // 注册当前实例，name传空，默认使用ip作为名称`
	`30`	`+ // 注册当前实例，id传空，默认使用ip作为名称`
`31`	`31`	`ins, err := cluster.RegInstance(ctx, "")`
`32`	`32`	`if err != nil {`
`33`	`33`	`fmt.Printf("reg failed. err:%v\n", err)`
`@@ -80,7 +80,7 @@ func getAllInstance(cluster base.Cluster) {`
`80`	`80`	`}`
`81`	`81`	`fmt.Printf("get all ins num:%v\n", len(all))`
`82`	`82`	`for _, ins := range all {`
`83`		`- fmt.Printf("ins=====>:%v\n", ins.GetName())`
	`83`	`+ fmt.Printf("ins=====>:%v\n", ins.GetID())`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ go 1.15`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/agiledragon/gomonkey/v2 v2.3.1`
`7`		`- github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124034518-37adad080eb7`
	`7`	`+ github.com/tencent-connect/botgo-plugins/cluster/base v0.0.0-20211124073815-757ae5fa4913`
`8`	`8`	`gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -73,14 +73,14 @@ func NewArgs(clusterName string, endpoints []string) *Args {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`-// RegInstance 注册实例，如果name为空，则自动使用ip作为名称，完整实例名称为 clusterName_name`
`77`		`-func (cluster *Cluster) RegInstance(ctx context.Context, name string) (base.Instance, error) {`
	`76`	`+// RegInstance 注册实例，如果id为空，则自动使用ip作为id，完整实例名称为 clusterName_id`
	`77`	`+func (cluster *Cluster) RegInstance(ctx context.Context, id string) (base.Instance, error) {`
`78`	`78`	`if cluster.localInstance != nil {`
`79`	`79`	`// 已注册，直接返回`
`80`	`80`	`return cluster.localInstance, nil`
`81`	`81`	`}`
`82`	`82`	`// 创建实例`
`83`		`- ins, err := newInstance(cluster.args.ClusterName, name)`
	`83`	`+ ins, err := newInstance(cluster.args.ClusterName, id)`
`84`	`84`	`if err != nil {`
`85`	`85`	`return nil, err`
`86`	`86`	`}`
`@@ -131,7 +131,7 @@ func (cluster *Cluster) GetAllInstances(ctx context.Context) ([]base.Instance, e`
`131`	`131`	`}`
`132`	`132`	`var instances []base.Instance`
`133`	`133`	`for _, item := range rsp.Kvs {`
`134`		`- ins, err := newInstanceWithName(string(item.Key))`
	`134`	`+ ins, err := newInstanceWithID(string(item.Key))`
`135`	`135`	`if err != nil {`
`136`	`136`	`continue`
`137`	`137`	`}`
`@@ -208,7 +208,7 @@ func (cluster Cluster) startHeartBeat(ins Instance) error {`
`208`	`208`	`if r := recover(); r != nil {`
`209`	`209`	`buf := make([]byte, 4096)`
`210`	`210`	`buf = buf[:runtime.Stack(buf, false)]`
`211`		`- fmt.Printf("[HeartBeatPanic]ins:%v, err:%v, stack:\n%s\n", ins.GetName(), r, buf)`
	`211`	`+ fmt.Printf("[HeartBeatPanic]ins:%v, err:%v, stack:\n%s\n", ins.GetID(), r, buf)`
`212`	`212`	`// 如果故障，则退出进程（通常不可能进入到这里）`
`213`	`213`	`os.Exit(-1)`
`214`	`214`	`}`
`@@ -272,7 +272,7 @@ func delNode(ctx context.Context, cli clientv3.Client, ins Instance) error {`
`272`	`272`	`if !ins.IsValid() {`
`273`	`273`	`return errors.New("invalid instance")`
`274`	`274`	`}`
`275`		`- _, err := cli.Delete(ctx, ins.GetName())`
	`275`	`+ _, err := cli.Delete(ctx, ins.GetID())`
`276`	`276`	`_, _ = cli.Revoke(ctx, ins.leaseID)`
`277`	`277`	`ins.clear()`
`278`	`278`	`return err`
`@@ -289,7 +289,7 @@ func putNode(ctx context.Context, cli clientv3.Client, ins Instance, ttl int64`
`289`	`289`	`return err`
`290`	`290`	`}`
`291`	`291`	`// 写入etcd节点，节点内容暂无实际意义，暂且写入1`
`292`		`- _, err = cli.Put(ctx, ins.GetName(), "1", clientv3.WithLease(rsp.ID))`
	`292`	`+ _, err = cli.Put(ctx, ins.GetID(), "1", clientv3.WithLease(rsp.ID))`
`293`	`293`	`if err != nil {`
`294`	`294`	`return err`
`295`	`295`	`}`