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

Jump to bottom

INDY-2262: use NodeRegHandler for Primary Selection #1398

Merged
merged 25 commits into from
Nov 15, 2019
Merged

INDY-2262: use NodeRegHandler for Primary Selection #1398

merged 25 commits into from
Nov 15, 2019

Conversation

ashcherbakov
Copy link
Contributor

@ashcherbakov ashcherbakov commented Nov 8, 2019 •
edited

  • use node registry as it was at the beginning of last view for Primary Selection
  • unskip corresponding integration tests
  • fixes in NodeRegHandler related to recovering of primaries for the previous view after cathcup
  • get rid of Future Primaries Batch Handler
  • get rid of primaries in PrePrepares
  • process Checkpoints for future views to be able to caught up and cleanups of Checkpointer validator
  • simplify PrimarySelector logic
  • get rid of outdated Config parameters related to view change
  • remove outdated code and cleanup

@ashcherbakov
cleanup and fix typos
fe9d684 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
use NodeReg in PrimarySelector
bb40875 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
Merge branches 'indy-2262' and 'indy-2262-2' of github.com:ashcherbak…
110eb27 
…ov/indy-plenum into indy-2262-2
@ashcherbakov
unskip integration tests for INDY-2262; allow processing checkpoints …
ee4b7e1 
…for future views

Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
fix primary selection when no primaries for prev view is there
ce5f699 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
merge master
56f2a38 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
fix flake8
2f9ed16 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
start removing FuturePriamriesBatchHandler
201dcb0 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@lgtm-com
Copy link

lgtm-com bot commented Nov 8, 2019

This pull request introduces 3 alerts and fixes 2 when merging 2f9ed16 into e1cfb88 - view on LGTM.com

new alerts:

  • 2 for Unused import
  • 1 for Conflicting attributes in base classes

fixed alerts:

  • 1 for Signature mismatch in overriding method
  • 1 for NotImplemented is not an Exception

@ashcherbakov ashcherbakov changed the title INDY-2262: use NodeRegHandler for Primary Selection [WIP] INDY-2262: use NodeRegHandler for Primary Selection Nov 11, 2019
@ashcherbakov
finish removing FuturePrimariesBatchHandler; remove Primaries from Pr…
4bea9a0 
…ePrepare

Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
calculate number of instances based on the node reg lenght
f57211d 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
fix tests and improve logging
92f1d36 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
Merge branch 'master' of https://github.com/hyperledger/indy-plenum i…
6b6b1fe 
…nto indy-2262-2

Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>

# Conflicts:
#	plenum/server/future_primaries_batch_handler.py
@lgtm-com
Copy link

lgtm-com bot commented Nov 13, 2019

This pull request introduces 4 alerts and fixes 1 when merging 6b6b1fe into e9385c5 - view on LGTM.com

new alerts:

  • 4 for Unused import

fixed alerts:

  • 1 for Signature mismatch in overriding method

@ashcherbakov
fix loading last view node reg from pool ledger; fix tests
b9321be 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
fix tests
5a7b84a 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@lgtm-com
Copy link

lgtm-com bot commented Nov 13, 2019

This pull request fixes 1 alert when merging 5a7b84a into e9385c5 - view on LGTM.com

fixed alerts:

  • 1 for Signature mismatch in overriding method

@ashcherbakov
fix tests
ca2ed6b 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@lgtm-com
Copy link

lgtm-com bot commented Nov 13, 2019

This pull request fixes 1 alert when merging ca2ed6b into e9385c5 - view on LGTM.com

fixed alerts:

  • 1 for Signature mismatch in overriding method

@ashcherbakov
use current node reg to calculate the number of instances when select…
db905f0 
…ing primaries

Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
make sure that we alwways have node regs for at least two last views;…
e224608 
… fix tests.

Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
get rid of unused config params; fix tests
1576fbf 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@lgtm-com
Copy link

lgtm-com bot commented Nov 14, 2019

This pull request fixes 1 alert when merging 1576fbf into e9385c5 - view on LGTM.com

fixed alerts:

  • 1 for Signature mismatch in overriding method

@ashcherbakov
fix tests
e7d728f 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
fix tests
59e8c76 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@lgtm-com
Copy link

lgtm-com bot commented Nov 15, 2019

This pull request fixes 1 alert when merging 59e8c76 into e9385c5 - view on LGTM.com

fixed alerts:

  • 1 for Signature mismatch in overriding method

@ashcherbakov
fix finding the first txn in a view if primaries have been changed mo…
631ba0d 
…re than once in a view

Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
fix stashing of Checkpoint msgs during view change
084fb67 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov
fix tests; get rid of unused code
6f18791 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@ashcherbakov ashcherbakov changed the title [WIP] INDY-2262: use NodeRegHandler for Primary Selection INDY-2262: use NodeRegHandler for Primary Selection Nov 15, 2019
@ashcherbakov
flake8 fixes
f4eefe2 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@lgtm-com
Copy link

lgtm-com bot commented Nov 15, 2019

This pull request fixes 1 alert when merging f4eefe2 into e9385c5 - view on LGTM.com

fixed alerts:

  • 1 for Signature mismatch in overriding method

@ashcherbakov
fix tests
8f498af 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-corporation.com>
@lgtm-com
Copy link

lgtm-com bot commented Nov 15, 2019

This pull request fixes 1 alert when merging 8f498af into e9385c5 - view on LGTM.com

fixed alerts:

  • 1 for Signature mismatch in overriding method

Toktar
Toktar approved these changes Nov 15, 2019
View reviewed changes
Copy link
Contributor

@Toktar Toktar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add a second approve for a double check before merge.

skhoroshavin
skhoroshavin approved these changes Nov 15, 2019
View reviewed changes
Copy link
Member

@skhoroshavin skhoroshavin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great PR, worth merging ASAP

plenum/server/view_change/view_changer.py
# - self.instance_changes.remove_view(self.view_no)

def propose_view_change(self, suspicion=Suspicions.PRIMARY_DEGRADED):
proposed_view_no = self.view_no
# TODO: For some reason not incrementing view_no in most cases leads to lots of failing/flaky tests
# if suspicion == Suspicions.INSTANCE_CHANGE_TIMEOUT or not self.view_change_in_progress:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this comment should be removed

@skhoroshavin skhoroshavin merged commit a86398c into hyperledger:master Nov 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skhoroshavin skhoroshavin skhoroshavin approved these changes

@Toktar Toktar Toktar approved these changes

@lampkin-diet lampkin-diet lampkin-diet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ashcherbakov @skhoroshavin @Toktar @lampkin-diet