Merge branch 'release-4.0' into cherry-pick-1784-to-release-4.0

pingcap · May 19, 2021 · 9ebcc08 · 9ebcc08
2 parents 3782274 + d1d13c5
commit 9ebcc08
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cdc/processor/state.go b/cdc/processor/state.go
@@ -45,7 +45,7 @@ func (s *globalState) Update(key util.EtcdKey, value []byte, isInit bool) error
 	if err != nil {
 		return errors.Trace(err)
 	}
-	if k.Tp == etcd.CDCKeyTypeCapture || k.Tp == etcd.CDCKeyTypeOnwer {
+	if k.Tp == etcd.CDCKeyTypeCapture || k.Tp == etcd.CDCKeyTypeOwner {
 		return nil
 	}
 	if len(k.CaptureID) != 0 && k.CaptureID != s.CaptureID {

diff --git a/pkg/etcd/etcdkey.go b/pkg/etcd/etcdkey.go
@@ -41,7 +41,7 @@ type CDCKeyType = int
 // the types of etcd key
 const (
 	CDCKeyTypeUnknown CDCKeyType = iota
-	CDCKeyTypeOnwer
+	CDCKeyTypeOwner
 	CDCKeyTypeCapture
 	CDCKeyTypeChangefeedInfo
 	CDCKeyTypeChangeFeedStatus
@@ -89,7 +89,7 @@ func (k *CDCKey) Parse(key string) error {
 	key = key[len(etcdKeyBase):]
 	switch {
 	case strings.HasPrefix(key, ownerKey):
-		k.Tp = CDCKeyTypeOnwer
+		k.Tp = CDCKeyTypeOwner
 		k.CaptureID = ""
 		k.ChangefeedID = ""
 		key = key[len(ownerKey):]
@@ -147,7 +147,7 @@ func (k *CDCKey) Parse(key string) error {
 
 func (k *CDCKey) String() string {
 	switch k.Tp {
-	case CDCKeyTypeOnwer:
+	case CDCKeyTypeOwner:
 		if len(k.OwnerLeaseID) == 0 {
 			return etcdKeyBase + ownerKey
 		}

diff --git a/pkg/etcd/etcdkey_test.go b/pkg/etcd/etcdkey_test.go
@@ -30,13 +30,13 @@ func (s *etcdkeySuite) TestEtcdKey(c *check.C) {
 	}{{
 		key: "/tidb/cdc/owner/223176cb44d20a13",
 		expected: &CDCKey{
-			Tp:           CDCKeyTypeOnwer,
+			Tp:           CDCKeyTypeOwner,
 			OwnerLeaseID: "223176cb44d20a13",
 		},
 	}, {
 		key: "/tidb/cdc/owner",
 		expected: &CDCKey{
-			Tp:           CDCKeyTypeOnwer,
+			Tp:           CDCKeyTypeOwner,
 			OwnerLeaseID: "",
 		},
 	}, {