Merge pull request #19602 from ahrtr/3.5_add_learner_test_20250314

[release-3.5] Fix the issue that learner promotion command doesn't support json output

Author: ahrtr

etcdctl/ctlv3/command/printer.go

@@ -107,6 +107,9 @@ func (p *printerRPC) MemberAdd(r v3.MemberAddResponse) { p.p((*pb.MemberAddRespo
 func (p *printerRPC) MemberRemove(id uint64, r v3.MemberRemoveResponse) {
 	p.p((*pb.MemberRemoveResponse)(&r))
 }
+func (p *printerRPC) MemberPromote(id uint64, r v3.MemberPromoteResponse) {
+	p.p((*pb.MemberPromoteResponse)(&r))
+}
 func (p *printerRPC) MemberUpdate(id uint64, r v3.MemberUpdateResponse) {
 	p.p((*pb.MemberUpdateResponse)(&r))
 }

tests/e2e/ctl_v3_member_test.go

@@ -22,6 +22,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/tests/v3/framework/e2e"
 )
@@ -227,3 +229,32 @@ func ctlV3MemberUpdate(cx ctlCtx, memberID, peerURL string) error {
 	cmdArgs := append(cx.PrefixArgs(), "member", "update", memberID, fmt.Sprintf("--peer-urls=%s", peerURL))
 	return e2e.SpawnWithExpectWithEnv(cmdArgs, cx.envMap, " updated in cluster ")
 }
+
+func TestCtlV3PromotingLearner(t *testing.T) {
+	e2e.BeforeTest(t)
+
+	t.Log("Create a single node etcd cluster")
+	cfg := e2e.NewConfigNoTLS()
+	cfg.BasePeerScheme = "unix"
+	cfg.ClusterSize = 1
+
+	epc, err := e2e.NewEtcdProcessCluster(t, cfg)
+	require.NoError(t, err, "failed to start etcd cluster: %v", err)
+	defer func() {
+		derr := epc.Close()
+		require.NoError(t, derr, "failed to close etcd cluster: %v", derr)
+	}()
+
+	t.Log("Add and start a learner")
+	learnerID, err := epc.StartNewProc(nil, true, t)
+	require.NoError(t, err)
+
+	t.Log("Write a key to ensure the cluster is healthy so far")
+	etcdctl := epc.Procs[0].Etcdctl(e2e.ClientNonTLS, false, false)
+	err = etcdctl.Put("foo", "bar")
+	require.NoError(t, err)
+
+	t.Logf("Promoting the learner %x", learnerID)
+	_, err = etcdctl.MemberPromote(learnerID)
+	require.NoError(t, err)
+}

tests/e2e/etcd_mix_versions_test.go

@@ -101,7 +101,7 @@ func mixVersionsSnapshotTestByAddingMember(t *testing.T, cfg e2e.EtcdProcessClus
 	newCfg := *epc.Cfg
 	newCfg.Version = newInstanceVersion
 	t.Log("Starting a new etcd instance")
-	_, err = epc.StartNewProc(&newCfg, t)
+	_, err = epc.StartNewProc(&newCfg, false, t)
 	require.NoError(t, err, "failed to start the new etcd instance: %v", err)
 	defer epc.Close()
 

tests/framework/e2e/cluster.go

@@ -24,6 +24,7 @@ import (
 	"testing"
 	"time"
 
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/proxy"
 	"go.etcd.io/etcd/server/v3/etcdserver"
 	"go.uber.org/zap"
@@ -628,8 +629,8 @@ func (epc *EtcdProcessCluster) WithStopSignal(sig os.Signal) (ret os.Signal) {
 // StartNewProc grows cluster size by one with two phases
 // Phase 1 - Inform cluster of new configuration
 // Phase 2 - Start new member
-func (epc *EtcdProcessCluster) StartNewProc(cfg *EtcdProcessClusterConfig, tb testing.TB) (memberID uint64, err error) {
-	memberID, serverCfg, err := epc.AddMember(cfg, tb)
+func (epc *EtcdProcessCluster) StartNewProc(cfg *EtcdProcessClusterConfig, isLearner bool, tb testing.TB) (memberID uint64, err error) {
+	memberID, serverCfg, err := epc.AddMember(cfg, isLearner, tb)
 	if err != nil {
 		return 0, err
 	}
@@ -643,12 +644,11 @@ func (epc *EtcdProcessCluster) StartNewProc(cfg *EtcdProcessClusterConfig, tb te
 }
 
 // AddMember adds a new member to the cluster without starting it.
-func (epc *EtcdProcessCluster) AddMember(cfg *EtcdProcessClusterConfig, tb testing.TB) (memberID uint64, serverCfg *EtcdServerProcessConfig, err error) {
-	if cfg != nil {
-		serverCfg = cfg.EtcdServerProcessConfig(tb, epc.nextSeq)
-	} else {
-		serverCfg = epc.Cfg.EtcdServerProcessConfig(tb, epc.nextSeq)
+func (epc *EtcdProcessCluster) AddMember(cfg *EtcdProcessClusterConfig, isLearner bool, tb testing.TB) (memberID uint64, serverCfg *EtcdServerProcessConfig, err error) {
+	if cfg == nil {
+		cfg = epc.Cfg
 	}
+	serverCfg = cfg.EtcdServerProcessConfig(tb, epc.nextSeq)
 
 	epc.nextSeq++
 
@@ -664,9 +664,17 @@ func (epc *EtcdProcessCluster) AddMember(cfg *EtcdProcessClusterConfig, tb testi
 	// First add new member to cluster
 	tb.Logf("add new member to cluster; member-name %s, member-peer-url %s", serverCfg.Name, serverCfg.Purl.String())
 	memberCtl := NewEtcdctl(epc.Procs[0].EndpointsV3(), cfg.ClientTLS, cfg.IsClientAutoTLS, false)
-	resp, err := memberCtl.MemberAdd(serverCfg.Name, []string{serverCfg.Purl.String()})
-	if err != nil {
-		return 0, nil, fmt.Errorf("failed to add new member: %w", err)
+	var (
+		resp *clientv3.MemberAddResponse
+		mErr error
+	)
+	if isLearner {
+		resp, mErr = memberCtl.MemberAddAsLearner(serverCfg.Name, []string{serverCfg.Purl.String()})
+	} else {
+		resp, mErr = memberCtl.MemberAdd(serverCfg.Name, []string{serverCfg.Purl.String()})
+	}
+	if mErr != nil {
+		return 0, nil, fmt.Errorf("failed to add new member: %w", mErr)
 	}
 
 	return resp.Member.ID, serverCfg, nil

tests/framework/e2e/etcdctl.go

@@ -174,6 +174,15 @@ func (ctl *Etcdctl) MemberRemove(id uint64) (*clientv3.MemberRemoveResponse, err
 	return &resp, err
 }
 
+func (ctl *Etcdctl) MemberPromote(id uint64) (*clientv3.MemberPromoteResponse, error) {
+	if ctl.v2 {
+		panic("Unsupported method for v2")
+	}
+	var resp clientv3.MemberPromoteResponse
+	err := ctl.spawnJsonCmd(&resp, "member", "promote", fmt.Sprintf("%x", id))
+	return &resp, err
+}
+
 func (ctl *Etcdctl) Compact(rev int64) (*clientv3.CompactResponse, error) {
 	if ctl.v2 {
 		panic("Unsupported method for v2")