From 0b71cfd2e8e5e3c584f2fd9f54fd3cd587e6ad0f Mon Sep 17 00:00:00 2001
From: dongmen <414110582@qq.com>
Date: Fri, 5 May 2023 17:50:23 +0800
Subject: [PATCH] add log

---
 cdc/capture/capture.go  | 6 ++----
 cdc/capture/election.go | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cdc/capture/capture.go b/cdc/capture/capture.go
index 245a1fce405..941b32dd96e 100644
--- a/cdc/capture/capture.go
+++ b/cdc/capture/capture.go
@@ -409,6 +409,8 @@ func (c *captureImpl) campaignOwner(ctx cdcContext.Context) error {
 			if rootErr == context.Canceled {
 				return nil
 			} else if rootErr == mvcc.ErrCompacted || isErrCompacted(rootErr) {
+				log.Warn("campaign owner failed due to etcd revision "+
+					"has been compacted, retry later", zap.Error(err))
 				continue
 			}
 			log.Warn("campaign owner failed",
@@ -551,10 +553,6 @@ func (c *captureImpl) GetOwner() (owner.Owner, error) {
 
 // campaign to be an owner.
 func (c *captureImpl) campaign(ctx context.Context) error {
-	//failpoint.Inject("capture-campaign-compacted-error", func() {
-	//	failpoint.Return(errors.Trace(mvcc.ErrCompacted))
-	//})
-
 	// TODO: `Campaign` will get stuck when send SIGSTOP to pd leader.
 	// For `Campaign`, when send SIGSTOP to pd leader, cdc maybe call `cancel`
 	// (cause by `processor routine` exit). And inside `Campaign`, the routine
diff --git a/cdc/capture/election.go b/cdc/capture/election.go
index 0dee3aea5f2..9012d78e596 100644
--- a/cdc/capture/election.go
+++ b/cdc/capture/election.go
@@ -15,11 +15,11 @@ package capture
 
 import (
 	"context"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
-	"go.etcd.io/etcd/server/v3/mvcc"
-
 	"go.etcd.io/etcd/client/v3/concurrency"
+	"go.etcd.io/etcd/server/v3/mvcc"
 )
 
 // election wraps the owner election methods.