[INDY-1116] fix IstanceChanges queue cleanup while view change comple…

…ted (#518) * [INDY-1116] fix IstanceChanges queue cleanup while view change completed Signed-off-by: Andrew Nikitin <[email protected]> * [INDY-1116] Freezing list of keys for iterating Signed-off-by: Andrew Nikitin <[email protected]>
hyperledger · Feb 7, 2018 · a4dfa67 · a4dfa67
1 parent c1420a9
commit a4dfa67
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/plenum/server/view_change/view_changer.py b/plenum/server/view_change/view_changer.py
@@ -524,7 +524,14 @@ def _start_selection(self):
         if self.view_change_in_progress:
             self.view_change_in_progress = False
             self.node.on_view_change_complete()
-            self.instanceChanges.pop(self.view_no - 1, None)
+            # when we had INSTANCE_CHANGE message, they added into instanceChanges
+            # by msg.view_no. When view change was occured and view_no is changed,
+            # then we should delete all INSTANCE_CHANGE messages with current (already changed)
+            # view_no (which used in corresponded INSTANCE_CHANGE messages)
+            # Therefore we delete all INSTANCE_CHANGE messages from previous and current view number
+            for view_number in list(self.instanceChanges.keys()):
+                if view_number <= self.view_no:
+                    self.instanceChanges.pop(view_number, None)
             self.previous_master_primary = None
             self.propagate_primary = False