This is an automated email from the ASF dual-hosted git repository.
gosullivan pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 8a12c6d GEODE-4818: Remove beSick() from DirectChannel,TcpConduit.
(#1591)
8a12c6d is described below
commit 8a12c6d694f440c6b702e278f349724dece01933
Author: Galen O'Sullivan <gosulli...@pivotal.io>
AuthorDate: Tue Mar 13 09:34:43 2018 -0700
GEODE-4818: Remove beSick() from DirectChannel,TcpConduit. (#1591)
Also remove some dead code and clean up a little bit while I'm here.
---
.../distributed/internal/direct/DirectChannel.java | 27 --------
.../membership/gms/mgr/GMSMembershipManager.java | 66 +++++---------------
.../org/apache/geode/internal/tcp/TCPConduit.java | 72 ++--------------------
3 files changed, 18 insertions(+), 147 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
index 61d12dd..af1f488 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
@@ -723,7 +723,6 @@ public class DirectChannel {
}
}
-
public void receive(DistributionMessage msg, int bytesRead) {
if (disconnected) {
return;
@@ -743,10 +742,6 @@ public class DirectChannel {
}
}
- public InternalDistributedMember getLocalAddress() {
- return this.localAddr;
- }
-
/**
* Ensure that the TCPConduit class gets loaded.
*
@@ -885,26 +880,4 @@ public class DirectChannel {
public boolean hasReceiversFor(DistributedMember mbr) {
return this.conduit.hasReceiversFor(mbr);
}
-
- /**
- * cause the channel to be sick
- */
- public void beSick() {
- TCPConduit tc = this.conduit;
- if (tc != null) {
- tc.beSick();
- }
- }
-
- /**
- * cause the channel to be healthy
- */
- public void beHealthy() {
- TCPConduit tc = this.conduit;
- if (tc != null) {
- tc.beHealthy();
- }
- }
-
-
}
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index ea747c3..f8ed9b6 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -120,12 +120,8 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
* conserve-sockets=true. Use of this should be removed when connection
pools are implemented in
* the direct-channel
*/
- private final ThreadLocal<Boolean> forceUseUDPMessaging = new
ThreadLocal<Boolean>() {
- @Override
- protected Boolean initialValue() {
- return Boolean.FALSE;
- }
- };
+ private final ThreadLocal<Boolean> forceUseUDPMessaging =
+ ThreadLocal.withInitial(() -> Boolean.FALSE);
/**
* Trick class to make the startup synch more visible in stack traces
@@ -153,8 +149,6 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
// Miscellaneous state depending on the kind of event
InternalDistributedMember member;
- boolean crashed;
- String reason;
DistributionMessage dmsg;
NetView gmsView;
@@ -1746,19 +1740,14 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
if (allDestinations)
return null;
- List<InternalDistributedMember> members =
(List<InternalDistributedMember>) ex.getMembers(); // We
- // need
- // to
- // return
- // this
- // list
- // of
- // failures
+ // We need to return this list of failures
+ List<InternalDistributedMember> members =
(List<InternalDistributedMember>) ex.getMembers();
// SANITY CHECK: If we fail to send a message to an existing member
// of the view, we have a serious error (bug36202).
- NetView view = services.getJoinLeave().getView(); // grab a recent view,
excluding shunned
- // members
+
+ // grab a recent view, excluding shunned members
+ NetView view = services.getJoinLeave().getView();
// Iterate through members and causes in tandem :-(
Iterator it_mem = members.iterator();
@@ -2382,31 +2371,6 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
return services.getShutdownCause();
}
- // @Override
- // public void membershipFailure(String reason, Exception e) {
- // try {
- // if (this.membershipTestHooks != null) {
- // List l = this.membershipTestHooks;
- // for (Iterator it=l.iterator(); it.hasNext(); ) {
- // MembershipTestHook dml = (MembershipTestHook)it.next();
- // dml.beforeMembershipFailure(reason, e);
- // }
- // }
- // listener.membershipFailure(reason, e);
- // if (this.membershipTestHooks != null) {
- // List l = this.membershipTestHooks;
- // for (Iterator it=l.iterator(); it.hasNext(); ) {
- // MembershipTestHook dml = (MembershipTestHook)it.next();
- // dml.afterMembershipFailure(reason, e);
- // }
- // }
- // }
- // catch (RuntimeException re) {
- //
logger.warn(LocalizedMessage.create(LocalizedStrings.GroupMembershipService_EXCEPTION_CAUGHT_WHILE_SHUTTING_DOWN),
- // re);
- // }
- // }
-
public void registerTestHook(MembershipTestHook mth) {
// lock for additions to avoid races during startup
latestViewWriteLock.lock();
@@ -2445,6 +2409,7 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
/**
* Test hook - be a sick member
*/
+ @Override
public synchronized void beSick() {
if (!beingSick) {
beingSick = true;
@@ -2452,15 +2417,13 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
this.address);
services.getJoinLeave().beSick();
services.getHealthMonitor().beSick();
- if (directChannel != null) {
- directChannel.beSick();
- }
}
}
/**
* Test hook - don't answer "are you alive" requests
*/
+ @Override
public synchronized void playDead() {
if (!playingDead) {
playingDead = true;
@@ -2474,6 +2437,7 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
/**
* Test hook - recover health
*/
+ @Override
public synchronized void beHealthy() {
if (beingSick || playingDead) {
synchronized (startupMutex) {
@@ -2483,9 +2447,6 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
}
logger.info("GroupMembershipService.beHealthy invoked for {} -
recovering health now",
this.address);
- if (directChannel != null) {
- directChannel.beHealthy();
- }
services.getJoinLeave().beHealthy();
services.getHealthMonitor().beHealthy();
services.getMessenger().beHealthy();
@@ -2521,14 +2482,17 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
}
}
+ @Override
protected void process(ClusterDistributionManager dm) {
// not used
}
+ @Override
public int getDSFID() {
return 0;
}
+ @Override
public int getProcessorType() {
return ClusterDistributionManager.SERIAL_EXECUTOR;
}
@@ -2613,7 +2577,7 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
* Class <code>BoundedLinkedHashMap</code> is a bounded
<code>LinkedHashMap</code>. The bound is
* the maximum number of entries the <code>BoundedLinkedHashMap</code> can
contain.
*/
- static class BoundedLinkedHashMap<K, V> extends LinkedHashMap {
+ static class BoundedLinkedHashMap<K, V> extends LinkedHashMap<K, V> {
private static final long serialVersionUID = -3419897166186852692L;
/**
@@ -2644,6 +2608,4 @@ public class GMSMembershipManager implements
MembershipManager, Manager {
shutdown();
}
}
-
-
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
b/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
index 9fd0029..9483e08 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
@@ -103,8 +103,6 @@ public class TCPConduit implements Runnable {
*/
static boolean useSSL;
- // public static final boolean USE_SYNC_WRITES =
Boolean.getBoolean("p2p.useSyncWrites");
-
/**
* Force use of Sockets rather than SocketChannels (NIO). Note from Bruce:
due to a bug in the
* java VM, NIO cannot be used with IPv6 addresses on Windows. When that
condition holds, the
@@ -536,7 +534,6 @@ public class TCPConduit implements Runnable {
stopped = true;
- // System.err.println("DEBUG: TCPConduit emergencyClose");
try {
if (channel != null) {
channel.close();
@@ -558,8 +555,6 @@ public class TCPConduit implements Runnable {
socket = null;
thread = null;
conTable = null;
-
- // System.err.println("DEBUG: end of TCPConduit emergencyClose");
}
/* stops the conduit, closing all tcp/ip connections */
@@ -812,19 +807,11 @@ public class TCPConduit implements Runnable {
} catch (CancelException e) {
} catch (Exception e) {
if (!stopped) {
- // if (e instanceof SocketException
- // && "Socket closed".equals(e.getMessage())) {
- // // safe to ignore; see bug 31156
- // }
- // else
- {
- this.getStats().incFailedAccept();
- logger.warn(LocalizedMessage.create(
-
LocalizedStrings.TCPConduit_FAILED_TO_ACCEPT_CONNECTION_FROM_0_BECAUSE_1,
- new Object[] {othersock.getInetAddress(), e}), e);
- }
+ this.getStats().incFailedAccept();
+ logger.warn(LocalizedMessage.create(
+
LocalizedStrings.TCPConduit_FAILED_TO_ACCEPT_CONNECTION_FROM_0_BECAUSE_1,
+ new Object[] {othersock.getInetAddress(), e}), e);
}
- // connections.cleanupLowWater();
}
}
@@ -852,8 +839,6 @@ public class TCPConduit implements Runnable {
*/
public void waitForThreadOwnedOrderedConnectionState(DistributedMember
member, Map channelState)
throws InterruptedException {
- // if (Thread.interrupted()) throw new InterruptedException(); not
necessary done in
- // waitForThreadOwnedOrderedConnectionState
getConTable().waitForThreadOwnedOrderedConnectionState(member,
channelState);
}
@@ -919,8 +904,6 @@ public class TCPConduit implements Runnable {
public Connection getConnection(InternalDistributedMember memberAddress,
final boolean preserveOrder, boolean retry, long startTime, long
ackTimeout,
long ackSATimeout) throws java.io.IOException,
DistributedSystemDisconnectedException {
- // final boolean preserveOrder = (processorType ==
DistributionManager.SERIAL_EXECUTOR )||
- // (processorType == DistributionManager.PARTITIONED_REGION_EXECUTOR);
if (stopped) {
throw new DistributedSystemDisconnectedException(
LocalizedStrings.TCPConduit_THE_CONDUIT_IS_STOPPED.toLocalizedString());
@@ -1126,20 +1109,6 @@ public class TCPConduit implements Runnable {
return "" + id;
}
- public boolean threadOwnsResources() {
- ConnectionTable ct = this.conTable;
- if (ct == null) {
- return false;
- } else {
- DistributionManager d = getDM();
- if (d != null) {
- return d.getSystem().threadOwnsResources();
- } else {
- return false;
- }
- }
- }
-
/**
* Returns the distribution manager of the direct channel
*/
@@ -1147,13 +1116,6 @@ public class TCPConduit implements Runnable {
return directChannel.getDM();
}
- /**
- * Closes any connections used to communicate with the given member
- */
- public void removeEndpoint(DistributedMember mbr, String reason) {
- removeEndpoint(mbr, reason, true);
- }
-
public void removeEndpoint(DistributedMember mbr, String reason, boolean
notifyDisconnect) {
ConnectionTable ct = this.conTable;
if (ct == null) {
@@ -1179,11 +1141,6 @@ public class TCPConduit implements Runnable {
protected class Stopper extends CancelCriterion {
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.CancelCriterion#cancelInProgress()
- */
@Override
public String cancelInProgress() {
DistributionManager dm = getDM();
@@ -1196,11 +1153,6 @@ public class TCPConduit implements Runnable {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
org.apache.geode.CancelCriterion#generateCancelledException(java.lang.Throwable)
- */
@Override
public RuntimeException generateCancelledException(Throwable e) {
String reason = cancelInProgress();
@@ -1252,20 +1204,4 @@ public class TCPConduit implements Runnable {
public boolean waitForMembershipCheck(InternalDistributedMember remoteId) {
return membershipManager.waitForNewMember(remoteId);
}
-
- /**
- * simulate being sick
- */
- public void beSick() {
- // this.inhibitNewConnections = true;
- // this.conTable.closeReceivers(true);
- }
-
- /**
- * simulate being healthy
- */
- public void beHealthy() {
- // this.inhibitNewConnections = false;
- }
-
}
--
To stop receiving notification emails like this one, please contact
gosulli...@apache.org.
