Based on #10919. Without this, if you cancel upgrade, you get a needless error: ERROR: VerifyDB(): *** irrecoverable inconsistency in block data at
Fix upgrade cancel warnings #10998
pull TheBlueMatt wants to merge 1 commits into bitcoin:master from TheBlueMatt:2017-08-fix-upgrade-cancel-warnings changing 1 files +1 −1-
TheBlueMatt commented at 1:29 AM on August 7, 2017: member
- TheBlueMatt renamed this:
2017 08 fix upgrade cancel warnings
Fix upgrade cancel warnings
on Aug 7, 2017 - fanquake added this to the milestone 0.15.0 on Aug 7, 2017
-
laanwj commented at 7:06 AM on August 7, 2017: member
Needs rebase so that it only has https://github.com/bitcoin/bitcoin/pull/10998/commits/76cd0f8f33c2ee229fb8babace2405b1b15d1f88 (utACK to that)
-
Skip remainder of init if upgrade is cancelled 861f9a28bc
- TheBlueMatt force-pushed on Aug 7, 2017
-
TheBlueMatt commented at 3:31 PM on August 7, 2017: member
Rebased on master.
-
jnewbery commented at 4:16 PM on August 7, 2017: member
Seems like reasonable behaviour to me, although I don't see how
strLoadErrorhere can ever get used:strLoadError = _("Error upgrading chainstate database");since we'll never reach https://github.com/bitcoin/bitcoin/blob/318392ca7cda813f4117688ce622fcef252744bc/src/init.cpp#L1543 if
fRequestShutdownis set to true. We should probably remove that assignment and improve the logging at https://github.com/bitcoin/bitcoin/blob/318392ca7cda813f4117688ce622fcef252744bc/src/txdb.cpp#L424.utACK 861f9a28bcb2b7bcdb602d319a0fd844bf519a1d.
-
btcdrak commented at 12:44 AM on August 8, 2017: contributor
utACK 861f9a28bcb2b7bcdb602d319a0fd844bf519a1d
- laanwj merged this on Aug 8, 2017
- laanwj closed this on Aug 8, 2017
- laanwj referenced this in commit 2507fd5556 on Aug 8, 2017
- codablock referenced this in commit eeabdb36cd on Sep 27, 2017
- codablock referenced this in commit 33bbf1e2be on Oct 12, 2017
- codablock referenced this in commit 426e3e0fb5 on Oct 26, 2017
- codablock referenced this in commit da5217f43a on Oct 26, 2017
- codablock referenced this in commit 83945a6380 on Oct 26, 2017
- codablock referenced this in commit 7e3e9e433b on Oct 30, 2017
- codablock referenced this in commit bff8b16aa8 on Oct 31, 2017
- codablock referenced this in commit ceb0d19b2d on Oct 31, 2017
- codablock referenced this in commit 64755903e2 on Oct 31, 2017
- codablock referenced this in commit 4cd19913dc on Oct 31, 2017
- UdjinM6 referenced this in commit bea88da7aa on Nov 8, 2017
- DrahtBot locked this on Sep 8, 2021