multi: Add started and done reorg notifications. #1495
Merged
Conversation
This file contains 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
|
Sample simnet reorg output: |
davecgh
requested changes
Oct 13, 2018
blockchain/chain.go
Outdated
| b.sendNotification(NTChainReorgStarted, &ChainReorgStarted{}) | ||
| b.chainLock.Lock() | ||
|
|
||
| reorgDone := func() { |
There was a problem hiding this comment.
Can just defer this:
defer func() {
// Send a notification announcing the end of the chain reorganization.
b.chainLock.Unlock()
b.sendNotification(NTChainReorgDone, nil)
b.chainLock.Lock()
}()
blockchain/chain.go
Outdated
| @@ -1353,6 +1365,7 @@ func (b *BlockChain) reorganizeChain(detachNodes, attachNodes *list.List) error | |||
| parent = detachBlocks[i+1] | |||
| } | |||
| if n.parent.hash != *parent.Hash() { | |||
| reorgDone() | |||
There was a problem hiding this comment.
No point in doing this before panic, but can be removed anyway with suggested defer above.
blockmanager.go
Outdated
| @@ -1929,6 +1929,14 @@ func (b *blockManager) handleNotifyMsg(notification *blockchain.Notification) { | |||
| r.ntfnMgr.NotifyBlockDisconnected(block) | |||
| } | |||
|
|
|||
| // Chain reorganization has commenced. | |||
| case blockchain.NTChainReorgStarted: | |||
| bmgrLog.Infof("Chain reorganization started.") | |||
blockmanager.go
Outdated
|
|
||
| // Chain reorganization has concluded. | ||
| case blockchain.NTChainReorgDone: | ||
| bmgrLog.Infof("Chain reorganization ended.") |
blockchain/notifications.go
Outdated
| @@ -119,6 +127,12 @@ type ReorganizationNtfnsData struct { | |||
| NewHeight int64 | |||
| } | |||
|
|
|||
| // ChainReorgStarted signals the commencement of a chain reorganization. | |||
| type ChainReorgStarted struct{} | |||
There was a problem hiding this comment.
I don't see a reason for this type since it's empty anyway. Just use nil in the ntfn.
blockchain/notifications.go
Outdated
| @@ -137,6 +151,8 @@ type TicketNotificationsData struct { | |||
| // - NTBlockAccepted: *BlockAcceptedNtfnsData | |||
| // - NTBlockConnected: []*dcrutil.Block of len 2 | |||
| // - NTBlockDisconnected: []*dcrutil.Block of len 2 | |||
| // - NTChainReorgStarted: *ChainReorgStarted | |||
blockchain/notifications.go
Outdated
| @@ -137,6 +151,8 @@ type TicketNotificationsData struct { | |||
| // - NTBlockAccepted: *BlockAcceptedNtfnsData | |||
| // - NTBlockConnected: []*dcrutil.Block of len 2 | |||
| // - NTBlockDisconnected: []*dcrutil.Block of len 2 | |||
| // - NTChainReorgStarted: *ChainReorgStarted | |||
| // - NTChainReorgDone: *ChainReorgDone | |||
blockchain/chain.go
Outdated
| @@ -1331,6 +1331,18 @@ func (b *BlockChain) reorganizeChain(detachNodes, attachNodes *list.List) error | |||
| b.sendNotification(NTReorganization, reorgData) | |||
| b.chainLock.Lock() | |||
|
|
|||
| // Send a notification announcing the start of the chain reorganization. | |||
| b.chainLock.Unlock() | |||
| b.sendNotification(NTChainReorgStarted, &ChainReorgStarted{}) | |||
There was a problem hiding this comment.
See other comments. No need to create an empty heap object that has to be GC'd. Just use nil.
b.sendNotification(NTChainReorgStarted, nil)
blockchain/notifications.go
Outdated
| type ChainReorgStarted struct{} | ||
|
|
||
| // ChainReorgDone signals the conclusion of a chain reorganization. | ||
| type ChainReorgDone struct{} |
This adds NTChainReorgStarted and NTChainReorgDone notifications to the blockmanager.
davecgh
approved these changes
Oct 13, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This adds
NTChainReorgStartedandNTChainReorgDonenotifications to the blockmanager.