GEODE-7354: break dependencies on SystemFailure (#4254)
Break dependencies from the membership subsystem to SystemFailure
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
index a6712e0..a16fe14 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
@@ -40,7 +40,6 @@
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
-import org.apache.geode.SystemFailure;
import org.apache.geode.annotations.internal.MutableForTesting;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
@@ -252,16 +251,6 @@
Socket sock = null;
while (!shuttingDown) {
- if (SystemFailure.getFailure() != null) {
- // Allocate no objects here!
- try {
- srv_sock.close();
- return;
- } catch (IOException ignore) {
- // ignore
- }
- SystemFailure.checkFailure(); // throws
- }
if (srv_sock.isClosed()) {
shuttingDown = true;
break;
@@ -377,22 +366,14 @@
logger.fatal("Exception in processing request from " + sender, ex);
}
- } catch (VirtualMachineError err) {
- SystemFailure.initiateFailure(err);
- throw err;
} catch (Throwable ex) {
- SystemFailure.checkFailure();
String sender = null;
if (socket != null) {
sender = socket.getInetAddress().getHostAddress();
}
try {
logger.fatal("Exception in processing request from " + sender, ex);
- } catch (VirtualMachineError err) {
- SystemFailure.initiateFailure(err);
- throw err;
} catch (Throwable t) {
- SystemFailure.checkFailure();
t.printStackTrace();
}
} finally {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java
index ec21ebd..aacd57b 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java
@@ -28,7 +28,6 @@
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
-import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.net.SSLConfigurationFactory;
@@ -77,14 +76,7 @@
// TODO - config
.or(type(DistributionConfigImpl.class))
- .or(type(DistributionConfig.class))
-
-
- // TODO - god classes
- .or(type(SystemFailure.class))
-
-
- );
+ .or(type(DistributionConfig.class)));
}
