Skip to content

Commit

Permalink
Merge pull request #19367 from henrybear327/e2e/fix_downgrade_node_el…
Browse files Browse the repository at this point in the history
…ection_log

Fix a log formatting bug in the e2e downgrade tests
  • Loading branch information
ahrtr authored Feb 10, 2025
2 parents 9de211d + 89dd13f commit 38bb52a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions tests/e2e/cluster_downgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"github.com/coreos/go-semver/semver"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/zap"

"go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/pkg/v3/fileutil"
Expand Down Expand Up @@ -160,7 +159,7 @@ func testDowngradeUpgrade(t *testing.T, numberOfMembersToDowngrade int, clusterS
}

membersToChange := rand.Perm(len(epc.Procs))[:numberOfMembersToDowngrade]
t.Logf(fmt.Sprintln("Elect members for operations"), zap.Any("members", membersToChange))
t.Logf("Elect members for operations on members: %v", membersToChange)

t.Logf("Starting downgrade process to %q", lastVersionStr)
err = e2e.DowngradeUpgradeMembersByID(t, nil, epc, membersToChange, currentVersion, lastClusterVersion)
Expand Down
2 changes: 1 addition & 1 deletion tests/framework/e2e/downgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func DowngradeCancel(t *testing.T, epc *EtcdProcessCluster) {

func DowngradeUpgradeMembers(t *testing.T, lg *zap.Logger, clus *EtcdProcessCluster, numberOfMembersToChange int, currentVersion, targetVersion *semver.Version) error {
membersToChange := rand.Perm(len(clus.Procs))[:numberOfMembersToChange]
t.Logf(fmt.Sprintln("Elect members for operations"), zap.Any("members", membersToChange))
t.Logf("Elect members for operations on members: %v", membersToChange)

return DowngradeUpgradeMembersByID(t, lg, clus, membersToChange, currentVersion, targetVersion)
}
Expand Down

0 comments on commit 38bb52a

Please sign in to comment.