added log for elastic search response body parse #2413
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
Contributor
bogdan-rosianu
commented
Oct 28, 2020
•
bogdan-rosianu
commented
- added an additional log for displaying the body content if the parsing fails
- made each indexer error be a not shippable one, so the indexer will try to re-index the failed data
- treated error in elasticDefaultErrorResponseHandler function
- added unit tests
- changed the indexer so it can better output errors when failing to index a header
- refactored the way receipts and smart contract results are indexed
iulianpascalau
requested changes
Oct 28, 2020
… try to re-index the failed data - treated error in elasticDefaultErrorResponseHandler function - added unit tests
sasurobert
previously approved these changes
Oct 28, 2020
# Conflicts: # core/indexer/elasticClientCommon_test.go
core/indexer/processTransactions.go
Outdated
| @@ -136,6 +141,16 @@ func (tdp *txDatabaseProcessor) prepareTransactionsForDatabase( | |||
| return append(convertMapTxsToSlice(transactions), rewardsTxs...), alteredAddresses | |||
| } | |||
|
|
|||
| func (tdp *txDatabaseProcessor) addScrsReceiverToAlteredAccounts(alteredAddress map[string]struct{}, scrs map[string]*smartContractResult.SmartContractResult) { | |||
There was a problem hiding this comment.
no need to inject shardCoordinator, could have used the current shard ID and a range on the provided body. Miniblocks already contain destination/sender shard ID
There was a problem hiding this comment.
It does not work as the intrashard miniblock holding smart contract results is not added in the body.
iulianpascalau
approved these changes
Oct 29, 2020
- re-removed shard coordinator injection
miiu96
reviewed
Oct 29, 2020
bogdan-rosianu
commented
Oct 29, 2020
ccorcoveanu
previously approved these changes
Oct 29, 2020
iulianpascalau
previously approved these changes
Oct 29, 2020
sasurobert
previously approved these changes
Oct 29, 2020
| @@ -22,7 +22,8 @@ type DataIndexerFactory interface { | |||
| // This could be an elastic search index, a MySql database or any other external services. | |||
| type Indexer interface { | |||
| SetTxLogsProcessor(txLogsProc process.TransactionLogProcessorDatabase) | |||
| SaveBlock(body data.BodyHandler, header data.HeaderHandler, txPool map[string]data.TransactionHandler, signersIndexes []uint64, notarizedHeadersHashes []string) | |||
| SaveBlock(body data.BodyHandler, header data.HeaderHandler, txPool map[string]data.TransactionHandler, | |||
There was a problem hiding this comment.
wouldn't it be better to have and argument structure here ?
iulianpascalau
dismissed stale reviews from sasurobert, ccorcoveanu, and themself
via
7162832
ccorcoveanu
reviewed
Oct 29, 2020
core/indexer/processTransactions.go
Outdated
| receipts := groupReceipts(body, txPool) | ||
| scResults := groupSmartContractResults(body, txPool) | ||
| tdp.addScrsReceiverToAlteredAccounts(body, alteredAddresses, scResults, selfShardID) | ||
| //we can not iterate smart contracts results directly on the miniblocks contained in the block body |
There was a problem hiding this comment.
"smart contracts" -> remove plural
"miniblocks" -> typo
sasurobert
previously approved these changes
Oct 29, 2020
iulianpascalau
previously approved these changes
Oct 29, 2020
iulianpascalau
previously approved these changes
Oct 29, 2020
sasurobert
previously approved these changes
Oct 29, 2020
iulianpascalau
previously approved these changes
Oct 29, 2020
andreibancioiu
approved these changes
Oct 29, 2020
raduchis
approved these changes
Oct 29, 2020
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.