-
Notifications
You must be signed in to change notification settings - Fork 501
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(updater): fix topology policy (#6054)
* fix(updater): fix topology policy Signed-off-by: liubo02 <[email protected]> * fix lint Signed-off-by: liubo02 <[email protected]> * fix e2e Signed-off-by: liubo02 <[email protected]> --------- Signed-off-by: liubo02 <[email protected]>
- Loading branch information
1 parent
7d238e5
commit 469992a
Showing
12 changed files
with
241 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // Copyright 2024 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package tikv |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // Copyright 2024 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package tikv | ||
|
|
||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| "github.com/onsi/ginkgo/v2" | ||
| "k8s.io/utils/ptr" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
|
||
| "github.com/pingcap/tidb-operator/pkg/runtime" | ||
| "github.com/pingcap/tidb-operator/tests/e2e/data" | ||
| "github.com/pingcap/tidb-operator/tests/e2e/framework" | ||
| "github.com/pingcap/tidb-operator/tests/e2e/label" | ||
| "github.com/pingcap/tidb-operator/tests/e2e/utils/waiter" | ||
| ) | ||
|
|
||
| var _ = ginkgo.Describe("Topology", label.TiKV, label.MultipleAZ, label.P0, func() { | ||
| f := framework.New() | ||
| f.Setup() | ||
| f.SetupCluster() | ||
|
|
||
| ginkgo.It("Create tikv evenly spread in multiple azs", func(ctx context.Context) { | ||
| ginkgo.By("Creating cluster") | ||
| pdg := f.MustCreatePD(ctx) | ||
| kvg := f.MustCreateTiKV(ctx, | ||
| data.WithReplicas[*runtime.TiKVGroup](6), | ||
| data.WithEvenlySpreadPolicy(), | ||
| ) | ||
|
|
||
| f.WaitForPDGroupReady(ctx, pdg) | ||
| f.WaitForTiKVGroupReady(ctx, kvg) | ||
|
|
||
| f.MustEvenlySpreadTiKV(ctx, kvg) | ||
| }) | ||
|
|
||
| ginkgo.It("support scale from 3 to 6 and rolling update at same time", label.Scale, label.Update, func(ctx context.Context) { | ||
| ginkgo.By("Creating cluster") | ||
| pdg := f.MustCreatePD(ctx) | ||
| kvg := f.MustCreateTiKV(ctx, | ||
| data.WithReplicas[*runtime.TiKVGroup](3), | ||
| data.WithEvenlySpreadPolicy(), | ||
| ) | ||
|
|
||
| f.WaitForPDGroupReady(ctx, pdg) | ||
| f.WaitForTiKVGroupReady(ctx, kvg) | ||
|
|
||
| f.MustEvenlySpreadTiKV(ctx, kvg) | ||
|
|
||
| patch := client.MergeFrom(kvg.DeepCopy()) | ||
| kvg.Spec.Replicas = ptr.To[int32](6) | ||
| kvg.Spec.Template.Spec.Config = `log.level = 'warn'` | ||
|
|
||
| nctx, cancel := context.WithCancel(ctx) | ||
| ch := make(chan struct{}) | ||
| go func() { | ||
| defer close(ch) | ||
| defer ginkgo.GinkgoRecover() | ||
| f.Must(waiter.WaitPodsRollingUpdateOnce(nctx, f.Client, runtime.FromTiKVGroup(kvg), 3, waiter.LongTaskTimeout)) | ||
| }() | ||
|
|
||
| maxTime, err := waiter.MaxPodsCreateTimestamp(ctx, f.Client, runtime.FromTiKVGroup(kvg)) | ||
| f.Must(err) | ||
| changeTime := maxTime.Add(time.Second) | ||
|
|
||
| ginkgo.By("Change config and replicas of the TiKVGroup") | ||
| f.Must(f.Client.Patch(ctx, kvg, patch)) | ||
| f.Must(waiter.WaitForPodsRecreated(ctx, f.Client, runtime.FromTiKVGroup(kvg), changeTime, waiter.LongTaskTimeout)) | ||
| f.WaitForTiKVGroupReady(ctx, kvg) | ||
| cancel() | ||
| <-ch | ||
|
|
||
| f.MustEvenlySpreadTiKV(ctx, kvg) | ||
| }) | ||
| }) |
Oops, something went wrong.