store/tikv: add/update some logs. (pingcap#1836)

shipizheng · Oct 18, 2016 · a12842e · a12842e
1 parent 3d670c4
commit a12842e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/store/tikv/coprocessor.go b/store/tikv/coprocessor.go
@@ -449,16 +449,19 @@ func (it *copIterator) handleTask(bo *Backoffer, task *copTask) (*coprocessor.Re
 		if e := resp.GetRegionError(); e != nil {
 			reportRegionError(e)
 			if notLeader := e.GetNotLeader(); notLeader != nil {
+				log.Warnf("tikv reports `NotLeader`: %s, ctx: %s, retry later", notLeader, req.Context)
 				it.store.regionCache.UpdateLeader(task.region.VerID(), notLeader.GetLeader().GetId())
 			} else if staleEpoch := e.GetStaleEpoch(); staleEpoch != nil {
+				log.Warnf("tikv reports `StaleEpoch`, ctx: %s, retry later", req.Context)
 				err = it.store.regionCache.OnRegionStale(task.region, staleEpoch.NewRegions)
 				if err != nil {
 					return nil, errors.Trace(err)
 				}
 			} else {
+				log.Warnf("tikv reports region error: %s, ctx: %s, retry later", e, req.Context)
 				it.store.regionCache.DropRegion(task.region.VerID())
 			}
-			err = bo.Backoff(boRegionMiss, err)
+			err = bo.Backoff(boRegionMiss, errors.Errorf("regionError: %s", e))
 			if err != nil {
 				return nil, errors.Trace(err)
 			}
@@ -470,6 +473,7 @@ func (it *copIterator) handleTask(bo *Backoffer, task *copTask) (*coprocessor.Re
 			continue
 		}
 		if e := resp.GetLocked(); e != nil {
+			log.Debugf("coprocessor encounters lock: %v", e)
 			ok, err1 := it.store.lockResolver.ResolveLocks(bo, []*Lock{newLock(e)})
 			if err1 != nil {
 				return nil, errors.Trace(err1)

diff --git a/store/tikv/txn_committer.go b/store/tikv/txn_committer.go
@@ -120,7 +120,10 @@ func (c *txnCommitter) iterKeys(bo *Backoffer, keys [][]byte, f func(*Backoffer,
 	}
 	if asyncNonPrimary {
 		go func() {
-			c.doBatches(bo, batches, f)
+			e := c.doBatches(bo, batches, f)
+			if e != nil {
+				log.Warnf("txnCommitter async doBatches err: %v", e)
+			}
 		}()
 		return nil
 	}
@@ -215,6 +218,7 @@ func (c *txnCommitter) prewriteSingleRegion(bo *Backoffer, batch batchKeys) erro
 			if err1 != nil {
 				return errors.Trace(err1)
 			}
+			log.Debugf("prewrite encounters lock: %v", lock)
 			locks = append(locks, lock)
 		}
 		ok, err := c.store.lockResolver.ResolveLocks(bo, locks)
@@ -334,8 +338,12 @@ func (c *txnCommitter) Commit() error {
 		c.mu.RUnlock()
 		if !committed {
 			go func() {
-				c.cleanupKeys(NewBackoffer(cleanupMaxBackoff), writtenKeys)
-				log.Infof("txn clean up done, tid: %d", c.startTS)
+				err := c.cleanupKeys(NewBackoffer(cleanupMaxBackoff), writtenKeys)
+				if err != nil {
+					log.Infof("txn cleanup err: %v, tid: %d", err, c.startTS)
+				} else {
+					log.Infof("txn clean up done, tid: %d", c.startTS)
+				}
 			}()
 		}
 	}()