Skip to content

Commit

Permalink
[INDY-1180] Do not raise error if commit for previous view (hyperledg…
Browse files Browse the repository at this point in the history
…er#578)

* Fix none finalised reqs in case of not participating

Signed-off-by: dsurnin <dmitry.surnin@dsr-corporation.com>

* Move add instruction after apply

Signed-off-by: dsurnin <dmitry.surnin@dsr-corporation.com>

* Do not raise error in case of commit for previous view, simply remove it

Signed-off-by: dsurnin <dmitry.surnin@dsr-corporation.com>
  • Loading branch information
dsurnin authored and Andrew Nikitin committed Apr 9, 2018
1 parent af5fc8e commit 62548bc
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion plenum/server/replica.py
Original file line number Diff line number Diff line change
Expand Up @@ -1540,11 +1540,13 @@ def process_stashed_out_of_order_commits(self):
vToRemove = set()
for v in self.stashed_out_of_order_commits:
if v < lastOrdered[0] and self.stashed_out_of_order_commits[v]:
raise RuntimeError(
self.logger.debug(
"{} found commits {} from previous view {}"
" that were not ordered but last ordered"
" is {}".format(
self, self.stashed_out_of_order_commits[v], v, lastOrdered))
vToRemove.add(v)
continue
pToRemove = set()
for p, commit in self.stashed_out_of_order_commits[v].items():
if (v, p) in self.ordered:
Expand Down

0 comments on commit 62548bc

Please sign in to comment.