Skip to content
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

cherry pick "etcd_cluster_version" metric" (#10257, #11233, #11254, #11265) to release-3.3 #11261

Conversation

wenjiaswe
Copy link
Contributor

Cherry pick of #10257 on release-3.3.

#10257: etcdserver/*: add "etcd_cluster_version" metric

@wenjiaswe wenjiaswe changed the title Automated cherry pick of #10257 [WIP] cherry pick of #10257 Oct 16, 2019
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
@wenjiaswe wenjiaswe force-pushed the automated-cherry-pick-of-#10257-upstream-release-3.3 branch 4 times, most recently from a4793be to 3fc4cc3 Compare October 16, 2019 10:35
@wenjiaswe
Copy link
Contributor Author

wenjiaswe commented Oct 16, 2019

/cc @jingyih hmm, failed test said

etcd_release_upgrade_test.go:108: failed get with curl (read /dev/ptmx: input/output error (expected "etcd_cluster_version{cluster_version=\"3.3\"} 1", got ["# HELP etcd_cluster_version Which version is running. 1 for 'cluster_version' label with current cluster version\r\n" "# TYPE etcd_cluster_version gauge\r\n" "etcd_cluster_version{cluster_version=\"3.3.0\"} 1\r\n"

But I brought up an etcd node and checked the metrics it is as expected:
etcd_cluster_version{cluster_version="3.3"} 1

@jingyih
Copy link
Contributor

jingyih commented Oct 16, 2019

I can take a look. This test is skipped in current master branch. Might be an actual bug we did not catch in the master before backporting.

@jingyih
Copy link
Contributor

jingyih commented Oct 16, 2019

Oh I misread. This is a test fail on a backported test. No wonder I cannot reproduce locally...

@wenjiaswe wenjiaswe force-pushed the automated-cherry-pick-of-#10257-upstream-release-3.3 branch from 3fc4cc3 to e788880 Compare October 16, 2019 20:27
@jingyih
Copy link
Contributor

jingyih commented Oct 17, 2019

Please also cherry pick #11265 to fix the test failure.

@wenjiaswe
Copy link
Contributor Author

@jingyih yes, the third commit already includes #11265, failure mentioned earlier is fixed:

=== RUN TestReleaseUpgrade --- PASS: TestReleaseUpgrade (5.22s)

but travis still failed:
Too many goroutines running after all test(s). 1 instances of: os.(*Process).Release(...) /home/travis/.gimme/versions/go1.12.9.linux.amd64/src/os/exec.go:108 +0x5e FAIL github.com/coreos/etcd/tests/e2e 155.956s

@wenjiaswe wenjiaswe changed the title [WIP] cherry pick of #10257 cherry pick "etcd_cluster_version" metric" (#10257, #11233, #11254, #11265) to release-3.3 Oct 17, 2019
@wenjiaswe
Copy link
Contributor Author

@gyuho @jingyih Test passed now, looks like [this failure] is just flaky. Please help to review. Thanks!

@gyuho gyuho merged commit aedfe54 into etcd-io:release-3.3 Oct 17, 2019
@gyuho
Copy link
Contributor

gyuho commented Oct 17, 2019

lgtm, thanks @jingyih @wenjiaswe

wenjiaswe added a commit that referenced this pull request Oct 17, 2019
Add log for etcd_cluster_version metrics addition in #11261
wenjiaswe added a commit that referenced this pull request Oct 17, 2019
Add log for etcd_cluster_version metrics addition in #11261
wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Nov 11, 2019
Add log for etcd_cluster_version metrics addition in etcd-io#11261
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants