Skip to content

Commit

Permalink
Revert "Expand decision logic to evict plus partition"
Browse files Browse the repository at this point in the history
This reverts commit 7d7c2cc.

Issue is that current logic with this change can lead to situations where the
wrong node is chosen to heal during automatic healing. While it is true that we
should be able to expand the logic it is not as simple because one replica set
will have detected a failed replica, but an entirely differnt replica set will
have to be used to pick a node to heal over.
  • Loading branch information
dgkimura committed Jun 16, 2018
1 parent 7d7c2cc commit 4269dbe
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions src/handler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -463,14 +463,10 @@ namespace dafs

auto minus_address = p_minus->GetNodeSetDetails().zero.replication;
auto plus_address = p_plus->GetNodeSetDetails().zero.replication;
auto zero_plus_address = p_zero->GetNodeSetDetails().plus.replication;

if ((plus_address.ip == address.ip &&
plus_address.port == address.port &&
!p_plus->IsAddressResponsive(address)) ||
(zero_plus_address.ip == address.ip &&
zero_plus_address.port == address.port &&
!p_zero->IsAddressResponsive(address)))

if (plus_address.ip == address.ip &&
plus_address.port == address.port &&
!p_plus->IsAddressResponsive(address))
{
// Here we agree with the proposal that plus partition should be
// removed.
Expand Down

0 comments on commit 4269dbe

Please # to comment.