support store status forever

projecteru2 · Nov 9, 2020 · 35bd9fc · 35bd9fc
1 parent 16bf528
commit 35bd9fc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/store/etcdv3/container.go b/store/etcdv3/container.go
@@ -76,11 +76,15 @@ func (m *Mercury) SetContainerStatus(ctx context.Context, container *types.Conta
 	}
 	val := string(data)
 	statusKey := filepath.Join(containerStatusPrefix, appname, entrypoint, container.Nodename, container.ID)
-	lease, err := m.cliv3.Grant(ctx, ttl)
-	if err != nil {
-		return err
+	updateStatus := []clientv3.Op{clientv3.OpPut(statusKey, val)}
+	lease := &clientv3.LeaseGrantResponse{}
+	if ttl != 0 {
+		lease, err = m.cliv3.Grant(ctx, ttl)
+		if err != nil {
+			return err
+		}
+		updateStatus = []clientv3.Op{clientv3.OpPut(statusKey, val, clientv3.WithLease(lease.ID))}
 	}
-	updateStatus := []clientv3.Op{clientv3.OpPut(statusKey, val, clientv3.WithLease(lease.ID))}
 	tr, err := m.cliv3.Txn(ctx).
 		If(clientv3.Compare(clientv3.Version(fmt.Sprintf(containerInfoKey, container.ID)), "!=", 0)).
 		Then( // 保证有容器
@@ -106,7 +110,7 @@ func (m *Mercury) SetContainerStatus(ctx context.Context, container *types.Conta
 		return nil
 	}
 	tr3 := tr2.Responses[0].GetResponseTxn()
-	if tr3.Succeeded {
+	if tr3.Succeeded && ttl != 0 { // 有 status 并且内容还跟之前一样
 		oldLeaseID := clientv3.LeaseID(tr3.Responses[0].GetResponseRange().Kvs[0].Lease) // 拿到 status 绑定的 leaseID
 		_, err := m.cliv3.KeepAliveOnce(ctx, oldLeaseID)                                 // 刷新 lease
 		return err

diff --git a/store/etcdv3/container_test.go b/store/etcdv3/container_test.go
@@ -161,6 +161,9 @@ func TestSetContainerStatus(t *testing.T) {
 	container.StatusMeta.Running = true
 	err = m.SetContainerStatus(ctx, container, 10)
 	assert.NoError(t, err)
+	// status not changed, ttl = 0
+	err = m.SetContainerStatus(ctx, container, 0)
+	assert.NoError(t, err)
 }
 
 func TestListContainers(t *testing.T) {