Automated cherry pick of #11194 on release-3.4

[jingyih]

Cherry pick of #11194 on release-3.4.

#11194: etcdctl: fix member add command

[gyuho]

Hmm, are test failures related? Is your 3.4 branch latest?

[jingyih]

Integration test failure is not related:

--- FAIL: TestBalancerUnderNetworkPartitionWatchFollower (3.27s)
    network_partition_test.go:266: took too long to detect leader lost

Haven't seen this e2e test failure before:

=== RUN   TestV3MetricsInsecure
--- FAIL: TestV3MetricsInsecure (0.94s)

=== RUN   TestV3MetricsSecure
--- FAIL: TestV3MetricsSecure (1.62s)

[jingyih]

e2e tests also failed for recent commits on release-3.4. Let me take a look.

[gyuho]

Ah, my commit should have broke it. Can we update this in 3.4 branch? https://github.com/etcd-io/etcd/blob/master/tests/semaphore.test.bash#L17

Try version 3.4.1?

[jingyih]

Ah, my commit should have broke it. Can we update this in 3.4 branch? https://github.com/etcd-io/etcd/blob/master/tests/semaphore.test.bash#L17

With this version override, cluster version test fails because in the test we do not trim ver

etcd/tests/e2e/metrics_test.go

Line 52 in d08bb07

{"/metrics", fmt.Sprintf(`etcd_cluster_version{cluster_version="%s"} 1`, ver)},

[gyuho]

right, let me quick-fix

[gyuho]

Should be fixed via c91a6bf.

[jingyih]

Should be fixed via c91a6bf.

I actually found some inconsistency in our code base. Should the cluster version be "3.4" or 3.4.0"?

In some places cluster version is trimmed via:

etcd/version/version.go

Line 50 in a0d2427

func Cluster(v string) string {

Sometimes (for example in metrics endpoint) we keep the patch version:

etcd/etcdserver/api/membership/cluster.go

Line 576 in c2f2309

ClusterVersionMetrics.With(prometheus.Labels{"cluster_version": ver.String()}).Set(1)

[gyuho]

The patch version is truncated because the metrics is "cluster_version". Maybe we can just strip out the patch version for this metrics (e.g. version.Cluster(ver.String()))? It's pretty confusing right now :0

[jingyih]

Sounds good. Let's use "major.minor" for the "cluster_version" metrics.