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

Recovery merge #679

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

Recovery merge #679

wants to merge 1 commit into from

Conversation

abudnik
Copy link
Member

@abudnik abudnik commented Dec 15, 2015

recovery: merge: removed obsolete Recovery code; used server-send, copy-iter everywhere

This PR sends greetings to PR #678

status = result.response.status
self._update_stats(start_time, index + 1, recovers_in_progress, status)
Copy link
Member

Choose a reason for hiding this comment

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

enumerate accepts optional parametr, which sets initial value of index. It's 0 by default.

enumerate(iterator, 1)

to remove index + 1

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@abudnik
Copy link
Member Author

abudnik commented Dec 17, 2015

Fixed: 20e5376

@agend
Copy link
Contributor

agend commented Jan 11, 2016

Hi all, do you have plans on merging this PR into master?

@agend
Copy link
Contributor

agend commented Jan 13, 2016

@abudnik @shaitan Do you have plan to merge this? We really need this feature) May be we can help in some way?

@abudnik
Copy link
Member Author

abudnik commented Jan 13, 2016

@agend You can merge both PR #679 and #681 into your local branch and test it on your test data. It would be very helpful for us.

@agend
Copy link
Contributor

agend commented Jan 13, 2016

@abudnik Is it save for data?

@shaitan
Copy link
Member

shaitan commented Jan 13, 2016

@agend It successfully passes our recovery tests but I wouldn't recommend you to test it on your production cluster until it is not tested on variety of test dataset or at least you have tested it on your test dataset that are close to your production.

PRs #679 and #681 are completed but before merging them we should fully test it to be sure that it is safe. Also we have one open question under discussion which doesn't affect to recovery correctness but defines recovery behaviour in case of error: "On which errors should copy-iterator stop?".

self.stats.set_counter('recovers_in_progress', recovers_in_progress)
if status != -errno.ETIMEDOUT:
self.stats.counter('recovered_keys', 1 if status == 0 else -1)
self.ctx.stats.counter('recovered_keys', 1 if status == 0 else -1)
Copy link
Member

Choose a reason for hiding this comment

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

I saw these fields in #668 pull request, why do you update them in two different places? Is this the same code as in #668 ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've fixed distinction between _update_stats() code in both PRs (509bd3b). They are the same now.

@bioothod
Copy link
Member

Should I merge this pull request?

@shaitan
Copy link
Member

shaitan commented May 23, 2016

I will overlook and actualize it later today.

@shaitan
Copy link
Member

shaitan commented May 24, 2016

It depends on #681 which has conflicts with current master.

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

Successfully merging this pull request may close these issues.

5 participants