You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2015/09/25 01:44:37 UTC
[1/3] incubator-geode git commit: GEODE-350: fixing suspect string
from testReplaceOfflineMemberAndRestartCreateColocatedPRLate
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-352 [created] 7f758b5ee
GEODE-350: fixing suspect string from testReplaceOfflineMemberAndRestartCreateColocatedPRLate
This test shuts down members, so it's reasonable to see a
RegionDestroyedException in the logs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ca660caa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ca660caa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ca660caa
Branch: refs/heads/feature/GEODE-352
Commit: ca660caae5221b4ccdfec6d56dc1b4badd7f4a2d
Parents: 8639b86
Author: Dan Smith <up...@apache.org>
Authored: Thu Sep 24 15:55:06 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Sep 24 15:55:06 2015 -0700
----------------------------------------------------------------------
.../partitioned/PersistentColocatedPartitionedRegionDUnitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ca660caa/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index 4dcc2cb..8e45a8f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -797,7 +797,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
*/
public void replaceOfflineMemberAndRestartCreateColocatedPRLate(SerializableRunnable createParentPR, SerializableRunnable createChildPR) throws Throwable {
addExpectedException("PartitionOfflineException");
- addExpectedException("PartitionOfflineException");
+ addExpectedException("RegionDestroyedException");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
[3/3] incubator-geode git commit: GEODE-352: Ingoring
SocketTimeoutException in dunit runs
Posted by up...@apache.org.
GEODE-352: Ingoring SocketTimeoutException in dunit runs
I believe this may also be the root cause of GEODE-270, GEODE-355,
GEODE-298, and GEODE-326.
The problem is that during tearDown, we start shutting down the cache
servers first, resulting in connectivity errors on the client.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7f758b5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7f758b5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7f758b5e
Branch: refs/heads/feature/GEODE-352
Commit: 7f758b5ee3d1a5a45ff21edab8955f7e61170bab
Parents: 7b15338
Author: Dan Smith <up...@apache.org>
Authored: Thu Sep 24 16:18:30 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Sep 24 16:18:30 2015 -0700
----------------------------------------------------------------------
.../src/test/java/batterytest/greplogs/ExpectedStrings.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7f758b5e/gemfire-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/batterytest/greplogs/ExpectedStrings.java b/gemfire-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
index 3bb47d4..1888fbe 100644
--- a/gemfire-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
+++ b/gemfire-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
@@ -146,6 +146,7 @@ public class ExpectedStrings {
expected.add(Pattern.compile("Could not find any server to create redundant client"));
expected.add(Pattern.compile("Could not find any server to create primary client"));
expected.add(Pattern.compile("Pool unexpected closed socket on server"));
+ expected.add(Pattern.compile("SocketTimeoutException"));
expected.add(Pattern.compile("Could not initialize a primary queue on startup"));
expected.add(Pattern.compile("java.lang.IllegalArgumentException: Sample timestamp must be greater than previous timestamp"));
//The following 2 strings are ignored due to bug 52042
[2/3] incubator-geode git commit: GEODE-352: Fixing NPEs seen in the
logs for PRClientServer tests
Posted by up...@apache.org.
GEODE-352: Fixing NPEs seen in the logs for PRClientServer tests
Some code that was added to the client server handshake was looking up
connected distributed system when one might be in the process of being
closed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7b153380
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7b153380
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7b153380
Branch: refs/heads/feature/GEODE-352
Commit: 7b1533800f4fb73527b8b4cdd379574b217bcced
Parents: ca660ca
Author: Dan Smith <up...@apache.org>
Authored: Thu Sep 24 16:05:18 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Sep 24 16:05:18 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache/client/internal/ConnectionFactoryImpl.java | 7 +++----
.../gemfire/cache/client/internal/ConnectionImpl.java | 6 +++---
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7b153380/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
index 7538b04..02a1fc0 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
@@ -20,9 +20,8 @@ import com.gemstone.gemfire.cache.client.ServerRefusedConnectionException;
import com.gemstone.gemfire.cache.client.internal.ServerBlackList.FailureTracker;
import com.gemstone.gemfire.cache.wan.GatewaySender;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.PoolCancelledException;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
import com.gemstone.gemfire.internal.cache.tier.Acceptor;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientUpdater;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
@@ -54,7 +53,7 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
private final CancelCriterion cancelCriterion;
private ConnectionSource source;
private int readTimeout;
- private DistributedSystem ds;
+ private InternalDistributedSystem ds;
private EndpointManager endpointManager;
private GatewaySender gatewaySender;
private PoolImpl pool;
@@ -67,7 +66,7 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
public static boolean testFailedConnectionToServer = false;
public ConnectionFactoryImpl(ConnectionSource source,
- EndpointManager endpointManager, DistributedSystem sys,
+ EndpointManager endpointManager, InternalDistributedSystem sys,
int socketBufferSize, int handShakeTimeout, int readTimeout,
ClientProxyMembershipID proxyId, CancelCriterion cancelCriterion,
boolean usedByGateway, GatewaySender sender,long pingInterval,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7b153380/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
index 43cff54..749a765 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
@@ -71,7 +71,7 @@ public class ConnectionImpl implements Connection {
private short wanSiteVersion = -1;//In Gateway communication version of connected wan site
//will be stored after successful handshake
// private final CancelCriterion cancelCriterion;
- private final DistributedSystem ds;
+ private final InternalDistributedSystem ds;
private OutputStream out;
private InputStream in;
@@ -80,7 +80,7 @@ public class ConnectionImpl implements Connection {
private HandShake handShake;
- public ConnectionImpl(DistributedSystem ds, CancelCriterion cancelCriterion) {
+ public ConnectionImpl(InternalDistributedSystem ds, CancelCriterion cancelCriterion) {
// this.cancelCriterion = cancelCriterion;
this.ds = ds;
}
@@ -90,7 +90,7 @@ public class ConnectionImpl implements Connection {
int handShakeTimeout, int readTimeout, byte communicationMode, GatewaySender sender)
throws IOException {
SocketCreator sc = SocketCreator.getDefaultInstance();
- DistributionConfig config = InternalDistributedSystem.getConnectedInstance().getConfig();
+ DistributionConfig config = ds.getConfig();
if (communicationMode == Acceptor.GATEWAY_TO_GATEWAY) {
sc = SocketCreator.createNonDefaultInstance(config.getGatewaySSLEnabled(),
config.getGatewaySSLRequireAuthentication(), config.getGatewaySSLProtocols(),