fix checksum coprocressor panic (pingcap#45)

YuJuncen · Nov 8, 2019 · 62d24a9 · 62d24a9
1 parent ade02e7
commit 62d24a9
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/pkg/restore/client.go b/pkg/restore/client.go
@@ -576,11 +576,18 @@ func (rc *Client) checksumRegion(
 	}
 
 	resp, err := kvClient.Coprocessor(rc.ctx, req)
-	if err != nil || resp.GetOtherError() != "" || resp.GetLocked() != nil {
+	if err != nil {
+		return nil, errors.Trace(err)
+	}
+	if resp.GetOtherError() != "" {
+		log.Error("Coprocessor request error",
+			zap.String("OtherError", resp.GetOtherError()))
+		return nil, errors.Errorf("OtherError: %s", resp.GetOtherError())
+	}
+	if resp.GetLocked() != nil {
 		log.Error("Coprocessor request error",
-			zap.String("OtherError", resp.GetOtherError()),
 			zap.Any("Locked", resp.GetLocked()))
-		return nil, errors.Trace(err)
+		return nil, errors.Errorf("Locked: %s", resp.GetLocked().String())
 	}
 
 	regionErr := resp.GetRegionError()