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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #9997 #10041

Merged
merged 2 commits into from
Oct 3, 2018
Merged

Automated cherry pick of #9997 #10041

merged 2 commits into from
Oct 3, 2018

Conversation

wenjiaswe
Copy link
Contributor

Cherry pick of #9997 on release-3.3.

#9997: etcdserver/api/snap: add v3 snapshot fsync metrics

@xiang90
Copy link
Contributor

xiang90 commented Aug 28, 2018

lgtm

@gyuho
Copy link
Contributor

gyuho commented Aug 28, 2018

@wenjiaswe Can you squash commits? Then lgtm thanks!

@wenjiaswe wenjiaswe force-pushed the automated-cherry-pick-of-#9997-upstream-release-3.3 branch from a30ff09 to d5d12a4 Compare August 29, 2018 21:49
gyuho
gyuho approved these changes Aug 29, 2018
View reviewed changes
Copy link
Contributor

@gyuho gyuho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm thanks!

@wenjiaswe
Copy link
Contributor Author

@gyuho Travis CI tests failed and complained about "/bin/bash: ./build: No such file or directory". I am not sure if this is related to the event that etcd is moved from coreos/etcd to etcd-io/etcd. I will take a look. Gyuho, if you have any insight about what area to look for, that would be great too. Thanks!

@gyuho
Copy link
Contributor

gyuho commented Sep 4, 2018

@wenjiaswe

I see compile error?

# github.com/coreos/etcd/cmd/vendor/github.com/coreos/etcd/etcdserver
../vendor/github.com/coreos/etcd/etcdserver/server.go:63:2: context redeclared as imported package name
	previous declaration at ../vendor/github.com/coreos/etcd/etcdserver/server.go:18:2

https://travis-ci.com/etcd-io/etcd/jobs/142774936#L616-L618?

And the import paths should just work, since we did not update release-3.3 import paths.

@wenjiaswe wenjiaswe force-pushed the automated-cherry-pick-of-#9997-upstream-release-3.3 branch from 21e252c to d5d12a4 Compare September 4, 2018 21:34
@wenjiaswe
Copy link
Contributor Author

@gyuho you are right! I must have looked at somewhere wrong... But it's wield that my branch builds successfully locally and github.com/coreos/etcd/cmd/vendor/github.com/coreos/etcd/etcdserver/server.go:63 and https://github.com/wenjiaswe/etcd/blob/d5d12a4b985400f5a8fbafdb957a3ad83629f5a8/etcdserver/server.go#L63 mentioned in https://travis-ci.com/etcd-io/etcd/jobs/142774936#L616 and https://travis-ci.com/etcd-io/etcd/jobs/142774936#L706 don't even have anything, it's an empty line:( context is declared once. The file is not changed anyway with the back port.

@jingyih
Copy link
Contributor

jingyih commented Oct 3, 2018

@wenjiaswe
The compile error is caused by a previously merged PR on this branch, it is fixed by #10093. Can you do a rebase?

@wenjiaswe
Copy link
Contributor Author

@jingyih ah! thanks for the fix!

@gyuho @wenjiaswe
etcdserver/api/snap: add v3 snapshot fsync metrics
7ec9ff6 
etcd_snap_db_fsync_duration_seconds_count
etcd_snap_db_save_total_duration_seconds_bucket

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
@gyuho @wenjiaswe
etcdserver/api/rafthttp: add v3 snapshot send/receive metrics
d838e24 
Distribution would be:
0.1 second or more
...
25.6 seconds or more
51.2 seconds or more

etcd_network_snapshot_send_success
etcd_network_snapshot_send_failures
etcd_network_snapshot_send_total_duration_seconds
etcd_network_snapshot_receive_success
etcd_network_snapshot_receive_failures
etcd_network_snapshot_receive_total_duration_seconds

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
@wenjiaswe wenjiaswe force-pushed the automated-cherry-pick-of-#9997-upstream-release-3.3 branch from d5d12a4 to d838e24 Compare October 3, 2018 18:31
@wenjiaswe wenjiaswe merged commit cb57901 into etcd-io:release-3.3 Oct 3, 2018
@thaJeztah thaJeztah mentioned this pull request Apr 12, 2019
Merged
@wenjiaswe wenjiaswe deleted the automated-cherry-pick-of-#9997-upstream-release-3.3 branch October 15, 2019 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gyuho gyuho gyuho approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@wenjiaswe @xiang90 @gyuho @jingyih