Skip to content
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.

Sign up for GitHub

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

Indy 1180 fix none finalised #581

Merged
merged 8 commits into from
Mar 21, 2018
+10 −4
Merged

Indy 1180 fix none finalised #581

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
662078f
Fix none finalised reqs in case of not participating
dsurnin Mar 16, 2018
e2121ed
Move add instruction after apply
dsurnin Mar 16, 2018
974f0e7
Merge remote-tracking branch 'origin/master' into indy-1180-fix-none-…
dsurnin Mar 19, 2018
8dba03a
Do not raise error in case of commit for previous view, simply remove it
dsurnin Mar 19, 2018
ffed4b4
Merge remote-tracking branch 'origin/master' into indy-1180-fix-none-…
dsurnin Mar 21, 2018
295791c
Reduce amount of logging; and some trace; check for already ordered b…
dsurnin Mar 21, 2018
574b8ba
Merge remote-tracking branch 'origin/master' into indy-1180-fix-none-…
dsurnin Mar 21, 2018
a8173d4
Fix flake errors
dsurnin Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions plenum/server/replica.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,13 +1533,14 @@ def process_stashed_out_of_order_commits(self):
# This method is called periodically to check for any commits that
# were stashed due to lack of commits before them and orders them if it
# can
self.logger.debug('{} trying to order from out of order commits. {} {}'.format(
self, self.ordered, self.stashed_out_of_order_commits))
self.logger.debug('{} trying to order from out of order commits. '
'Len(stashed_out_of_order_commits) == {}'
.format(self, len(self.stashed_out_of_order_commits)))
if self.last_ordered_3pc:
lastOrdered = self.last_ordered_3pc
vToRemove = set()
for v in self.stashed_out_of_order_commits:
if v < lastOrdered[0] and self.stashed_out_of_order_commits[v]:
if v < lastOrdered[0]:
self.logger.debug(
"{} found commits {} from previous view {}"
" that were not ordered but last ordered"
Expand All @@ -1549,7 +1550,8 @@ def process_stashed_out_of_order_commits(self):
continue
pToRemove = set()
for p, commit in self.stashed_out_of_order_commits[v].items():
if (v, p) in self.ordered:
if (v, p) in self.ordered or\
self.has_already_ordered(*(commit.viewNo, commit.ppSeqNo)):
pToRemove.add(p)
continue
if (v == lastOrdered[0] and lastOrdered == (v, p - 1)) or \
Expand All @@ -1569,6 +1571,10 @@ def process_stashed_out_of_order_commits(self):

if not self.stashed_out_of_order_commits:
self.stopRepeating(self.process_stashed_out_of_order_commits)
else:
self.logger.debug('{} last_ordered_3pc if False. '
'Len(stashed_out_of_order_commits) == {}'
.format(self, len(self.stashed_out_of_order_commits)))

def isLowestCommitInView(self, commit):
view_no = commit.viewNo
Expand Down