Browse Source

functional-tester/tester: fix txn op, nil clientv3

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
commit
6d69e16a0a

+ 1 - 0
tools/functional-tester/tester/checks.go

@@ -113,6 +113,7 @@ func (lc *leaseChecker) Check() error {
 			cli.Close()
 			cli.Close()
 		}
 		}
 	}()
 	}()
+	lc.cli = cli
 	if err := lc.check(true, lc.ls.revokedLeases.leases); err != nil {
 	if err := lc.check(true, lc.ls.revokedLeases.leases); err != nil {
 		return err
 		return err
 	}
 	}

+ 1 - 1
tools/functional-tester/tester/stress_key.go

@@ -259,8 +259,8 @@ func writeTxn(cli *clientv3.Client, keys []string, txnOps int) stressFunc {
 		}
 		}
 		_, err := cli.Txn(ctx).
 		_, err := cli.Txn(ctx).
 			If(com).
 			If(com).
-			Else(elseOps...).
 			Then(thenOps...).
 			Then(thenOps...).
+			Else(elseOps...).
 			Commit()
 			Commit()
 		return err, int64(txnOps)
 		return err, int64(txnOps)
 	}
 	}

+ 12 - 3
tools/functional-tester/tester/stress_lease.go

@@ -347,6 +347,15 @@ func (ls *leaseStresser) keepLeaseAlive(leaseID int64) {
 			cancel()
 			cancel()
 			continue
 			continue
 		}
 		}
+		if err != nil {
+			ls.lg.Debug(
+				"keepLeaseAlive failed to receive lease keepalive response",
+				zap.String("endpoint", ls.m.EtcdClientEndpoint),
+				zap.String("lease-id", fmt.Sprintf("%016x", leaseID)),
+				zap.Error(err),
+			)
+			continue
+		}
 
 
 		ls.lg.Debug(
 		ls.lg.Debug(
 			"keepLeaseAlive waiting on lease stream",
 			"keepLeaseAlive waiting on lease stream",
@@ -355,15 +364,15 @@ func (ls *leaseStresser) keepLeaseAlive(leaseID int64) {
 		)
 		)
 		leaseRenewTime := time.Now()
 		leaseRenewTime := time.Now()
 		respRC := <-stream
 		respRC := <-stream
-		if err != nil {
+		if respRC == nil {
 			ls.lg.Debug(
 			ls.lg.Debug(
-				"keepLeaseAlive failed to receive lease keepalive response",
+				"keepLeaseAlive received nil lease keepalive response",
 				zap.String("endpoint", ls.m.EtcdClientEndpoint),
 				zap.String("endpoint", ls.m.EtcdClientEndpoint),
 				zap.String("lease-id", fmt.Sprintf("%016x", leaseID)),
 				zap.String("lease-id", fmt.Sprintf("%016x", leaseID)),
-				zap.Error(err),
 			)
 			)
 			continue
 			continue
 		}
 		}
+
 		// lease expires after TTL become 0
 		// lease expires after TTL become 0
 		// don't send keepalive if the lease has expired
 		// don't send keepalive if the lease has expired
 		if respRC.TTL <= 0 {
 		if respRC.TTL <= 0 {