You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/09 02:37:17 UTC
[4/6] incubator-geode git commit: GEODE-986 CI Failure:
MultiuserAPIDUnitTest.testMultiUserUnsupportedAPIs failed with
SocketException
GEODE-986 CI Failure: MultiuserAPIDUnitTest.testMultiUserUnsupportedAPIs failed with SocketException
I'm reverting the change in TcpClient that defaults to v9.0 if a locator
does not respond to a RequestVersion message. That change wasn't necessary
to fix GEODE_986 and caused some other problems.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/afa7cc81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/afa7cc81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/afa7cc81
Branch: refs/heads/feature/GEODE-837
Commit: afa7cc815f0dcb47baaa5d81146cf50cdecce83a
Parents: 4af7072
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed Jun 8 10:30:37 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Wed Jun 8 10:33:28 2016 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/cache/client/internal/AbstractOp.java | 2 --
.../gemfire/cache/client/internal/ConnectionImpl.java | 7 +++++--
.../gemfire/distributed/internal/tcpserver/TcpClient.java | 6 +++---
.../internal/tcpserver/TcpServerBackwardCompatDUnitTest.java | 3 +--
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/afa7cc81/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
index fca9295..0cce678 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
@@ -382,8 +382,6 @@ public abstract class AbstractOp implements Op {
this.failed = false;
this.timedOut = true;
throw ste;
- } catch(Exception e) {
- throw e;
}
} finally {
endAttempt(cnx.getStats(), start);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/afa7cc81/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
old mode 100755
new mode 100644
index 7a2308c..6ed2912
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
@@ -265,8 +265,11 @@ public class ConnectionImpl implements Connection {
|| op instanceof ExecuteRegionFunctionSingleHopOpImpl) {
int earliertimeout = this.getSocket().getSoTimeout();
this.getSocket().setSoTimeout(GemFireCacheImpl.getClientFunctionTimeout());
- result = op.attempt(this);
- this.getSocket().setSoTimeout(earliertimeout);
+ try {
+ result = op.attempt(this);
+ } finally {
+ this.getSocket().setSoTimeout(earliertimeout);
+ }
} else {
result = op.attempt(this);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/afa7cc81/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
old mode 100755
new mode 100644
index f07c053..c770238
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
@@ -213,7 +213,7 @@ public class TcpClient {
out.flush();
DataInputStream in = new DataInputStream(sock.getInputStream());
- in = new VersionedDataInputStream(in, Version.GFE_90);
+ in = new VersionedDataInputStream(in, Version.GFE_57);
try {
VersionResponse response = DataSerializer.readObject(in);
if (response != null) {
@@ -238,9 +238,9 @@ public class TcpClient {
logger.debug("Locator " + ipAddr + " did not respond to a request for its version. I will assume it is using v5.7 for safety.");
}
synchronized(serverVersions) {
- serverVersions.put(ipAddr, Version.GFE_90.ordinal());
+ serverVersions.put(ipAddr, Version.GFE_57.ordinal());
}
- return Short.valueOf(Version.GFE_90.ordinal());
+ return Short.valueOf(Version.GFE_57.ordinal());
}
private TcpClient() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/afa7cc81/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index 5430dea..976a2fa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -46,7 +46,6 @@ import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties
*
*/
@Category(DistributedTest.class)
-//@Ignore("Test was disabled by renaming to DisabledTest")
public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase {
/**
@@ -109,7 +108,7 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase {
props.setProperty(LOCATORS, locators);
props.setProperty(MCAST_PORT, "0");
props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
- props.setProperty(LOG_LEVEL, "finest");
+// props.setProperty(LOG_LEVEL, "finest");
// Start locator0 with props.
//props.setProperty(DistributionConfig.START_LOCATOR_NAME, host.getHostName() + "["+port0+"]");