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

Fix the calculation of remaining bytes while sending snapshot to client. #19116

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

ishan16696
Copy link
Contributor

@ishan16696 ishan16696 commented Dec 30, 2024

Currently, remaining bytes is only considering the size of database, not considering the sha256 size as it's also required to send. Please refer here for more info: #18340 (comment)

This PR fixes the calculation of remaining bytes while sending snapshot to client. Moreover, it also improves the log to give more information.

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ishan16696
Once this PR has been reviewed and has the lgtm label, please assign serathius for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot
Copy link

Hi @ishan16696. Thanks for your PR.

I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link

codecov bot commented Dec 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.81%. Comparing base (6c4e7df) to head (b256f52).

Additional details and impacted files
Files with missing lines Coverage Δ
server/etcdserver/api/v3rpc/maintenance.go 73.65% <100.00%> (+0.15%) ⬆️

... and 22 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19116      +/-   ##
==========================================
+ Coverage   68.76%   68.81%   +0.04%     
==========================================
  Files         420      420              
  Lines       35640    35641       +1     
==========================================
+ Hits        24508    24525      +17     
+ Misses       9711     9690      -21     
- Partials     1421     1426       +5     

Continue to review full report in Codecov by Sentry.

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

@@ -178,7 +179,7 @@ func (ms *maintenanceServer) Snapshot(sr *pb.SnapshotRequest, srv pb.Maintenance
// No, the client will still receive non-nil response
// until server closes the stream with EOF
resp := &pb.SnapshotResponse{
RemainingBytes: uint64(total - sent),
RemainingBytes: uint64(totalByteToSend - sent),
Copy link
Member

Choose a reason for hiding this comment

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

Maybe add a test?

Copy link
Contributor Author

@ishan16696 ishan16696 Jan 2, 2025

Choose a reason for hiding this comment

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

ok, Can you please tell me where should I add the unit test for this as I don't see a test file of name : maintenance_test.go ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants