Skip to content

Conversation

TheBlueMatt
Copy link
Contributor

Based on #10919.
Without this, if you cancel upgrade, you get a needless error:
ERROR: VerifyDB(): *** irrecoverable inconsistency in block data at

@TheBlueMatt TheBlueMatt changed the title 2017 08 fix upgrade cancel warnings Fix upgrade cancel warnings Aug 7, 2017
@fanquake fanquake added this to the 0.15.0 milestone Aug 7, 2017
@laanwj
Copy link
Member

laanwj commented Aug 7, 2017

Needs rebase so that it only has 76cd0f8
(utACK to that)

@TheBlueMatt TheBlueMatt force-pushed the 2017-08-fix-upgrade-cancel-warnings branch from 76cd0f8 to 861f9a2 Compare August 7, 2017 15:31
@TheBlueMatt
Copy link
Contributor Author

Rebased on master.

@jnewbery
Copy link
Contributor

jnewbery commented Aug 7, 2017

Seems like reasonable behaviour to me, although I don't see how strLoadError here can ever get used:

                    strLoadError = _("Error upgrading chainstate database");

since we'll never reach

return InitError(strLoadError);
if fRequestShutdown is set to true. We should probably remove that assignment and improve the logging at
LogPrintf("[%s].\n", ShutdownRequested() ? "CANCELLED" : "DONE");
.

utACK 861f9a2.

@btcdrak
Copy link
Contributor

btcdrak commented Aug 8, 2017

utACK 861f9a2

@laanwj laanwj merged commit 861f9a2 into bitcoin:master Aug 8, 2017
laanwj added a commit that referenced this pull request Aug 8, 2017
861f9a2 Skip remainder of init if upgrade is cancelled (Matt Corallo)

Pull request description:

  Based on #10919.
  Without this, if you cancel upgrade, you get a needless error:
  ERROR: VerifyDB(): *** irrecoverable inconsistency in block data at

Tree-SHA512: aa47665682c6605ada376f1c100ce17cf8c4312427929eb2e75306f2199b47cbcdb4e0d98d5efcfefff03947b2c0fcbd3aab487a4ed14d50607df685c91a03d0
codablock pushed a commit to codablock/dash that referenced this pull request Oct 26, 2017
861f9a2 Skip remainder of init if upgrade is cancelled (Matt Corallo)

Pull request description:

  Based on bitcoin#10919.
  Without this, if you cancel upgrade, you get a needless error:
  ERROR: VerifyDB(): *** irrecoverable inconsistency in block data at

Tree-SHA512: aa47665682c6605ada376f1c100ce17cf8c4312427929eb2e75306f2199b47cbcdb4e0d98d5efcfefff03947b2c0fcbd3aab487a4ed14d50607df685c91a03d0
codablock pushed a commit to codablock/dash that referenced this pull request Oct 31, 2017
861f9a2 Skip remainder of init if upgrade is cancelled (Matt Corallo)

Pull request description:

  Based on bitcoin#10919.
  Without this, if you cancel upgrade, you get a needless error:
  ERROR: VerifyDB(): *** irrecoverable inconsistency in block data at

Tree-SHA512: aa47665682c6605ada376f1c100ce17cf8c4312427929eb2e75306f2199b47cbcdb4e0d98d5efcfefff03947b2c0fcbd3aab487a4ed14d50607df685c91a03d0
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants