-
Notifications
You must be signed in to change notification settings - Fork 9.8k
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.
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
add MemberDowngradeUpgrade failpoint #19125
Merged
+254
−180
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| // Copyright 2025 The etcd Authors | ||
| // | ||
| // 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 e2e | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "math/rand" | ||
| "strings" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/coreos/go-semver/semver" | ||
| "github.com/stretchr/testify/require" | ||
| "go.uber.org/zap" | ||
|
|
||
| "go.etcd.io/etcd/api/v3/version" | ||
| "go.etcd.io/etcd/server/v3/etcdserver" | ||
| "go.etcd.io/etcd/tests/v3/framework/testutils" | ||
| ) | ||
|
|
||
| func DowngradeEnable(t *testing.T, epc *EtcdProcessCluster, ver *semver.Version) { | ||
| t.Logf("etcdctl downgrade enable %s", ver.String()) | ||
| c := epc.Etcdctl() | ||
| testutils.ExecuteWithTimeout(t, 20*time.Second, func() { | ||
| err := c.DowngradeEnable(context.TODO(), ver.String()) | ||
| require.NoError(t, err) | ||
| }) | ||
|
|
||
| t.Log("Downgrade enabled, validating if cluster is ready for downgrade") | ||
| for i := 0; i < len(epc.Procs); i++ { | ||
| ValidateVersion(t, epc.Cfg, epc.Procs[i], version.Versions{ | ||
| Cluster: ver.String(), | ||
| Server: offsetMinor(ver, 1).String(), | ||
| Storage: ver.String(), | ||
| }) | ||
| AssertProcessLogs(t, epc.Procs[i], "The server is ready to downgrade") | ||
| } | ||
|
|
||
| t.Log("Cluster is ready for downgrade") | ||
| } | ||
|
|
||
| func DowngradeUpgradeMembers(t *testing.T, lg *zap.Logger, clus *EtcdProcessCluster, numberOfMembersToChange int, currentVersion, targetVersion *semver.Version) error { | ||
| if lg == nil { | ||
| lg = clus.lg | ||
| } | ||
| isDowngrade := targetVersion.LessThan(*currentVersion) | ||
| opString := "upgrading" | ||
| newExecPath := BinPath.Etcd | ||
| if isDowngrade { | ||
| opString = "downgrading" | ||
| newExecPath = BinPath.EtcdLastRelease | ||
| } | ||
| membersToChange := rand.Perm(len(clus.Procs))[:numberOfMembersToChange] | ||
| lg.Info(fmt.Sprintf("Test %s members", opString), zap.Any("members", membersToChange)) | ||
|
|
||
| // Need to wait health interval for cluster to prepare for downgrade/upgrade | ||
| time.Sleep(etcdserver.HealthInterval) | ||
|
|
||
| for _, memberID := range membersToChange { | ||
| member := clus.Procs[memberID] | ||
| if member.Config().ExecPath == newExecPath { | ||
| return fmt.Errorf("member:%s is already running with the %s target binary - %s", member.Config().Name, opString, member.Config().ExecPath) | ||
| } | ||
| lg.Info(fmt.Sprintf("%s member", opString), zap.String("member", member.Config().Name)) | ||
| if err := member.Stop(); err != nil { | ||
| return err | ||
| } | ||
| member.Config().ExecPath = newExecPath | ||
| lg.Info("Restarting member", zap.String("member", member.Config().Name)) | ||
| err := member.Start(context.TODO()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| lg.Info("Validating versions") | ||
| for _, memberID := range membersToChange { | ||
| member := clus.Procs[memberID] | ||
| if isDowngrade || numberOfMembersToChange == len(clus.Procs) { | ||
| ValidateVersion(t, clus.Cfg, member, version.Versions{ | ||
| Cluster: targetVersion.String(), | ||
| Server: targetVersion.String(), | ||
| }) | ||
| } else { | ||
| ValidateVersion(t, clus.Cfg, member, version.Versions{ | ||
| Cluster: currentVersion.String(), | ||
| Server: targetVersion.String(), | ||
| }) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func ValidateVersion(t *testing.T, cfg *EtcdProcessClusterConfig, member EtcdProcess, expect version.Versions) { | ||
| testutils.ExecuteWithTimeout(t, 30*time.Second, func() { | ||
| for { | ||
| result, err := getMemberVersionByCurl(cfg, member) | ||
| if err != nil { | ||
| cfg.Logger.Warn("failed to get member version and retrying", zap.Error(err), zap.String("member", member.Config().Name)) | ||
github-advanced-security[bot] marked this conversation as resolved.
Dismissed
Show resolved
Hide resolved
|
||
| time.Sleep(time.Second) | ||
| continue | ||
| } | ||
| cfg.Logger.Info("Comparing versions", zap.String("member", member.Config().Name), zap.Any("got", result), zap.Any("want", expect)) | ||
| if err := compareMemberVersion(expect, result); err != nil { | ||
| cfg.Logger.Warn("Versions didn't match retrying", zap.Error(err), zap.String("member", member.Config().Name)) | ||
| time.Sleep(time.Second) | ||
| continue | ||
| } | ||
| cfg.Logger.Info("Versions match", zap.String("member", member.Config().Name)) | ||
| break | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| // offsetMinor returns the version with offset from the original minor, with the same major. | ||
| func offsetMinor(v *semver.Version, offset int) *semver.Version { | ||
| var minor int64 | ||
| if offset >= 0 { | ||
| minor = v.Minor + int64(offset) | ||
| } else { | ||
| diff := int64(-offset) | ||
| if diff < v.Minor { | ||
| minor = v.Minor - diff | ||
| } | ||
| } | ||
| return &semver.Version{Major: v.Major, Minor: minor} | ||
| } | ||
|
|
||
| func majorMinorVersionsEqual(v1, v2 string) bool { | ||
| ver1 := semver.New(v1) | ||
| ver2 := semver.New(v2) | ||
| return ver1.Major == ver2.Major && ver1.Minor == ver2.Minor | ||
| } | ||
|
|
||
| func compareMemberVersion(expect version.Versions, target version.Versions) error { | ||
| if expect.Server != "" && !majorMinorVersionsEqual(expect.Server, target.Server) { | ||
| return fmt.Errorf("expect etcdserver version %v, but got %v", expect.Server, target.Server) | ||
| } | ||
|
|
||
| if expect.Cluster != "" && !majorMinorVersionsEqual(expect.Cluster, target.Cluster) { | ||
| return fmt.Errorf("expect etcdcluster version %v, but got %v", expect.Cluster, target.Cluster) | ||
| } | ||
|
|
||
| if expect.Storage != "" && !majorMinorVersionsEqual(expect.Storage, target.Storage) { | ||
| return fmt.Errorf("expect storage version %v, but got %v", expect.Storage, target.Storage) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func getMemberVersionByCurl(cfg *EtcdProcessClusterConfig, member EtcdProcess) (version.Versions, error) { | ||
| args := CURLPrefixArgsCluster(cfg, member, "GET", CURLReq{Endpoint: "/version"}) | ||
| lines, err := RunUtilCompletion(args, nil) | ||
| if err != nil { | ||
| return version.Versions{}, err | ||
| } | ||
|
|
||
| data := strings.Join(lines, "\n") | ||
| result := version.Versions{} | ||
| if err := json.Unmarshal([]byte(data), &result); err != nil { | ||
| return version.Versions{}, fmt.Errorf("failed to unmarshal (%v): %w", data, err) | ||
| } | ||
| return result, nil | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's better to leave caller to decide logger. This defaulting obscures what logger is used from caller.