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 for 2338 #2339

Merged
merged 1 commit into from Apr 18, 2018
Merged

Fix for 2338 #2339

merged 1 commit into from Apr 18, 2018

Conversation

@janardhan1993
Copy link
Contributor

@janardhan1993 janardhan1993 commented Apr 17, 2018

This change is Reviewable

@pawanrawal
Copy link
Member

@pawanrawal pawanrawal commented Apr 18, 2018

Review status: 0 of 2 files reviewed at latest revision, 1 unresolved discussion, some commit checks failed.


dgraph/cmd/zero/oracle.go, line 302 at r2 (raw file):

	// There might be race between this proposal trying to commit and predicate
	// move aborting it.
	if s.orc.aborted(src.StartTs) {

Nice fix, though I see that proposeTxn would never return any error. This might have been better handled by the functioning returning an error. Can you maybe add a TODO for this?


worker/groups.go, line 501 at r2 (raw file):

			}
			// In case there is no leader, we might miss this state update. So as soon as
			// a node becomes leader it asks for fresh state.

Is it asking or proposing the latest state? I don't follow the problem that we are trying to solve here.


Comments from Reviewable

@janardhan1993 janardhan1993 changed the title Fix for 2338 WIP:Fix for 2338 Apr 18, 2018
@janardhan1993 janardhan1993 changed the title WIP:Fix for 2338 Fix for 2338 Apr 18, 2018
Janardhan Reddy
@janardhan1993 janardhan1993 force-pushed the jan/fix_2338 branch from 95f3382 to 17cea1e Apr 18, 2018
@janardhan1993
Copy link
Contributor Author

@janardhan1993 janardhan1993 commented Apr 18, 2018

Review status: 0 of 1 files reviewed at latest revision, 2 unresolved discussions.


dgraph/cmd/zero/oracle.go, line 302 at r2 (raw file):

Previously, pawanrawal (Pawan Rawal) wrote…

Nice fix, though I see that proposeTxn would never return any error. This might have been better handled by the functioning returning an error. Can you maybe add a TODO for this?

Done.


worker/groups.go, line 501 at r2 (raw file):

Previously, pawanrawal (Pawan Rawal) wrote…

Is it asking or proposing the latest state? I don't follow the problem that we are trying to solve here.

Reverted this change, did this change on a hunch but didn't fix the issue.


Comments from Reviewable

@janardhan1993 janardhan1993 merged commit 0c011c6 into master Apr 18, 2018
1 of 4 checks passed
1 of 4 checks passed
CI (dgraph) TeamCity build started
Details
code-review/reviewable 1 file, 2 discussions left (pawanrawal)
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
license/cla Contributor License Agreement is signed.
Details
@dgraph-bot dgraph-bot removed the in progress label Apr 18, 2018
@janardhan1993 janardhan1993 deleted the jan/fix_2338 branch Apr 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.