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
Start snapshot after restart fix #4551
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -128,12 +128,6 @@ func NewAccountsDB(args ArgsAccountsDB) (*AccountsDB, error) { | |
processStatusHandler: args.ProcessStatusHandler, | ||
} | ||
|
||
trieStorageManager := adb.mainTrie.GetStorageManager() | ||
val, err := trieStorageManager.GetFromCurrentEpoch([]byte(common.ActiveDBKey)) | ||
if err != nil || !bytes.Equal(val, []byte(common.ActiveDBVal)) { | ||
startSnapshotAfterRestart(adb, args) | ||
} | ||
|
||
return adb, nil | ||
} | ||
|
||
|
@@ -160,17 +154,16 @@ func checkArgsAccountsDB(args ArgsAccountsDB) error { | |
return nil | ||
} | ||
|
||
func startSnapshotAfterRestart(adb AccountsAdapter, args ArgsAccountsDB) { | ||
tsm := args.Trie.GetStorageManager() | ||
func startSnapshotAfterRestart(adb AccountsAdapter, tsm common.StorageManager, processingMode common.NodeProcessingMode) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. checked the file with v1.4.0, looks good 👍 |
||
epoch, err := tsm.GetLatestStorageEpoch() | ||
if err != nil { | ||
log.Error("could not get latest storage epoch") | ||
} | ||
putActiveDBMarker := epoch == 0 && err == nil | ||
isInImportDBMode := args.ProcessingMode == common.ImportDb | ||
isInImportDBMode := processingMode == common.ImportDb | ||
putActiveDBMarker = putActiveDBMarker || isInImportDBMode | ||
if putActiveDBMarker { | ||
log.Debug("marking activeDB", "epoch", epoch, "error", err, "processing mode", args.ProcessingMode) | ||
log.Debug("marking activeDB", "epoch", epoch, "error", err, "processing mode", processingMode) | ||
err = tsm.Put([]byte(common.ActiveDBKey), []byte(common.ActiveDBVal)) | ||
handleLoggingWhenError("error while putting active DB value into main storer", err) | ||
return | ||
|
@@ -204,6 +197,22 @@ func handleLoggingWhenError(message string, err error, extraArguments ...interfa | |
log.Warn(message, append(args, extraArguments...)...) | ||
} | ||
|
||
// StartSnapshotIfNeeded starts the snapshot if the previous snapshot process was not fully completed | ||
func (adb *AccountsDB) StartSnapshotIfNeeded() { | ||
startSnapshotIfNeeded(adb, adb.mainTrie.GetStorageManager(), adb.processingMode) | ||
} | ||
|
||
func startSnapshotIfNeeded( | ||
adb AccountsAdapter, | ||
trieStorageManager common.StorageManager, | ||
processingMode common.NodeProcessingMode, | ||
) { | ||
val, err := trieStorageManager.GetFromCurrentEpoch([]byte(common.ActiveDBKey)) | ||
if err != nil || !bytes.Equal(val, []byte(common.ActiveDBVal)) { | ||
startSnapshotAfterRestart(adb, trieStorageManager, processingMode) | ||
} | ||
} | ||
|
||
// GetCode returns the code for the given account | ||
func (adb *AccountsDB) GetCode(codeHash []byte) []byte { | ||
if len(codeHash) == 0 { | ||
|
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
package state | ||
|
||
import ( | ||
"bytes" | ||
"fmt" | ||
"sync" | ||
|
||
|
@@ -39,15 +38,14 @@ func NewPeerAccountsDB(args ArgsAccountsDB) (*PeerAccountsDB, error) { | |
}, | ||
} | ||
|
||
trieStorageManager := adb.mainTrie.GetStorageManager() | ||
val, err := trieStorageManager.GetFromCurrentEpoch([]byte(common.ActiveDBKey)) | ||
if err != nil || !bytes.Equal(val, []byte(common.ActiveDBVal)) { | ||
startSnapshotAfterRestart(adb, args) | ||
} | ||
|
||
return adb, nil | ||
} | ||
|
||
// StartSnapshotIfNeeded starts the snapshot if the previous snapshot process was not fully completed | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. checked with the rc/v1.4.0, looks good |
||
func (adb *PeerAccountsDB) StartSnapshotIfNeeded() { | ||
startSnapshotIfNeeded(adb, adb.mainTrie.GetStorageManager(), adb.processingMode) | ||
} | ||
|
||
// MarkSnapshotDone will mark that the snapshot process has been completed | ||
func (adb *PeerAccountsDB) MarkSnapshotDone() { | ||
trieStorageManager, epoch, err := adb.getTrieStorageManagerAndLatestEpoch() | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please re-check this. On rc/v1.4.0 we do not have this call here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in rc/v1.4.0 these are called in the
addSyncersToAccountsDB
function after setting the trie syncers.