Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

Commit

Permalink
fix format error raised by merge conflict resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
amyangfei committed May 30, 2019
1 parent 6ab4d6c commit 25f9b59
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions dm/master/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1865,9 +1865,9 @@ func (s *Server) waitOperationOk(ctx context.Context, cli workerrpc.Client, name
log.Errorf("fail to query task operation %v", err)
} else {
respLog := resp.QueryTaskOperation.Log
if respLog == nil {
return errors.Errorf("operation %d of task %s not found, please execute `query-status` to check status", opLogID, name)
} else if respLog.Success {
if respLog == nil {
return errors.Errorf("operation %d of task %s not found, please execute `query-status` to check status", opLogID, name)
} else if respLog.Success {
return nil
} else if len(respLog.Message) != 0 {
return errors.New(respLog.Message)
Expand Down

0 comments on commit 25f9b59

Please sign in to comment.