You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gossip.apache.org by ec...@apache.org on 2016/11/09 18:00:59 UTC
incubator-gossip git commit: GOSSIP-30 Use getDeadMembers instead of
getDeadList
Repository: incubator-gossip
Updated Branches:
refs/heads/master 02ac78251 -> 3d0ccf52e
GOSSIP-30 Use getDeadMembers instead of getDeadList
Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/3d0ccf52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/3d0ccf52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/3d0ccf52
Branch: refs/heads/master
Commit: 3d0ccf52e516eabbb07bea5cc8a52aefb0f1ce67
Parents: 02ac782
Author: Rishabh Patel <ri...@gmail.com>
Authored: Mon Oct 17 13:04:43 2016 -0700
Committer: Rishabh Patel <ri...@gmail.com>
Committed: Mon Oct 17 13:04:43 2016 -0700
----------------------------------------------------------------------
README.md | 2 +-
.../java/org/apache/gossip/manager/GossipCore.java | 14 +++++++-------
.../java/org/apache/gossip/manager/GossipManager.java | 10 ----------
.../java/org/apache/gossip/ShutdownDeadtimeTest.java | 2 +-
4 files changed, 9 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/3d0ccf52/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 27f5c2f..8d42d16 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ The status can be polled using the getters that return immutable lists.
```java
List<LocalGossipMember> getMemberList()
- public List<LocalGossipMember> getDeadList()
+ public List<LocalGossipMember> getDeadMembers()
```
These can be accessed from the `GossipManager` on your `GossipService`, e.g:
http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/3d0ccf52/src/main/java/org/apache/gossip/manager/GossipCore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/gossip/manager/GossipCore.java b/src/main/java/org/apache/gossip/manager/GossipCore.java
index 1871751..a87d573 100644
--- a/src/main/java/org/apache/gossip/manager/GossipCore.java
+++ b/src/main/java/org/apache/gossip/manager/GossipCore.java
@@ -257,7 +257,7 @@ public class GossipCore {
List<GossipMember> remoteList) {
// if the person sending to us is in the dead list consider them up
- for (LocalGossipMember i : gossipManager.getDeadList()) {
+ for (LocalGossipMember i : gossipManager.getDeadMembers()) {
if (i.getId().equals(senderMember.getId())) {
LOGGER.info(gossipManager.getMyself() + " contacted by dead member " + senderMember.getUri());
LocalGossipMember newLocalMember = new LocalGossipMember(senderMember.getClusterName(),
@@ -280,7 +280,7 @@ public class GossipCore {
localMember.resetTimeoutTimer();
}
} else if (!gossipManager.getLiveMembers().contains(remoteMember)
- && !gossipManager.getDeadList().contains(remoteMember)) {
+ && !gossipManager.getDeadMembers().contains(remoteMember)) {
LocalGossipMember newLocalMember = new LocalGossipMember(remoteMember.getClusterName(),
remoteMember.getUri(), remoteMember.getId(),
remoteMember.getHeartbeat(), gossipManager, gossipManager.getSettings()
@@ -288,9 +288,9 @@ public class GossipCore {
gossipManager.createOrReviveMember(newLocalMember);
newLocalMember.startTimeoutTimer();
} else {
- if (gossipManager.getDeadList().contains(remoteMember)) {
- LocalGossipMember localDeadMember = gossipManager.getDeadList().get(
- gossipManager.getDeadList().indexOf(remoteMember));
+ if (gossipManager.getDeadMembers().contains(remoteMember)) {
+ LocalGossipMember localDeadMember = gossipManager.getDeadMembers().get(
+ gossipManager.getDeadMembers().indexOf(remoteMember));
if (remoteMember.getHeartbeat() > localDeadMember.getHeartbeat()) {
LocalGossipMember newLocalMember = new LocalGossipMember(remoteMember.getClusterName(),
remoteMember.getUri(), remoteMember.getId(),
@@ -305,14 +305,14 @@ public class GossipCore {
LOGGER.debug("sender " + senderMember);
LOGGER.debug("remote " + remoteList);
LOGGER.debug("live " + gossipManager.getLiveMembers());
- LOGGER.debug("dead " + gossipManager.getDeadList());
+ LOGGER.debug("dead " + gossipManager.getDeadMembers());
}
} else {
LOGGER.debug("me " + gossipManager.getMyself());
LOGGER.debug("sender " + senderMember);
LOGGER.debug("remote " + remoteList);
LOGGER.debug("live " + gossipManager.getLiveMembers());
- LOGGER.debug("dead " + gossipManager.getDeadList());
+ LOGGER.debug("dead " + gossipManager.getDeadMembers());
// throw new IllegalArgumentException("wtf");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/3d0ccf52/src/main/java/org/apache/gossip/manager/GossipManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/gossip/manager/GossipManager.java b/src/main/java/org/apache/gossip/manager/GossipManager.java
index 9f75fe3..cd6e0a9 100644
--- a/src/main/java/org/apache/gossip/manager/GossipManager.java
+++ b/src/main/java/org/apache/gossip/manager/GossipManager.java
@@ -176,16 +176,6 @@ public abstract class GossipManager implements NotificationListener {
return me;
}
- public List<LocalGossipMember> getDeadList() {
- List<LocalGossipMember> up = new ArrayList<>();
- for (Entry<LocalGossipMember, GossipState> entry : members.entrySet()) {
- if (GossipState.DOWN.equals(entry.getValue())) {
- up.add(entry.getKey());
- }
- }
- return Collections.unmodifiableList(up);
- }
-
/**
* Starts the client. Specifically, start the various cycles for this protocol. Start the gossip
* thread and start the receiver thread.
http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/3d0ccf52/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java b/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java
index 383657d..ded1d0f 100644
--- a/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java
+++ b/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java
@@ -107,7 +107,7 @@ public class ShutdownDeadtimeTest {
public Integer call() throws Exception {
int total = 0;
for (int i = 0; i < clusterMembers - 1; ++i) {
- total += clients.get(i).getGossipManager().getDeadList().size();
+ total += clients.get(i).getGossipManager().getDeadMembers().size();
}
return total;
}