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

CHANGELOG-3.2: update from #7892 #9948

Merged
merged 1 commit into from
Jul 24, 2018
Merged

Conversation

wenjiaswe
Copy link
Contributor

CHANGELOG-3.2: update from #7892

@codecov-io
Copy link

Codecov Report

Merging #9948 into master will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9948      +/-   ##
==========================================
+ Coverage   69.12%   69.15%   +0.03%     
==========================================
  Files         386      386              
  Lines       35784    35784              
==========================================
+ Hits        24735    24746      +11     
- Misses       9232     9236       +4     
+ Partials     1817     1802      -15
Impacted Files Coverage Δ
etcdctl/ctlv3/command/lease_command.go 65.34% <0%> (-5.95%) ⬇️
pkg/adt/interval_tree.go 84.98% <0%> (-5.71%) ⬇️
pkg/transport/listener.go 58.67% <0%> (-4.09%) ⬇️
proxy/grpcproxy/watcher.go 85.71% <0%> (-4.09%) ⬇️
proxy/grpcproxy/watch.go 88.19% <0%> (-1.25%) ⬇️
etcdserver/api/v2http/client.go 85.51% <0%> (-1.21%) ⬇️
etcdserver/raft.go 80.09% <0%> (-0.72%) ⬇️
mvcc/watchable_store.go 82.8% <0%> (-0.71%) ⬇️
clientv3/watch.go 91.71% <0%> (-0.43%) ⬇️
clientv3/balancer/grpc1.7-health.go 59.01% <0%> (-0.3%) ⬇️
... and 14 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 104b6a3...82b712a. Read the comment docs.

CHANGELOG-3.2.md Outdated
@@ -28,7 +28,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
- Add [`etcd_mvcc_db_total_size_in_bytes`](https://github.com/coreos/etcd/pull/9819) Prometheus metric.
- In addition to [`etcd_debugging_mvcc_db_total_size_in_bytes`](https://github.com/coreos/etcd/pull/9819).
- Add [`etcd_mvcc_db_total_size_in_use_in_bytes`](https://github.com/coreos/etcd/pull/9256) Prometheus metric.
- Use it with `etcd_mvcc_db_total_size_in_bytes` and `etcd_mvcc_db_total_size_in_use_in_bytes`.
- Use it with `etcd_server_quota_backend_bytes` and `etcd_mvcc_db_total_size_in_use_in_bytes`.
Copy link
Contributor

Choose a reason for hiding this comment

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

revert this change? We already have this change log in line 22?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is kinda repeating with line 22. We could either remove line 31 completely, or I think we were trying to say use the three metrics (etcd_mvcc_db_total_size_in_use_in_bytes, etcd_server_quota_backend_bytes and etcd_mvcc_db_total_size_in_bytes) together, before it mentioned etcd_mvcc_db_total_size_in_use_in_bytes again but didn't say etcd_server_quota_backend_bytes. Well, apparently I changed the wrong thing though, I meant to s/etcd_mvcc_db_total_size_in_use_in_bytes/etcd_server_quota_backend_bytes

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, I just noticed that. Yeah they are redundant.

@gyuho
Copy link
Contributor

gyuho commented Jul 23, 2018

I think we need the same change from a47f0a0 for 3.2 changelog?

@gyuho
Copy link
Contributor

gyuho commented Jul 24, 2018

@wenjiaswe Ping? Once we update this, we are ready for patch release. Thanks.

@wenjiaswe
Copy link
Contributor Author

@gyuho Sorry missed this review. I just updated for line 31, with the correct replacement, please let me know if that's OK or not. For ["the same change from a47f0a0 for 3.2 changelog"](the same change from a47f0a0 for 3.2 changelog), I delivered in #9943 .

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.

oh I thought we are missing changes from a47f0a0, but I see it now. LGTM thanks!

@gyuho
Copy link
Contributor

gyuho commented Jul 24, 2018

@wenjiaswe Can you also help merge #9950? So we do not do this kind of manual checking? Thanks!

@gyuho gyuho merged commit 69ae028 into etcd-io:master Jul 24, 2018
@wenjiaswe
Copy link
Contributor Author

Yes, will do!

@wenjiaswe wenjiaswe deleted the changelog47892 branch July 24, 2018 17:50
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.

None yet

3 participants