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

raftstore: not always update pending_cross_snap (#3822) #4003

Merged
merged 2 commits into from Jan 2, 2019

Conversation

@Connor1996
Copy link
Member

commented Jan 2, 2019

cherry pick of #3822

raftstore: do not update pending_cross_snap when peer is applying sna…
…pshot(#3873)

Signed-off-by: Connor1996 <zbk602423539@gmail.com>

@Connor1996 Connor1996 force-pushed the Connor1996:merge-1 branch from 3471bc1 to 585c292 Jan 2, 2019

@Connor1996

This comment has been minimized.

Copy link
Member Author

commented Jan 2, 2019

/run-all-tests tidb=release-2.0 pd=release-2.0 tidb-test=release-2.0

@zhouqiang-cl

This comment has been minimized.

Copy link
Member

commented Jan 2, 2019

/rebuild

@Connor1996 Connor1996 changed the title raftstore: do not update pending_cross_snap when peer is applying sna… raftstore: not always update pending_cross_snap (#3822) Jan 2, 2019

fix
Signed-off-by: Connor1996 <zbk602423539@gmail.com>
@Connor1996

This comment has been minimized.

Copy link
Member Author

commented Jan 2, 2019

/run-all-tests tidb=release-2.0 pd=release-2.0 tidb-test=release-2.0

@DorianZheng DorianZheng added the C: Raft label Jan 2, 2019

@BusyJay
BusyJay approved these changes Jan 2, 2019

@overvenus overvenus merged commit f697493 into tikv:release-2.0 Jan 2, 2019

7 checks passed

DCO All commits are signed off!
Details
idc-jenkins-ci/test Jenkins job succeeded.
Details
jenkins-ci-tikv/build Jenkins job succeeded.
Details
jenkins-ci-tikv/integration-common-test Jenkins job succeeded.
Details
jenkins-ci-tikv/integration-compatibility-test Jenkins job succeeded.
Details
jenkins-ci-tikv/integration-ddl-test Jenkins job succeeded.
Details
jenkins-ci-tikv/unit-test Jenkins job succeeded.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.