Allow to cancel the txdb upgrade via splashscreen keypress 'q'#10660
Merged
laanwj merged 6 commits intobitcoin:masterfrom Jun 29, 2017
Merged
Allow to cancel the txdb upgrade via splashscreen keypress 'q'#10660laanwj merged 6 commits intobitcoin:masterfrom
laanwj merged 6 commits intobitcoin:masterfrom
Conversation
jonasschnelli
force-pushed
the
2017/06/chainstate_update_prog
branch
3 times, most recently
from
90ebd98 to
8aaf606
Compare
Contributor
Author
|
Speak up if you have a better, state-less solution for the UI progress callback. |
Member
|
Awesome! Will test.
TBH this doesn't matter much. This is a one-time scenario, it's important to have something that works reliably, it doesn't need to look pretty. |
jonasschnelli
changed the title
achow101
reviewed
Jun 23, 2017
src/txdb.cpp
Outdated
Member
There was a problem hiding this comment.
Couldn't this just be one string with a \n in the middle instead of two separate strings?
Member
There was a problem hiding this comment.
From my experience, translators hate messages with html or newlines in them, increasing the chance to make a mistake there.
Member
|
Tried this. Two issues:
|
jonasschnelli
force-pushed
the
2017/06/chainstate_update_prog
branch
2 times, most recently
from
5268f8d to
5b304a1
Compare
Contributor
Author
|
Rebased and overhauled. |
Member
|
Tested upgrade w/ my test data up to height=430234:
|
laanwj
reviewed
Jun 29, 2017
src/qt/splashscreen.cpp
Outdated
Member
There was a problem hiding this comment.
I'd prefer breakAction to 'continueAction'.
Continue, to me, implies that it's part of a pause/continue kind of functionality, not early quit.
jonasschnelli
force-pushed
the
2017/06/chainstate_update_prog
branch
from
5b304a1 to
c7e9233
Compare
Contributor
Author
|
Agree with @laanwj, changed |
jonasschnelli
force-pushed
the
2017/06/chainstate_update_prog
branch
from
c7e9233 to
b96ce7d
Compare
jonasschnelli
force-pushed
the
2017/06/chainstate_update_prog
branch
from
b96ce7d to
542ce6e
Compare
Member
|
ACK 542ce6e |
laanwj
added a commit
that referenced
this pull request
Jun 29, 2017
…ess 'q' 542ce6e Report [CANCELLED] instead of [DONE] when shut down during txdb upgrade (Jonas Schnelli) 83fbea3 Report txdb upgrade not more often then every 10% (Jonas Schnelli) 06c5b6e Show txdb upgrade progress in debug log (Jonas Schnelli) 316fcb5 Allow to cancel the txdb upgrade via splashscreen callback (Jonas Schnelli) ae09d45 Allow to shut down during txdb upgrade (Jonas Schnelli) 00cb69b [Qt] allow to execute a callback during splashscreen progress (Jonas Schnelli) Tree-SHA512: 23190f23f441bfd60821e49f8b3698a6bef97eb0e0ee659328e4a7395769ecd1616420eacc38aa1fa0ff62b9de5f13a0098dc798cdec6bff649575cefebc0db2
Contributor
|
utACK with the changes at #10770. |
codablock
pushed a commit
to codablock/dash
that referenced
this pull request
Oct 26, 2017
…n keypress 'q' 542ce6e Report [CANCELLED] instead of [DONE] when shut down during txdb upgrade (Jonas Schnelli) 83fbea3 Report txdb upgrade not more often then every 10% (Jonas Schnelli) 06c5b6e Show txdb upgrade progress in debug log (Jonas Schnelli) 316fcb5 Allow to cancel the txdb upgrade via splashscreen callback (Jonas Schnelli) ae09d45 Allow to shut down during txdb upgrade (Jonas Schnelli) 00cb69b [Qt] allow to execute a callback during splashscreen progress (Jonas Schnelli) Tree-SHA512: 23190f23f441bfd60821e49f8b3698a6bef97eb0e0ee659328e4a7395769ecd1616420eacc38aa1fa0ff62b9de5f13a0098dc798cdec6bff649575cefebc0db2
codablock
pushed a commit
to codablock/dash
that referenced
this pull request
Oct 31, 2017
…n keypress 'q' 542ce6e Report [CANCELLED] instead of [DONE] when shut down during txdb upgrade (Jonas Schnelli) 83fbea3 Report txdb upgrade not more often then every 10% (Jonas Schnelli) 06c5b6e Show txdb upgrade progress in debug log (Jonas Schnelli) 316fcb5 Allow to cancel the txdb upgrade via splashscreen callback (Jonas Schnelli) ae09d45 Allow to shut down during txdb upgrade (Jonas Schnelli) 00cb69b [Qt] allow to execute a callback during splashscreen progress (Jonas Schnelli) Tree-SHA512: 23190f23f441bfd60821e49f8b3698a6bef97eb0e0ee659328e4a7395769ecd1616420eacc38aa1fa0ff62b9de5f13a0098dc798cdec6bff649575cefebc0db2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Progress calc credit: @sipa
This PR will accomplish three things:
2017-06-23 07:49:55 Upgrading utxo-set database...2017-06-23 07:49:55 [0%]...[0%]...[13%]...[25%]...[39%]...[52%]...[63%]...[76%]...[90%]...[DONE].qin splash screen to shutdown.Let me explain why keypress instead of buttons:
The current splash screen is a drawn pixmap. Adding buttons there will require a complete re-design of the splashscreen (should be done once). It should be an auto-resizing QWidget as used in the other layout situations.
For getting a UTXO-upgrade abort into 0.15, this solution may be acceptable.