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

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-03 13:37:06 -07:00
parent a80a1a6356
commit 6d69e16a0a
3 changed files with 19 additions and 9 deletions

View File

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

View File

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

View File

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