Merge pull request #106 from askuy/feature/optimizek8swatch

fix etcd registry ttl
gotomicro · May 28, 2021 · bbe3515 · bbe3515
2 parents cc68121 + 96196e4
commit bbe3515
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/eetcd/examples/server/config.toml b/eetcd/examples/server/config.toml
@@ -3,5 +3,6 @@
 [etcd]
 addrs=["127.0.0.1:2379"]
 [registry]
+#ServiceTTL = "10s"
 connectTimeout = "1s"
 secure = false
diff --git a/eetcd/readme.md b/eetcd/readme.md
@@ -0,0 +1,11 @@
+## 查看全部租期
+```
+# 查看全部租期
+etcdctl lease list
+found 1 leases
+694d79ada4e6c82c
+# 查看某个租期信息
+etcdctl lease timetolive 694d79ada4e6c82c --keys
+lease 694d79ada4e6c82c granted with TTL(10s), remaining(9s), attached keys([/ego/main/providers/grpc://0.0.0.0:9003])
+```
+
diff --git a/eetcd/registry/component.go b/eetcd/registry/component.go
@@ -191,7 +191,6 @@ func (reg *Component) registerMetric(ctx context.Context, info *server.ServiceIn
 	key := fmt.Sprintf(metric, info.Name, val)
 
 	opOptions := make([]clientv3.OpOption, 0)
-	// opOptions = append(opOptions, clientv3.WithSerializable())
 	if ttl := reg.Config.ServiceTTL.Seconds(); ttl > 0 {
 		//todo ctx without timeout for same as service life?
 		sess, err := reg.getSession(key, concurrency.WithTTL(int(ttl)))
@@ -230,6 +229,7 @@ func (reg *Component) registerBiz(ctx context.Context, info *server.ServiceInfo)
 		if err != nil {
 			return err
 		}
+
 		opOptions = append(opOptions, clientv3.WithLease(sess.Lease()))
 	}
 	_, err := reg.client.Put(readCtx, key, val, opOptions...)
@@ -249,7 +249,7 @@ func (reg *Component) getSession(k string, opts ...concurrency.SessionOption) (*
 	if ok {
 		return sess, nil
 	}
-	sess, err := concurrency.NewSession(reg.client.Client)
+	sess, err := concurrency.NewSession(reg.client.Client, opts...)
 	if err != nil {
 		return sess, err
 	}