INDY-1955: don't send CatchupReq to disconnected and unresponsive nodes #1063
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
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
…nto task-1876-ordering-in-catchup
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Toktar
commented
Jan 25, 2019
| @@ -483,6 +489,8 @@ def _make_consistency_proof(self, ledger, end, catchup_till): | |||
| @measure_time(MetricsName.PROCESS_CATCHUP_REP_TIME) | |||
| def processCatchupRep(self, rep: CatchupRep, frm: str): | |||
| logger.info("{} received catchup reply from {}: {}".format(self, frm, rep)) | |||
| if frm in self.wait_catchup_rep_from: | |||
There was a problem hiding this comment.
Maybe will be better use recvdCatchupRepliesFrm. But in this case we will not check nodes which stopped to answer during catchup.
| 1. Stop the node Delta | ||
| 2. Order 9 txns. In sending CatchupReq in a first round every | ||
| node [Alpha, Beta, Gamma] will receive request for 3 txns. | ||
| 3. Delay CatchupRep messages on Alpha |
| looper.run(checkNodesConnected([*rest_nodes[:-1], restarted_node])) | ||
|
|
||
| waitNodeDataEquality(looper, *[*rest_nodes[:-1], restarted_node], customTimeout=240) | ||
| assert len(logs_catchup_req) <= 1 |
There was a problem hiding this comment.
But we calculated logs_catchup_req and logs_request_txns before we started the catch-up, didn't we? So, it will always be 0.
| looper.run(checkNodesConnected(txnPoolNodeSet)) | ||
|
|
||
| waitNodeDataEquality(looper, *txnPoolNodeSet, customTimeout=240) | ||
| assert len(logsAbout) == 1 |
There was a problem hiding this comment.
But we calculated logsAbout before we started the catch-up, didn't we? So, it will always be 0.
| assert len(logs_catchup_req) <= 1 | ||
| assert len(logs_request_txns) <= 1 | ||
|
|
||
| # Restart Delta and wait for successful catch up |
There was a problem hiding this comment.
I think this part is not needed
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
…nto task-1876-ordering-in-catchup
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
Signed-off-by: toktar <renata.toktar@dsr-corporation.com>
ashcherbakov
approved these changes
Jan 28, 2019
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.
TODO:
unit tests