Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

try to Graceful Drain TiCDC for improper constraint image tag (#5173) #5178

Merged
merged 3 commits into from
Jul 17, 2023
Merged

try to Graceful Drain TiCDC for improper constraint image tag (#5173) #5178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c87e40b
try to Graceful Drain TiCDC for improper constraint image tag
csuzhangxc Jul 14, 2023
b854f11
fix log
csuzhangxc Jul 14, 2023
83092bf
fix UT
csuzhangxc Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkg/controller/ticdc_control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,9 @@ func (c *defaultTiCDCControl) DrainCapture(tc *v1alpha1.TidbCluster, ordinal int
// Let caller retry drain capture.
return 0, true, nil
}
if len(captures) == 1 {
if len(captures) == 1 || len(captures) == 0 {
// No way to drain a single node TiCDC cluster, ignore.
// Can't get capture info, ignore.
return 0, false, nil
}

Expand Down Expand Up @@ -186,8 +187,9 @@ func (c *defaultTiCDCControl) ResignOwner(tc *v1alpha1.TidbCluster, ordinal int3
// Let caller retry resign owner.
return false, nil
}
if len(captures) == 1 {
if len(captures) == 1 || len(captures) == 0 {
// No way to resign owner in a single node TiCDC cluster, ignore.
// Can't get capture info, ignore.
return true, nil
}

Expand Down Expand Up @@ -237,6 +239,10 @@ func (c *defaultTiCDCControl) IsHealthy(tc *v1alpha1.TidbCluster, ordinal int32)
// Let caller retry.
return false, nil
}
if len(captures) == 0 {
// No way to get capture info, ignore.
return true, nil
}

_, owner := getOrdinalAndOwnerCaptureInfo(tc, ordinal, captures)
if owner == nil {
Expand Down
14 changes: 8 additions & 6 deletions pkg/manager/member/ticdc_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,17 @@ func isTiCDCPodSupportGracefulUpgrade(
currentVersion := tc.TiCDCVersion()
ge, err := cmpver.Compare(podVersion, cmpver.GreaterOrEqual, currentVersion)
if err != nil {
klog.Errorf("ticdc.%s: fail to compare TiCDC pod version \"%s\", version \"%s\", error: %v, skip graceful shutdown",
klog.Warningf("ticdc.%s: fail to compare TiCDC pod version \"%s\", version \"%s\", error: %v, still try to graceful shutdown",
action, podVersion, currentVersion, err)
return false, nil
// if parse version failed, we still try to graftfully shutdown TiCDC,
// as we already checked `http.StatusNotFound` in `DrainCapture`, `ResignOwner` and `IsHealthy`
return true, nil
}
le, err := cmpver.Compare(podVersion, cmpver.LessOrEqual, currentVersion)
if err != nil {
klog.Errorf("ticdc.%s: fail to compare TiCDC pod version \"%s\", version \"%s\", error: %v, skip graceful shutdown",
klog.Warningf("ticdc.%s: fail to compare TiCDC pod version \"%s\", version \"%s\", error: %v, still try to graceful shutdown",
action, podVersion, currentVersion, err)
return false, nil
return true, nil
}
// Reload TiCDC if the current version matches pod version.
if ge && le {
Expand All @@ -252,7 +254,7 @@ func isTiCDCPodSupportGracefulUpgrade(
// We are performing cross version upgrade.
lessThan63, err := cmpver.Compare(podVersion, cmpver.Less, ticdcCrossUpgradeVersion)
if err != nil {
klog.Errorf("ticdc.%s: fail to compare TiCDC pod version \"%s\", version \"%s\", error: %v, skip graceful shutdown",
klog.Warningf("ticdc.%s: fail to compare TiCDC pod version \"%s\", version \"%s\", error: %v, skip graceful shutdown",
action, podVersion, ticdcCrossUpgradeVersion, err)
return false, nil
}
Expand All @@ -271,7 +273,7 @@ func isTiCDCPodSupportGracefulUpgrade(
podVersionPlus2 := podVer.IncMajor().IncMajor()
withInTwoMajorVersion, err := cmpver.Compare(currentVersion, cmpver.Less, podVersionPlus2.String())
if err != nil {
klog.Errorf("ticdc.%s: fail to compare version \"%s\", version \"%s\", error: %v, skip graceful shutdown",
klog.Warningf("ticdc.%s: fail to compare version \"%s\", version \"%s\", error: %v, skip graceful shutdown",
action, currentVersion, ticdcCrossUpgradeVersion, err)
return false, nil
}
Expand Down
16 changes: 8 additions & 8 deletions pkg/manager/member/ticdc_scaler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ func TestTiCDCIsSupportGracefulUpgrade(t *testing.T) {
expectedErr: false,
},
{
caseName: "v6.3.0 -> latest, skip graceful upgrade",
caseName: "v6.3.0 -> latest, still try to graceful upgrade",
cdcCtl: &controller.FakeTiCDCControl{
GetStatusFn: func(tc *v1alpha1.TidbCluster, ordinal int32) (*controller.CaptureStatus, error) {
return &controller.CaptureStatus{
Expand All @@ -720,7 +720,7 @@ func TestTiCDCIsSupportGracefulUpgrade(t *testing.T) {
v := "latest"
tc.Spec.TiCDC.Version = &v
},
expectedOk: false,
expectedOk: true,
expectedErr: false,
},
{
Expand All @@ -734,19 +734,19 @@ func TestTiCDCIsSupportGracefulUpgrade(t *testing.T) {
expectedErr: true,
},
{
caseName: "malformed pod version, skip graceful upgrade",
caseName: "malformed pod version, still try to graceful upgrade",
cdcCtl: &controller.FakeTiCDCControl{
GetStatusFn: func(tc *v1alpha1.TidbCluster, ordinal int32) (*controller.CaptureStatus, error) {
return &controller.CaptureStatus{
Version: "malformed",
}, nil
},
},
expectedOk: false,
expectedOk: true,
expectedErr: false,
},
{
caseName: "malformed tc version, skip graceful upgrade",
caseName: "malformed tc version, still try to graceful upgrade",
cdcCtl: &controller.FakeTiCDCControl{
GetStatusFn: func(tc *v1alpha1.TidbCluster, ordinal int32) (*controller.CaptureStatus, error) {
return &controller.CaptureStatus{
Expand All @@ -757,11 +757,11 @@ func TestTiCDCIsSupportGracefulUpgrade(t *testing.T) {
changeTc: func(tc *v1alpha1.TidbCluster) {
tc.Spec.Version = "malformed"
},
expectedOk: false,
expectedOk: true,
expectedErr: false,
},
{
caseName: "malformed ticdc spec version, skip graceful upgrade",
caseName: "malformed ticdc spec version, still try to graceful upgrade",
cdcCtl: &controller.FakeTiCDCControl{
GetStatusFn: func(tc *v1alpha1.TidbCluster, ordinal int32) (*controller.CaptureStatus, error) {
return &controller.CaptureStatus{
Expand All @@ -773,7 +773,7 @@ func TestTiCDCIsSupportGracefulUpgrade(t *testing.T) {
v := "malformed"
tc.Spec.TiCDC.Version = &v
},
expectedOk: false,
expectedOk: true,
expectedErr: false,
},
{
Expand Down