Skip to content

feat(Restore): Retry restore proposals.#5765

Merged
martinmr merged 5 commits intomasterfrom
martinmr/restore-retry
Jul 2, 2020
Merged

feat(Restore): Retry restore proposals.#5765
martinmr merged 5 commits intomasterfrom
martinmr/restore-retry

Conversation

@martinmr
Copy link
Copy Markdown
Contributor

@martinmr martinmr commented Jun 30, 2020

This change adds retries when sending proposals to each group to start a restore for
temporary and/or recoverable errors.

Fixes DGRAPH-1232


This change is Reviewable

Docs Preview: Dgraph Preview

@martinmr martinmr marked this pull request as ready for review July 1, 2020 00:03
@martinmr martinmr requested a review from a team July 1, 2020 00:03
Copy link
Copy Markdown
Contributor

@parasssh parasssh left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 1 files reviewed, 3 unresolved discussions (waiting on @manishrjain, @martinmr, and @vvbalaji-dgraph)

a discussion (no related file):
:lgtm: minor comments. Feel free to resolve.



worker/online_restore_ee.go, line 78 at r1 (raw file):

		go func() {
			errCh <- retryRestoreProposal(ctx, reqCopy)

retryRestoreProposal is confusing. Maybe just rename to tryRestoreProposal()


worker/online_restore_ee.go, line 114 at r1 (raw file):

		return true
	case strings.Contains(err.Error(), errRestoreProposal):
		// Do not try to recover from errors when sending the proposal.

Can proposal failure also be recoverable?

Copy link
Copy Markdown
Contributor Author

@martinmr martinmr left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 1 files reviewed, 3 unresolved discussions (waiting on @manishrjain, @martinmr, @parasssh, and @vvbalaji-dgraph)


worker/online_restore_ee.go, line 78 at r1 (raw file):

Previously, parasssh wrote…

retryRestoreProposal is confusing. Maybe just rename to tryRestoreProposal()

Done.


worker/online_restore_ee.go, line 114 at r1 (raw file):

Previously, parasssh wrote…

Can proposal failure also be recoverable?

I checked and the only error that seems recoverable is if raft has not been initialized yet. I added a condition to check for this error.

@martinmr martinmr merged commit 5c75240 into master Jul 2, 2020
@martinmr martinmr deleted the martinmr/restore-retry branch July 2, 2020 18:02
martinmr added a commit that referenced this pull request Jul 2, 2020
This change adds retries when sending proposals to each group to start a restore for
temporary and/or recoverable errors.

Fixes DGRAPH-1232
arijitAD pushed a commit that referenced this pull request Jul 14, 2020
This change adds retries when sending proposals to each group to start a restore for
temporary and/or recoverable errors.

Fixes DGRAPH-1232
dna2github pushed a commit to dna2fork/dgraph that referenced this pull request Jul 18, 2020
This change adds retries when sending proposals to each group to start a restore for
temporary and/or recoverable errors.

Fixes DGRAPH-1232
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.

2 participants