Fix the issue that learner promotion command doesn't support json output

Signed-off-by: Benjamin Wang <[email protected]>

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/framework/e2e/cluster.go

@@ -645,11 +645,10 @@ func (epc *EtcdProcessCluster) StartNewProc(cfg *EtcdProcessClusterConfig, isLea
 
 // AddMember adds a new member to the cluster without starting it.
 func (epc *EtcdProcessCluster) AddMember(cfg *EtcdProcessClusterConfig, isLearner bool, 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)
+	if cfg == nil {
+		cfg = epc.Cfg
 	}
+	serverCfg = cfg.EtcdServerProcessConfig(tb, epc.nextSeq)
 
 	epc.nextSeq++