You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2015/09/03 01:58:06 UTC
[01/17] incubator-geode git commit: renamed BridgeRegionEventImpl to
ClientRegionEventImpl
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-243 89d944ef0 -> e6002bf0d
renamed BridgeRegionEventImpl to ClientRegionEventImpl
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3db9d438
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3db9d438
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3db9d438
Branch: refs/heads/feature/GEODE-243
Commit: 3db9d4389561271c0442786e166ae8b25e9224b1
Parents: 89d944e
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 11:12:29 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 11:12:29 2015 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/internal/DSFIDFactory.java | 4 +-
.../internal/DataSerializableFixedID.java | 2 +-
.../internal/cache/BridgeRegionEventImpl.java | 108 -------------------
.../internal/cache/ClientRegionEventImpl.java | 108 +++++++++++++++++++
.../internal/cache/DestroyRegionOperation.java | 6 +-
.../cache/DistributedClearOperation.java | 6 +-
.../gemfire/internal/cache/LocalRegion.java | 4 +-
.../gemfire/internal/cache/RegionEventImpl.java | 2 +-
.../cache/tier/sockets/CacheClientNotifier.java | 6 +-
.../sanctionedDataSerializables.txt | 2 +-
10 files changed, 124 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
index 0bb2b80..2181de4 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
@@ -180,7 +180,7 @@ import com.gemstone.gemfire.internal.admin.remote.VersionInfoResponse;
import com.gemstone.gemfire.internal.admin.statalerts.GaugeThresholdDecoratorImpl;
import com.gemstone.gemfire.internal.admin.statalerts.NumberThresholdDecoratorImpl;
import com.gemstone.gemfire.internal.cache.AddCacheServerProfileMessage;
-import com.gemstone.gemfire.internal.cache.BridgeRegionEventImpl;
+import com.gemstone.gemfire.internal.cache.ClientRegionEventImpl;
import com.gemstone.gemfire.internal.cache.CacheServerAdvisor.CacheServerProfile;
import com.gemstone.gemfire.internal.cache.BucketAdvisor;
import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisor;
@@ -820,7 +820,7 @@ public final class DSFIDFactory implements DataSerializableFixedID {
registerDSFID(GATEWAY_SENDER_PROFILE,
GatewaySenderAdvisor.GatewaySenderProfile.class);
registerDSFID(ROLE_EVENT, RoleEventImpl.class);
- registerDSFID(BRIDGE_REGION_EVENT, BridgeRegionEventImpl.class);
+ registerDSFID(CLIENT_REGION_EVENT, ClientRegionEventImpl.class);
registerDSFID(PR_INVALIDATE_MESSAGE, InvalidateMessage.class);
registerDSFID(PR_INVALIDATE_REPLY_MESSAGE,
InvalidateMessage.InvalidateReplyMessage.class);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
index 3a34e75..8a4d31e 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
@@ -341,7 +341,7 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final byte PARTITION_PROFILE = 18;
public static final byte ROLE_EVENT = 19;
- public static final byte BRIDGE_REGION_EVENT = 20;
+ public static final byte CLIENT_REGION_EVENT = 20;
public static final byte CONCURRENT_HASH_MAP = 21;
public static final byte FIND_DURABLE_QUEUE = 22;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeRegionEventImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeRegionEventImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeRegionEventImpl.java
deleted file mode 100755
index 7bcaf64..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeRegionEventImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-
-package com.gemstone.gemfire.internal.cache;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.cache.Operation;
-import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-
-//import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-
-/**
- * Class <code>BridgeRegionEventImpl</code> is an implementation of a bridge
- * region event, which is just an <code>RegionEvent</code> with the client's
- * host and port for notification purposes.
- *
- * @author Girish Thombare
- *
- * @since 5.1
- */
-public final class BridgeRegionEventImpl extends RegionEventImpl
- {
-
- /**
- * The originating membershipId of this event.
- */
- private ClientProxyMembershipID context;
-
- public BridgeRegionEventImpl() {
- }
-
- /**
- * To be called from the Distributed Message without setting EventID
- * @param region
- * @param op
- * @param callbackArgument
- * @param originRemote
- * @param distributedMember
- */
- public BridgeRegionEventImpl(LocalRegion region, Operation op, Object callbackArgument,boolean originRemote, DistributedMember distributedMember,ClientProxyMembershipID contx) {
- super(region, op,callbackArgument, originRemote,distributedMember);
- setContext(contx);
- }
-
- public BridgeRegionEventImpl(LocalRegion region, Operation op, Object callbackArgument,boolean originRemote, DistributedMember distributedMember,ClientProxyMembershipID contx,EventID eventId) {
- super(region, op,callbackArgument, originRemote,distributedMember, eventId);
- setContext(contx);
- }
-
-
- /**
- * sets The membershipId originating this event
- *
- */
- protected void setContext(ClientProxyMembershipID contx)
- {
- this.context = contx;
- }
-
- /**
- * Returns The context originating this event
- *
- * @return The context originating this event
- */
- @Override
- public ClientProxyMembershipID getContext()
- {
- return this.context;
- }
-
- @Override
- public String toString()
- {
- String superStr = super.toString();
- StringBuffer buffer = new StringBuffer();
- String str = superStr.substring(0, superStr.length() - 1);
- buffer.append(str).append(";context=").append(getContext()).append(']');
- return buffer.toString();
- }
-
- @Override
- public int getDSFID() {
- return BRIDGE_REGION_EVENT;
- }
-
- @Override
- public void toData(DataOutput out) throws IOException
- {
- super.toData(out);
- DataSerializer.writeObject(getContext(), out);
- }
-
- @Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException
- {
- super.fromData(in);
- setContext(ClientProxyMembershipID.readCanonicalized(in));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
new file mode 100755
index 0000000..7c7aed1
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
@@ -0,0 +1,108 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+
+package com.gemstone.gemfire.internal.cache;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.cache.Operation;
+import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+
+//import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+
+/**
+ * Class <code>BridgeRegionEventImpl</code> is an implementation of a bridge
+ * region event, which is just an <code>RegionEvent</code> with the client's
+ * host and port for notification purposes.
+ *
+ * @author Girish Thombare
+ *
+ * @since 5.1
+ */
+public final class ClientRegionEventImpl extends RegionEventImpl
+ {
+
+ /**
+ * The originating membershipId of this event.
+ */
+ private ClientProxyMembershipID context;
+
+ public ClientRegionEventImpl() {
+ }
+
+ /**
+ * To be called from the Distributed Message without setting EventID
+ * @param region
+ * @param op
+ * @param callbackArgument
+ * @param originRemote
+ * @param distributedMember
+ */
+ public ClientRegionEventImpl(LocalRegion region, Operation op, Object callbackArgument,boolean originRemote, DistributedMember distributedMember,ClientProxyMembershipID contx) {
+ super(region, op,callbackArgument, originRemote,distributedMember);
+ setContext(contx);
+ }
+
+ public ClientRegionEventImpl(LocalRegion region, Operation op, Object callbackArgument,boolean originRemote, DistributedMember distributedMember,ClientProxyMembershipID contx,EventID eventId) {
+ super(region, op,callbackArgument, originRemote,distributedMember, eventId);
+ setContext(contx);
+ }
+
+
+ /**
+ * sets The membershipId originating this event
+ *
+ */
+ protected void setContext(ClientProxyMembershipID contx)
+ {
+ this.context = contx;
+ }
+
+ /**
+ * Returns The context originating this event
+ *
+ * @return The context originating this event
+ */
+ @Override
+ public ClientProxyMembershipID getContext()
+ {
+ return this.context;
+ }
+
+ @Override
+ public String toString()
+ {
+ String superStr = super.toString();
+ StringBuffer buffer = new StringBuffer();
+ String str = superStr.substring(0, superStr.length() - 1);
+ buffer.append(str).append(";context=").append(getContext()).append(']');
+ return buffer.toString();
+ }
+
+ @Override
+ public int getDSFID() {
+ return BRIDGE_REGION_EVENT;
+ }
+
+ @Override
+ public void toData(DataOutput out) throws IOException
+ {
+ super.toData(out);
+ DataSerializer.writeObject(getContext(), out);
+ }
+
+ @Override
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException
+ {
+ super.fromData(in);
+ setContext(ClientProxyMembershipID.readCanonicalized(in));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyRegionOperation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyRegionOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyRegionOperation.java
index 921cbf9..198803d 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyRegionOperation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyRegionOperation.java
@@ -105,9 +105,9 @@ public class DestroyRegionOperation extends DistributedCacheOperation {
protected CacheOperationMessage createMessage()
{
DestroyRegionMessage mssg;
- if (this.event instanceof BridgeRegionEventImpl) {
+ if (this.event instanceof ClientRegionEventImpl) {
mssg = new DestroyRegionWithContextMessage();
- ((DestroyRegionWithContextMessage)mssg).context = ((BridgeRegionEventImpl)this.event)
+ ((DestroyRegionWithContextMessage)mssg).context = ((ClientRegionEventImpl)this.event)
.getContext();
}
else {
@@ -502,7 +502,7 @@ public class DestroyRegionOperation extends DistributedCacheOperation {
@Override
final public RegionEventImpl createRegionEvent(DistributedRegion rgn)
{
- BridgeRegionEventImpl event = new BridgeRegionEventImpl(rgn,
+ ClientRegionEventImpl event = new ClientRegionEventImpl(rgn,
getOperation(), this.callbackArg, true /* originRemote */,
getSender(), (ClientProxyMembershipID)this.context);
return event;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedClearOperation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedClearOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedClearOperation.java
index 4dbc9c4..8056120 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedClearOperation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedClearOperation.java
@@ -128,9 +128,9 @@ public class DistributedClearOperation extends DistributedCacheOperation
protected CacheOperationMessage createMessage()
{
ClearRegionMessage mssg;
- if (this.event instanceof BridgeRegionEventImpl) {
+ if (this.event instanceof ClientRegionEventImpl) {
mssg = new ClearRegionWithContextMessage();
- ((ClearRegionWithContextMessage)mssg).context = ((BridgeRegionEventImpl)this.event)
+ ((ClearRegionWithContextMessage)mssg).context = ((ClientRegionEventImpl)this.event)
.getContext();
}
@@ -271,7 +271,7 @@ public class DistributedClearOperation extends DistributedCacheOperation
final public RegionEventImpl createRegionEvent(DistributedRegion rgn)
{
- BridgeRegionEventImpl event = new BridgeRegionEventImpl(rgn,
+ ClientRegionEventImpl event = new ClientRegionEventImpl(rgn,
getOperation(), this.callbackArg, true /* originRemote */,
getSender(), (ClientProxyMembershipID)this.context);
return event;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index 54160be..d891326 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -9770,7 +9770,7 @@ public class LocalRegion extends AbstractRegion
}
}
- RegionEventImpl event = new BridgeRegionEventImpl(this, Operation.REGION_DESTROY,
+ RegionEventImpl event = new ClientRegionEventImpl(this, Operation.REGION_DESTROY,
callbackArg,false, client.getDistributedMember(), client/* context */, eventId);
basicDestroyRegion(event, true);
@@ -9795,7 +9795,7 @@ public class LocalRegion extends AbstractRegion
}
}
- RegionEventImpl event = new BridgeRegionEventImpl(this, Operation.REGION_CLEAR,
+ RegionEventImpl event = new ClientRegionEventImpl(this, Operation.REGION_CLEAR,
callbackArg,false, client.getDistributedMember(), client/* context */, eventId);
basicClear(event, true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java
index 7d96986..08a6bad 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java
@@ -282,7 +282,7 @@ public class RegionEventImpl
}
public ClientProxyMembershipID getContext() {
- // regular region events do not have bridge context - see BridgeRegionEventImpl
+ // regular region events do not have a context - see ClientRegionEventImpl
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
index 073b7ef..2a62249 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -78,7 +78,7 @@ import com.gemstone.gemfire.internal.SystemTimer;
import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.internal.cache.BridgeObserver;
import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
-import com.gemstone.gemfire.internal.cache.BridgeRegionEventImpl;
+import com.gemstone.gemfire.internal.cache.ClientRegionEventImpl;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.CacheClientStatus;
import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisor;
@@ -1158,8 +1158,8 @@ public class CacheClientNotifier {
RegionEventImpl regionEvent = (RegionEventImpl)event;
callbackArgument = regionEvent.getRawCallbackArgument();
eventIdentifier = regionEvent.getEventId();
- if (event instanceof BridgeRegionEventImpl) {
- BridgeRegionEventImpl bridgeEvent = (BridgeRegionEventImpl)event;
+ if (event instanceof ClientRegionEventImpl) {
+ ClientRegionEventImpl bridgeEvent = (ClientRegionEventImpl)event;
membershipID = bridgeEvent.getContext();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3db9d438/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index d5e88bc..e46e70a 100644
--- a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -844,7 +844,7 @@ com/gemstone/gemfire/internal/cache/AddCacheServerProfileMessage,2
fromData,16,2a2bb7002f2a2bb900300100b50007b1
toData,16,2a2bb7002d2b2ab40007b9002e0200b1
-com/gemstone/gemfire/internal/cache/BridgeRegionEventImpl,2
+com/gemstone/gemfire/internal/cache/ClientRegionEventImpl,2
fromData,14,2a2bb700132a2bb80014b60003b1
toData,14,2a2bb700112ab6000d2bb80012b1
[14/17] incubator-geode git commit: changed BridgeServer in localized
strings to CacheServer
Posted by ds...@apache.org.
changed BridgeServer in localized strings to CacheServer
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8fa360e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8fa360e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8fa360e2
Branch: refs/heads/feature/GEODE-243
Commit: 8fa360e236cee9066487a291fe9a98a13e0e1fc5
Parents: 8f4c32e
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 15:41:54 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 15:41:54 2015 -0700
----------------------------------------------------------------------
.../internal/InternalDistributedSystem.java | 2 +-
.../gemfire/internal/cache/CacheServerImpl.java | 10 +++++-----
.../internal/cache/xmlcache/CacheCreation.java | 2 +-
.../gemfire/internal/i18n/LocalizedStrings.java | 18 +++++++++---------
4 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fa360e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index 817ce99..76c2b92 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -2844,7 +2844,7 @@ public final class InternalDistributedSystem
}
} catch (IOException ex) {
throw new GemFireIOException(
- LocalizedStrings.CacheCreation_WHILE_STARTING_BRIDGE_SERVER_0
+ LocalizedStrings.CacheCreation_WHILE_STARTING_CACHE_SERVER_0
.toLocalizedString(impl), ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fa360e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
index 7c8713d..f93feb1 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
@@ -424,7 +424,7 @@ public class CacheServerImpl
this.loadMonitor.stop();
}
} catch(RuntimeException e) {
- cache.getLoggerI18n().warning(LocalizedStrings.BridgeServerImpl_CACHESERVER_ERROR_CLOSING_LOAD_MONITOR, e);
+ cache.getLoggerI18n().warning(LocalizedStrings.CacheServerImpl_CACHESERVER_ERROR_CLOSING_LOAD_MONITOR, e);
firstException = e;
}
@@ -433,7 +433,7 @@ public class CacheServerImpl
this.advisor.close();
}
} catch(RuntimeException e) {
- cache.getLoggerI18n().warning(LocalizedStrings.BridgeServerImpl_CACHESERVER_ERROR_CLOSING_ADVISOR, e);
+ cache.getLoggerI18n().warning(LocalizedStrings.CacheServerImpl_CACHESERVER_ERROR_CLOSING_ADVISOR, e);
firstException = e;
}
@@ -442,7 +442,7 @@ public class CacheServerImpl
this.acceptor.close();
}
} catch(RuntimeException e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.BridgeServerImpl_CACHESERVER_ERROR_CLOSING_ACCEPTOR_MONITOR), e);
+ logger.warn(LocalizedMessage.create(LocalizedStrings.CacheServerImpl_CACHESERVER_ERROR_CLOSING_ACCEPTOR_MONITOR), e);
if (firstException != null) {
firstException = e;
}
@@ -616,7 +616,7 @@ public class CacheServerImpl
else {
// throw invalid eviction policy exception
throw new InvalidValueException(
- LocalizedStrings.BridgeServerImpl__0_INVALID_EVICTION_POLICY.toLocalizedString(ePolicy));
+ LocalizedStrings.CacheServerImpl__0_INVALID_EVICTION_POLICY.toLocalizedString(ePolicy));
}
return factory;
}
@@ -777,7 +777,7 @@ public class CacheServerImpl
public void registerInterestRegistrationListener(
InterestRegistrationListener listener) {
if (!this.isRunning()) {
- throw new IllegalStateException(LocalizedStrings.BridgeServerImpl_MUST_BE_RUNNING.toLocalizedString());
+ throw new IllegalStateException(LocalizedStrings.CacheServerImpl_MUST_BE_RUNNING.toLocalizedString());
}
getCacheClientNotifier().registerInterestRegistrationListener(listener);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fa360e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
index 08543d2..24d8b92 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
@@ -602,7 +602,7 @@ public class CacheCreation implements InternalCache, Extensible<Cache> {
}
catch (IOException ex) {
throw new GemFireIOException(
- LocalizedStrings.CacheCreation_WHILE_STARTING_BRIDGE_SERVER_0
+ LocalizedStrings.CacheCreation_WHILE_STARTING_CACHE_SERVER_0
.toLocalizedString(impl), ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fa360e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index f5ae3e5..ad33c5b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -131,7 +131,7 @@ public class LocalizedStrings extends ParentLocalizedStrings {
public static final StringId EndpointImpl_0_CAN_NOT_REGISTER_INSTANTIATORS_1_BECAUSE_THE_SERVER_IS_NOT_AVAILABLE = new StringIdImpl(3505, "{0} : Can not register instantiators {1} because the server is not available.");
public static final StringId EndpointImpl_0_CANNOT_UNREGISTER_INTEREST_IN_REGION_1_KEY_2_BECAUSE_THE_SERVER_IS_NOT_AVAILABLE = new StringIdImpl(3506, "{0} : Cannot unregister interest in region {1} key {2} because the server is not available.");
public static final StringId EndpointImpl_0_CAN_NOT_NOTIFY_SERVER_THAT_THIS_CLIENT_IS_READY_BECAUSE_THE_SERVER_IS_NOT_AVAILABLE = new StringIdImpl(3507, "{0} : Can not notify server that this client is ready because the server is not available.");
- public static final StringId CacheCreation_WHILE_STARTING_BRIDGE_SERVER_0 = new StringIdImpl(3508, "While starting bridge server {0}");
+ public static final StringId CacheCreation_WHILE_STARTING_CACHE_SERVER_0 = new StringIdImpl(3508, "While starting cache server {0}");
public static final StringId CacheCreation_WHILE_STARTING_GATEWAY_HUB_0 = new StringIdImpl(3509, "While starting gateway hub {0}");
public static final StringId CacheXml_ERROR_WHILE_PARSING_XML = new StringIdImpl(3510, "Error while parsing XML");
public static final StringId CacheXml_FATAL_ERROR_WHILE_PARSING_XML = new StringIdImpl(3511, "Fatal error while parsing XML");
@@ -654,9 +654,9 @@ public class LocalizedStrings extends ParentLocalizedStrings {
public static final StringId AdminWaiters_REQUEST_WAIT_WAS_INTERRUPTED = new StringIdImpl(4029, "Request wait was interrupted.");
public static final StringId AlertLevelChangeMessage_CHANGING_ALERT_LEVEL_TO_0 = new StringIdImpl(4030, "Changing alert level to {0}");
public static final StringId BridgeServerRequest_ADD_BRIDGE_SERVER = new StringIdImpl(4031, "Add bridge server");
- public static final StringId BridgeServerRequest_GET_INFO_ABOUT_BRIDGE_SERVER_0 = new StringIdImpl(4032, "Get info about bridge server {0}");
- public static final StringId BridgeServerRequest_START_BRIDGE_SERVER_0 = new StringIdImpl(4033, "Start bridge server {0}");
- public static final StringId BridgeServerRequest_STOP_BRIDGE_SERVER_0 = new StringIdImpl(4034, "Stop bridge server {0}");
+ public static final StringId BridgeServerRequest_GET_INFO_ABOUT_BRIDGE_SERVER_0 = new StringIdImpl(4032, "Get info about cache server {0}");
+ public static final StringId BridgeServerRequest_START_BRIDGE_SERVER_0 = new StringIdImpl(4033, "Start cache server {0}");
+ public static final StringId BridgeServerRequest_STOP_BRIDGE_SERVER_0 = new StringIdImpl(4034, "Stop cache server {0}");
public static final StringId BridgeServerRequest_UNKNOWN_OPERATION_0 = new StringIdImpl(4035, "Unknown operation {0}");
public static final StringId CacheConfigRequest_SET_A_SINGLE_CACHE_CONFIGURATION_ATTRIBUTE = new StringIdImpl(4036, "Set a single cache configuration attribute");
public static final StringId CancellationMessage_CANCELLATIONMESSAGE_FROM_0_FOR_MESSAGE_ID_1 = new StringIdImpl(4037, "CancellationMessage from {0} for message id {1}");
@@ -982,7 +982,7 @@ public class LocalizedStrings extends ParentLocalizedStrings {
public static final StringId StatAlertsManager_STATALERTMANAGER_EVALUATEALERTDEFNSTASK_GENERAL_EXCEPTION_0 = new StringIdImpl(4357, "StatAlertManager.EvaluateAlertDefnsTask :General Exception: {0}");
public static final StringId CqQueryImpl_CQ_NOT_REGISTERED_ON_PRIMARY = new StringIdImpl(4358, "Cq not registered on primary");
public static final StringId HACacheServer_INITIALIZED = new StringIdImpl(4359, "Initialized");
- public static final StringId BridgeServerImpl_CLIENT_MESSAGES_REGION_IS_GETTING_CREATED = new StringIdImpl(4360, "client messages Region is getting created");
+ // ok to reuse 4360
public static final StringId HARegionQueue_TASK_TO_DECREMENT_THE_REF_COUNT_MAY_NOT_HAVE_BEEN_STARTED = new StringIdImpl(4361, "Exception in HARegionQueue.updateHAContainer(). The task to decrement the ref count by one for all the HAEventWrapper instances of this queue present in the haContainer may not have been started");
public static final StringId CacheClientNotifier_HACONTAINER_0_IS_NOW_CLEANED_UP = new StringIdImpl(4362, "haContainer ({0}) is now cleaned up.");
public static final StringId CacheClientNotifier_HACONTAINER_0_HAS_BEEN_CREATED = new StringIdImpl(4363, "haContainer ({0}) has been created.");
@@ -1006,7 +1006,7 @@ public class LocalizedStrings extends ParentLocalizedStrings {
public static final StringId RegionAttributesCreation_CUSTOMENTRYTIMETOLIVE_IS_NOT_THE_SAME = new StringIdImpl(4381, "CustomEntryTimeToLive is not the same");
public static final StringId AbstractRegion_CANNOT_SET_CUSTOM_TIME_TO_LIVE_WHEN_STATISTICS_ARE_DISABLED = new StringIdImpl(4382, "Cannot set custom time to live when statistics are disabled");
public static final StringId PutMessage_UNKNOWN_DESERIALIZATION_POLICY = new StringIdImpl(4383, "unknown deserialization policy");
- public static final StringId BridgeServerImpl__0_INVALID_EVICTION_POLICY = new StringIdImpl(4384, "{0} Invalid eviction policy");
+ public static final StringId CacheServerImpl__0_INVALID_EVICTION_POLICY = new StringIdImpl(4384, "{0} Invalid eviction policy");
public static final StringId MergeLogFiles_IF_A_DIRECTORY_IS_SPECIFIED_ALL_LOG_FILES_IN_THAT_DIRECTORY_ARE_MERGED = new StringIdImpl(4385, "If a directory is specified, all .log files in that directory are merged.");
public static final StringId MergeLogFiles_FILE_0_IS_NEITHER_A_FILE_NOR_A_DIRECTORY = new StringIdImpl(4386, "File ''{0}'' is neither a file nor a directory.");
public static final StringId AvailablePort_NETWORK_IS_UNREACHABLE = new StringIdImpl(4387, "Network is unreachable");
@@ -1146,9 +1146,9 @@ public class LocalizedStrings extends ParentLocalizedStrings {
public static final StringId Oplog_OPLOG_SHUTDOWN_INTERRUPTED_ACQUIRING_READ_LOCK = new StringIdImpl(4524, "Oplog#shutdown: interrupted acquiring read lock.");
public static final StringId InternalDistributedSystem_UNABLE_TO_START_THE_MONITOR_SERVICE = new StringIdImpl(4525, "Unable to start the monitor service");
public static final StringId AbstractDistributionConfig_REDIS_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1 = new StringIdImpl(4526, "The redis-bind-address \"{0}\" is not a valid address for this machine. These are the valid addresses for this machine: {1}");
- public static final StringId BridgeServerImpl_CACHESERVER_ERROR_CLOSING_LOAD_MONITOR = new StringIdImpl(4527, "CacheServer - Error closing load monitor");
- public static final StringId BridgeServerImpl_CACHESERVER_ERROR_CLOSING_ADVISOR = new StringIdImpl(4528, "CacheServer - Error closing advisor");
- public static final StringId BridgeServerImpl_CACHESERVER_ERROR_CLOSING_ACCEPTOR_MONITOR = new StringIdImpl(4529, "CacheServer - Error closing acceptor monitor");
+ public static final StringId CacheServerImpl_CACHESERVER_ERROR_CLOSING_LOAD_MONITOR = new StringIdImpl(4527, "CacheServer - Error closing load monitor");
+ public static final StringId CacheServerImpl_CACHESERVER_ERROR_CLOSING_ADVISOR = new StringIdImpl(4528, "CacheServer - Error closing advisor");
+ public static final StringId CacheServerImpl_CACHESERVER_ERROR_CLOSING_ACCEPTOR_MONITOR = new StringIdImpl(4529, "CacheServer - Error closing acceptor monitor");
public static final StringId DiskRegion_COMPLEXDISKREGION_CLOSE_EXCEPTION_IN_STOPPING_COMPACTOR = new StringIdImpl(4530, "DiskRegion::close: Exception in stopping compactor");
public static final StringId CacheClientNotifier_CACHECLIENTNOTIFIER_CAUGHT_EXCEPTION_ATTEMPTING_TO_CLIENT = new StringIdImpl(4531, "CacheClientNotifier: Caught exception attempting to client: ");
public static final StringId CqQueryImpl_EXCEPTION_WHILE_EXECUTING_CQ_EXCEPTION_0 = new StringIdImpl(4532, "Exception while executing cq Exception: {0}");
[12/17] incubator-geode git commit: removed some commented out old
bridge code
Posted by ds...@apache.org.
removed some commented out old bridge code
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e939e1d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e939e1d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e939e1d1
Branch: refs/heads/feature/GEODE-243
Commit: e939e1d1b385a291568af3531746332841796ca0
Parents: 361e82a
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 14:26:51 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 14:26:51 2015 -0700
----------------------------------------------------------------------
.../gemfire/internal/cache/LocalRegion.java | 16 ----------------
1 file changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e939e1d1/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index 3d3e86a..2c57501 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -3982,22 +3982,6 @@ public class LocalRegion extends AbstractRegion
reinitialize(inputStream, event);
}
-// public void createRegionOnServer() throws CacheWriterException
-// {
-// if (basicGetWriter() instanceof BridgeWriter) {
-// if (getParentRegion() != null) {
-// BridgeWriter bw = (BridgeWriter)basicGetWriter();
-// bw.createRegionOnServer(getParentRegion().getFullPath(), getName());
-// }
-// else {
-// throw new CacheWriterException(LocalizedStrings.LocalRegion_REGION_0_IS_A_ROOT_REGION_ONLY_NONROOT_REGIONS_CAN_BE_CREATED_ON_THE_SERVER.toLocalizedString(getFullPath()));
-// }
-// }
-// else {
-// throw new CacheWriterException(LocalizedStrings.LocalRegion_SERVER_REGION_CREATION_IS_ONLY_SUPPORTED_ON_CLIENT_SERVER_TOPOLOGIES_THE_CURRENT_CACHEWRITER_IS_0.toLocalizedString(this.cacheWriter));
-// }
-// }
-
public void registerInterest(Object key)
{
registerInterest(key, false);
[08/17] incubator-geode git commit: renamed
BridgeMembershipSelectorDUnitTest to ClientMembershipSelectorDUnitTest
Posted by ds...@apache.org.
renamed BridgeMembershipSelectorDUnitTest to ClientMembershipSelectorDUnitTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/09eac4de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/09eac4de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/09eac4de
Branch: refs/heads/feature/GEODE-243
Commit: 09eac4de4c5d982f54ab7dd9677db793d5c3f330
Parents: 725e4bf
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 11:37:15 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 11:37:15 2015 -0700
----------------------------------------------------------------------
.../cache30/BridgeMembershipSelectorDUnitTest.java | 16 ----------------
.../cache30/ClientMembershipSelectorDUnitTest.java | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09eac4de/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipSelectorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipSelectorDUnitTest.java
deleted file mode 100644
index 37bf92b..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipSelectorDUnitTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.gemstone.gemfire.cache30;
-
-/**
- * Same as BridgeMembershipDUnitTest but uses selector in server
- *
- * @author darrel
- * @since 5.1
- */
-public class BridgeMembershipSelectorDUnitTest extends ClientMembershipDUnitTest {
- public BridgeMembershipSelectorDUnitTest(String name) {
- super(name);
- }
- protected int getMaxThreads() {
- return 2;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09eac4de/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
new file mode 100644
index 0000000..ebf894e
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
@@ -0,0 +1,16 @@
+package com.gemstone.gemfire.cache30;
+
+/**
+ * Same as parent but uses selector in server
+ *
+ * @author darrel
+ * @since 5.1
+ */
+public class ClientMembershipSelectorDUnitTest extends ClientMembershipDUnitTest {
+ public ClientMembershipSelectorDUnitTest(String name) {
+ super(name);
+ }
+ protected int getMaxThreads() {
+ return 2;
+ }
+}
[11/17] incubator-geode git commit: renamed BridgeObserver to
ClientServerObserver
Posted by ds...@apache.org.
renamed BridgeObserver to ClientServerObserver
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/361e82a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/361e82a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/361e82a6
Branch: refs/heads/feature/GEODE-243
Commit: 361e82a6461843ebb8f8711fbe1ca0133c3bbb5b
Parents: 183ed7a
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 13:58:04 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 13:58:04 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache/client/internal/PoolImpl.java | 14 +--
.../cache/client/internal/QueueManagerImpl.java | 14 +--
.../cache/client/internal/QueueStateImpl.java | 6 +-
.../internal/RegisterDataSerializersOp.java | 8 +-
.../internal/RegisterInstantiatorsOp.java | 8 +-
.../client/internal/ServerRegionProxy.java | 8 +-
.../gemfire/internal/cache/BridgeObserver.java | 89 ---------------
.../internal/cache/BridgeObserverAdapter.java | 107 -------------------
.../internal/cache/BridgeObserverHolder.java | 53 ---------
.../internal/cache/ClientServerObserver.java | 90 ++++++++++++++++
.../cache/ClientServerObserverAdapter.java | 107 +++++++++++++++++++
.../cache/ClientServerObserverHolder.java | 53 +++++++++
.../gemfire/internal/cache/LocalRegion.java | 2 +-
.../PartitionedRegionObserverHolder.java | 2 +-
.../cache/tier/sockets/CacheClientNotifier.java | 6 +-
.../cache/tier/sockets/CacheClientProxy.java | 6 +-
.../cache/tier/sockets/CacheClientUpdater.java | 12 +--
.../internal/cache/ha/FailoverDUnitTest.java | 10 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 6 +-
.../fixed/FixedPartitioningTestBase.java | 6 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 14 +--
.../cache/tier/sockets/Bug36805DUnitTest.java | 2 +-
.../tier/sockets/ClientConflationDUnitTest.java | 10 +-
.../cache/tier/sockets/ConflationDUnitTest.java | 14 +--
.../DataSerializerPropogationDUnitTest.java | 16 +--
.../sockets/DurableResponseMatrixDUnitTest.java | 6 +-
.../cache/tier/sockets/HAInterestBaseTest.java | 22 ++--
.../tier/sockets/HAInterestPart2DUnitTest.java | 12 +--
.../sockets/HAStartupAndFailoverDUnitTest.java | 36 +++----
.../sockets/RedundancyLevelPart1DUnitTest.java | 4 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 6 +-
.../tier/sockets/RedundancyLevelTestBase.java | 12 +--
.../sockets/ReliableMessagingDUnitTest.java | 16 +--
33 files changed, 389 insertions(+), 388 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
index 851c5c8..d211417 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
@@ -1204,36 +1204,36 @@ public class PoolImpl implements InternalPool {
///////////////////// start test hooks ///////////////////////
/**
- * A debug flag used for testing used in BridgeObserver
+ * A debug flag used for testing used in ClientServerObserver
*/
public static volatile boolean AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false;
/**
- * A debug flag used for testing used in BridgeObserver
+ * A debug flag used for testing used in ClientServerObserver
*/
public static volatile boolean BEFORE_REGISTER_CALLBACK_FLAG = false;
/**
- * A debug flag used for testing used in BridgeObserver
+ * A debug flag used for testing used in ClientServerObserver
*/
public static volatile boolean BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = false;
/**
- * A debug flag used for testing used in BridgeObserver
+ * A debug flag used for testing used in ClientServerObserver
*/
public static volatile boolean AFTER_REGISTER_CALLBACK_FLAG = false;
/**
- * A debug flag used for testing used in BridgeObserver
+ * A debug flag used for testing used in ClientServerObserver
*/
public static volatile boolean BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false;
/**
- * A debug flag used for testing used in BridgeObserver
+ * A debug flag used for testing used in ClientServerObserver
*/
public static volatile boolean BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG = false;
/**
- * A debug flag used for testing used in BridgeObserver
+ * A debug flag used for testing used in ClientServerObserver
*/
public static volatile boolean AFTER_QUEUE_DESTROY_MESSAGE_FLAG = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
index f0bf9e9..1d6597f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
@@ -48,8 +48,8 @@ import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.tier.InterestType;
@@ -733,7 +733,7 @@ public class QueueManagerImpl implements QueueManager {
private boolean promoteBackupCnxToPrimary(QueueConnectionImpl cnx) {
boolean result = false;
if (PoolImpl.BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforePrimaryIdentificationFromBackup();
}
try {
@@ -752,7 +752,7 @@ public class QueueManagerImpl implements QueueManager {
MakePrimaryOp.execute(pool, cnx, haveSentClientReady);
result = true;
if (PoolImpl.AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterPrimaryIdentificationFromBackup(cnx.getServer());
}
}
@@ -888,7 +888,7 @@ public class QueueManagerImpl implements QueueManager {
logger.debug("SubscriptionManager redundancy satisfier - Switched backup server to primary: {}", newPrimary.getEndpoint());
}
if (PoolImpl.AFTER_PRIMARY_RECOVERED_CALLBACK_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterPrimaryRecovered(newPrimary.getServer());
}
@@ -924,7 +924,7 @@ public class QueueManagerImpl implements QueueManager {
}
if (newPrimary != null && PoolImpl.AFTER_PRIMARY_RECOVERED_CALLBACK_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterPrimaryRecovered(newPrimary.getServer());
}
printPrimaryNotFoundError = true;
@@ -1207,7 +1207,7 @@ public class QueueManagerImpl implements QueueManager {
protected void recoverAllInterestTypes(final Connection recoveredConnection,
boolean isFirstNewConnection) {
if (PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforeInterestRecovery();
}
recoverInterestList(recoveredConnection, false, true, isFirstNewConnection);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
index 9a6b3db..9f15155 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
@@ -24,8 +24,8 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.cache.client.internal.PoolImpl.PoolTask;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
@@ -257,7 +257,7 @@ public class QueueStateImpl implements QueueState {
return;
}
if (PoolImpl.BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforeSendingClientAck();
}
//if ((qManager.getPool().getSubscriptionRedundancy() != 0) || (qManager.getPool().isDurableClient())) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterDataSerializersOp.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterDataSerializersOp.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterDataSerializersOp.java
index c3ab84b..d06107d 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterDataSerializersOp.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterDataSerializersOp.java
@@ -12,8 +12,8 @@ import java.io.IOException;
import com.gemstone.gemfire.DataSerializer;
import com.gemstone.gemfire.SerializationException;
import com.gemstone.gemfire.internal.InternalDataSerializer.SerializerAttributesHolder;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.tier.MessageType;
import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
@@ -61,7 +61,7 @@ public class RegisterDataSerializersOp {
getMessage().addBytesPart(eventId.calcBytes());
// // CALLBACK FOR TESTING PURPOSE ONLY ////
if (PoolImpl.IS_INSTANTIATOR_CALLBACK) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforeSendingToServer(eventId);
}
}
@@ -85,7 +85,7 @@ public class RegisterDataSerializersOp {
getMessage().addBytesPart(eventId.calcBytes());
// // CALLBACK FOR TESTING PURPOSE ONLY ////
if (PoolImpl.IS_INSTANTIATOR_CALLBACK) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforeSendingToServer(eventId);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java
index f3c9f03..8e7515d 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java
@@ -12,8 +12,8 @@ import java.io.IOException;
import com.gemstone.gemfire.Instantiator;
import com.gemstone.gemfire.SerializationException;
import com.gemstone.gemfire.internal.InternalInstantiator.InstantiatorAttributesHolder;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.tier.MessageType;
import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
@@ -87,7 +87,7 @@ public class RegisterInstantiatorsOp {
getMessage().addBytesPart(eventId.calcBytes());
// // // CALLBACK FOR TESTING PURPOSE ONLY ////
if (PoolImpl.IS_INSTANTIATOR_CALLBACK) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforeSendingToServer(eventId);
}
}
@@ -128,7 +128,7 @@ public class RegisterInstantiatorsOp {
getMessage().addBytesPart(eventId.calcBytes());
// // // CALLBACK FOR TESTING PURPOSE ONLY ////
if (PoolImpl.IS_INSTANTIATOR_CALLBACK) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforeSendingToServer(eventId);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java
index 077461c..b10a38b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java
@@ -29,8 +29,8 @@ import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.cache.AbstractRegion;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.LocalRegion;
@@ -368,7 +368,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
interestType, policy, isDurable, receiveUpdatesAsInvalidates, regionDataPolicy);
//////// TEST PURPOSE ONLY ///////////
if (PoolImpl.AFTER_REGISTER_CALLBACK_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterInterestRegistration();
}
/////////////////////////////////////////
@@ -562,7 +562,7 @@ public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAc
finished = true;
//////// TEST PURPOSE ONLY ///////////
if (PoolImpl.AFTER_REGISTER_CALLBACK_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterInterestRegistration();
}
/////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserver.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserver.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserver.java
deleted file mode 100755
index d8b41a2..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserver.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.internal.cache;
-
-import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
-
-/**
- * This interface is used by testing/debugging code to be notified of different
- * events. See the documentation for class BridgeObserverHolder for details.
- *
- * @author Yogesh Mahajan
- * @since 5.1
- *
- */
-public interface BridgeObserver
-{
- /**
- * This callback is called when now primary Ep is identified.
- */
- public void afterPrimaryIdentificationFromBackup(ServerLocation location);
-
- /**
- * This callback is called just before interest registartion
- */
- public void beforeInterestRegistration();
-
- /**
- * This callback is called just after interest registartion
- */
- public void afterInterestRegistration();
-
- /**
- * This callback is called just before primary identification
- */
- public void beforePrimaryIdentificationFromBackup();
-
- /**
- * This callback is called just before Interest Recovery by DSM thread happens
- */
- public void beforeInterestRecovery();
-
- /**
- * Invoked by CacheClientUpdater just before invoking endpointDied for
- * fail over
- * @param location ServerLocation which has failed
- */
- public void beforeFailoverByCacheClientUpdater(ServerLocation location);
- /**
- * Invoked before sending an instantiator message to server
- *
- * @param eventId
- */
- public void beforeSendingToServer(EventID eventId);
- /**
- * Invoked after sending an instantiator message to server
- *
- * @param eventId
- */
- public void afterReceivingFromServer(EventID eventId);
-
- /**
- * This callback is called just before sending client ack to the primary servrer.
- */
- public void beforeSendingClientAck();
-
- /**
- * Invoked after Message is created
- *
- * @param msg
- */
- public void afterMessageCreation(Message msg);
-
- /**
- * Invoked after Queue Destroy Message has been sent
- */
- public void afterQueueDestroyMessage();
-
- /**
- * Invoked after a primary is recovered from a backup or new connection.
- */
- public void afterPrimaryRecovered(ServerLocation location);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserverAdapter.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserverAdapter.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserverAdapter.java
deleted file mode 100755
index 0dce187..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserverAdapter.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.internal.cache;
-
-import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
-
-/**
- * This class provides 'do-nothing' implementations of all of the methods of
- * interface BridgeObserver. See the documentation for class
- * BridgeObserverHolder for details.
- *
- * @author Yogesh Mahajan
- * @since 5.1
- */
-public class BridgeObserverAdapter implements BridgeObserver
-{
- /**
- * This callback is called when now primary Ep is identified.
- */
- public void afterPrimaryIdentificationFromBackup(ServerLocation primaryEndpoint)
- {
- }
-
- /**
- * This callback is called just before interest registartion
- */
- public void beforeInterestRegistration()
- {
- }
-
- /**
- * This callback is called just after interest registartion
- */
- public void afterInterestRegistration()
- {
- }
-
- /**
- * This callback is called just before primary identification
- */
- public void beforePrimaryIdentificationFromBackup()
- {
- }
-
- /**
- * This callback is called just before Interest Recovery by DSM thread happens
- */
- public void beforeInterestRecovery()
- {
-
- }
-
- public void beforeFailoverByCacheClientUpdater(ServerLocation epFailed)
- {
- }
- /**
- * Invoked before sending an instantiator message to server
- *
- * @param eventId
- */
- public void beforeSendingToServer(EventID eventId){
-
- }
- /**
- * Invoked after sending an instantiator message to server
- *
- * @param eventId
- */
- public void afterReceivingFromServer(EventID eventId){
-
- }
-
- /**
- * This callback is called just before sending client ack to the primary servrer.
- */
- public void beforeSendingClientAck(){
-
- }
-
- /**
- * Invoked after Message is created
- *
- * @param msg
- */
- public void afterMessageCreation(Message msg){
-
- }
-
- /**
- * Invoked after Queue Destroy Message has been sent
- */
- public void afterQueueDestroyMessage(){
-
- }
-
- /**
- * Invoked after a primary is recovered from a backup or new connection.
- */
- public void afterPrimaryRecovered(ServerLocation location) {
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserverHolder.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserverHolder.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserverHolder.java
deleted file mode 100755
index d68a608..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BridgeObserverHolder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.internal.cache;
-
-import com.gemstone.gemfire.cache.query.internal.Support;
-
-/**
- * This class is intended to hold a single 'observer' which will receive
- * callbacks. There can be only one such observer at a time. If no observer is
- * needed, this member variable should point to an object with 'do-nothing'
- * methods, such as BridgeObserverAdapter.
- *
- * @author Yogesh Mahajan
- * @since 5.1
- */
-public class BridgeObserverHolder
- {
-
- /**
- * The default 'do-nothing' bridge observer *
- */
- private static final BridgeObserver NO_OBSERVER = new BridgeObserverAdapter();
-
- /**
- * The current observer which will be notified of all query events.
- */
- private static BridgeObserver _instance = NO_OBSERVER;
-
- /**
- * Set the given observer to be notified of events. Returns the current
- * observer.
- */
- public static final BridgeObserver setInstance(BridgeObserver observer)
- {
- Support.assertArg(observer != null,
- "setInstance expects a non-null argument!");
- BridgeObserver oldObserver = _instance;
- _instance = observer;
- return oldObserver;
- }
-
- /** Return the current BridgeObserver instance */
- public static final BridgeObserver getInstance()
- {
- return _instance;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserver.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserver.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserver.java
new file mode 100755
index 0000000..0646f04
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserver.java
@@ -0,0 +1,90 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache;
+
+import com.gemstone.gemfire.distributed.internal.ServerLocation;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
+
+/**
+ * This interface is used by testing/debugging code to be notified of different
+ * client/server events.
+ * See the documentation for class ClientServerObserverHolder for details.
+ *
+ * @author Yogesh Mahajan
+ * @since 5.1
+ *
+ */
+public interface ClientServerObserver
+{
+ /**
+ * This callback is called when now primary Ep is identified.
+ */
+ public void afterPrimaryIdentificationFromBackup(ServerLocation location);
+
+ /**
+ * This callback is called just before interest registartion
+ */
+ public void beforeInterestRegistration();
+
+ /**
+ * This callback is called just after interest registartion
+ */
+ public void afterInterestRegistration();
+
+ /**
+ * This callback is called just before primary identification
+ */
+ public void beforePrimaryIdentificationFromBackup();
+
+ /**
+ * This callback is called just before Interest Recovery by DSM thread happens
+ */
+ public void beforeInterestRecovery();
+
+ /**
+ * Invoked by CacheClientUpdater just before invoking endpointDied for
+ * fail over
+ * @param location ServerLocation which has failed
+ */
+ public void beforeFailoverByCacheClientUpdater(ServerLocation location);
+ /**
+ * Invoked before sending an instantiator message to server
+ *
+ * @param eventId
+ */
+ public void beforeSendingToServer(EventID eventId);
+ /**
+ * Invoked after sending an instantiator message to server
+ *
+ * @param eventId
+ */
+ public void afterReceivingFromServer(EventID eventId);
+
+ /**
+ * This callback is called just before sending client ack to the primary servrer.
+ */
+ public void beforeSendingClientAck();
+
+ /**
+ * Invoked after Message is created
+ *
+ * @param msg
+ */
+ public void afterMessageCreation(Message msg);
+
+ /**
+ * Invoked after Queue Destroy Message has been sent
+ */
+ public void afterQueueDestroyMessage();
+
+ /**
+ * Invoked after a primary is recovered from a backup or new connection.
+ */
+ public void afterPrimaryRecovered(ServerLocation location);
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverAdapter.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverAdapter.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverAdapter.java
new file mode 100755
index 0000000..094bb58
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverAdapter.java
@@ -0,0 +1,107 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache;
+
+import com.gemstone.gemfire.distributed.internal.ServerLocation;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
+
+/**
+ * This class provides 'do-nothing' implementations of all of the methods of
+ * interface ClientServerObserver. See the documentation for class
+ * ClientServerObserverHolder for details.
+ *
+ * @author Yogesh Mahajan
+ * @since 5.1
+ */
+public class ClientServerObserverAdapter implements ClientServerObserver
+{
+ /**
+ * This callback is called when now primary Ep is identified.
+ */
+ public void afterPrimaryIdentificationFromBackup(ServerLocation primaryEndpoint)
+ {
+ }
+
+ /**
+ * This callback is called just before interest registartion
+ */
+ public void beforeInterestRegistration()
+ {
+ }
+
+ /**
+ * This callback is called just after interest registartion
+ */
+ public void afterInterestRegistration()
+ {
+ }
+
+ /**
+ * This callback is called just before primary identification
+ */
+ public void beforePrimaryIdentificationFromBackup()
+ {
+ }
+
+ /**
+ * This callback is called just before Interest Recovery by DSM thread happens
+ */
+ public void beforeInterestRecovery()
+ {
+
+ }
+
+ public void beforeFailoverByCacheClientUpdater(ServerLocation epFailed)
+ {
+ }
+ /**
+ * Invoked before sending an instantiator message to server
+ *
+ * @param eventId
+ */
+ public void beforeSendingToServer(EventID eventId){
+
+ }
+ /**
+ * Invoked after sending an instantiator message to server
+ *
+ * @param eventId
+ */
+ public void afterReceivingFromServer(EventID eventId){
+
+ }
+
+ /**
+ * This callback is called just before sending client ack to the primary servrer.
+ */
+ public void beforeSendingClientAck(){
+
+ }
+
+ /**
+ * Invoked after Message is created
+ *
+ * @param msg
+ */
+ public void afterMessageCreation(Message msg){
+
+ }
+
+ /**
+ * Invoked after Queue Destroy Message has been sent
+ */
+ public void afterQueueDestroyMessage(){
+
+ }
+
+ /**
+ * Invoked after a primary is recovered from a backup or new connection.
+ */
+ public void afterPrimaryRecovered(ServerLocation location) {
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverHolder.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverHolder.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverHolder.java
new file mode 100755
index 0000000..003852b
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverHolder.java
@@ -0,0 +1,53 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache;
+
+import com.gemstone.gemfire.cache.query.internal.Support;
+
+/**
+ * This class is intended to hold a single 'observer' which will receive
+ * callbacks. There can be only one such observer at a time. If no observer is
+ * needed, this member variable should point to an object with 'do-nothing'
+ * methods, such as ClientServerObserverAdapter.
+ *
+ * @author Yogesh Mahajan
+ * @since 5.1
+ */
+public class ClientServerObserverHolder
+ {
+
+ /**
+ * The default 'do-nothing' bridge observer *
+ */
+ private static final ClientServerObserver NO_OBSERVER = new ClientServerObserverAdapter();
+
+ /**
+ * The current observer which will be notified of all query events.
+ */
+ private static ClientServerObserver _instance = NO_OBSERVER;
+
+ /**
+ * Set the given observer to be notified of events. Returns the current
+ * observer.
+ */
+ public static final ClientServerObserver setInstance(ClientServerObserver observer)
+ {
+ Support.assertArg(observer != null,
+ "setInstance expects a non-null argument!");
+ ClientServerObserver oldObserver = _instance;
+ _instance = observer;
+ return oldObserver;
+ }
+
+ /** Return the current BridgeObserver instance */
+ public static final ClientServerObserver getInstance()
+ {
+ return _instance;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index d891326..3d3e86a 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -4092,7 +4092,7 @@ public class LocalRegion extends AbstractRegion
this.clearKeysOfInterest(key, interestType, pol);
// Checking for the Dunit test(testRegisterInterst_Destroy_Concurrent) flag
if (PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforeInterestRegistration();
}// Test Code Ends
final byte regionDataPolicy = getAttributes().getDataPolicy().ordinal;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionObserverHolder.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionObserverHolder.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionObserverHolder.java
index 0e8c3d8..0498328 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionObserverHolder.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionObserverHolder.java
@@ -44,7 +44,7 @@ public class PartitionedRegionObserverHolder {
return oldObserver;
}
- /** Return the current BridgeObserver instance */
+ /** Return the current ClientServerObserver instance */
public static final PartitionedRegionObserver getInstance()
{
return _instance;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
index 2a62249..1cf15eb 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -76,8 +76,8 @@ import com.gemstone.gemfire.internal.InternalInstantiator;
import com.gemstone.gemfire.internal.SocketUtils;
import com.gemstone.gemfire.internal.SystemTimer;
import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.ClientRegionEventImpl;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.CacheClientStatus;
@@ -1102,7 +1102,7 @@ public class CacheClientNotifier {
removeClientProxy(proxy);
if (PoolImpl.AFTER_QUEUE_DESTROY_MESSAGE_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterQueueDestroyMessage();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
index 15f83bb..f66ee42 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
@@ -67,8 +67,8 @@ import com.gemstone.gemfire.internal.SocketCreator;
import com.gemstone.gemfire.internal.SystemTimer;
import com.gemstone.gemfire.internal.SystemTimer.SystemTimerTask;
import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisee;
import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisor.InitialImageAdvice;
import com.gemstone.gemfire.internal.cache.Conflatable;
@@ -2790,7 +2790,7 @@ public class CacheClientProxy implements ClientSession {
latestValue);
if (AFTER_MESSAGE_CREATION_FLAG) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterMessageCreation(message);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
index 64731d1..07dc030 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -65,8 +65,8 @@ import com.gemstone.gemfire.internal.SocketCreator;
import com.gemstone.gemfire.internal.SocketUtils;
import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -1273,7 +1273,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater,
// // CALLBACK TESTING PURPOSE ONLY ////
if (PoolImpl.IS_INSTANTIATOR_CALLBACK) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterReceivingFromServer(eventId);
}
// /////////////////////////////////////
@@ -1323,7 +1323,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater,
// // CALLBACK TESTING PURPOSE ONLY ////
if (PoolImpl.IS_INSTANTIATOR_CALLBACK) {
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterReceivingFromServer(eventId);
}
///////////////////////////////////////
@@ -1794,7 +1794,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater,
if (errMessage == null) {
errMessage = "";
}
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforeFailoverByCacheClientUpdater(this.location);
eManager.serverCrashed(this.endpoint);
if (isDebugEnabled) {
@@ -1811,7 +1811,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater,
catch (Exception e) {
if (!quitting()) {
this.endPointDied = true;
- BridgeObserver bo = BridgeObserverHolder.getInstance();
+ ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.beforeFailoverByCacheClientUpdater(this.location);
eManager.serverCrashed(this.endpoint);
String message = ": Caught the following exception and will exit: ";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
index c7598b1..7c623d9 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
@@ -26,8 +26,8 @@ import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
import com.gemstone.gemfire.cache.client.PoolManager;
@@ -98,7 +98,7 @@ public class FailoverDUnitTest extends DistributedTestCase
registerInterestList();
primary.invoke(FailoverDUnitTest.class, "put");
verifyEntries();
- setBridgeObserver();
+ setClientServerObserver();
primary.invoke(FailoverDUnitTest.class, "stopServer");
verifyEntriesAfterFailover();
}
@@ -270,9 +270,9 @@ public class FailoverDUnitTest extends DistributedTestCase
assertEquals("value-3", r.getEntry("key-3").getValue());
}
- public static void setBridgeObserver() {
+ public static void setClientServerObserver() {
PoolImpl.BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforePrimaryIdentificationFromBackup() {
primary.invoke(FailoverDUnitTest.class, "putDuringFailover");
PoolImpl.BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
index 1a8b3fb..90b8425 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -25,8 +25,8 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
import dunit.DistributedTestCase;
import dunit.Host;
@@ -260,7 +260,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
public static void setBridgeObeserverForAfterQueueDestroyMessage()
throws Exception {
PoolImpl.AFTER_QUEUE_DESTROY_MESSAGE_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
@Override
public void afterQueueDestroyMessage() {
clientVM.invoke(HASlowReceiverDUnitTest.class, "checkRedundancyLevel",
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
index d2b134f..7d34359 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
@@ -40,9 +40,9 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.FileUtil;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.FixedPartitionAttributesImpl;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.HARegion;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
index 11bfad8..f1a149e 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
@@ -26,8 +26,8 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import dunit.DistributedTestCase;
import dunit.Host;
@@ -159,7 +159,7 @@ public class Bug36457DUnitTest extends DistributedTestCase
getServerHostName(server1.getHost()), port1, port2 });
//set a cllabck so that we come to know that whether a failover is called or not
// if failover is called means this bug is present.
- client2.invoke(Bug36457DUnitTest.class, "setBridgeObserver");
+ client2.invoke(Bug36457DUnitTest.class, "setClientServerObserver");
client1.invoke(Bug36457DUnitTest.class, "destroyRegion");
isFaileoverHappened = ((Boolean)client2.invoke(Bug36457DUnitTest.class,
"isFaileoverHappened")).booleanValue();
@@ -173,11 +173,11 @@ public class Bug36457DUnitTest extends DistributedTestCase
return new Boolean(isFaileoverHappened);
}
- public static void setBridgeObserver()
+ public static void setClientServerObserver()
{
PoolImpl.AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = true;
- BridgeObserverHolder
- .setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder
+ .setInstance(new ClientServerObserverAdapter() {
public void afterPrimaryIdentificationFromBackup(ServerLocation primaryEndpoint)
{
getLogWriter().fine("TEST FAILED HERE YOGI ");
@@ -186,7 +186,7 @@ public class Bug36457DUnitTest extends DistributedTestCase
});
}
- public static void unSetBridgeObserver()
+ public static void unSetClientServerObserver()
{
PoolImpl.AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
index d102036..d149094 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
@@ -154,7 +154,7 @@ public class Bug36805DUnitTest extends DistributedTestCase
// set a cllabck so that we come to know that whether a failover is called
// or not
// if failover is called means this bug is present.
- // client2.invoke(Bug36805DUnitTest.class, "setBridgeObserver");
+ // client2.invoke(Bug36805DUnitTest.class, "setClientServerObserver");
client1.invoke(Bug36805DUnitTest.class, "registerInterest"); // register
// interest
// shoud not
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 20406b5..90ec2b5 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -28,8 +28,8 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import dunit.DistributedTestCase;
@@ -123,7 +123,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
createClientCacheFeeder(getServerHostName(Host.getHost(0)), new Integer(PORT));
vm1.invoke(ClientConflationDUnitTest.class, "createClientCache", new Object[] { getServerHostName(vm1.getHost()), new Integer(PORT),
conflation});
- vm1.invoke(ClientConflationDUnitTest.class, "setBridgeObserverForBeforeInterestRecovery");
+ vm1.invoke(ClientConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm1.invoke(ClientConflationDUnitTest.class, "setAllCountersZero");
vm1.invoke(ClientConflationDUnitTest.class, "assertAllCountersZero");
vm1.invoke(ClientConflationDUnitTest.class, "registerInterest");
@@ -267,10 +267,10 @@ public class ClientConflationDUnitTest extends DistributedTestCase
* reset all counters to zero before interest recovery
*
*/
- public static void setBridgeObserverForBeforeInterestRecovery()
+ public static void setClientServerObserverForBeforeInterestRecovery()
{
PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRecovery()
{
setAllCountersZero();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
index b2a7565..88ec5d0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -24,8 +24,8 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.HARegion;
@@ -131,7 +131,7 @@ public class ConflationDUnitTest extends DistributedTestCase
createClientCache1UniqueWriter ( getServerHostName(Host.getHost(0)), new Integer(PORT));
vm2.invoke(ConflationDUnitTest.class, "createClientCache2UniqueWriter",
new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT)});
- vm2.invoke(ConflationDUnitTest.class, "setBridgeObserverForBeforeInterestRecovery");
+ vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "registerInterest");
@@ -162,7 +162,7 @@ public class ConflationDUnitTest extends DistributedTestCase
createClientCache1CommonWriter( getServerHostName(Host.getHost(0)), new Integer(PORT));
vm2.invoke(ConflationDUnitTest.class, "createClientCache2CommonWriter",
new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT)});
- vm2.invoke(ConflationDUnitTest.class, "setBridgeObserverForBeforeInterestRecovery");
+ vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "registerInterest");
@@ -195,7 +195,7 @@ public class ConflationDUnitTest extends DistributedTestCase
vm2.invoke(ConflationDUnitTest.class,
"createClientCache2CommonWriterTest3", new Object[] {
getServerHostName(Host.getHost(0)), new Integer(PORT) });
- vm2.invoke(ConflationDUnitTest.class, "setBridgeObserverForBeforeInterestRecovery");
+ vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "registerInterest");
@@ -484,10 +484,10 @@ public class ConflationDUnitTest extends DistributedTestCase
* reset all counters to zero before interest recovery
*
*/
- public static void setBridgeObserverForBeforeInterestRecovery()
+ public static void setClientServerObserverForBeforeInterestRecovery()
{
PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRecovery()
{
setAllCountersZero();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
index 4608ae5..85bd4d1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
@@ -34,8 +34,8 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.InternalDataSerializer;
import com.gemstone.gemfire.internal.InternalDataSerializer.SerializerAttributesHolder;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.EventID;
@@ -726,9 +726,9 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
getServerHostName(server2.getHost()), new Integer(PORT2) });
- setBridgeObserver1();
+ setClientServerObserver1();
client2
- .invoke(DataSerializerPropogationDUnitTest.class, "setBridgeObserver2");
+ .invoke(DataSerializerPropogationDUnitTest.class, "setClientServerObserver2");
registerDSObject13();
@@ -905,9 +905,9 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
return new Integer(port);
}
- public static void setBridgeObserver1() {
+ public static void setClientServerObserver1() {
PoolImpl.IS_INSTANTIATOR_CALLBACK = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
@Override
public void beforeSendingToServer(EventID eventID) {
eventId = eventID;
@@ -928,9 +928,9 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
eventId = eventID;
}
- public static void setBridgeObserver2() {
+ public static void setClientServerObserver2() {
PoolImpl.IS_INSTANTIATOR_CALLBACK = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
@Override
public void afterReceivingFromServer(EventID eventID) {
testEventIDResult = eventID.equals(eventId);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
index 4d97c41..79f7281 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
@@ -13,8 +13,8 @@ import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -147,7 +147,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
public void testRegisterInterest_Destroy_Concurrent() throws Exception
{
PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRegistration()
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java
index 6e2478f..c8d5fcc 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java
@@ -25,8 +25,8 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.tier.InterestType;
@@ -285,9 +285,9 @@ public class HAInterestBaseTest extends DistributedTestCase {
r1.put(k2, server_k2);
}
- public static void setBridgeObserverForBeforeInterestRecoveryFailure() {
+ public static void setClientServerObserverForBeforeInterestRecoveryFailure() {
PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRecovery() {
synchronized (HAInterestBaseTest.class) {
Thread t = new Thread() {
@@ -310,9 +310,9 @@ public class HAInterestBaseTest extends DistributedTestCase {
});
}
- public static void setBridgeObserverForBeforeInterestRecovery() {
+ public static void setClientServerObserverForBeforeInterestRecovery() {
PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRecovery() {
synchronized (HAInterestBaseTest.class) {
Thread t = new Thread() {
@@ -341,9 +341,9 @@ public class HAInterestBaseTest extends DistributedTestCase {
}
}
- public static void setBridgeObserverForBeforeRegistration(final VM vm) {
+ public static void setClientServerObserverForBeforeRegistration(final VM vm) {
PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRegistration() {
synchronized (HAInterestBaseTest.class) {
vm.invoke(HAInterestBaseTest.class, "startServer");
@@ -364,9 +364,9 @@ public class HAInterestBaseTest extends DistributedTestCase {
}
}
- public static void setBridgeObserverForAfterRegistration(final VM vm) {
+ public static void setClientServerObserverForAfterRegistration(final VM vm) {
PoolImpl.AFTER_REGISTER_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void afterInterestRegistration() {
synchronized (HAInterestBaseTest.class) {
vm.invoke(HAInterestBaseTest.class, "startServer");
@@ -389,7 +389,7 @@ public class HAInterestBaseTest extends DistributedTestCase {
}
}
- public static void unSetBridgeObserverForRegistrationCallback() {
+ public static void unSetClientServerObserverForRegistrationCallback() {
synchronized (HAInterestBaseTest.class) {
PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG = false;
PoolImpl.AFTER_REGISTER_CALLBACK_FLAG = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
index 2ea7f7c..995bc31 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
@@ -82,12 +82,12 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest {
VM backup = getBackupVM();
backup.invoke(HAInterestBaseTest.class, "stopServer");
verifyDeadAndLiveServers(1, 2);
- setBridgeObserverForBeforeRegistration(backup);
+ setClientServerObserverForBeforeRegistration(backup);
try {
registerK1AndK2();
waitForBeforeRegistrationCallback();
} finally {
- unSetBridgeObserverForRegistrationCallback();
+ unSetClientServerObserverForRegistrationCallback();
}
server1.invoke(HAInterestBaseTest.class, "verifyInterestRegistration");
server2.invoke(HAInterestBaseTest.class, "verifyInterestRegistration");
@@ -111,12 +111,12 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest {
backup.invoke(HAInterestBaseTest.class, "stopServer");
verifyDeadAndLiveServers(1, 2);
- setBridgeObserverForAfterRegistration(backup);
+ setClientServerObserverForAfterRegistration(backup);
try {
registerK1AndK2();
waitForAfterRegistrationCallback();
} finally {
- unSetBridgeObserverForRegistrationCallback();
+ unSetClientServerObserverForRegistrationCallback();
}
server1.invoke(HAInterestBaseTest.class, "verifyInterestRegistration");
@@ -248,7 +248,7 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest {
// put on stopped server
server1.invoke(HAInterestBaseTest.class, "putK1andK2");
// spawn a thread to put on server , which will acquire a lock on entry
- setBridgeObserverForBeforeInterestRecovery();
+ setClientServerObserverForBeforeInterestRecovery();
server1.invoke(HAInterestBaseTest.class, "startServer");
verifyDeadAndLiveServers(0, 1);
waitForBeforeInterestRecoveryCallBack();
@@ -304,7 +304,7 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest {
verifyDeadAndLiveServers(2, 0);
primary.invoke(HAInterestBaseTest.class, "putK1andK2");
- setBridgeObserverForBeforeInterestRecoveryFailure();
+ setClientServerObserverForBeforeInterestRecoveryFailure();
primary.invoke(HAInterestBaseTest.class, "startServer");
waitForBeforeInterestRecoveryCallBack();
if (exceptionOccured) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index f4463d1..6a6a56f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -27,8 +27,8 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import dunit.DistributedTestCase;
@@ -98,23 +98,23 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
waitForPrimaryIdentification();
//primary
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
- unSetBridgeObserver();
+ unSetClientServerObserver();
//secondary
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
//primary
waitForPrimaryIdentification();
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
- unSetBridgeObserver();
+ unSetClientServerObserver();
server3.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
// All servers are dead at this point , no primary in the system.
verifyDeadAndLiveServers(3,0);
@@ -146,7 +146,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
//secondary
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
//stop new primary
server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
@@ -156,7 +156,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
//newly selectd primary
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
- unSetBridgeObserver();
+ unSetClientServerObserver();
}
/**
@@ -174,7 +174,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
// secondaries
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
//stop ProbablePrimary
@@ -185,7 +185,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
waitForPrimaryIdentification();
//new primary
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
- unSetBridgeObserver();
+ unSetClientServerObserver();
}
@@ -212,10 +212,10 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
waitForPrimaryIdentification();
- unSetBridgeObserver();
+ unSetClientServerObserver();
verifyDeadAndLiveServers(1,2);
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
}
@@ -299,12 +299,12 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
// // create a client with large retry interval for server monitors and no client updater thread
// // so that only cache operation can detect a server failure and should initiate failover
// createClientCacheWithLargeRetryIntervalAndWithoutCallbackConnection(this.getName());
-// setBridgeObserver();
+// setClientServerObserver();
// server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
// releaseConnection();//Added by Jason
// put();
// waitForPrimaryIdentification();
-// unSetBridgeObserver();
+// unSetClientServerObserver();
// verifyDeadAndLiveServers(1,2);
// }
// public static void releaseConnection() {
@@ -357,9 +357,9 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
// start = System.currentTimeMillis();
}
- public static void setBridgeObserver() {
+ public static void setClientServerObserver() {
PoolImpl.AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void afterPrimaryIdentificationFromBackup(ServerLocation primaryEndpoint) {
synchronized (HAStartupAndFailoverDUnitTest.class) {
HAStartupAndFailoverDUnitTest.identifiedPrimary = true;
@@ -369,12 +369,12 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
});
}
- public static void unSetBridgeObserver()
+ public static void unSetClientServerObserver()
{
synchronized (HAStartupAndFailoverDUnitTest.class) {
PoolImpl.AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false;
HAStartupAndFailoverDUnitTest.identifiedPrimary = false;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter());
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index c1f4aab..05f5449 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
@@ -81,7 +81,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
*/
public void testRedundancyNotSpecifiedPrimaryServerFails()
{
- /*BridgeObserver oldBo = BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ /*ClientServerObserver oldBo = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeFailoverByCacheClientUpdater(Endpoint epFailed)
{
try{
@@ -123,7 +123,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
"test failed due to exception in test RedundancyNotSpecifiedPrimaryServerFails ",
ex);
}/*finally {
- BridgeObserverHolder.setInstance(oldBo);
+ ClientServerObserverHolder.setInstance(oldBo);
}*/
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
index 7869289..3d11b5b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
@@ -7,8 +7,8 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import dunit.DistributedTestCase;
@@ -59,7 +59,7 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = true;
registerInterestCalled = false;
makePrimaryCalled = false;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRegistration()
{
registerInterestCalled = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index be2cade..5ff95f0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -28,9 +28,9 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import dunit.DistributedTestCase;
@@ -76,7 +76,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
static PoolImpl pool = null;
- static BridgeObserver oldBo = null;
+ static ClientServerObserver oldBo = null;
static boolean FailOverDetectionByCCU = false;
@@ -525,7 +525,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
if(!FailOverDetectionByCCU)
{
- oldBo = BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ oldBo = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeFailoverByCacheClientUpdater(ServerLocation epFailed)
{
try {
@@ -617,7 +617,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
super.tearDown2();
if(!FailOverDetectionByCCU)
- BridgeObserverHolder.setInstance(oldBo);
+ ClientServerObserverHolder.setInstance(oldBo);
FailOverDetectionByCCU = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/361e82a6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index f10f25d..13f8d21 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -25,9 +25,9 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.ha.HAHelper;
import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
import com.gemstone.gemfire.internal.cache.ha.ThreadIdentifier;
@@ -101,7 +101,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
public void testPeriodicAckSendByClientPrimaryFailover() throws Exception {
addExpectedException("java.net.ConnectException");
createEntries();
- setBridgeObserverForBeforeSendingClientAck();
+ setClientServerObserverForBeforeSendingClientAck();
server1.invoke(ReliableMessagingDUnitTest.class, "putOnServer");
getLogWriter().info("Entering waitForServerUpdate");
waitForServerUpdate();
@@ -279,10 +279,10 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
}
}
- public static void setBridgeObserverForBeforeSendingClientAck() throws Exception
+ public static void setClientServerObserverForBeforeSendingClientAck() throws Exception
{
PoolImpl.BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG = true;
- origObserver = BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ origObserver = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeSendingClientAck()
{
getLogWriter().info("beforeSendingClientAck invoked");
@@ -418,10 +418,10 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
}
}
- private static BridgeObserver origObserver;
+ private static ClientServerObserver origObserver;
public static void resetCallBack() {
- BridgeObserverHolder.setInstance(origObserver);
+ ClientServerObserverHolder.setInstance(origObserver);
}
}
[16/17] incubator-geode git commit: removed BridgeWriter refs
Posted by ds...@apache.org.
removed BridgeWriter refs
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1d7601e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1d7601e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1d7601e5
Branch: refs/heads/feature/GEODE-243
Commit: 1d7601e5cb235e3c52b306aa46226694fbbeb2a6
Parents: 9f6d446
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 15:59:36 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 15:59:36 2015 -0700
----------------------------------------------------------------------
.../cache/tier/sockets/CacheServerTestUtil.java | 33 +------------------
.../tier/sockets/ClientServerMiscDUnitTest.java | 34 ++++++++++----------
.../sockets/EventIDVerificationDUnitTest.java | 2 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 25 --------------
4 files changed, 19 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1d7601e5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
index 9d1477a..6fd9e1d 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
@@ -64,42 +64,16 @@ public class CacheServerTestUtil extends DistributedTestCase
super(name);
}
-
-
-// public static void createCacheClient(Properties props, String regionName)
-// throws Exception {
-// createCacheClient(props, regionName, getClientProperties(), Boolean.FALSE);
-// }
public static void createCacheClient(Pool poolAttr, String regionName)
throws Exception {
createCacheClient(poolAttr, regionName, getClientProperties(), Boolean.FALSE);
}
-// public static void createCacheClient(Properties props, String regionName,
-// Properties dsProperties) throws Exception {
-// createCacheClient(props, regionName, dsProperties, Boolean.FALSE);
-// }
public static void createCacheClient(Pool poolAttr, String regionName,
Properties dsProperties) throws Exception {
createCacheClient(poolAttr, regionName, dsProperties, Boolean.FALSE);
}
-// public static void createCacheClient(Properties props, String regionName,
-// Properties dsProperties, Boolean addControlListener) throws Exception {
-// new CacheServerTestUtil("temp").createCache(dsProperties);
-// BridgeWriter writer = new BridgeWriter();
-// writer.init(props);
-// AttributesFactory factory = new AttributesFactory();
-// factory.setScope(Scope.LOCAL);
-// factory.setCacheWriter(writer);
-// if (addControlListener.booleanValue()) {
-// factory.addCacheListener(new ControlListener());
-// }
-// RegionAttributes attrs = factory.create();
-// cache.createRegion(regionName, attrs);
-// pool = (PoolImpl)writer.getConnectionProxy();
-// }
-
public static void createClientCache(Pool poolAttr, String regionName) throws Exception {
createClientCache(poolAttr, regionName, getClientProperties());
}
@@ -299,7 +273,7 @@ public class CacheServerTestUtil extends DistributedTestCase
}
/**
- * Create client regions each with their own BridgeWriter instance.
+ * Create client regions
* @param props
* @param regionName1
* @param regionName2
@@ -535,11 +509,6 @@ public class CacheServerTestUtil extends DistributedTestCase
return pool;
}
-// public static BridgeWriter getWriter()
-// {
-// return writer;
-// }
-
/**
* Disables the shuffling of endpoints for a client
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1d7601e5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index 6fe8b3a..1813123 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -46,7 +46,7 @@ import java.util.Set;
import junit.framework.AssertionFailedError;
/**
- * Tests corner cases between Region, BridgeWriter and PoolImpl
+ * Tests client server corner cases between Region and Pool
*
* @author Yogesh Mahajan
*
@@ -356,12 +356,12 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
/**
- * Test for single BridgeWriter used across two regions: notify by subscription is true.
+ * Test two regions: notify by subscription is true.
* For region1 the interest list is empty , for region 2 the intetest list is all keys.
* If an update/create is made on region1 , the client should not receive any.
* If the create/update is on region2 , the client should receive the update.
*/
- public void testSameBridgeWriterForTwoRegionHavingDifferentInterestList()
+ public void testForTwoRegionHavingDifferentInterestList()
throws Exception
{
// start server first
@@ -385,7 +385,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
/**
- * Test for single BridgeWriter used across two regions: notify by subscription is true.
+ * Test two regions: notify by subscription is true.
* Both the regions have registered interest in all the keys.
* Now close region1 on the client.
* The region1 should get removed from the interest list on CCP at server.
@@ -394,7 +394,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
* ( which is diferent from not receiving a callbak on the client).
* If an update on region2 is made on the server , then client should receive the calback
*/
- public void testSameBridgeWriterForTwoRegionHavingALLKEYSInterest()
+ public void testForTwoRegionHavingALLKEYSInterest()
throws Exception
{
// start server first
@@ -411,14 +411,14 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
verifyUpdatesOnRegion2();
}
- /** Test for single BridgeWriter used across two regions: notify by subscription is true.
+ /** Test two regions: notify by subscription is true.
* Both the regions have registered interest in all the keys.
* Close both the regions. When the last region is closed ,
* it should close the ConnectionProxy on the client ,
* close all the server connection threads on the server &
* remove the CacheClientProxy from the CacheClient notifier
*/
- public void testRegionCloseWithSameBridgeWriter() throws Exception
+ public void testRegionClose() throws Exception
{
// start server first
PORT1 = initServerCache(true);
@@ -436,7 +436,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
/**
- * Test for single BridgeWriter used across two regions: notify by
+ * Test two regions: notify by
* subscription is true. Both the regions have registered interest in all the
* keys. Destroy region1 on the client. It should reach the server , kill the
* region on the server , propagate it to the interested clients , but it
@@ -476,12 +476,12 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
/**
- * Test for single BridgeWriter used across two regions:If notify by
+ * Test two regions:If notify by
* subscription is false , both the regions should receive invalidates for the
* updates on server in their respective regions
*
*/
- public void testInvalidatesPropagateOnTwoRegionsHavingCommonBridgeWriter()
+ public void testInvalidatesPropagateOnTwoRegions()
throws Exception
{
// start server first
@@ -535,16 +535,16 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
/**
- * Create cache, create bridge writer, notify-by-subscription=false,
+ * Create cache, create pool, notify-by-subscription=false,
* create a region and on client and on server.
- * Do not attach Bridge writer to region ,
+ * Do not attach pool to region ,
* populate some entries on region both on client and server.
* Update the entries on server the client.
* The client should not have entry invalidate.
*
* @throws Exception
*/
- public void testInvalidatesPropagateOnRegionHavingNoBridgeWriter()
+ public void testInvalidatesPropagateOnRegionHavingNoPool()
throws Exception
{
// start server first
@@ -565,7 +565,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
.setPingInterval(2000)
// .setRetryAttempts(5)
// .setRetryInterval(2000)
- .create("testInvalidatesPropagateOnRegionHavingNoBridgeWriter");
+ .create("testInvalidatesPropagateOnRegionHavingNoPool");
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -685,14 +685,14 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
/**
*
- * Cycling a DistributedSystem with an initialized BridgeWriter causes interest registration NPE
+ * Cycling a DistributedSystem with an initialized pool causes interest registration NPE
*
* Test Scenario:
*
* Create a DistributedSystem (DS1).
- * Create a BridgeWriter (BW), initialize (creates a proxy with DS1 memberid)
+ * Create a pool, initialize (creates a proxy with DS1 memberid)
* Disconnect DS1. Create a DistributedSystem (DS2).
- * Create a Region with BW, it attempts to register interest using DS2 memberid, gets NPE.
+ * Create a Region with pool, it attempts to register interest using DS2 memberid, gets NPE.
*
* @throws Exception
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1d7601e5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index ce88c48..c52e7a5 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -177,7 +177,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
ClientServerTestCase.configureConnectionPool(factory, host, new int[] {PORT1,PORT2}, true, -1, 2, null, -1, -1, false, -2);
- CacheWriter writer = new CacheWriterAdapter() { // couldn't port this test to pool because it subclasses BridgeWriter
+ CacheWriter writer = new CacheWriterAdapter() {
public void beforeCreate(EntryEvent event)
{
vm0.invoke(EventIDVerificationDUnitTest.class, "setEventIDData",
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1d7601e5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index 6a6a56f..4242fe0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -288,31 +288,6 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
verifyDeadAndLiveServers(1,2);
}
-
- // darrel: this following is an invalid test.
- // A "primary" is only identified when you have a callback connection
-// /**
-// * Tests failover initialization by cache operation Threads on Primary
-// */
-// public void testInitiateFailoverByCacheOperationThreads_Primary() throws Exception
-// {
-// // create a client with large retry interval for server monitors and no client updater thread
-// // so that only cache operation can detect a server failure and should initiate failover
-// createClientCacheWithLargeRetryIntervalAndWithoutCallbackConnection(this.getName());
-// setClientServerObserver();
-// server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
-// releaseConnection();//Added by Jason
-// put();
-// waitForPrimaryIdentification();
-// unSetClientServerObserver();
-// verifyDeadAndLiveServers(1,2);
-// }
-// public static void releaseConnection() {
-// Region r1 = cache.getRegion("/" + REGION_NAME);
-// BridgeWriter bw = (BridgeWriter)r1.getAttributes().getCacheWriter();
-// bw.release();
-// }
-
public static void put()
{
try {
[15/17] incubator-geode git commit: missed checkin in last commit
Posted by ds...@apache.org.
missed checkin in last commit
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9f6d4461
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9f6d4461
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9f6d4461
Branch: refs/heads/feature/GEODE-243
Commit: 9f6d4461a4288ea4ebe30d861425e596399baa49
Parents: 8fa360e
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 15:55:21 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 15:55:21 2015 -0700
----------------------------------------------------------------------
.../java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9f6d4461/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index ad33c5b..7bf07c9 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -1296,7 +1296,7 @@ public class LocalizedStrings extends ParentLocalizedStrings {
public static final StringId GatewayImpl_PAUSED__0 = new StringIdImpl(4674, "Paused {0}");
public static final StringId GatewayImpl_RESUMED__0 = new StringIdImpl(4675, "Resumed {0}");
public static final StringId CacheClientProxy_NOT_PRIMARY = new StringIdImpl(4676, "This process is not the primary server for the given client");
- public static final StringId BridgeServerImpl_MUST_BE_RUNNING = new StringIdImpl(4677, "The bridge server must be running to use this operation");
+ public static final StringId CacheServerImpl_MUST_BE_RUNNING = new StringIdImpl(4677, "The cache server must be running to use this operation");
public static final StringId InitialImageOperation_0_UNABLE_TO_FLUSH_STATE_TO_1 = new StringIdImpl(4678, "{0}: Unable to flush state to {1} for concurrent gii union");
public static final StringId InstantiatorRecoveryListener_INSTANTIATORRECOVERYTASK_ERROR_CLASSNOTFOUNDEXCEPTION = new StringIdImpl(4679, "InstantiatorRecoveryTask - Error ClassNotFoundException: {0}");
public static final StringId AbstractRegion_NO_CUSTOM_EVICTION_SET = new StringIdImpl(4680, "Custom eviction not enabled for region {0}"); public static final StringId ResourceAdvisor_MEMBER_CAUGHT_EXCEPTION_PROCESSING_PROFILE = new StringIdImpl(4682, "This member caught exception processing profile {0} {1}");
[17/17] incubator-geode git commit: more removal of Bridge from
localized strings
Posted by ds...@apache.org.
more removal of Bridge from localized strings
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e6002bf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e6002bf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e6002bf0
Branch: refs/heads/feature/GEODE-243
Commit: e6002bf0dae5f3be0a974bda86db1ecad39b9a7a
Parents: 1d7601e
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 16:25:12 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 16:25:12 2015 -0700
----------------------------------------------------------------------
.../gemfire/internal/cache/CacheServerImpl.java | 6 ++--
.../cache/tier/sockets/AcceptorImpl.java | 14 ++++----
.../internal/cache/xmlcache/CacheCreation.java | 4 +--
.../internal/i18n/ParentLocalizedStrings.java | 37 ++++++++++----------
4 files changed, 30 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e6002bf0/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
index f93feb1..422711e 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
@@ -138,7 +138,7 @@ public class CacheServerImpl
*/
private void checkRunning() {
if (this.isRunning()) {
- throw new IllegalStateException(LocalizedStrings.BridgeServerImpl_A_BRIDGE_SERVERS_CONFIGURATION_CANNOT_BE_CHANGED_ONCE_IT_IS_RUNNING.toLocalizedString());
+ throw new IllegalStateException(LocalizedStrings.CacheServerImpl_A_CACHE_SERVERS_CONFIGURATION_CANNOT_BE_CHANGED_ONCE_IT_IS_RUNNING.toLocalizedString());
}
}
@@ -295,7 +295,7 @@ public class CacheServerImpl
// force notifyBySubscription to be true so that meta info is pushed
// from servers to clients instead of invalidates.
if (!this.notifyBySubscription) {
- logger.info(LocalizedMessage.create(LocalizedStrings.BridgeServerImpl_FORCING_NOTIFYBYSUBSCRIPTION_TO_SUPPORT_DYNAMIC_REGIONS));
+ logger.info(LocalizedMessage.create(LocalizedStrings.CacheServerImpl_FORCING_NOTIFYBYSUBSCRIPTION_TO_SUPPORT_DYNAMIC_REGIONS));
this.notifyBySubscription = true;
}
}
@@ -345,7 +345,7 @@ public class CacheServerImpl
if(cache instanceof GemFireCacheImpl) {
ClientHealthMonitoringRegion.getInstance((GemFireCacheImpl)cache);
}
- this.cache.getLoggerI18n().config(LocalizedStrings.BridgeServerImpl_CACHESERVER_CONFIGURATION___0, getConfig());
+ this.cache.getLoggerI18n().config(LocalizedStrings.CacheServerImpl_CACHESERVER_CONFIGURATION___0, getConfig());
/*
* If the stopped bridge server is restarted, we'll need to re-register the
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e6002bf0/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
index f18d1cf..74cdfa9 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
@@ -532,7 +532,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
this.localPort = port;
String sockName = this.serverSock.getLocalSocketAddress().toString();
logger.info(LocalizedMessage.create(
- LocalizedStrings.AcceptorImpl_BRIDGE_SERVER_CONNECTION_LISTENER_BOUND_TO_ADDRESS_0_WITH_BACKLOG_1,
+ LocalizedStrings.AcceptorImpl_CACHE_SERVER_CONNECTION_LISTENER_BOUND_TO_ADDRESS_0_WITH_BACKLOG_1,
new Object[] {sockName, Integer.valueOf(backLog)}));
if(isGatewayReceiver){
this.stats = GatewayReceiverStats.createGatewayReceiverStats(sockName);
@@ -1355,7 +1355,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
if (isRunning()) {
if (!this.loggedAcceptError) {
this.loggedAcceptError = true;
- logger.error(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_BRIDGE_SERVER_UNEXPECTED_IOEXCEPTION_FROM_ACCEPT, e));
+ logger.error(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_CACHE_SERVER_UNEXPECTED_IOEXCEPTION_FROM_ACCEPT, e));
}
// Why sleep?
// try {Thread.sleep(3000);} catch (InterruptedException ie) {}
@@ -1368,7 +1368,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
catch (Exception e) {
closeSocket(s);
if (isRunning()) {
- logger.fatal(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_BRIDGE_SERVER_UNEXPECTED_EXCEPTION, e));
+ logger.fatal(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_CACHE_SERVER_UNEXPECTED_EXCEPTION, e));
}
}
}
@@ -1408,10 +1408,10 @@ public class AcceptorImpl extends Acceptor implements Runnable
if (!AcceptorImpl.this.loggedAcceptError) {
AcceptorImpl.this.loggedAcceptError = true;
if (ex instanceof SocketTimeoutException) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_BRIDGE_SERVER_FAILED_ACCEPTING_CLIENT_CONNECTION_DUE_TO_SOCKET_TIMEOUT));
+ logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_CACHE_SERVER_FAILED_ACCEPTING_CLIENT_CONNECTION_DUE_TO_SOCKET_TIMEOUT));
}
else {
- logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_BRIDGE_SERVER_FAILED_ACCEPTING_CLIENT_CONNECTION__0, ex), ex);
+ logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_CACHE_SERVER_FAILED_ACCEPTING_CLIENT_CONNECTION__0, ex), ex);
}
}
}
@@ -1485,7 +1485,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
SystemTimer.SystemTimerTask st = new SystemTimer.SystemTimerTask() {
@Override
public void run2() {
- logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_BRIDGE_SERVER_TIMED_OUT_WAITING_FOR_HANDSHAKE_FROM__0, s.getRemoteSocketAddress()));
+ logger.warn(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_CACHE_SERVER_TIMED_OUT_WAITING_FOR_HANDSHAKE_FROM__0, s.getRemoteSocketAddress()));
closeSocket(s);
}
};
@@ -1634,7 +1634,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
try {
synchronized (syncLock) {
this.shutdown = true;
- logger.info(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_BRIDGE_SERVER_ON_PORT_0_IS_SHUTTING_DOWN, this.localPort));
+ logger.info(LocalizedMessage.create(LocalizedStrings.AcceptorImpl_CACHE_SERVER_ON_PORT_0_IS_SHUTTING_DOWN, this.localPort));
if (this.thread != null) {
this.thread.interrupt();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e6002bf0/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
index 24d8b92..0347d67 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
@@ -698,7 +698,7 @@ public class CacheCreation implements InternalCache, Extensible<Cache> {
Collection myBridges = this.getCacheServers();
Collection otherBridges = other.getCacheServers();
if (myBridges.size() != otherBridges.size()) {
- throw new RuntimeException(LocalizedStrings.CacheCreation_BRIDGESERVERS_SIZE.toLocalizedString());
+ throw new RuntimeException(LocalizedStrings.CacheCreation_CACHESERVERS_SIZE.toLocalizedString());
}
for (Iterator myIter = myBridges.iterator(); myIter.hasNext(); ) {
@@ -715,7 +715,7 @@ public class CacheCreation implements InternalCache, Extensible<Cache> {
}
if (!found) {
- throw new RuntimeException(LocalizedStrings.CacheCreation_BRIDGE_0_NOT_FOUND.toLocalizedString(myBridge));
+ throw new RuntimeException(LocalizedStrings.CacheCreation_CACHE_SERVER_0_NOT_FOUND.toLocalizedString(myBridge));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e6002bf0/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java
index e5de82d..44e67ca 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java
@@ -41,13 +41,13 @@ class ParentLocalizedStrings {
public static final StringId AbstractHealthEvaluator_POOR_HEALTH__0 = new StringIdImpl(1026, "POOR_HEALTH: {0}");
public static final StringId AbstractRegion_CACHECALLBACK_CLOSE_EXCEPTION = new StringIdImpl(1027, "CacheCallback close exception");
// ok to reuse 1028
- public static final StringId AcceptorImpl_BRIDGE_SERVER_CONNECTION_LISTENER_BOUND_TO_ADDRESS_0_WITH_BACKLOG_1 = new StringIdImpl(1029, "Bridge server connection listener bound to address {0} with backlog {1}.");
- public static final StringId AcceptorImpl_BRIDGE_SERVER_FAILED_ACCEPTING_CLIENT_CONNECTION_DUE_TO_SOCKET_TIMEOUT = new StringIdImpl(1030, "Bridge server: failed accepting client connection due to socket timeout.");
- public static final StringId AcceptorImpl_BRIDGE_SERVER_FAILED_ACCEPTING_CLIENT_CONNECTION__0 = new StringIdImpl(1031, "Bridge server: failed accepting client connection {0}");
- public static final StringId AcceptorImpl_BRIDGE_SERVER_ON_PORT_0_IS_SHUTTING_DOWN = new StringIdImpl(1032, "Bridge server on port {0} is shutting down.");
- public static final StringId AcceptorImpl_BRIDGE_SERVER_TIMED_OUT_WAITING_FOR_HANDSHAKE_FROM__0 = new StringIdImpl(1033, "Bridge server: timed out waiting for handshake from {0}");
- public static final StringId AcceptorImpl_BRIDGE_SERVER_UNEXPECTED_EXCEPTION = new StringIdImpl(1034, "Bridge server: Unexpected Exception");
- public static final StringId AcceptorImpl_BRIDGE_SERVER_UNEXPECTED_IOEXCEPTION_FROM_ACCEPT = new StringIdImpl(1035, "Bridge server: Unexpected IOException from accept");
+ public static final StringId AcceptorImpl_CACHE_SERVER_CONNECTION_LISTENER_BOUND_TO_ADDRESS_0_WITH_BACKLOG_1 = new StringIdImpl(1029, "Cache server connection listener bound to address {0} with backlog {1}.");
+ public static final StringId AcceptorImpl_CACHE_SERVER_FAILED_ACCEPTING_CLIENT_CONNECTION_DUE_TO_SOCKET_TIMEOUT = new StringIdImpl(1030, "Cache server: failed accepting client connection due to socket timeout.");
+ public static final StringId AcceptorImpl_CACHE_SERVER_FAILED_ACCEPTING_CLIENT_CONNECTION__0 = new StringIdImpl(1031, "Cache server: failed accepting client connection {0}");
+ public static final StringId AcceptorImpl_CACHE_SERVER_ON_PORT_0_IS_SHUTTING_DOWN = new StringIdImpl(1032, "Cache server on port {0} is shutting down.");
+ public static final StringId AcceptorImpl_CACHE_SERVER_TIMED_OUT_WAITING_FOR_HANDSHAKE_FROM__0 = new StringIdImpl(1033, "Cache server: timed out waiting for handshake from {0}");
+ public static final StringId AcceptorImpl_CACHE_SERVER_UNEXPECTED_EXCEPTION = new StringIdImpl(1034, "Cache server: Unexpected Exception");
+ public static final StringId AcceptorImpl_CACHE_SERVER_UNEXPECTED_IOEXCEPTION_FROM_ACCEPT = new StringIdImpl(1035, "Cache server: Unexpected IOException from accept");
public static final StringId AcceptorImpl_EXCEEDED_MAX_CONNECTIONS_0 = new StringIdImpl(1036, "exceeded max-connections {0}");
public static final StringId AcceptorImpl_IGNORING = new StringIdImpl(1037, "ignoring");
public static final StringId AcceptorImpl_IGNORING_EVENT_ON_SELECTOR_KEY__0 = new StringIdImpl(1038, "ignoring event on selector key {0}");
@@ -133,10 +133,9 @@ class ParentLocalizedStrings {
public static final StringId BaseCommand_SEVERE_CACHE_EXCEPTION_0 = new StringIdImpl(1118, "Severe cache exception : {0}");
public static final StringId BaseCommand_UNEXPECTED_QUERYINVALIDEXCEPTION_WHILE_PROCESSING_QUERY_0 = new StringIdImpl(1119, "Unexpected QueryInvalidException while processing query {0}");
// ok to reuse 1120..1121
- public static final StringId BridgeServerImpl_CACHESERVER_CONFIGURATION___0 = new StringIdImpl(1122, "CacheServer Configuration: {0}");
- public static final StringId BridgeServerImpl_FORCING_NOTIFYBYSUBSCRIPTION_TO_SUPPORT_DYNAMIC_REGIONS = new StringIdImpl(1123, "Forcing notifyBySubscription to support dynamic regions");
- public static final StringId BridgeServerImpl_STARTED__0 = new StringIdImpl(1124, "Started {0}");
- // ok to reuse 1126..1130
+ public static final StringId CacheServerImpl_CACHESERVER_CONFIGURATION___0 = new StringIdImpl(1122, "CacheServer Configuration: {0}");
+ public static final StringId CacheServerImpl_FORCING_NOTIFYBYSUBSCRIPTION_TO_SUPPORT_DYNAMIC_REGIONS = new StringIdImpl(1123, "Forcing notifyBySubscription to support dynamic regions");
+ // ok to reuse 1124..1130
public static final StringId BucketAdvisor_ATTEMPTED_TO_CLOSE_BUCKETADVISOR_THAT_IS_ALREADY_CLOSED = new StringIdImpl(1131, "Attempted to close BucketAdvisor that is already CLOSED");
public static final StringId AgentImpl_COULD_NOT_TAIL_0_BECAUSE_1 = new StringIdImpl(1132, "Could not tail \"{0}\" because: {1}");
public static final StringId SystemAdmin_USED_TO_SPECIFY_A_HOST_NAME_OR_IP_ADDRESS_TO_GIVE_TO_CLIENTS_SO_THEY_CAN_CONNECT_TO_A_LOCATOR = new StringIdImpl(1133, "Used to specify a host name or IP address to give to clients so they can connect to a locator.");
@@ -674,7 +673,7 @@ class ParentLocalizedStrings {
public static final StringId IndexCreationMsg_REGION_IS_LOCALLY_DESTROYED_THROWING_REGIONDESTROYEDEXCEPTION_FOR__0 = new StringIdImpl(1673, "Region is locally destroyed, throwing RegionDestroyedException for {0}");
public static final StringId CqQueryImpl_FAILED_TO_STOP_THE_CQ_CQNAME_0_THE_SERVER_ENDPOINTS_ON_WHICH_THIS_CQ_WAS_REGISTERED_WERE_NOT_FOUND = new StringIdImpl(1676, "Failed to stop the cq. CqName: {0}. The server endpoints on which this cq was registered were not found.");
public static final StringId InitialImageOperation_IGNORING_EXCEPTION_DURING_GETFROMALL = new StringIdImpl(1677, "Ignoring exception during getFromAll");
- public static final StringId InternalBridgeMembership_DONOTIFYJOINED_HAS_NO_LISTENERS_TO_NOTIFY_FOR__0 = new StringIdImpl(1678, "doNotifyJoined has no listeners to notify for {0}");
+ // ok to reuse 1678
public static final StringId InternalDataSerializer_COULD_NOT_LOAD_DATASERIALIZER_CLASS_0 = new StringIdImpl(1679, "Could not load DataSerializer class: {0}");
public static final StringId InternalDataSerializer_REGISTER_DATASERIALIZER_0_OF_CLASS_1 = new StringIdImpl(1680, "Register DataSerializer {0} of class {1}");
public static final StringId InternalDistributedSystem_CONNECTLISTENER_THREW = new StringIdImpl(1681, "ConnectListener threw...");
@@ -914,7 +913,7 @@ class ParentLocalizedStrings {
public static final StringId PartitionedRegion_WILL_BE_CREATING_INDEX_ON_THIS_VM_BECAUSE_OF_CREATEINDEX_MESSAGE_COMING_FROM_REMOTE_VM_WITH_THESE_SETTINGS_0 = new StringIdImpl(1909, "Will be creating index on this vm because of createIndex message coming from remote vm with these settings {0} ");
public static final StringId PartitionedRegion_WILL_BE_REMOVING_ALL_THE_BUCKET_INDEXES = new StringIdImpl(1910, "Will be removing all the bucket indexes");
public static final StringId PartitionedRegion_WILL_BE_REMOVING_INDEXES_ON___0__BUCKETS = new StringIdImpl(1911, "Will be removing indexes on : {0} buckets");
- public static final StringId PartitionedRegion_WILL_SEND_UPDATED_PROFILE_NOW_FOR_REQUIRING_OLD_VALUE_ON_THIS_BRIDGE_SERVER = new StringIdImpl(1912, "Will send updated profile now for requiring old value on this bridge server.");
+ // ok to reuse 1912
public static final StringId ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_CREATE_REQUEST_1_FOR_2_EVENTS = new StringIdImpl(1913, "{0}: Caught exception processing batch create request {1} for {2} events");
public static final StringId ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_DESTROY_REQUEST_1_CONTAINING_2_EVENTS = new StringIdImpl(1914, "{0}: Caught exception processing batch destroy request {1} containing {2} events");
public static final StringId ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_REQUEST_1_CONTAINING_2_EVENTS = new StringIdImpl(1915, "{0}: Caught exception processing batch request {1} containing {2} events");
@@ -989,7 +988,7 @@ class ParentLocalizedStrings {
public static final StringId Request_THE_INPUT_REGION_NAME_FOR_THE_GET_REQUEST_IS_NULL = new StringIdImpl(1984, "The input region name for the get request is null.");
public static final StringId RuntimeDistributionConfigImpl_STILL_USING_PREVIOUS_LICENSE_BECAUSE_A_VALID_LICENSE_WAS_NOT_FOUND_AFTER_CHANGING_THE_LICENSEFILE__0 = new StringIdImpl(1985, "Still using previous license because a valid license was not found after changing the \"license-file\". {0}");
public static final StringId RuntimeDistributionConfigImpl_STILL_USING_PREVIOUS_LICENSE_BECAUSE_A_VALID_LICENSE_WAS_NOT_FOUND_AFTER_CHANGING_THE_LICENSETYPE__0 = new StringIdImpl(1986, "Still using previous license because a valid license was not found after changing the \"license-type\". {0}");
- public static final StringId LocalRegion_UNHANDLED_EXCEPTION_CAUGHT_WHILE_PROCESSING_BRIDGE_FILTERS = new StringIdImpl(1987, "Unhandled exception caught while processing bridge filters");
+ // ok to reuse 1987
public static final StringId ServerConnection_0_HANDSHAKE_ACCEPT_FAILED_ON_SOCKET_1_2 = new StringIdImpl(1988, "{0}: Handshake accept failed on socket {1}: {2}");
public static final StringId ServerConnection_0_HANDSHAKE_REPLY_CODE_TIMEOUT_NOT_RECEIVED_WITH_IN_1_MS = new StringIdImpl(1989, "{0}: Handshake reply code timeout, not received with in {1} ms");
public static final StringId ServerConnection_0_RECEIVED_NO_HANDSHAKE_REPLY_CODE = new StringIdImpl(1990, "{0}: Received no handshake reply code");
@@ -1037,7 +1036,7 @@ class ParentLocalizedStrings {
public static final StringId RemoteMessage_REGION_0_NOT_COLOCATED_WITH_TRANSACTION = new StringIdImpl(2026, "Region {0} not colocated with other regions in transaction");
public static final StringId ServerConnection_BATCH_IDS_ARE_OUT_OF_ORDER_SETTING_LATESTBATCHID_TO_0_IT_WAS_1 = new StringIdImpl(2027, "Batch IDs are out of order. Setting latestBatchId to:{0}. It was:{1}");
public static final StringId DistributionManager_Cache_Time_Offset_Skew_Warning = new StringIdImpl(2028, "New cache time offset calculated is off more than {0} ms from earlier offset.");
- public static final StringId ServerConnection_LICENSE_DETAILS_CURRENT_BRIDGE_CONNECTIONS_SIZE_0_VALUES_1 = new StringIdImpl(2029, "License details: current bridge connections (size {0}) values = {1}");
+ // ok to reuse 2029
public static final StringId CacheXmlParser_UNKNOWN_INDEX_TYPE = new StringIdImpl(2030, "Unknown index type defined as {0}, will be set to range index");
public static final StringId TXStateStub_LOCAL_DESTROY_NOT_ALLOWED_IN_TRANSACTION = new StringIdImpl(2031, "localDestroy() is not allowed in a transaction");
public static final StringId TXStateStub_LOCAL_INVALIDATE_NOT_ALLOWED_IN_TRANSACTION = new StringIdImpl(2032, "localInvalidate() is not allowed in a transaction");
@@ -1286,7 +1285,7 @@ class ParentLocalizedStrings {
public static final StringId BaseRecordManager_NAME_DIRECTORY_MUST_EXIST = new StringIdImpl(2270, "Name directory must exist");
public static final StringId BaseRecordManager_RECORDMANAGER_HAS_BEEN_CLOSED = new StringIdImpl(2271, "RecordManager has been closed");
// ok to reuse 2272..2274
- public static final StringId BridgeServerImpl_A_BRIDGE_SERVERS_CONFIGURATION_CANNOT_BE_CHANGED_ONCE_IT_IS_RUNNING = new StringIdImpl(2275, "A bridge server''s configuration cannot be changed once it is running.");
+ public static final StringId CacheServerImpl_A_CACHE_SERVERS_CONFIGURATION_CANNOT_BE_CHANGED_ONCE_IT_IS_RUNNING = new StringIdImpl(2275, "A cache server''s configuration cannot be changed once it is running.");
// ok to reuse 2276..2284
public static final StringId BucketAdvisor_CANNOT_CHANGE_FROM_0_TO_1 = new StringIdImpl(2285, "Cannot change from {0} to {1}");
public static final StringId BucketRegion_THIS_SHOULD_NEVER_BE_CALLED_ON_0 = new StringIdImpl(2286, "This should never be called on {0}");
@@ -1306,8 +1305,8 @@ class ParentLocalizedStrings {
public static final StringId CacheCollector_UNABLE_TO_MIX_REGION_AND_ENTRY_SNAPSHOTS_IN_CACHECOLLECTOR = new StringIdImpl(2300, "Unable to mix region and entry snapshots in CacheCollector.");
public static final StringId CacheCreation_ATTRIBUTES_FOR_0_DO_NOT_MATCH = new StringIdImpl(2301, "Attributes for {0} do not match");
//ok to reuse 2302,2303
- public static final StringId CacheCreation_BRIDGESERVERS_SIZE = new StringIdImpl(2304, "bridgeServers size");
- public static final StringId CacheCreation_BRIDGE_0_NOT_FOUND = new StringIdImpl(2305, "bridge {0} not found");
+ public static final StringId CacheCreation_CACHESERVERS_SIZE = new StringIdImpl(2304, "cacheServers size");
+ public static final StringId CacheCreation_CACHE_SERVER_0_NOT_FOUND = new StringIdImpl(2305, "cache server {0} not found");
public static final StringId CacheCreation_NAMEDATTRIBUTES_SIZE = new StringIdImpl(2306, "namedAttributes size");
public static final StringId CacheCreation_NO_ATTRIBUTES_FOR_0 = new StringIdImpl(2307, "No attributes for {0}");
public static final StringId CacheCreation_NO_ROOT_0 = new StringIdImpl(2308, "no root {0}");
@@ -1671,7 +1670,7 @@ class ParentLocalizedStrings {
public static final StringId GatewayHubCreation_NOT_SUPPORTED = new StringIdImpl(2669, "Not supported");
public static final StringId GatewayHubCreation_REMOVEGATEWAY_IS_NOT_SUPPORTED = new StringIdImpl(2670, "removeGateway is not supported");
public static final StringId GatewayHubImpl_AN_UNKNOWN_GATEWAY_HUB_POLICY_0_WAS_SPECIFIED_IT_MUST_BE_ONE_OF_1_2_3 = new StringIdImpl(2671, "An unknown gateway hub policy ( {0} ) was specified. It must be one of < {1} {2} {3} >.");
- public static final StringId GatewayHubImpl_A_BRIDGE_SERVERS_CONFIGURATION_CANNOT_BE_CHANGED_ONCE_IT_IS_RUNNING = new StringIdImpl(2672, "A bridge server''s configuration cannot be changed once it is running.");
+ // ok to reuse 2672
public static final StringId GatewayHubImpl_GATEWAYHUB_0_ALREADY_DEFINES_A_GATEWAY_WITH_ID_1 = new StringIdImpl(2673, "GatewayHub {0} already defines a Gateway with id= {1}");
public static final StringId GatewayHubImpl_GATEWAYHUB_0_DOES_NOT_CONTAIN_A_GATEWAY_WITH_ID_1 = new StringIdImpl(2674, "GatewayHub {0} does not contain a Gateway with id= {1}");
public static final StringId GatewayImpl_A_GATEWAYS_CONFIGURATION_CANNOT_BE_CHANGED_ONCE_IT_IS_RUNNING = new StringIdImpl(2675, "A Gateway''s configuration cannot be changed once it is running.");
[03/17] incubator-geode git commit: renamed BridgeTestCase to
ClientServerTestCase
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
index ba53570..10ef9d0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -19,7 +19,7 @@ import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -205,7 +205,7 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPool(factory, host, PORT2,-1, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, host, PORT2,-1, true, -1, 2, null);
RegionAttributes attrs = factory.create();
region = cache.createRegion(REGION_NAME, attrs);
assertNotNull(region);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
index ea7008d..7cd2ebf 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.client.internal.QueueStateImpl.SequenceIdAndExpirationObject;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -189,7 +189,7 @@ public class PutAllDUnitTest extends DistributedTestCase
props.setProperty("connectionsPerServer", "2");
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- PoolImpl p = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, host, PORT1,-1, true, -1, 2, null);
+ PoolImpl p = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, host, PORT1,-1, true, -1, 2, null);
CacheListener clientListener = new HAEventIdPropagationListenerForClient2();
factory.setCacheListener(clientListener);
RegionAttributes attrs = factory.create();
@@ -220,7 +220,7 @@ public class PutAllDUnitTest extends DistributedTestCase
props.setProperty("connectionsPerServer", "2");
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- PoolImpl p = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, host, PORT1,-1, true, -1, 2, null);
+ PoolImpl p = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, host, PORT1,-1, true, -1, 2, null);
CacheListener clientListener = new HAEventIdPropagationListenerForClient1();
factory.setCacheListener(clientListener);
RegionAttributes attrs = factory.create();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java
index a4462e4..ad5050a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java
@@ -19,7 +19,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -236,7 +236,7 @@ public class StatsBugDUnitDisabledTest extends DistributedTestCase
cache = test.createCache(createProperties1());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- pool = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, host, new int[] {port1.intValue(),port2.intValue()}, true, -1, 3, null);
+ pool = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, host, new int[] {port1.intValue(),port2.intValue()}, true, -1, 3, null);
RegionAttributes attrs = factory.create();
Region region = cache.createRegion(REGION_NAME, attrs);
region.registerInterest("ALL_KEYS");
@@ -260,7 +260,7 @@ public class StatsBugDUnitDisabledTest extends DistributedTestCase
cache = test.createCache(createProperties1());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- pool = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, host, new int[] {port1.intValue(),port2.intValue()}, true, -1, 3, null);
+ pool = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, host, new int[] {port1.intValue(),port2.intValue()}, true, -1, 3, null);
RegionAttributes attrs = factory.create();
Region region = cache.createRegion(REGION_NAME, attrs);
region.registerInterest("ALL_KEYS", false, false);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index 20eacae..ce88c48 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -174,7 +174,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setMirrorType(MirrorType.NONE);
- BridgeTestCase.configureConnectionPool(factory, host, new int[] {PORT1,PORT2}, true, -1, 2, null, -1, -1, false, -2);
+ ClientServerTestCase.configureConnectionPool(factory, host, new int[] {PORT1,PORT2}, true, -1, 2, null, -1, -1, false, -2);
CacheWriter writer = new CacheWriterAdapter() { // couldn't port this test to pool because it subclasses BridgeWriter
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index 16ca834..c90e68f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.client.ServerConnectivityException;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DurableClientAttributes;
@@ -52,7 +52,7 @@ import dunit.VM;
* @since 4.2.1
*/
-public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase {
+public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTestCase {
protected static final boolean CLIENT = true;
protected static final boolean SERVER = false;
@@ -410,7 +410,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
getSystem(config);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -870,7 +870,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
assertFalse(getCache().isClosed());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -1880,7 +1880,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
// create region which connects to bridge server
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
[07/17] incubator-geode git commit: renamed BridgeWriterMisc tests to
ClientServerMisc
Posted by ds...@apache.org.
renamed BridgeWriterMisc tests to ClientServerMisc
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/725e4bf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/725e4bf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/725e4bf5
Branch: refs/heads/feature/GEODE-243
Commit: 725e4bf53a26c6595d454263344774895e9073e4
Parents: 091e9ae
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 11:34:42 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 11:34:42 2015 -0700
----------------------------------------------------------------------
.../cache/ConcurrentMapOpsDUnitTest.java | 2 +-
.../tier/sockets/BridgeWriterMiscDUnitTest.java | 1381 ------------------
.../BridgeWriterMiscSelectorDUnitTest.java | 27 -
.../tier/sockets/ClientServerMiscDUnitTest.java | 1381 ++++++++++++++++++
.../ClientServerMiscSelectorDUnitTest.java | 27 +
5 files changed, 1409 insertions(+), 1409 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/725e4bf5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
index b620034..214be28 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
@@ -47,7 +47,7 @@ import dunit.SerializableRunnable;
import dunit.VM;
/**
- * tests for the concurrentMapOperations. there are more tests in BridgeWriterMiscDUnitTest
+ * tests for the concurrentMapOperations. there are more tests in ClientServerMiscDUnitTest
* @author sbawaska
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/725e4bf5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscDUnitTest.java
deleted file mode 100755
index 95a62af..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscDUnitTest.java
+++ /dev/null
@@ -1,1381 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.internal.cache.tier.sockets;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheException;
-import com.gemstone.gemfire.cache.CacheWriterException;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.EvictionAttributes;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.client.NoAvailableServersException;
-import com.gemstone.gemfire.cache.client.Pool;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.client.internal.Connection;
-import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-import com.gemstone.gemfire.cache.client.internal.RegisterInterestTracker;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.cache30.LRUEvictionControllerDUnitTest;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.CacheServerImpl;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
-
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * Tests corner cases between Region, BridgeWriter and PoolImpl
- *
- * @author Yogesh Mahajan
- *
- */
-public class BridgeWriterMiscDUnitTest extends CacheTestCase
-{
-// private static Cache cache = null;
-
- protected static PoolImpl pool = null;
-
- protected static Connection conn = null;
-
- private static Cache static_cache;
-
- private static int PORT1;
-
- private static final String k1 = "k1";
-
- private static final String k2 = "k2";
-
- private static final String server_k1 = "server-k1";
-
- private static final String server_k2 = "server-k2";
-
- private static final String REGION_NAME1 = "BridgeWriterMiscDUnitTest_region1";
-
- private static final String REGION_NAME2 = "BridgeWriterMiscDUnitTest_region2";
-
- private static final String PR_REGION_NAME = "BridgeWriterMiscDUnitTest_PRregion";
-
- private static Host host;
-
- private static VM server1;
-
- private static VM server2;
-
- private static RegionAttributes attrs;
-
-
- // variables for concurrent map API test
- Properties props = new Properties();
- final int putRange_1Start = 1;
- final int putRange_1End = 5;
- final int putRange_2Start = 6;
- final int putRange_2End = 10;
- final int putRange_3Start = 11;
- final int putRange_3End = 15;
- final int putRange_4Start = 16;
- final int putRange_4End = 20;
- final int removeRange_1Start = 2;
- final int removeRange_1End = 4;
- final int removeRange_2Start = 7;
- final int removeRange_2End = 9;
-
-
-
- /** constructor */
- public BridgeWriterMiscDUnitTest(String name) {
- super(name);
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- host = Host.getHost(0);
- server1 = host.getVM(0);
- server2 = host.getVM(1);
- }
-
- private int initServerCache(boolean notifyBySub) {
- Object[] args = new Object[] { notifyBySub, getMaxThreads()};
- return ((Integer)server1.invoke(BridgeWriterMiscDUnitTest.class,
- "createServerCache",
- args)).intValue();
- }
-
- private int initServerCache2(boolean notifyBySub) {
- Object[] args = new Object[] {notifyBySub, getMaxThreads()};
- return ((Integer)server2.invoke(BridgeWriterMiscDUnitTest.class,
- "createServerCache",
- args)).intValue();
- }
-
-
- public void testConcurrentOperationsWithDRandPR() throws Exception {
- int port1 = initServerCache(true); // vm0
- int port2 = initServerCache2(true); // vm1
- String serverName = getServerHostName(Host.getHost(0));
- host.getVM(2).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port1});
- host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2});
- getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
- concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
- // TODO add verification in vm3
- getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
- concurrentMapTest(host.getVM(2), "/" + PR_REGION_NAME);
- // TODO add verification in vm3
- }
-
- public void testConcurrentOperationsWithDRandPRandEmptyClient() throws Exception {
- int port1 = initServerCache(true); // vm0
- int port2 = initServerCache2(true); // vm1
- String serverName = getServerHostName(Host.getHost(0));
- host.getVM(2).invoke(this.getClass(), "createEmptyClientCache", new Object[]{serverName, port1});
- host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2});
- getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
- concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
- // TODO add verification in vm3
- getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
- concurrentMapTest(host.getVM(2), "/" + PR_REGION_NAME);
- // TODO add verification in vm3
- }
-
- /**
- * Do putIfAbsent(), replace(Object, Object),
- * replace(Object, Object, Object), remove(Object, Object) operations
- */
- public void concurrentMapTest(final VM clientVM, final String rName) {
-
- //String exceptionStr = "";
- clientVM.invoke(new CacheSerializableRunnable("doConcurrentMapOperations") {
- public void run2() throws CacheException {
- Cache cache = getCache();
- final Region pr = cache.getRegion(rName);
- assertNotNull(rName + " not created", pr);
- boolean isEmpty = pr.getAttributes().getDataPolicy() == DataPolicy.EMPTY;
-
- // test successful putIfAbsent
- for (int i = putRange_1Start; i <= putRange_1End; i++) {
- Object putResult = pr.putIfAbsent(Integer.toString(i),
- Integer.toString(i));
- assertNull("Expected null, but got " + putResult + " for key " + i,
- putResult);
- }
- int size;
- if (!isEmpty) {
- size = pr.size();
- assertEquals("Size doesn't return expected value", putRange_1End, size);
- assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
- pr.isEmpty());
- }
-
- // test unsuccessful putIfAbsent
- for (int i = putRange_1Start; i <= putRange_1End; i++) {
- Object putResult = pr.putIfAbsent(Integer.toString(i),
- Integer.toString(i + 1));
- assertEquals("for i=" + i, Integer.toString(i), putResult);
- assertEquals("for i=" + i, Integer.toString(i), pr.get(Integer.toString(i)));
- }
- if (!isEmpty) {
- size = pr.size();
- assertEquals("Size doesn't return expected value", putRange_1End, size);
- assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
- pr.isEmpty());
- }
-
- // test successful replace(key, oldValue, newValue)
- for (int i = putRange_1Start; i <= putRange_1End; i++) {
- boolean replaceSucceeded = pr.replace(Integer.toString(i),
- Integer.toString(i),
- "replaced" + i);
- assertTrue("for i=" + i, replaceSucceeded);
- assertEquals("for i=" + i, "replaced" + i, pr.get(Integer.toString(i)));
- }
- if (!isEmpty) {
- size = pr.size();
- assertEquals("Size doesn't return expected value", putRange_1End, size);
- assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
- pr.isEmpty());
- }
-
- // test unsuccessful replace(key, oldValue, newValue)
- for (int i = putRange_1Start; i <= putRange_2End; i++) {
- boolean replaceSucceeded = pr.replace(Integer.toString(i),
- Integer.toString(i), // wrong expected old value
- "not" + i);
- assertFalse("for i=" + i, replaceSucceeded);
- assertEquals("for i=" + i,
- i <= putRange_1End ? "replaced" + i : null,
- pr.get(Integer.toString(i)));
- }
- if (!isEmpty) {
- size = pr.size();
- assertEquals("Size doesn't return expected value", putRange_1End, size);
- assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
- pr.isEmpty());
- }
-
- // test successful replace(key, value)
- for (int i = putRange_1Start; i <= putRange_1End; i++) {
- Object replaceResult = pr.replace(Integer.toString(i),
- "twice replaced" + i);
- assertEquals("for i=" + i, "replaced" + i, replaceResult);
- assertEquals("for i=" + i,
- "twice replaced" + i,
- pr.get(Integer.toString(i)));
- }
- if (!isEmpty) {
- size = pr.size();
- assertEquals("Size doesn't return expected value", putRange_1End, size);
- assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
- pr.isEmpty());
- }
-
- // test unsuccessful replace(key, value)
- for (int i = putRange_2Start; i <= putRange_2End; i++) {
- Object replaceResult = pr.replace(Integer.toString(i),
- "thrice replaced" + i);
- assertNull("for i=" + i, replaceResult);
- assertNull("for i=" + i, pr.get(Integer.toString(i)));
- }
- if (!isEmpty) {
- size = pr.size();
- assertEquals("Size doesn't return expected value", putRange_1End, size);
- assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
- pr.isEmpty());
- }
-
- // test unsuccessful remove(key, value)
- for (int i = putRange_1Start; i <= putRange_2End; i++) {
- boolean removeResult = pr.remove(Integer.toString(i),
- Integer.toString(-i));
- assertFalse("for i=" + i, removeResult);
- assertEquals("for i=" + i,
- i <= putRange_1End ? "twice replaced" + i : null,
- pr.get(Integer.toString(i)));
- }
- if (!isEmpty) {
- size = pr.size();
- assertEquals("Size doesn't return expected value", putRange_1End, size);
- assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
- pr.isEmpty());
- }
-
- // test successful remove(key, value)
- for (int i = putRange_1Start; i <= putRange_1End; i++) {
- boolean removeResult = pr.remove(Integer.toString(i),
- "twice replaced" + i);
- assertTrue("for i=" + i, removeResult);
- assertEquals("for i=" + i, null, pr.get(Integer.toString(i)));
- }
- if (!isEmpty) {
- size = pr.size();
- assertEquals("Size doesn't return expected value", 0, size);
- pr.localClear();
- assertTrue("isEmpty doesnt return proper state of the PartitionedRegion",
- pr.isEmpty());
- }
-
- if (!isEmpty) {
- // bug #42169 - entry not updated on server when locally destroyed on client
- String key42169 = "key42169";
- pr.put(key42169, "initialValue42169");
- pr.localDestroy(key42169);
- boolean success = pr.replace(key42169, "initialValue42169", "newValue42169");
- assertTrue("expected replace to succeed", success);
- pr.destroy(key42169);
- pr.put(key42169, "secondRound");
- pr.localDestroy(key42169);
- Object result = pr.putIfAbsent(key42169, null);
- assertEquals("expected putIfAbsent to fail", result, "secondRound");
- pr.destroy(key42169);
- }
-
- if (isEmpty) {
- String key41265 = "key41265";
- boolean success = pr.remove(key41265, null);
- assertFalse("expected remove to fail because key does not exist", success);
- }
-
- // test null values
-
- // putIfAbsent with null value creates invalid entry
- Object oldValue = pr.putIfAbsent("keyForNull", null);
- assertNull(oldValue);
- if (!isEmpty) {
- assertTrue(pr.containsKey("keyForNull"));
- assertTrue(!pr.containsValueForKey("keyForNull"));
- }
-
- // replace allows null value for oldValue, meaning invalidated entry
- assertTrue(pr.replace("keyForNull", null, "no longer invalid"));
-
- // replace does not allow null value for new value
- try {
- pr.replace("keyForNull", "no longer invalid", null);
- fail("expected a NullPointerException");
- } catch (NullPointerException expected) {
- }
-
- // other variant of replace does not allow null value for new value
- try {
- pr.replace("keyForNull", null);
- fail ("expected a NullPointerException");
- } catch (NullPointerException expected) {
- }
-
- // replace with null oldvalue matches invalidated entry
- pr.putIfAbsent("otherKeyForNull", null);
- int puts = ((GemFireCacheImpl)pr.getCache()).getCachePerfStats().getPuts();
- boolean success = pr.replace("otherKeyForNull", null, "no longer invalid");
- assertTrue(success);
- int newputs = ((GemFireCacheImpl)pr.getCache()).getCachePerfStats().getPuts();
- assertTrue("stats not updated properly or replace malfunctioned", newputs == puts+1);
-
- }
- });
- }
-
- /**
- * Test for single BridgeWriter used across two regions: notify by subscription is true.
- * For region1 the interest list is empty , for region 2 the intetest list is all keys.
- * If an update/create is made on region1 , the client should not receive any.
- * If the create/update is on region2 , the client should receive the update.
- */
- public void testSameBridgeWriterForTwoRegionHavingDifferentInterestList()
- throws Exception
- {
- // start server first
- PORT1 = initServerCache(true);
- createClientCache(getServerHostName(Host.getHost(0)), PORT1);
- populateCache();
- registerInterest();
- server1.invoke(BridgeWriterMiscDUnitTest.class, "put");
-
-// pause(5000 + 5000 + 10000);
- /*final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
- try {
- Thread.yield();
- Thread.sleep(maxWaitTime);
- }
- catch (InterruptedException e) {
- fail("interrupted");
- }*/
- verifyUpdates();
-
- }
-
- /**
- * Test for single BridgeWriter used across two regions: notify by subscription is true.
- * Both the regions have registered interest in all the keys.
- * Now close region1 on the client.
- * The region1 should get removed from the interest list on CCP at server.
- * Any update on region1 on server should not get pushed to the client.
- * Ensure that the message related is not added to the client's queue at all
- * ( which is diferent from not receiving a callbak on the client).
- * If an update on region2 is made on the server , then client should receive the calback
- */
- public void testSameBridgeWriterForTwoRegionHavingALLKEYSInterest()
- throws Exception
- {
- // start server first
- PORT1 = initServerCache(true);
- createClientCache(getServerHostName(Host.getHost(0)), PORT1);
- populateCache();
- registerInterestInBothTheRegions();
- closeRegion1();
- pause(6000);
- server1.invoke(BridgeWriterMiscDUnitTest.class,
- "verifyInterestListOnServer");
- server1.invoke(BridgeWriterMiscDUnitTest.class, "put");
- //pause(5000);
- verifyUpdatesOnRegion2();
- }
-
- /** Test for single BridgeWriter used across two regions: notify by subscription is true.
- * Both the regions have registered interest in all the keys.
- * Close both the regions. When the last region is closed ,
- * it should close the ConnectionProxy on the client ,
- * close all the server connection threads on the server &
- * remove the CacheClientProxy from the CacheClient notifier
- */
- public void testRegionCloseWithSameBridgeWriter() throws Exception
- {
- // start server first
- PORT1 = initServerCache(true);
- pool = (PoolImpl)createClientCache(getServerHostName(Host.getHost(0)),PORT1);
- populateCache();
- registerInterestInBothTheRegions();
- closeBothRegions();
- //pause(5000);
- assertEquals(false, pool.isDestroyed());
- pool.destroy();
- assertEquals(true, pool.isDestroyed());
- server1.invoke(BridgeWriterMiscDUnitTest.class,
- "verifyNoCacheClientProxyOnServer");
-
- }
-
- /**
- * Test for single BridgeWriter used across two regions: notify by
- * subscription is true. Both the regions have registered interest in all the
- * keys. Destroy region1 on the client. It should reach the server , kill the
- * region on the server , propagate it to the interested clients , but it
- * should keep CacheClient Proxy alive. Destroy Region2 . It should reach
- * server , close conenction proxy , destroy the region2 on the server ,
- * remove the cache client proxy from the cache client notifier & propagate it
- * to the clients. Then create third region and verify that no
- * CacheClientProxy is created on server
- */
- public void testCCPDestroyOnLastDestroyRegion() throws Exception
- {
- PORT1 = initServerCache(true);
- PoolImpl pool = (PoolImpl)createClientCache(getServerHostName(Host.getHost(0)),PORT1);
- destroyRegion1();
- // pause(5000);
- server1.invoke(BridgeWriterMiscDUnitTest.class,
- "verifyCacheClientProxyOnServer", new Object[] { new String(
- REGION_NAME1) });
- Connection conn = pool.acquireConnection();
- assertNotNull(conn);
- assertEquals(1, pool.getConnectedServerCount());
- assertEquals(false, pool.isDestroyed());
- destroyRegion2();
- assertEquals(false, pool.isDestroyed());
- destroyPRRegion();
- assertEquals(false, pool.isDestroyed());
- pool.destroy();
- assertEquals(true, pool.isDestroyed());
- // pause(5000);
- server1.invoke(BridgeWriterMiscDUnitTest.class,
- "verifyNoCacheClientProxyOnServer");
- try {
- getCache().createRegion(REGION_NAME2, attrs);
- fail("expected IllegalStateException");
- } catch (IllegalStateException expected) {
- }
- }
-
- /**
- * Test for single BridgeWriter used across two regions:If notify by
- * subscription is false , both the regions should receive invalidates for the
- * updates on server in their respective regions
- *
- */
- public void testInvalidatesPropagateOnTwoRegionsHavingCommonBridgeWriter()
- throws Exception
- {
- // start server first
- PORT1 = initServerCache(false);
- createClientCache(getServerHostName(Host.getHost(0)), PORT1);
- registerInterestForInvalidatesInBothTheRegions();
- populateCache();
- server1.invoke(BridgeWriterMiscDUnitTest.class, "put");
- //pause(5000);
- verifyInvalidatesOnBothRegions();
-
- }
-
- /**
- * Test for bug 43407, where LRU in the client caused an entry to be
- * evicted with DESTROY(), then the client invalidated the entry and
- * did a get(). After the get() the entry was not seen to be in the
- * client's cache. This turned out to be expected behavior, but we
- * now have this test to guarantee that the product behaves as expected.
- */
- public void testBug43407()
- throws Exception
- {
- // start server first
- PORT1 = initServerCache(false);
- createClientCache(getServerHostName(Host.getHost(0)), PORT1);
- registerInterestForInvalidatesInBothTheRegions();
- Region region = static_cache.getRegion(REGION_NAME1);
- populateCache();
- region.put("invalidationKey", "invalidationValue");
- region.localDestroy("invalidationKey");
- if (region.containsKey("invalidationKey")) {
- fail("region still contains invalidationKey");
- }
- region.invalidate("invalidationKey");
- if (region.containsKey("invalidationKey")) {
- fail("this test expects the entry is not created on invalidate() if not there before the operation");
- }
- Object value = region.get("invalidationKey");
- if (value != null) {
- fail("this test expected a null response to get('invalidationKey')");
- }
- if (!region.containsKeyOnServer("invalidationKey")) {
- fail("expected an entry on the server after invalidation");
- }
- // bug 43407 asserts that there should be an entry, but the product does not
- // do this. This verifies that the product does not behave as asserted in that bug
- if (region.containsKey("invalidationKey")) {
- fail("expected no entry after invalidation when entry was not in client but was on server");
- }
- }
-
- /**
- * Create cache, create bridge writer, notify-by-subscription=false,
- * create a region and on client and on server.
- * Do not attach Bridge writer to region ,
- * populate some entries on region both on client and server.
- * Update the entries on server the client.
- * The client should not have entry invalidate.
- *
- * @throws Exception
- */
- public void testInvalidatesPropagateOnRegionHavingNoBridgeWriter()
- throws Exception
- {
- // start server first
- PORT1 = initServerCache(false);
- Properties props = new Properties();
- props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
- props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new BridgeWriterMiscDUnitTest("temp").createCache(props);
- String host = getServerHostName(server1.getHost());
- PoolImpl p = (PoolImpl)PoolManager.createFactory()
- .addServer(host, PORT1)
- .setSubscriptionEnabled(true)
- .setThreadLocalConnections(true)
- .setReadTimeout(1000)
- .setSocketBufferSize(32768)
- .setMinConnections(3)
- .setSubscriptionRedundancy(-1)
- .setPingInterval(2000)
- // .setRetryAttempts(5)
- // .setRetryInterval(2000)
- .create("testInvalidatesPropagateOnRegionHavingNoBridgeWriter");
-
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- // factory.setPoolName(p.getName());
-
- attrs = factory.create();
- final Region region1 = getCache().createRegion(REGION_NAME1, attrs);
- final Region region2 = getCache().createRegion(REGION_NAME2, attrs);
- assertNotNull(region1);
- assertNotNull(region2);
- pool = p;
- conn = pool.acquireConnection();
- assertNotNull(conn);
-
- populateCache();
- server1.invoke(BridgeWriterMiscDUnitTest.class, "put");
- // pause(5000);
- WaitCriterion wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = region1.getEntry(k1).getValue();
- return k1.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- // assertEquals(region1.getEntry(k1).getValue(), k1);
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = region1.getEntry(k2).getValue();
- return k2.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = region2.getEntry(k1).getValue();
- return k1.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- // assertEquals(region1.getEntry(k2).getValue(), k2);
- // assertEquals(region2.getEntry(k1).getValue(), k1);
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = region2.getEntry(k2).getValue();
- return k2.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- // assertEquals(region2.getEntry(k2).getValue(), k2);
- }
-
- /**
- * Create proxy before cache creation, create cache, create two regions,
- * attach same bridge writer to both of the regions Region interests AL_KEYS
- * on both the regions, notify-by-subscription=true . The CCP should have both
- * the regions in interest list.
- *
- * @throws Exception
- */
-
- public void testProxyCreationBeforeCacheCreation() throws Exception
- {
- Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", "");
- DistributedSystem ds = getSystem(props);
- assertNotNull(ds);
- ds.disconnect();
- ds = getSystem(props);
- PORT1 = initServerCache(true);
- String host = getServerHostName(server1.getHost());
- Pool p = PoolManager.createFactory()
- .addServer(host, PORT1)
- .setSubscriptionEnabled(true)
- .setSubscriptionRedundancy(-1)
- // .setRetryAttempts(5)
- .create("testProxyCreationBeforeCacheCreationPool");
-
- Cache cache = getCache();
- assertNotNull(cache);
-
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- factory.setPoolName(p.getName());
-
- RegionAttributes myAttrs = factory.create();
- Region region1 = cache.createRegion(REGION_NAME1, myAttrs);
- Region region2 = cache.createRegion(REGION_NAME2, myAttrs);
- assertNotNull(region1);
- assertNotNull(region2);
- //region1.registerInterest(CacheClientProxy.ALL_KEYS);
- region2.registerInterest("ALL_KEYS");
- pause(6000);
- server1.invoke(BridgeWriterMiscDUnitTest.class,
- "verifyInterestListOnServer");
-
- }
- /**
- *
- * Cycling a DistributedSystem with an initialized BridgeWriter causes interest registration NPE
- *
- * Test Scenario:
- *
- * Create a DistributedSystem (DS1).
- * Create a BridgeWriter (BW), initialize (creates a proxy with DS1 memberid)
- * Disconnect DS1. Create a DistributedSystem (DS2).
- * Create a Region with BW, it attempts to register interest using DS2 memberid, gets NPE.
- *
- * @throws Exception
- */
- public void testBug35380() throws Exception
- {
- Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", "");
- DistributedSystem ds = getSystem(props);
- assertNotNull(ds);
-
- PORT1 = initServerCache(true);
- String host = getServerHostName(server1.getHost());
- Pool p = PoolManager.createFactory()
- .addServer(host, PORT1)
- .setSubscriptionEnabled(true)
- .setSubscriptionRedundancy(-1)
- //.setRetryAttempts(5)
- .create("testBug35380Pool");
-
- Cache cache = getCache();
-
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- factory.setPoolName(p.getName());
-
- RegionAttributes myAttrs = factory.create();
- Region region1 = cache.createRegion(REGION_NAME1, myAttrs);
- Region region2 = cache.createRegion(REGION_NAME2, myAttrs);
- assertNotNull(region1);
- assertNotNull(region2);
-
- region2.registerInterest("ALL_KEYS");
-
- ds.disconnect();
- Properties prop = new Properties();
- prop.setProperty("mcast-port", "0");
- prop.setProperty("locators", "");
- ds = getSystem(prop);
-
- cache = getCache();
- assertNotNull(cache);
-
- AttributesFactory factory1 = new AttributesFactory();
- factory1.setScope(Scope.DISTRIBUTED_ACK);
- //reuse writer from prev DS
- factory1.setPoolName(p.getName());
-
- RegionAttributes attrs1 = factory1.create();
- try {
- cache.createRegion(REGION_NAME1, attrs1);
- fail("expected ShutdownException");
- }
- catch(IllegalStateException expected) {
- }
- catch (DistributedSystemDisconnectedException expected) {
- }
- }
-
-
- private void createCache(Properties props) throws Exception {
- createCacheV(props);
- }
- private Cache createCacheV(Properties props) throws Exception
- {
- DistributedSystem ds = getSystem(props);
- assertNotNull(ds);
- ds.disconnect();
- ds = getSystem(props);
- Cache cache = getCache();
- assertNotNull(cache);
- return cache;
- }
-
- public static void createClientCacheV(String h, int port)
- throws Exception {
- _createClientCache(h, port, false);
- }
-
- public static void createEmptyClientCache(String h, int port)
- throws Exception {
- _createClientCache(h, port, true);
- }
-
- public static Pool createClientCache(String h, int port)
- throws Exception {
- return _createClientCache(h, port, false);
- }
-
- public static Pool _createClientCache(String h, int port, boolean empty)
- throws Exception {
- Properties props = new Properties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", "");
- Cache cache = new BridgeWriterMiscDUnitTest("temp").createCacheV(props);
- BridgeWriterMiscDUnitTest.static_cache = cache;
- PoolImpl p = (PoolImpl)PoolManager.createFactory()
- .addServer(h, port)
- .setSubscriptionEnabled(true)
- .setThreadLocalConnections(true)
- .setReadTimeout(1000)
- .setSocketBufferSize(32768)
- .setMinConnections(3)
- .setSubscriptionRedundancy(-1)
- .setPingInterval(2000)
- // .setRetryAttempts(5)
- // .setRetryInterval(2000)
- .create("BridgeWriterMiscDUnitTestPool");
-
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- if (empty) {
- factory.setDataPolicy(DataPolicy.EMPTY);
- }
- factory.setPoolName(p.getName());
-
- attrs = factory.create();
- Region region1 = cache.createRegion(REGION_NAME1, attrs);
- Region region2 = cache.createRegion(REGION_NAME2, attrs);
- Region prRegion = cache.createRegion(PR_REGION_NAME, attrs);
- assertNotNull(region1);
- assertNotNull(region2);
- assertNotNull(prRegion);
- pool = p;
-// conn = pool.acquireConnection();
-// assertNotNull(conn);
- // TODO does this WaitCriterion actually help?
- WaitCriterion wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- try {
- conn = pool.acquireConnection();
- if (conn == null) {
- excuse = "acquireConnection returned null?";
- return false;
- }
- return true;
- } catch (NoAvailableServersException e) {
- excuse = "Cannot find a server: " + e;
- return false;
- }
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- return p;
- }
-
- public static Integer createServerCache(Boolean notifyBySubscription, Integer maxThreads)
- throws Exception {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").createCacheV(new Properties());
- unsetSlowDispatcherFlag();
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- factory.setEnableConflation(true);
- factory.setDataPolicy(DataPolicy.REPLICATE);
- RegionAttributes myAttrs = factory.create();
- Region r1 = cache.createRegion(REGION_NAME1, myAttrs);
- Region r2 = cache.createRegion(REGION_NAME2, myAttrs);
- factory = new AttributesFactory();
- factory.setDataPolicy(DataPolicy.PARTITION);
- RegionAttributes prAttrs = factory.create();
- Region pr = cache.createRegion(PR_REGION_NAME, prAttrs);
- assertNotNull(r1);
- assertNotNull(r2);
- assertNotNull(pr);
-
- CacheServer server = cache.addCacheServer();
- int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- r1.getCache().getDistributedSystem().getLogWriter().info("Starting server on port " + port);
- server.setPort(port);
- server.setMaxThreads(maxThreads.intValue());
- server.setNotifyBySubscription(notifyBySubscription.booleanValue());
- server.start();
- r1.getCache().getDistributedSystem().getLogWriter().info("Started server on port " + server.getPort());
- return new Integer(server.getPort());
-
- }
-
- protected int getMaxThreads() {
- return 0;
- }
-
- public static void registerInterest()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- assertNotNull(r);
- //r.registerInterestRegex(CacheClientProxy.ALL_KEYS);
- r.registerInterest("ALL_KEYS");
- }
- catch (CacheWriterException e) {
- e.printStackTrace();
- fail("Test failed due to CacheWriterException during registerInterest", e);
- }
- }
-
- public static void registerInterestForInvalidatesInBothTheRegions()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
- assertNotNull(r1);
- Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- assertNotNull(r2);
- r1.registerInterest("ALL_KEYS", false, false);
- r2.registerInterest("ALL_KEYS", false, false);
- }
- catch (CacheWriterException e) {
- e.printStackTrace();
- fail(
- "Test failed due to CacheWriterException during registerInterestnBothRegions",
- e);
- }
- }
-
- public static void registerInterestInBothTheRegions()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
- assertNotNull(r1);
- Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- assertNotNull(r2);
- r1.registerInterest("ALL_KEYS");
- r2.registerInterest("ALL_KEYS");
- }
- catch (CacheWriterException e) {
- e.printStackTrace();
- fail(
- "Test failed due to CacheWriterException during registerInterestnBothRegions",
- e);
- }
- }
-
- public static void closeRegion1()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
- assertNotNull(r1);
- r1.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- fail("Test failed due to Exception during closeRegion1", e);
- }
- }
-
- public static void closeBothRegions()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
- Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- Region pr = cache.getRegion(Region.SEPARATOR + PR_REGION_NAME);
- assertNotNull(r1);
- assertNotNull(r2);
- assertNotNull(pr);
- r1.close();
- r2.close();
- pr.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- fail("Test failed due to Exception during closeBothRegions", e);
- }
- }
-
- public static void destroyRegion1()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
- assertNotNull(r1);
- r1.destroyRegion();
- }
- catch (Exception e) {
- e.printStackTrace();
- fail("Test failed due to Exception during closeBothRegions", e);
- }
- }
-
- public static void destroyRegion2()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- assertNotNull(r2);
- r2.destroyRegion();
- }
- catch (Exception e) {
- e.printStackTrace();
- fail("Test failed due to Exception during closeBothRegions", e);
- }
- }
-
- public static void destroyPRRegion() {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r2 = cache.getRegion(Region.SEPARATOR + PR_REGION_NAME);
- assertNotNull(r2);
- r2.destroyRegion();
- } catch (Exception e) {
- // e.printStackTrace();
- fail("Test failed due to Exception during closeBothRegions", e);
- }
- }
-
- public static void verifyInterestListOnServer()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- assertEquals("More than one BridgeServer", 1, cache.getCacheServers()
- .size());
- CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
- .iterator().next();
- assertNotNull(bs);
- assertNotNull(bs.getAcceptor());
- assertNotNull(bs.getAcceptor().getCacheClientNotifier());
- Iterator iter_prox = bs.getAcceptor().getCacheClientNotifier()
- .getClientProxies().iterator();
- while (iter_prox.hasNext()) {
- CacheClientProxy ccp = (CacheClientProxy)iter_prox.next();
- // CCP should not contain region1
- Set akr = ccp.cils[RegisterInterestTracker.interestListIndex].regions;
- assertNotNull(akr);
- assertTrue(!akr.contains(Region.SEPARATOR + REGION_NAME1));
- // CCP should contain region2
- assertTrue(akr.contains(Region.SEPARATOR + REGION_NAME2));
- assertEquals(1, akr.size());
- }
- }
- catch (Exception ex) {
- ex.printStackTrace();
- fail("while setting verifyInterestListOnServer " + ex);
- }
- }
-
- public static void verifyNoCacheClientProxyOnServer()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- assertEquals("More than one BridgeServer", 1, cache.getCacheServers()
- .size());
- CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
- .iterator().next();
- assertNotNull(bs);
- assertNotNull(bs.getAcceptor());
- final CacheClientNotifier ccn = bs.getAcceptor().getCacheClientNotifier();
-
- assertNotNull(ccn);
- WaitCriterion wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- return ccn.getClientProxies().size() == 0;
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 40 * 1000, 1000, true);
- }
- catch (Exception ex) {
- ex.printStackTrace();
- fail("while setting verifyNoCacheClientProxyOnServer " + ex);
- }
- }
-
- public static void verifyCacheClientProxyOnServer(String regionName)
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- assertNull(cache.getRegion(Region.SEPARATOR + regionName));
- verifyCacheClientProxyOnServer();
-
- //assertEquals(1, bs.getAcceptor().getCacheClientNotifier().getClientProxies().size());
- }
- catch (Exception ex) {
- ex.printStackTrace();
- fail("while setting verifyNoCacheClientProxyOnServer " + ex);
- }
- }
-
- public static void verifyCacheClientProxyOnServer()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- assertEquals("More than one BridgeServer", 1, cache.getCacheServers()
- .size());
- CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
- .iterator().next();
- assertNotNull(bs);
- assertNotNull(bs.getAcceptor());
- final CacheClientNotifier ccn = bs.getAcceptor().getCacheClientNotifier();
-
- assertNotNull(ccn);
- WaitCriterion wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- return ccn.getClientProxies().size() == 1;
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 40 * 1000, 1000, true);
- }
- catch (Exception ex) {
- ex.printStackTrace();
- fail("while setting verifyNoCacheClientProxyOnServer " + ex);
- }
- }
-
- public static void populateCache()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
- Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- assertNotNull(r1);
- assertNotNull(r2);
-
- if (!r1.containsKey(k1))
- r1.create(k1, k1);
- if (!r1.containsKey(k2))
- r1.create(k2, k2);
- if (!r2.containsKey(k1))
- r2.create(k1, k1);
- if (!r2.containsKey(k2))
- r2.create(k2, k2);
-
- assertEquals(r1.getEntry(k1).getValue(), k1);
- assertEquals(r1.getEntry(k2).getValue(), k2);
- assertEquals(r2.getEntry(k1).getValue(), k1);
- assertEquals(r2.getEntry(k2).getValue(), k2);
- }
- catch (Exception ex) {
- fail("failed while createEntries()", ex);
- }
- }
-
- public static void put()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
- Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- assertNotNull(r1);
- assertNotNull(r2);
-
- r1.put(k1, server_k1);
- r1.put(k2, server_k2);
-
- r2.put(k1, server_k1);
- r2.put(k2, server_k2);
-
- assertEquals(r1.getEntry(k1).getValue(), server_k1);
- assertEquals(r1.getEntry(k2).getValue(), server_k2);
- assertEquals(r2.getEntry(k1).getValue(), server_k1);
- assertEquals(r2.getEntry(k2).getValue(), server_k2);
- }
- catch (Exception ex) {
- fail("failed while put()", ex);
- }
- }
-
- public static void verifyUpdates()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
- final Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- assertNotNull(r1);
- assertNotNull(r2);
- // verify updates
- WaitCriterion wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r1.getEntry(k1).getValue();
- return k1.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- // assertEquals(k1, r1.getEntry(k1).getValue());
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r1.getEntry(k2).getValue();
- return k2.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- // assertEquals(k2, r1.getEntry(k2).getValue());
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r2.getEntry(k1).getValue();
- return server_k1.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- // assertEquals(server_k1, r2.getEntry(k1).getValue());
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r2.getEntry(k2).getValue();
- return server_k2.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- // assertEquals(server_k2, r2.getEntry(k2).getValue());
- }
- catch (Exception ex) {
- fail("failed while verifyUpdates()", ex);
- }
- }
-
- public static void verifyInvalidatesOnBothRegions()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
- final Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- assertNotNull(r1);
- assertNotNull(r2);
-
- WaitCriterion wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r1.getEntry(k1).getValue();
- return val == null;
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
-
- // assertNull(r1.getEntry(k1).getValue());
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r1.getEntry(k1).getValue();
- return val == null;
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
-
- // assertNull(r1.getEntry(k2).getValue());
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r1.getEntry(k2).getValue();
- return val == null;
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
-
-
- // assertNull(r2.getEntry(k1).getValue());
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r2.getEntry(k1).getValue();
- return val == null;
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
-
- // assertNull(r2.getEntry(k2).getValue());
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r2.getEntry(k2).getValue();
- return val == null;
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
- }
- catch (Exception ex) {
- fail("failed while verifyInvalidatesOnBothRegions()", ex);
- }
- }
-
- public static void verifyUpdatesOnRegion2()
- {
- try {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- final Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
- assertNotNull(r2);
- WaitCriterion wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r2.getEntry(k1).getValue();
- return server_k1.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- // assertEquals(server_k1, r2.getEntry(k1).getValue());
- wc = new WaitCriterion() {
- String excuse;
- public boolean done() {
- Object val = r2.getEntry(k2).getValue();
- return server_k2.equals(val);
- }
- public String description() {
- return excuse;
- }
- };
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
-
- // assertEquals(server_k2, r2.getEntry(k2).getValue());
- }
- catch (Exception ex) {
- fail("failed while verifyUpdatesOnRegion2()", ex);
- }
- }
-
- public void tearDown2() throws Exception
- {
- super.tearDown2();
- // close the clients first
- closeCache();
- // then close the servers
- server1.invoke(BridgeWriterMiscDUnitTest.class, "closeCache");
-
- }
-
- public static void closeCache()
- {
- Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache();
- if (cache != null && !cache.isClosed()) {
- cache.close();
- cache.getDistributedSystem().disconnect();
- }
- }
-
- /**
- * set the boolean for starting the dispatcher thread a bit later to FALSE.
- * This is just a precaution in case any test set it to true and did not unset
- * it on completion.
- *
- */
- public static void unsetSlowDispatcherFlag()
- {
- CacheClientProxy.isSlowStartForTesting = false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/725e4bf5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscSelectorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscSelectorDUnitTest.java
deleted file mode 100644
index 01bc903..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscSelectorDUnitTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.internal.cache.tier.sockets;
-
-
-/**
- * Just like BridgeWriterMiscDUnitTest but enables bridge thread pool
- * (ie. selector)
- *
- * @author darrel
- *
- */
-public class BridgeWriterMiscSelectorDUnitTest extends BridgeWriterMiscDUnitTest
-{
- public BridgeWriterMiscSelectorDUnitTest(String name) {
- super(name);
- }
-
- protected int getMaxThreads() {
- return 2;
- }
-}
[02/17] incubator-geode git commit: missed file in previous commit
Posted by ds...@apache.org.
missed file in previous commit
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0099dcfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0099dcfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0099dcfe
Branch: refs/heads/feature/GEODE-243
Commit: 0099dcfe5d3b2fd5ebbb21553621ec8d45bc8ccb
Parents: 3db9d43
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 11:19:09 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 11:19:09 2015 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/internal/cache/ClientRegionEventImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0099dcfe/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
index 7c7aed1..176ddcb 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
@@ -19,8 +19,8 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
//import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
/**
- * Class <code>BridgeRegionEventImpl</code> is an implementation of a bridge
- * region event, which is just an <code>RegionEvent</code> with the client's
+ * Class <code>ClientRegionEventImpl</code> is a
+ * region event with the client's
* host and port for notification purposes.
*
* @author Girish Thombare
@@ -89,7 +89,7 @@ public final class ClientRegionEventImpl extends RegionEventImpl
@Override
public int getDSFID() {
- return BRIDGE_REGION_EVENT;
+ return CLIENT_REGION_EVENT;
}
@Override
[05/17] incubator-geode git commit: renamed BridgeWriterDUnitTest to
ClientRegisterInterestDUnitTest renamed BridgeWriterSelectorDUnitTest to
ClientRegisterInterestSelectorDUnitTest
Posted by ds...@apache.org.
renamed BridgeWriterDUnitTest to ClientRegisterInterestDUnitTest
renamed BridgeWriterSelectorDUnitTest to ClientRegisterInterestSelectorDUnitTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/091e9ae0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/091e9ae0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/091e9ae0
Branch: refs/heads/feature/GEODE-243
Commit: 091e9ae04fd84231664cab18490226b409660b6e
Parents: f840837
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 11:28:25 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 11:28:25 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache30/BridgeWriterDUnitTest.java | 418 -------------------
.../cache30/BridgeWriterSelectorDUnitTest.java | 16 -
.../ClientRegisterInterestDUnitTest.java | 418 +++++++++++++++++++
...ClientRegisterInterestSelectorDUnitTest.java | 16 +
4 files changed, 434 insertions(+), 434 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/091e9ae0/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterDUnitTest.java
deleted file mode 100644
index 5554993..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterDUnitTest.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.cache30;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.CacheException;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.cache.client.SubscriptionNotEnabledException;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
-
-/**
- * Tests the client register interest
- *
- * @author Kirk Lund
- * @since 4.2.3
- */
-public class BridgeWriterDUnitTest extends ClientServerTestCase {
-
- public BridgeWriterDUnitTest(String name) {
- super(name);
- }
-
- public void tearDown2() throws Exception {
- super.tearDown2();
- disconnectAllFromDS(); // cleans up bridge server and client and lonerDS
- }
-
- /**
- * Tests for Bug 35381 Calling register interest if
- * establishCallbackConnection is not set causes bridge server NPE.
- */
- public void testBug35381() throws Exception {
- final Host host = Host.getHost(0);
- final String name = this.getUniqueName();
- final int[] ports = new int[1]; // 1 server in this test
-
- final int whichVM = 0;
- final VM vm = Host.getHost(0).getVM(whichVM);
- vm.invoke(new CacheSerializableRunnable("Create bridge server") {
- public void run2() throws CacheException {
- getLogWriter().info("[testBug35381] Create BridgeServer");
- getSystem();
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.LOCAL);
- Region region = createRegion(name, factory.create());
- assertNotNull(region);
- assertNotNull(getRootRegion().getSubregion(name));
- region.put("KEY-1", "VAL-1");
-
- try {
- bridgeServerPort = startBridgeServer(0);
- }
- catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
- fail("startBridgeServer threw IOException " + e.getMessage());
- }
-
- assertTrue(bridgeServerPort != 0);
-
- getLogWriter().info("[testBug35381] port=" + bridgeServerPort);
- getLogWriter().info("[testBug35381] serverMemberId=" + getMemberId());
- }
- });
- ports[whichVM] = vm.invokeInt(BridgeWriterDUnitTest.class,
- "getBridgeServerPort");
- assertTrue(ports[whichVM] != 0);
-
- getLogWriter().info("[testBug35381] create bridge client");
- Properties config = new Properties();
- config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
- config.setProperty(DistributionConfig.LOCATORS_NAME, "");
- getSystem(config);
- getCache();
-
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.LOCAL);
-
- getLogWriter().info("[testBug35381] creating connection pool");
- boolean establishCallbackConnection = false; // SOURCE OF BUG 35381
- ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
- Region region = createRegion(name, factory.create());
- assertNotNull(getRootRegion().getSubregion(name));
- try {
- region.registerInterest("KEY-1");
- fail("registerInterest failed to throw SubscriptionNotEnabledException with establishCallbackConnection set to false");
- }
- catch (SubscriptionNotEnabledException expected) {
- }
- }
- protected static int bridgeServerPort;
- private static int getBridgeServerPort() {
- return bridgeServerPort;
- }
-
- /**
- * Tests failover of register interest from client point of view. Related
- * bugs include:
- *
- * <p>Bug 35654 "failed re-registration may never be detected and thus
- * may never re-re-register"
- *
- * <p>Bug 35639 "registerInterest re-registration happens everytime a healthy
- * server is detected"
- *
- * <p>Bug 35655 "a single failed re-registration causes all other pending
- * re-registrations to be cancelled"
- */
- public void _testRegisterInterestFailover() throws Exception {
- // controller is bridge client
-
- final Host host = Host.getHost(0);
- final String name = this.getUniqueName();
- final String regionName1 = name+"-1";
- final String regionName2 = name+"-2";
- final String regionName3 = name+"-3";
- final String key1 = "KEY-"+regionName1+"-1";
- final String key2 = "KEY-"+regionName1+"-2";
- final String key3 = "KEY-"+regionName1+"-3";
- final int[] ports = new int[3]; // 3 servers in this test
-
- // create first bridge server with region for client...
- final int firstServerIdx = 0;
- final VM firstServerVM = Host.getHost(0).getVM(firstServerIdx);
- firstServerVM.invoke(new CacheSerializableRunnable("Create first bridge server") {
- public void run2() throws CacheException {
- getLogWriter().info("[testRegisterInterestFailover] Create first bridge server");
- getSystem();
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.LOCAL);
- Region region1 = createRootRegion(regionName1, factory.create());
- Region region2 = createRootRegion(regionName2, factory.create());
- Region region3 = createRootRegion(regionName3, factory.create());
- region1.put(key1, "VAL-1");
- region2.put(key2, "VAL-1");
- region3.put(key3, "VAL-1");
-
- try {
- bridgeServerPort = startBridgeServer(0);
- }
- catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
- fail("startBridgeServer threw IOException " + e.getMessage());
- }
-
- assertTrue(bridgeServerPort != 0);
-
- getLogWriter().info("[testRegisterInterestFailover] " +
- "firstServer port=" + bridgeServerPort);
- getLogWriter().info("[testRegisterInterestFailover] " +
- "firstServer memberId=" + getMemberId());
- }
- });
-
- // create second bridge server missing region for client...
- final int secondServerIdx = 1;
- final VM secondServerVM = Host.getHost(0).getVM(secondServerIdx);
- secondServerVM.invoke(new CacheSerializableRunnable("Create second bridge server") {
- public void run2() throws CacheException {
- getLogWriter().info("[testRegisterInterestFailover] Create second bridge server");
- getSystem();
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.LOCAL);
- Region region1 = createRootRegion(regionName1, factory.create());
- Region region3 = createRootRegion(regionName3, factory.create());
- region1.put(key1, "VAL-2");
- region3.put(key3, "VAL-2");
-
- try {
- bridgeServerPort = startBridgeServer(0);
- }
- catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
- fail("startBridgeServer threw IOException " + e.getMessage());
- }
-
- assertTrue(bridgeServerPort != 0);
-
- getLogWriter().info("[testRegisterInterestFailover] " +
- "secondServer port=" + bridgeServerPort);
- getLogWriter().info("[testRegisterInterestFailover] " +
- "secondServer memberId=" + getMemberId());
- }
- });
-
- // get the bridge server ports...
- ports[firstServerIdx] = firstServerVM.invokeInt(
- BridgeWriterDUnitTest.class, "getBridgeServerPort");
- assertTrue(ports[firstServerIdx] != 0);
- ports[secondServerIdx] = secondServerVM.invokeInt(
- BridgeWriterDUnitTest.class, "getBridgeServerPort");
- assertTrue(ports[secondServerIdx] != 0);
- assertTrue(ports[firstServerIdx] != ports[secondServerIdx]);
-
- // stop second and third servers
- secondServerVM.invoke(new CacheSerializableRunnable("Stop second bridge server") {
- public void run2() throws CacheException {
- stopBridgeServers(getCache());
- }
- });
-
- // create the bridge client
- getLogWriter().info("[testBug35654] create bridge client");
- Properties config = new Properties();
- config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
- config.setProperty(DistributionConfig.LOCATORS_NAME, "");
- getSystem(config);
- getCache();
-
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.LOCAL);
-
- getLogWriter().info("[testRegisterInterestFailover] creating connection pool");
- boolean establishCallbackConnection = true;
- final PoolImpl p = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
-
- final Region region1 = createRootRegion(regionName1, factory.create());
- final Region region2 = createRootRegion(regionName2, factory.create());
- final Region region3 = createRootRegion(regionName3, factory.create());
-
- assertTrue(region1.getInterestList().isEmpty());
- assertTrue(region2.getInterestList().isEmpty());
- assertTrue(region3.getInterestList().isEmpty());
-
- region1.registerInterest(key1);
- region2.registerInterest(key2);
- region3.registerInterest(key3);
-
- assertTrue(region1.getInterestList().contains(key1));
- assertTrue(region2.getInterestList().contains(key2));
- assertTrue(region3.getInterestList().contains(key3));
-
- assertTrue(region1.getInterestListRegex().isEmpty());
- assertTrue(region2.getInterestListRegex().isEmpty());
- assertTrue(region3.getInterestListRegex().isEmpty());
-
- // get ConnectionProxy and wait until connected to first server
- WaitCriterion ev = new WaitCriterion() {
- public boolean done() {
- return p.getPrimaryPort() != -1;
- }
- public String description() {
- return "primary port remained invalid";
- }
- };
- DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
- assertEquals(ports[firstServerIdx], p.getPrimaryPort());
-
- // assert intial values
- assertEquals("VAL-1", region1.get(key1));
- assertEquals("VAL-1", region2.get(key2));
- assertEquals("VAL-1", region3.get(key3));
-
- // do puts on server1 and make sure values come thru for all 3 registrations
- firstServerVM.invoke(new CacheSerializableRunnable("Puts from first bridge server") {
- public void run2() throws CacheException {
- Region region1 = getCache().getRegion(regionName1);
- region1.put(key1, "VAL-1-1");
- Region region2 = getCache().getRegion(regionName2);
- region2.put(key2, "VAL-1-1");
- Region region3 = getCache().getRegion(regionName3);
- region3.put(key3, "VAL-1-1");
- }
- });
-
- ev = new WaitCriterion() {
- public boolean done() {
- if (!"VAL-1-1".equals(region1.get(key1)) ||
- !"VAL-1-1".equals(region2.get(key2)) ||
- !"VAL-1-1".equals(region3.get(key3))
- ) return false;
- return true;
- }
- public String description() {
- return null;
- }
- };
- DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
- assertEquals("VAL-1-1", region1.get(key1));
- assertEquals("VAL-1-1", region2.get(key2));
- assertEquals("VAL-1-1", region3.get(key3));
-
- // force failover to server 2
- secondServerVM.invoke(new CacheSerializableRunnable("Start second bridge server") {
- public void run2() throws CacheException {
- try {
- startBridgeServer(ports[secondServerIdx]);
- }
- catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
- fail("startBridgeServer threw IOException " + e.getMessage());
- }
- }
- });
-
- firstServerVM.invoke(new CacheSerializableRunnable("Stop first bridge server") {
- public void run2() throws CacheException {
- stopBridgeServers(getCache());
- }
- });
-
- // wait for failover to second server
- ev = new WaitCriterion() {
- public boolean done() {
- return ports[secondServerIdx] == p.getPrimaryPort();
- }
- public String description() {
- return "primary port never became " + ports[secondServerIdx];
- }
- };
- DistributedTestCase.waitForCriterion(ev, 100 * 1000, 200, true);
-
- try {
- assertEquals(null, region2.get(key2));
- fail("CacheLoaderException expected");
- }
- catch (com.gemstone.gemfire.cache.CacheLoaderException e) {
- }
-
- // region2 registration should be gone now
- // do puts on server2 and make sure values come thru for only 2 registrations
- secondServerVM.invoke(new CacheSerializableRunnable("Puts from second bridge server") {
- public void run2() throws CacheException {
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.LOCAL);
- createRootRegion(regionName2, factory.create());
- }
- });
-
- // assert that there is no actively registered interest on region2
- assertTrue(region2.getInterestList().isEmpty());
- assertTrue(region2.getInterestListRegex().isEmpty());
-
- region2.put(key2, "VAL-0");
-
- secondServerVM.invoke(new CacheSerializableRunnable("Put from second bridge server") {
- public void run2() throws CacheException {
- Region region1 = getCache().getRegion(regionName1);
- region1.put(key1, "VAL-2-2");
- Region region2 = getCache().getRegion(regionName2);
- region2.put(key2, "VAL-2-1");
- Region region3 = getCache().getRegion(regionName3);
- region3.put(key3, "VAL-2-2");
- }
- });
-
- // wait for updates to come thru
- ev = new WaitCriterion() {
- public boolean done() {
- if (!"VAL-2-2".equals(region1.get(key1)) ||
- !"VAL-2-2".equals(region3.get(key3)))
- return false;
- return true;
- }
- public String description() {
- return null;
- }
- };
- DistributedTestCase.waitForCriterion(ev, 100 * 1000, 200, true);
- assertEquals("VAL-2-2", region1.get(key1));
- assertEquals("VAL-0", region2.get(key2));
- assertEquals("VAL-2-2", region3.get(key3));
-
- // assert again that there is no actively registered interest on region2
- assertTrue(region2.getInterestList().isEmpty());
-
- // register interest again on region2 and make
- region2.registerInterest(key2);
- assertEquals("VAL-2-1", region2.get(key2));
-
- secondServerVM.invoke(new CacheSerializableRunnable("Put from second bridge server") {
- public void run2() throws CacheException {
- Region region1 = getCache().getRegion(regionName1);
- region1.put(key1, "VAL-2-3");
- Region region2 = getCache().getRegion(regionName2);
- region2.put(key2, "VAL-2-2");
- Region region3 = getCache().getRegion(regionName3);
- region3.put(key3, "VAL-2-3");
- }
- });
-
- // wait for updates to come thru
- ev = new WaitCriterion() {
- public boolean done() {
- if (!"VAL-2-3".equals(region1.get(key1)) ||
- !"VAL-2-2".equals(region2.get(key2)) ||
- !"VAL-2-3".equals(region3.get(key3)))
- return false;
- return true;
- }
- public String description() {
- return null;
- }
- };
- DistributedTestCase.waitForCriterion(ev, 100 * 1000, 200, true);
- assertEquals("VAL-2-3", region1.get(key1));
- assertEquals("VAL-2-2", region2.get(key2));
- assertEquals("VAL-2-3", region3.get(key3));
-
- // assert public methods report actively registered interest on region2
- assertTrue(region2.getInterestList().contains(key2));
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/091e9ae0/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterSelectorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterSelectorDUnitTest.java
deleted file mode 100644
index 147af46..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterSelectorDUnitTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.gemstone.gemfire.cache30;
-
-/**
- * Same as BridgeWriterDUnitTest but uses selector in server
- *
- * @author darrel
- * @since 5.1
- */
-public class BridgeWriterSelectorDUnitTest extends BridgeWriterDUnitTest {
- public BridgeWriterSelectorDUnitTest(String name) {
- super(name);
- }
- protected int getMaxThreads() {
- return 2;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/091e9ae0/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
new file mode 100644
index 0000000..b49ec56
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
@@ -0,0 +1,418 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache30;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.cache.client.SubscriptionNotEnabledException;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.VM;
+
+/**
+ * Tests the client register interest
+ *
+ * @author Kirk Lund
+ * @since 4.2.3
+ */
+public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
+
+ public ClientRegisterInterestDUnitTest(String name) {
+ super(name);
+ }
+
+ public void tearDown2() throws Exception {
+ super.tearDown2();
+ disconnectAllFromDS(); // cleans up bridge server and client and lonerDS
+ }
+
+ /**
+ * Tests for Bug 35381 Calling register interest if
+ * establishCallbackConnection is not set causes bridge server NPE.
+ */
+ public void testBug35381() throws Exception {
+ final Host host = Host.getHost(0);
+ final String name = this.getUniqueName();
+ final int[] ports = new int[1]; // 1 server in this test
+
+ final int whichVM = 0;
+ final VM vm = Host.getHost(0).getVM(whichVM);
+ vm.invoke(new CacheSerializableRunnable("Create bridge server") {
+ public void run2() throws CacheException {
+ getLogWriter().info("[testBug35381] Create BridgeServer");
+ getSystem();
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.LOCAL);
+ Region region = createRegion(name, factory.create());
+ assertNotNull(region);
+ assertNotNull(getRootRegion().getSubregion(name));
+ region.put("KEY-1", "VAL-1");
+
+ try {
+ bridgeServerPort = startBridgeServer(0);
+ }
+ catch (IOException e) {
+ getLogWriter().error("startBridgeServer threw IOException", e);
+ fail("startBridgeServer threw IOException " + e.getMessage());
+ }
+
+ assertTrue(bridgeServerPort != 0);
+
+ getLogWriter().info("[testBug35381] port=" + bridgeServerPort);
+ getLogWriter().info("[testBug35381] serverMemberId=" + getMemberId());
+ }
+ });
+ ports[whichVM] = vm.invokeInt(ClientRegisterInterestDUnitTest.class,
+ "getBridgeServerPort");
+ assertTrue(ports[whichVM] != 0);
+
+ getLogWriter().info("[testBug35381] create bridge client");
+ Properties config = new Properties();
+ config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+ config.setProperty(DistributionConfig.LOCATORS_NAME, "");
+ getSystem(config);
+ getCache();
+
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.LOCAL);
+
+ getLogWriter().info("[testBug35381] creating connection pool");
+ boolean establishCallbackConnection = false; // SOURCE OF BUG 35381
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
+ Region region = createRegion(name, factory.create());
+ assertNotNull(getRootRegion().getSubregion(name));
+ try {
+ region.registerInterest("KEY-1");
+ fail("registerInterest failed to throw SubscriptionNotEnabledException with establishCallbackConnection set to false");
+ }
+ catch (SubscriptionNotEnabledException expected) {
+ }
+ }
+ protected static int bridgeServerPort;
+ private static int getBridgeServerPort() {
+ return bridgeServerPort;
+ }
+
+ /**
+ * Tests failover of register interest from client point of view. Related
+ * bugs include:
+ *
+ * <p>Bug 35654 "failed re-registration may never be detected and thus
+ * may never re-re-register"
+ *
+ * <p>Bug 35639 "registerInterest re-registration happens everytime a healthy
+ * server is detected"
+ *
+ * <p>Bug 35655 "a single failed re-registration causes all other pending
+ * re-registrations to be cancelled"
+ */
+ public void _testRegisterInterestFailover() throws Exception {
+ // controller is bridge client
+
+ final Host host = Host.getHost(0);
+ final String name = this.getUniqueName();
+ final String regionName1 = name+"-1";
+ final String regionName2 = name+"-2";
+ final String regionName3 = name+"-3";
+ final String key1 = "KEY-"+regionName1+"-1";
+ final String key2 = "KEY-"+regionName1+"-2";
+ final String key3 = "KEY-"+regionName1+"-3";
+ final int[] ports = new int[3]; // 3 servers in this test
+
+ // create first bridge server with region for client...
+ final int firstServerIdx = 0;
+ final VM firstServerVM = Host.getHost(0).getVM(firstServerIdx);
+ firstServerVM.invoke(new CacheSerializableRunnable("Create first bridge server") {
+ public void run2() throws CacheException {
+ getLogWriter().info("[testRegisterInterestFailover] Create first bridge server");
+ getSystem();
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.LOCAL);
+ Region region1 = createRootRegion(regionName1, factory.create());
+ Region region2 = createRootRegion(regionName2, factory.create());
+ Region region3 = createRootRegion(regionName3, factory.create());
+ region1.put(key1, "VAL-1");
+ region2.put(key2, "VAL-1");
+ region3.put(key3, "VAL-1");
+
+ try {
+ bridgeServerPort = startBridgeServer(0);
+ }
+ catch (IOException e) {
+ getLogWriter().error("startBridgeServer threw IOException", e);
+ fail("startBridgeServer threw IOException " + e.getMessage());
+ }
+
+ assertTrue(bridgeServerPort != 0);
+
+ getLogWriter().info("[testRegisterInterestFailover] " +
+ "firstServer port=" + bridgeServerPort);
+ getLogWriter().info("[testRegisterInterestFailover] " +
+ "firstServer memberId=" + getMemberId());
+ }
+ });
+
+ // create second bridge server missing region for client...
+ final int secondServerIdx = 1;
+ final VM secondServerVM = Host.getHost(0).getVM(secondServerIdx);
+ secondServerVM.invoke(new CacheSerializableRunnable("Create second bridge server") {
+ public void run2() throws CacheException {
+ getLogWriter().info("[testRegisterInterestFailover] Create second bridge server");
+ getSystem();
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.LOCAL);
+ Region region1 = createRootRegion(regionName1, factory.create());
+ Region region3 = createRootRegion(regionName3, factory.create());
+ region1.put(key1, "VAL-2");
+ region3.put(key3, "VAL-2");
+
+ try {
+ bridgeServerPort = startBridgeServer(0);
+ }
+ catch (IOException e) {
+ getLogWriter().error("startBridgeServer threw IOException", e);
+ fail("startBridgeServer threw IOException " + e.getMessage());
+ }
+
+ assertTrue(bridgeServerPort != 0);
+
+ getLogWriter().info("[testRegisterInterestFailover] " +
+ "secondServer port=" + bridgeServerPort);
+ getLogWriter().info("[testRegisterInterestFailover] " +
+ "secondServer memberId=" + getMemberId());
+ }
+ });
+
+ // get the bridge server ports...
+ ports[firstServerIdx] = firstServerVM.invokeInt(
+ ClientRegisterInterestDUnitTest.class, "getBridgeServerPort");
+ assertTrue(ports[firstServerIdx] != 0);
+ ports[secondServerIdx] = secondServerVM.invokeInt(
+ ClientRegisterInterestDUnitTest.class, "getBridgeServerPort");
+ assertTrue(ports[secondServerIdx] != 0);
+ assertTrue(ports[firstServerIdx] != ports[secondServerIdx]);
+
+ // stop second and third servers
+ secondServerVM.invoke(new CacheSerializableRunnable("Stop second bridge server") {
+ public void run2() throws CacheException {
+ stopBridgeServers(getCache());
+ }
+ });
+
+ // create the bridge client
+ getLogWriter().info("[testBug35654] create bridge client");
+ Properties config = new Properties();
+ config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+ config.setProperty(DistributionConfig.LOCATORS_NAME, "");
+ getSystem(config);
+ getCache();
+
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.LOCAL);
+
+ getLogWriter().info("[testRegisterInterestFailover] creating connection pool");
+ boolean establishCallbackConnection = true;
+ final PoolImpl p = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
+
+ final Region region1 = createRootRegion(regionName1, factory.create());
+ final Region region2 = createRootRegion(regionName2, factory.create());
+ final Region region3 = createRootRegion(regionName3, factory.create());
+
+ assertTrue(region1.getInterestList().isEmpty());
+ assertTrue(region2.getInterestList().isEmpty());
+ assertTrue(region3.getInterestList().isEmpty());
+
+ region1.registerInterest(key1);
+ region2.registerInterest(key2);
+ region3.registerInterest(key3);
+
+ assertTrue(region1.getInterestList().contains(key1));
+ assertTrue(region2.getInterestList().contains(key2));
+ assertTrue(region3.getInterestList().contains(key3));
+
+ assertTrue(region1.getInterestListRegex().isEmpty());
+ assertTrue(region2.getInterestListRegex().isEmpty());
+ assertTrue(region3.getInterestListRegex().isEmpty());
+
+ // get ConnectionProxy and wait until connected to first server
+ WaitCriterion ev = new WaitCriterion() {
+ public boolean done() {
+ return p.getPrimaryPort() != -1;
+ }
+ public String description() {
+ return "primary port remained invalid";
+ }
+ };
+ DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
+ assertEquals(ports[firstServerIdx], p.getPrimaryPort());
+
+ // assert intial values
+ assertEquals("VAL-1", region1.get(key1));
+ assertEquals("VAL-1", region2.get(key2));
+ assertEquals("VAL-1", region3.get(key3));
+
+ // do puts on server1 and make sure values come thru for all 3 registrations
+ firstServerVM.invoke(new CacheSerializableRunnable("Puts from first bridge server") {
+ public void run2() throws CacheException {
+ Region region1 = getCache().getRegion(regionName1);
+ region1.put(key1, "VAL-1-1");
+ Region region2 = getCache().getRegion(regionName2);
+ region2.put(key2, "VAL-1-1");
+ Region region3 = getCache().getRegion(regionName3);
+ region3.put(key3, "VAL-1-1");
+ }
+ });
+
+ ev = new WaitCriterion() {
+ public boolean done() {
+ if (!"VAL-1-1".equals(region1.get(key1)) ||
+ !"VAL-1-1".equals(region2.get(key2)) ||
+ !"VAL-1-1".equals(region3.get(key3))
+ ) return false;
+ return true;
+ }
+ public String description() {
+ return null;
+ }
+ };
+ DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
+ assertEquals("VAL-1-1", region1.get(key1));
+ assertEquals("VAL-1-1", region2.get(key2));
+ assertEquals("VAL-1-1", region3.get(key3));
+
+ // force failover to server 2
+ secondServerVM.invoke(new CacheSerializableRunnable("Start second bridge server") {
+ public void run2() throws CacheException {
+ try {
+ startBridgeServer(ports[secondServerIdx]);
+ }
+ catch (IOException e) {
+ getLogWriter().error("startBridgeServer threw IOException", e);
+ fail("startBridgeServer threw IOException " + e.getMessage());
+ }
+ }
+ });
+
+ firstServerVM.invoke(new CacheSerializableRunnable("Stop first bridge server") {
+ public void run2() throws CacheException {
+ stopBridgeServers(getCache());
+ }
+ });
+
+ // wait for failover to second server
+ ev = new WaitCriterion() {
+ public boolean done() {
+ return ports[secondServerIdx] == p.getPrimaryPort();
+ }
+ public String description() {
+ return "primary port never became " + ports[secondServerIdx];
+ }
+ };
+ DistributedTestCase.waitForCriterion(ev, 100 * 1000, 200, true);
+
+ try {
+ assertEquals(null, region2.get(key2));
+ fail("CacheLoaderException expected");
+ }
+ catch (com.gemstone.gemfire.cache.CacheLoaderException e) {
+ }
+
+ // region2 registration should be gone now
+ // do puts on server2 and make sure values come thru for only 2 registrations
+ secondServerVM.invoke(new CacheSerializableRunnable("Puts from second bridge server") {
+ public void run2() throws CacheException {
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.LOCAL);
+ createRootRegion(regionName2, factory.create());
+ }
+ });
+
+ // assert that there is no actively registered interest on region2
+ assertTrue(region2.getInterestList().isEmpty());
+ assertTrue(region2.getInterestListRegex().isEmpty());
+
+ region2.put(key2, "VAL-0");
+
+ secondServerVM.invoke(new CacheSerializableRunnable("Put from second bridge server") {
+ public void run2() throws CacheException {
+ Region region1 = getCache().getRegion(regionName1);
+ region1.put(key1, "VAL-2-2");
+ Region region2 = getCache().getRegion(regionName2);
+ region2.put(key2, "VAL-2-1");
+ Region region3 = getCache().getRegion(regionName3);
+ region3.put(key3, "VAL-2-2");
+ }
+ });
+
+ // wait for updates to come thru
+ ev = new WaitCriterion() {
+ public boolean done() {
+ if (!"VAL-2-2".equals(region1.get(key1)) ||
+ !"VAL-2-2".equals(region3.get(key3)))
+ return false;
+ return true;
+ }
+ public String description() {
+ return null;
+ }
+ };
+ DistributedTestCase.waitForCriterion(ev, 100 * 1000, 200, true);
+ assertEquals("VAL-2-2", region1.get(key1));
+ assertEquals("VAL-0", region2.get(key2));
+ assertEquals("VAL-2-2", region3.get(key3));
+
+ // assert again that there is no actively registered interest on region2
+ assertTrue(region2.getInterestList().isEmpty());
+
+ // register interest again on region2 and make
+ region2.registerInterest(key2);
+ assertEquals("VAL-2-1", region2.get(key2));
+
+ secondServerVM.invoke(new CacheSerializableRunnable("Put from second bridge server") {
+ public void run2() throws CacheException {
+ Region region1 = getCache().getRegion(regionName1);
+ region1.put(key1, "VAL-2-3");
+ Region region2 = getCache().getRegion(regionName2);
+ region2.put(key2, "VAL-2-2");
+ Region region3 = getCache().getRegion(regionName3);
+ region3.put(key3, "VAL-2-3");
+ }
+ });
+
+ // wait for updates to come thru
+ ev = new WaitCriterion() {
+ public boolean done() {
+ if (!"VAL-2-3".equals(region1.get(key1)) ||
+ !"VAL-2-2".equals(region2.get(key2)) ||
+ !"VAL-2-3".equals(region3.get(key3)))
+ return false;
+ return true;
+ }
+ public String description() {
+ return null;
+ }
+ };
+ DistributedTestCase.waitForCriterion(ev, 100 * 1000, 200, true);
+ assertEquals("VAL-2-3", region1.get(key1));
+ assertEquals("VAL-2-2", region2.get(key2));
+ assertEquals("VAL-2-3", region3.get(key3));
+
+ // assert public methods report actively registered interest on region2
+ assertTrue(region2.getInterestList().contains(key2));
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/091e9ae0/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
new file mode 100644
index 0000000..86c12f1
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
@@ -0,0 +1,16 @@
+package com.gemstone.gemfire.cache30;
+
+/**
+ * Same as parent but uses selector in server
+ *
+ * @author darrel
+ * @since 5.1
+ */
+public class ClientRegisterInterestSelectorDUnitTest extends ClientRegisterInterestDUnitTest {
+ public ClientRegisterInterestSelectorDUnitTest(String name) {
+ super(name);
+ }
+ protected int getMaxThreads() {
+ return 2;
+ }
+}
[13/17] incubator-geode git commit: removed bridge-server and dynamic
region factory support for BridgeLoader and BridgeWriter from the 9.0 xsd.
Posted by ds...@apache.org.
removed bridge-server and dynamic region factory support
for BridgeLoader and BridgeWriter from the 9.0 xsd.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8f4c32e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8f4c32e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8f4c32e8
Branch: refs/heads/feature/GEODE-243
Commit: 8f4c32e8313b0ab39f42cfd19dccd2e935890b2b
Parents: e939e1d
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 14:47:48 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 14:47:48 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache/cache-9.0.xsd | 26 --------------------
1 file changed, 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8f4c32e8/gemfire-core/src/main/resources/META-INF/schemas/schema.pivotal.io/gemfire/cache/cache-9.0.xsd
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/resources/META-INF/schemas/schema.pivotal.io/gemfire/cache/cache-9.0.xsd b/gemfire-core/src/main/resources/META-INF/schemas/schema.pivotal.io/gemfire/cache/cache-9.0.xsd
index 35af50c..989ca37 100644
--- a/gemfire-core/src/main/resources/META-INF/schemas/schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+++ b/gemfire-core/src/main/resources/META-INF/schemas/schema.pivotal.io/gemfire/cache/cache-9.0.xsd
@@ -257,15 +257,6 @@ declarative caching XML file elements unless indicated otherwise.
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="bridge-server" type="gf:server-type">
- <xsd:annotation>
- <xsd:documentation>
- The "bridge-server" element specifies a Cache Bridge Server that is started when the Cache is declaratively initialized.
- NOTE: as
- of 5.7 this element is deprecated; use the "cache-server" element instead.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
<xsd:element maxOccurs="unbounded" minOccurs="0" name="pool" type="gf:pool-type" />
<xsd:element maxOccurs="unbounded" minOccurs="0" name="disk-store" type="gf:disk-store-type" />
<xsd:element maxOccurs="unbounded" minOccurs="0" name="hdfs-store" type="gf:hdfs-store-type" />
@@ -917,14 +908,6 @@ As of 6.5 disk-dirs is deprecated on region-attributes. Use disk-store-name inst
<!-- ======================================================= -->
<xsd:complexType name="server-type">
- <xsd:annotation>
- <xsd:documentation>
- The "bridge-server" element specifies a Cache Bridge Server that is started when the Cache is declaratively initialized.
- NOTE: as
- of 5.7
- this element is deprecated; use the "cache-server" element instead.
- </xsd:documentation>
- </xsd:annotation>
<xsd:sequence>
<xsd:element maxOccurs="unbounded" minOccurs="0" name="group" type="xsd:string">
<xsd:annotation>
@@ -1327,19 +1310,10 @@ As of 6.5 disk-dirs is deprecated on region-attributes. Use disk-store-name inst
pool used
by client applications in a client/server cache configuration.
It should not be specified in servers or peers.
-
- The optional "cache-loader" and
- "cache-writer" are for legacy client client
- applications that doen't use a connection pool. They must be a
- bridge-loader and a bridge-writer. They should
- not be specified in
- servers or peers.
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="0" name="disk-dir" type="gf:disk-dir-type" />
- <xsd:element maxOccurs="1" minOccurs="0" name="cache-loader" type="gf:cache-loader-type" />
- <xsd:element maxOccurs="1" minOccurs="0" name="cache-writer" type="gf:cache-writer-type" />
</xsd:sequence>
<xsd:attribute name="disable-persist-backup" type="xsd:boolean" use="optional" />
<xsd:attribute name="disable-register-interest" type="xsd:boolean" use="optional" />
[04/17] incubator-geode git commit: renamed BridgeTestCase to
ClientServerTestCase
Posted by ds...@apache.org.
renamed BridgeTestCase to ClientServerTestCase
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f8408378
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f8408378
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f8408378
Branch: refs/heads/feature/GEODE-243
Commit: f840837801a0106b2748475f7899b67a2ab0f002
Parents: 0099dcf
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 11:20:23 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 11:20:23 2015 -0700
----------------------------------------------------------------------
.../management/MemoryThresholdsDUnitTest.java | 4 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 4 +-
.../query/dunit/PdxStringQueryDUnitTest.java | 16 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 4 +-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 14 +-
...esourceManagerWithQueryMonitorDUnitTest.java | 4 +-
.../gemfire/cache30/BridgeTestCase.java | 376 -------------------
.../gemfire/cache30/BridgeWriterDUnitTest.java | 6 +-
.../gemfire/cache30/Bug38741DUnitTest.java | 4 +-
.../cache30/ClientMembershipDUnitTest.java | 12 +-
.../gemfire/cache30/ClientServerTestCase.java | 376 +++++++++++++++++++
.../internal/cache/Bug41957DUnitTest.java | 4 +-
.../cache/ClientServerGetAllDUnitTest.java | 30 +-
.../cache/DeltaPropagationDUnitTest.java | 4 +-
.../internal/cache/EventTrackerDUnitTest.java | 8 +-
.../internal/cache/HABug36773DUnitTest.java | 4 +-
.../HAOverflowMemObjectSizerDUnitTest.java | 4 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 4 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 6 +-
.../internal/cache/ha/FailoverDUnitTest.java | 4 +-
.../internal/cache/ha/HABugInPutDUnitTest.java | 4 +-
.../internal/cache/ha/HAClearDUnitTest.java | 4 +-
.../cache/ha/HAConflationDUnitTest.java | 4 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 4 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 4 +-
.../internal/cache/ha/HAGIIDUnitTest.java | 4 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 4 +-
.../ha/OperationsPropagationDUnitTest.java | 4 +-
.../internal/cache/ha/PutAllDUnitTest.java | 6 +-
.../cache/ha/StatsBugDUnitDisabledTest.java | 6 +-
.../sockets/EventIDVerificationDUnitTest.java | 4 +-
...ersalMembershipListenerAdapterDUnitTest.java | 10 +-
32 files changed, 473 insertions(+), 473 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index 37f9744..8c4f893 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -84,7 +84,7 @@ import dunit.VM;
* @author Mitch Thomas
* @since 6.0
*/
-public class MemoryThresholdsDUnitTest extends BridgeTestCase {
+public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
public static class Range implements Serializable {
public final static Range DEFAULT = new Range(0, 20);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 83b8608..d65dcc7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.cache.client.ServerOperationException;
import com.gemstone.gemfire.cache.control.ResourceManager;
import com.gemstone.gemfire.cache.management.MemoryThresholdsDUnitTest.Range;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -72,7 +72,7 @@ import dunit.VM;
* @author David Hoots
* @since 9.0
*/
-public class MemoryThresholdsOffHeapDUnitTest extends BridgeTestCase {
+public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
private static final long serialVersionUID = -684231183212051910L;
final String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD.getRawText().replaceAll("\\{[0-9]+\\}",
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
index 15ab005..bf5a150 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.cache.query.internal.index.RangeIndex;
import com.gemstone.gemfire.cache.query.types.CollectionType;
import com.gemstone.gemfire.cache.query.types.ObjectType;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.AvailablePortHelper;
@@ -168,7 +168,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
public void run2() throws CacheException {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
Region region = createRegion(regionName, rootRegionName, factory.create());
getLogWriter().info("Put PortfolioPdx");
for (int i=0; i<numberOfEntries; i++) {
@@ -426,7 +426,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
public void run2() throws CacheException {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
Region region = createRegion(regionName, rootRegionName, factory.create());
getLogWriter().info("Put PortfolioPdx");
for (int i=0; i<numberOfEntries; i++) {
@@ -638,7 +638,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
public void run2() throws CacheException {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
Region region = createRegion(regionName, rootRegionName, factory.create());
getLogWriter().info("Put PortfolioPdx");
for (int i=0; i<numberOfEntries; i++) {
@@ -852,7 +852,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
public void run2() throws CacheException {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
Region region = createRegion(regionName, rootRegionName, factory.create());
getLogWriter().info("Put PortfolioPdx");
for (int i=0; i<numberOfEntries; i++) {
@@ -1116,7 +1116,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
public void run2() throws CacheException {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
Region region = createRegion(regionName, rootRegionName, factory.create());
getLogWriter().info("Put PortfolioPdx");
for (int i=0; i<numberOfEntries; i++) {
@@ -1343,7 +1343,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
public void run2() throws CacheException {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
Region region = createRegion(regionName, rootRegionName, factory.create());
getLogWriter().info("Put PortfolioPdx");
for (int i=0; i<numberOfEntries; i++) {
@@ -1570,7 +1570,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
public void run2() throws CacheException {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
Region region = createRegion(regionName, rootRegionName, factory.create());
getLogWriter().info("Put PortfolioPdx");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 769ec83..68ec0c5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter;
import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
import com.gemstone.gemfire.cache.query.types.ObjectType;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
@@ -575,7 +575,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
createRegion(name, factory.create());
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index 03c7316..ef24789 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -14,7 +14,7 @@ import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.query.*;
import com.gemstone.gemfire.cache.query.internal.*;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
@@ -117,7 +117,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
createRegion(name, factory.create());
}
});
@@ -262,7 +262,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
createRegion(name, factory.create());
}
});
@@ -390,7 +390,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
createRegion(name, factory.create());
}
});
@@ -624,7 +624,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
createRegion(name, factory.create());
}
});
@@ -712,7 +712,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
createRegion(name, factory.create());
}
});
@@ -883,7 +883,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host0, port,-1, true, -1, -1, null);
createRegion(name+"1", factory.create());
createRegion(name+"2", factory.create());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index cdd03b3..4cd2439 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.cache.query.data.Portfolio;
import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
import com.gemstone.gemfire.cache.query.internal.QueryMonitor;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
@@ -63,7 +63,7 @@ import dunit.Host;
import dunit.SerializableCallable;
import dunit.VM;
-public class ResourceManagerWithQueryMonitorDUnitTest extends BridgeTestCase {
+public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCase {
private static int MAX_TEST_QUERY_TIMEOUT = 4000;
private static int TEST_QUERY_TIMEOUT = 1000;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeTestCase.java
deleted file mode 100644
index 5d73738..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeTestCase.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.cache30;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Properties;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.Declarable;
-import com.gemstone.gemfire.cache.LoaderHelper;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.client.Pool;
-import com.gemstone.gemfire.cache.client.PoolFactory;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.VM;
-
-/**
- * Provides helper methods for testing BridgeServers and bridge clients. This
- * test case was created by refactoring methods from ConnectionPoolDUnitTest into
- * this class.
- *
- * @author Kirk Lund
- * @since 4.2.1
- */
-public class BridgeTestCase extends CacheTestCase {
-
- public static String NON_EXISTENT_KEY = "NON_EXISTENT_KEY";
-
- public static boolean AUTO_LOAD_BALANCE = false;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- // this makes sure we don't have any connection left over from previous tests
- disconnectAllFromDS();
- }
-
- @Override
- public void tearDown2() throws Exception {
- // this makes sure we don't leave anything for the next tests
- disconnectAllFromDS();
- }
-
- public BridgeTestCase(String name) {
- super(name);
- }
-
- /**
- * Starts a bridge server on the given port
- *
- * @since 4.0
- */
- public int startBridgeServer(int port)
- throws IOException {
-
- Cache cache = getCache();
- CacheServer bridge = cache.addCacheServer();
- bridge.setPort(port);
- bridge.setMaxThreads(getMaxThreads());
- bridge.start();
- return bridge.getPort();
- }
-
- /**
- * Defaults to 0 which means no selector in server.
- * Subclasses can override setting this to a value > 0 to enable selector.
- */
- protected int getMaxThreads() {
- return 0;
- }
-
- /**
- * Stops the bridge server that serves up the given cache.
- *
- * @since 4.0
- */
- public void stopBridgeServers(Cache cache) {
- CacheServer bridge = null;
- for (Iterator bsI = cache.getCacheServers().iterator();bsI.hasNext(); ) {
- bridge = (CacheServer) bsI.next();
- bridge.stop();
- assertFalse(bridge.isRunning());
- }
- }
-
- /**
- * Returns region attributes for a <code>LOCAL</code> region
- */
- protected RegionAttributes getRegionAttributes() {
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.LOCAL);
- return factory.create();
- }
-
- public static String createBridgeClientConnection(String host, int[] ports) {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ports.length; i++) {
- if (i > 0) {
- sb.append(",");
- }
- sb.append("name" + i + "=");
- sb.append(host + ":" + ports[i]);
- }
- return sb.toString();
- }
-
- public static Pool configureConnectionPool(AttributesFactory factory,
- String host, int port1, int port2, boolean establish, int redundancy,
- int connectionsPerServer, String serverGroup, int pingInterval,
- int idleTimeout, boolean threadLocalCnxs, int lifetimeTimeout) {
- int[] ports;
- if (port2 != -1) {
- ports = new int[] { port1, port2 };
- }
- else {
- ports = new int[] { port1 };
- }
- return configureConnectionPool(factory, host, ports, establish, redundancy,
- connectionsPerServer, serverGroup, pingInterval, idleTimeout,
- threadLocalCnxs, lifetimeTimeout);
- }
-
- public static Pool configureConnectionPool(AttributesFactory factory,
- String host, int port1, int port2, boolean establish, int redundancy,
- int connectionsPerServer, String serverGroup, int pingInterval,
- int idleTimeout, boolean threadLocalCnxs) {
- return configureConnectionPool(factory, host, port1, port2, establish,
- redundancy, connectionsPerServer, serverGroup, pingInterval,
- idleTimeout, threadLocalCnxs, -2/*lifetimeTimeout*/);
- }
-
- public static Pool configureConnectionPool(AttributesFactory factory,
- String host, int port1, int port2, boolean establish, int redundancy,
- int connectionsPerServer, String serverGroup, int pingInterval) {
- return configureConnectionPool(factory, host, port1, port2, establish,
- redundancy, connectionsPerServer, serverGroup, pingInterval, -1, false);
- }
-
- public static Pool configureConnectionPool(AttributesFactory factory,
- String host, int port1, int port2, boolean establish, int redundancy,
- int connectionsPerServer, String serverGroup) {
- return configureConnectionPool(factory, host, port1, port2, establish,
- redundancy, connectionsPerServer, serverGroup, -1/*pingInterval*/);
- }
-
- public static Pool configureConnectionPoolWithName(AttributesFactory factory,
- String host, int[] ports, boolean establish, int redundancy,
- int connectionsPerServer, String serverGroup, String poolName) {
- return configureConnectionPoolWithNameAndFactory(factory, host, ports,
- establish, redundancy, connectionsPerServer, serverGroup, poolName,
- PoolManager.createFactory(), -1, -1, false, -2, -1);
- }
-
- public static Pool configureConnectionPoolWithName(AttributesFactory factory,
- String host, int[] ports, boolean establish, int redundancy,
- int connectionsPerServer, String serverGroup, String poolName,
- int pingInterval, int idleTimeout, boolean threadLocalCnxs,
- int lifetimeTimeout, int statisticInterval) {
- return configureConnectionPoolWithNameAndFactory(factory, host, ports,
- establish, redundancy, connectionsPerServer, serverGroup, poolName,
- PoolManager.createFactory(), pingInterval, idleTimeout,
- threadLocalCnxs, lifetimeTimeout, statisticInterval);
- }
-
- public static Pool configureConnectionPoolWithNameAndFactory(
- AttributesFactory factory, String host, int[] ports, boolean establish,
- int redundancy, int connectionsPerServer, String serverGroup,
- String poolName, PoolFactory pf) {
- return configureConnectionPoolWithNameAndFactory(factory, host, ports,
- establish, redundancy, connectionsPerServer, serverGroup, poolName, pf,
- -1, -1, false, -2, -1);
- }
-
- public static Pool configureConnectionPoolWithNameAndFactory(
- AttributesFactory factory, String host, int[] ports, boolean establish,
- int redundancy, int connectionsPerServer, String serverGroup,
- String poolName, PoolFactory pf, int pingInterval, int idleTimeout,
- boolean threadLocalCnxs, int lifetimeTimeout, int statisticInterval) {
-
- if(AUTO_LOAD_BALANCE) {
- pf.addLocator(host,getDUnitLocatorPort());
- } else {
- for(int z=0;z<ports.length;z++) {
- pf.addServer(host,ports[z]);
- }
- }
-
- //TODO - probably should pass in minConnections rather than connecions per server
- if(connectionsPerServer!=-1) {
- pf.setMinConnections(connectionsPerServer * ports.length);
- }
- if (threadLocalCnxs) {
- pf.setThreadLocalConnections(true);
- }
- if (pingInterval != -1) {
- pf.setPingInterval(pingInterval);
- }
- if (idleTimeout != -1) {
- pf.setIdleTimeout(idleTimeout);
- }
- if (statisticInterval != -1) {
- pf.setStatisticInterval(statisticInterval);
- }
- if (lifetimeTimeout != -2) {
- pf.setLoadConditioningInterval(lifetimeTimeout);
- }
- if(establish) {
- pf.setSubscriptionEnabled(true);
- pf.setSubscriptionRedundancy(redundancy);
- pf.setSubscriptionAckInterval(1);
- }
- if(serverGroup!=null) {
- pf.setServerGroup(serverGroup);
- }
- String rpoolName = "testPool";
- if(poolName!=null) {
- rpoolName = poolName;
- }
- Pool pool = pf.create(rpoolName);
- if(factory!=null) {
- factory.setPoolName(rpoolName);
- }
- return pool;
- }
-
- public static Pool configureConnectionPool(AttributesFactory factory,
- String host, int[] ports, boolean establish, int redundancy,
- int connectionsPerServer, String serverGroup) {
- return configureConnectionPool(factory, host, ports, establish, redundancy,
- connectionsPerServer, serverGroup, -1/*pingInterval*/,
- -1/*idleTimeout*/, false/*threadLocalCnxs*/, -2/*lifetimeTimeout*/);
- }
-
- public static Pool configureConnectionPool(AttributesFactory factory,
- String host, int[] ports, boolean establish, int redundancy,
- int connectionsPerServer, String serverGroup, int pingInterval,
- int idleTimeout, boolean threadLocalCnxs, int lifetimeTimeout) {
- return configureConnectionPoolWithName(factory, host, ports, establish,
- redundancy, connectionsPerServer, serverGroup, null/*poolName*/,
- pingInterval, idleTimeout, threadLocalCnxs, lifetimeTimeout, -1);
- }
-
- public static Pool configureConnectionPool(AttributesFactory factory,
- String host, int[] ports, boolean establish, int redundancy,
- int connectionsPerServer, String serverGroup, int pingInterval,
- int idleTimeout, boolean threadLocalCnxs, int lifetimeTimeout,
- int statisticInterval) {
- return configureConnectionPoolWithName(factory, host, ports, establish,
- redundancy, connectionsPerServer, serverGroup, null/*poolName*/,
- pingInterval, idleTimeout, threadLocalCnxs, lifetimeTimeout,
- statisticInterval);
- }
-
- /*protected static InternalDistributedMember findDistributedMember() {
- DM dm = ((InternalDistributedSystem)
- InternalDistributedSystem.getAnyInstance()).getDistributionManager();
- return dm.getDistributionManagerId();
- }*/
-
- protected static String getMemberId() {
- final InternalDistributedSystem system = InternalDistributedSystem.getAnyInstance();
- WaitCriterion w = new WaitCriterion() {
-
- public String description() {
- return "bridge never finished connecting";
- }
-
- public boolean done() {
-// getLogWriter().warning("checking member id " + system.getMemberId() +
-// " for member " + system.getDistributedMember() + " hash " +
-// System.identityHashCode(system.getDistributedMember()));
- return !system.getMemberId().contains("):0:");
- }
-
- };
- int waitMillis = 5000;
- int interval = 100;
- boolean throwException = true;
- waitForCriterion(w, waitMillis, interval, throwException);
- return system.getMemberId();
- }
-
- protected static DistributedMember getDistributedMember() {
- DistributedSystem system = InternalDistributedSystem.getAnyInstance();
- return system.getDistributedMember();
- }
-
- protected static Properties getSystemProperties() {
- DistributedSystem system = InternalDistributedSystem.getAnyInstance();
- return system.getProperties();
- }
-
- /**
- * Create a bridgeserver that has a value for every key queried and a unique
- * key/value in the specified Region that uniquely identifies each instance.
- *
- * @param vm
- * the VM on which to create the BridgeServer
- * @param rName
- * the name of the Region to create on the BridgeServerf
- * @param port
- * the TCP port on which the BridgeServer should listen
- */
- public static class BridgeServerCacheLoader extends TestCacheLoader implements Declarable {
-
- public BridgeServerCacheLoader() {}
-
- @Override
- public Object load2(LoaderHelper helper) {
- if (helper.getArgument() instanceof Integer) {
- try {
- Thread.sleep(((Integer) helper.getArgument()).intValue());
- }
- catch (InterruptedException ugh) { fail("interrupted"); }
- }
- Object ret = helper.getKey();
-
- if( ret instanceof String)
- {
- if(ret != null && ret.equals(NON_EXISTENT_KEY))
- return null;//return null
- }
- return ret;
-
- }
-
- public void init(Properties props) {}
- }
-
- public final static String BridgeServerKey = "BridgeServerKey";
- public void createBridgeServer(VM vm, final String rName, final int port) {
- vm.invoke(new CacheSerializableRunnable("Create Region on Server") {
- @Override
- public void run2() {
- try {
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK); // can't be local since used with registerInterest
- factory.setCacheLoader(new BridgeServerCacheLoader());
- beginCacheXml();
- createRootRegion(rName, factory.create());
- startBridgeServer(port);
- finishCacheXml(rName + "-" + port);
-
- Region region = getRootRegion(rName);
- assertNotNull(region);
- region.put(BridgeServerKey, new Integer(port)); // A unique key/value to identify the BridgeServer
- }
- catch(Exception e) {
- getSystem().getLogWriter().severe(e);
- fail("Failed to start CacheServer " + e);
- }
- }
- });
- }
-
- public static int[] createUniquePorts(int numToCreate) {
- return AvailablePortHelper.getRandomAvailableTCPPorts(numToCreate);
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterDUnitTest.java
index 1250c6e..5554993 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeWriterDUnitTest.java
@@ -28,7 +28,7 @@ import dunit.VM;
* @author Kirk Lund
* @since 4.2.3
*/
-public class BridgeWriterDUnitTest extends BridgeTestCase {
+public class BridgeWriterDUnitTest extends ClientServerTestCase {
public BridgeWriterDUnitTest(String name) {
super(name);
@@ -91,7 +91,7 @@ public class BridgeWriterDUnitTest extends BridgeTestCase {
getLogWriter().info("[testBug35381] creating connection pool");
boolean establishCallbackConnection = false; // SOURCE OF BUG 35381
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
Region region = createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
try {
@@ -225,7 +225,7 @@ public class BridgeWriterDUnitTest extends BridgeTestCase {
getLogWriter().info("[testRegisterInterestFailover] creating connection pool");
boolean establishCallbackConnection = true;
- final PoolImpl p = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
+ final PoolImpl p = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
final Region region1 = createRootRegion(regionName1, factory.create());
final Region region2 = createRootRegion(regionName2, factory.create());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
index d614b10..cfeb0e1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
@@ -51,7 +51,7 @@ import dunit.VM;
* @author Mitch Thomas
* @since bugfix5.7
*/
-public class Bug38741DUnitTest extends BridgeTestCase {
+public class Bug38741DUnitTest extends ClientServerTestCase {
private static final long serialVersionUID = 1L;
protected RegionAttributes getRegionAttributes() {
@@ -151,7 +151,7 @@ public class Bug38741DUnitTest extends BridgeTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, serverHostName, ports, true,-1,1,null);
+ ClientServerTestCase.configureConnectionPool(factory, serverHostName, ports, true,-1,1,null);
factory.setScope(Scope.LOCAL);
Region r = createRootRegion(rName, factory.create());
SerializationCountingKey ks1 = new SerializationCountingKey(k1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 8eccd40..f4e2ac6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@ -57,7 +57,7 @@ import dunit.DistributedTestCase.WaitCriterion;
* @author Kirk Lund
* @since 4.2.1
*/
-public class ClientMembershipDUnitTest extends BridgeTestCase {
+public class ClientMembershipDUnitTest extends ClientServerTestCase {
protected static final boolean CLIENT = true;
protected static final boolean SERVER = false;
@@ -836,7 +836,7 @@ public class ClientMembershipDUnitTest extends BridgeTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(Host.getHost(0)), ports, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(Host.getHost(0)), ports, true, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -1070,7 +1070,7 @@ public class ClientMembershipDUnitTest extends BridgeTestCase {
getSystem(config);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, true, -1, 2, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -1338,7 +1338,7 @@ public class ClientMembershipDUnitTest extends BridgeTestCase {
getSystem(config);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, true, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -1446,7 +1446,7 @@ public class ClientMembershipDUnitTest extends BridgeTestCase {
getLogWriter().info("[testGetConnectedServers] creating connectionpool for " +
getServerHostName(host) + " " + ports[i]);
int[] thisServerPorts = new int[] { ports[i] };
- BridgeTestCase.configureConnectionPoolWithName(factory, getServerHostName(host), thisServerPorts, false, -1, -1, null,"pooly"+i);
+ ClientServerTestCase.configureConnectionPoolWithName(factory, getServerHostName(host), thisServerPorts, false, -1, -1, null,"pooly"+i);
Region region = createRegion(name+"_"+i, factory.create());
assertNotNull(getRootRegion().getSubregion(name+"_"+i));
region.get("KEY-1");
@@ -1550,7 +1550,7 @@ public class ClientMembershipDUnitTest extends BridgeTestCase {
factory.setScope(Scope.LOCAL);
getLogWriter().info("[testGetNotifiedClients] creating connection pool");
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, true, -1, -1, null);
Region region = createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
region.registerInterest("KEY-1");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
new file mode 100644
index 0000000..7a546a1
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
@@ -0,0 +1,376 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache30;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Properties;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.Declarable;
+import com.gemstone.gemfire.cache.LoaderHelper;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+
+import dunit.VM;
+
+/**
+ * Provides helper methods for testing clients and servers. This
+ * test case was created by refactoring methods from ConnectionPoolDUnitTest into
+ * this class.
+ *
+ * @author Kirk Lund
+ * @since 4.2.1
+ */
+public class ClientServerTestCase extends CacheTestCase {
+
+ public static String NON_EXISTENT_KEY = "NON_EXISTENT_KEY";
+
+ public static boolean AUTO_LOAD_BALANCE = false;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ // this makes sure we don't have any connection left over from previous tests
+ disconnectAllFromDS();
+ }
+
+ @Override
+ public void tearDown2() throws Exception {
+ // this makes sure we don't leave anything for the next tests
+ disconnectAllFromDS();
+ }
+
+ public ClientServerTestCase(String name) {
+ super(name);
+ }
+
+ /**
+ * Starts a bridge server on the given port
+ *
+ * @since 4.0
+ */
+ public int startBridgeServer(int port)
+ throws IOException {
+
+ Cache cache = getCache();
+ CacheServer bridge = cache.addCacheServer();
+ bridge.setPort(port);
+ bridge.setMaxThreads(getMaxThreads());
+ bridge.start();
+ return bridge.getPort();
+ }
+
+ /**
+ * Defaults to 0 which means no selector in server.
+ * Subclasses can override setting this to a value > 0 to enable selector.
+ */
+ protected int getMaxThreads() {
+ return 0;
+ }
+
+ /**
+ * Stops the bridge server that serves up the given cache.
+ *
+ * @since 4.0
+ */
+ public void stopBridgeServers(Cache cache) {
+ CacheServer bridge = null;
+ for (Iterator bsI = cache.getCacheServers().iterator();bsI.hasNext(); ) {
+ bridge = (CacheServer) bsI.next();
+ bridge.stop();
+ assertFalse(bridge.isRunning());
+ }
+ }
+
+ /**
+ * Returns region attributes for a <code>LOCAL</code> region
+ */
+ protected RegionAttributes getRegionAttributes() {
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.LOCAL);
+ return factory.create();
+ }
+
+ public static String createBridgeClientConnection(String host, int[] ports) {
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < ports.length; i++) {
+ if (i > 0) {
+ sb.append(",");
+ }
+ sb.append("name" + i + "=");
+ sb.append(host + ":" + ports[i]);
+ }
+ return sb.toString();
+ }
+
+ public static Pool configureConnectionPool(AttributesFactory factory,
+ String host, int port1, int port2, boolean establish, int redundancy,
+ int connectionsPerServer, String serverGroup, int pingInterval,
+ int idleTimeout, boolean threadLocalCnxs, int lifetimeTimeout) {
+ int[] ports;
+ if (port2 != -1) {
+ ports = new int[] { port1, port2 };
+ }
+ else {
+ ports = new int[] { port1 };
+ }
+ return configureConnectionPool(factory, host, ports, establish, redundancy,
+ connectionsPerServer, serverGroup, pingInterval, idleTimeout,
+ threadLocalCnxs, lifetimeTimeout);
+ }
+
+ public static Pool configureConnectionPool(AttributesFactory factory,
+ String host, int port1, int port2, boolean establish, int redundancy,
+ int connectionsPerServer, String serverGroup, int pingInterval,
+ int idleTimeout, boolean threadLocalCnxs) {
+ return configureConnectionPool(factory, host, port1, port2, establish,
+ redundancy, connectionsPerServer, serverGroup, pingInterval,
+ idleTimeout, threadLocalCnxs, -2/*lifetimeTimeout*/);
+ }
+
+ public static Pool configureConnectionPool(AttributesFactory factory,
+ String host, int port1, int port2, boolean establish, int redundancy,
+ int connectionsPerServer, String serverGroup, int pingInterval) {
+ return configureConnectionPool(factory, host, port1, port2, establish,
+ redundancy, connectionsPerServer, serverGroup, pingInterval, -1, false);
+ }
+
+ public static Pool configureConnectionPool(AttributesFactory factory,
+ String host, int port1, int port2, boolean establish, int redundancy,
+ int connectionsPerServer, String serverGroup) {
+ return configureConnectionPool(factory, host, port1, port2, establish,
+ redundancy, connectionsPerServer, serverGroup, -1/*pingInterval*/);
+ }
+
+ public static Pool configureConnectionPoolWithName(AttributesFactory factory,
+ String host, int[] ports, boolean establish, int redundancy,
+ int connectionsPerServer, String serverGroup, String poolName) {
+ return configureConnectionPoolWithNameAndFactory(factory, host, ports,
+ establish, redundancy, connectionsPerServer, serverGroup, poolName,
+ PoolManager.createFactory(), -1, -1, false, -2, -1);
+ }
+
+ public static Pool configureConnectionPoolWithName(AttributesFactory factory,
+ String host, int[] ports, boolean establish, int redundancy,
+ int connectionsPerServer, String serverGroup, String poolName,
+ int pingInterval, int idleTimeout, boolean threadLocalCnxs,
+ int lifetimeTimeout, int statisticInterval) {
+ return configureConnectionPoolWithNameAndFactory(factory, host, ports,
+ establish, redundancy, connectionsPerServer, serverGroup, poolName,
+ PoolManager.createFactory(), pingInterval, idleTimeout,
+ threadLocalCnxs, lifetimeTimeout, statisticInterval);
+ }
+
+ public static Pool configureConnectionPoolWithNameAndFactory(
+ AttributesFactory factory, String host, int[] ports, boolean establish,
+ int redundancy, int connectionsPerServer, String serverGroup,
+ String poolName, PoolFactory pf) {
+ return configureConnectionPoolWithNameAndFactory(factory, host, ports,
+ establish, redundancy, connectionsPerServer, serverGroup, poolName, pf,
+ -1, -1, false, -2, -1);
+ }
+
+ public static Pool configureConnectionPoolWithNameAndFactory(
+ AttributesFactory factory, String host, int[] ports, boolean establish,
+ int redundancy, int connectionsPerServer, String serverGroup,
+ String poolName, PoolFactory pf, int pingInterval, int idleTimeout,
+ boolean threadLocalCnxs, int lifetimeTimeout, int statisticInterval) {
+
+ if(AUTO_LOAD_BALANCE) {
+ pf.addLocator(host,getDUnitLocatorPort());
+ } else {
+ for(int z=0;z<ports.length;z++) {
+ pf.addServer(host,ports[z]);
+ }
+ }
+
+ //TODO - probably should pass in minConnections rather than connecions per server
+ if(connectionsPerServer!=-1) {
+ pf.setMinConnections(connectionsPerServer * ports.length);
+ }
+ if (threadLocalCnxs) {
+ pf.setThreadLocalConnections(true);
+ }
+ if (pingInterval != -1) {
+ pf.setPingInterval(pingInterval);
+ }
+ if (idleTimeout != -1) {
+ pf.setIdleTimeout(idleTimeout);
+ }
+ if (statisticInterval != -1) {
+ pf.setStatisticInterval(statisticInterval);
+ }
+ if (lifetimeTimeout != -2) {
+ pf.setLoadConditioningInterval(lifetimeTimeout);
+ }
+ if(establish) {
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(redundancy);
+ pf.setSubscriptionAckInterval(1);
+ }
+ if(serverGroup!=null) {
+ pf.setServerGroup(serverGroup);
+ }
+ String rpoolName = "testPool";
+ if(poolName!=null) {
+ rpoolName = poolName;
+ }
+ Pool pool = pf.create(rpoolName);
+ if(factory!=null) {
+ factory.setPoolName(rpoolName);
+ }
+ return pool;
+ }
+
+ public static Pool configureConnectionPool(AttributesFactory factory,
+ String host, int[] ports, boolean establish, int redundancy,
+ int connectionsPerServer, String serverGroup) {
+ return configureConnectionPool(factory, host, ports, establish, redundancy,
+ connectionsPerServer, serverGroup, -1/*pingInterval*/,
+ -1/*idleTimeout*/, false/*threadLocalCnxs*/, -2/*lifetimeTimeout*/);
+ }
+
+ public static Pool configureConnectionPool(AttributesFactory factory,
+ String host, int[] ports, boolean establish, int redundancy,
+ int connectionsPerServer, String serverGroup, int pingInterval,
+ int idleTimeout, boolean threadLocalCnxs, int lifetimeTimeout) {
+ return configureConnectionPoolWithName(factory, host, ports, establish,
+ redundancy, connectionsPerServer, serverGroup, null/*poolName*/,
+ pingInterval, idleTimeout, threadLocalCnxs, lifetimeTimeout, -1);
+ }
+
+ public static Pool configureConnectionPool(AttributesFactory factory,
+ String host, int[] ports, boolean establish, int redundancy,
+ int connectionsPerServer, String serverGroup, int pingInterval,
+ int idleTimeout, boolean threadLocalCnxs, int lifetimeTimeout,
+ int statisticInterval) {
+ return configureConnectionPoolWithName(factory, host, ports, establish,
+ redundancy, connectionsPerServer, serverGroup, null/*poolName*/,
+ pingInterval, idleTimeout, threadLocalCnxs, lifetimeTimeout,
+ statisticInterval);
+ }
+
+ /*protected static InternalDistributedMember findDistributedMember() {
+ DM dm = ((InternalDistributedSystem)
+ InternalDistributedSystem.getAnyInstance()).getDistributionManager();
+ return dm.getDistributionManagerId();
+ }*/
+
+ protected static String getMemberId() {
+ final InternalDistributedSystem system = InternalDistributedSystem.getAnyInstance();
+ WaitCriterion w = new WaitCriterion() {
+
+ public String description() {
+ return "bridge never finished connecting";
+ }
+
+ public boolean done() {
+// getLogWriter().warning("checking member id " + system.getMemberId() +
+// " for member " + system.getDistributedMember() + " hash " +
+// System.identityHashCode(system.getDistributedMember()));
+ return !system.getMemberId().contains("):0:");
+ }
+
+ };
+ int waitMillis = 5000;
+ int interval = 100;
+ boolean throwException = true;
+ waitForCriterion(w, waitMillis, interval, throwException);
+ return system.getMemberId();
+ }
+
+ protected static DistributedMember getDistributedMember() {
+ DistributedSystem system = InternalDistributedSystem.getAnyInstance();
+ return system.getDistributedMember();
+ }
+
+ protected static Properties getSystemProperties() {
+ DistributedSystem system = InternalDistributedSystem.getAnyInstance();
+ return system.getProperties();
+ }
+
+ /**
+ * Create a bridgeserver that has a value for every key queried and a unique
+ * key/value in the specified Region that uniquely identifies each instance.
+ *
+ * @param vm
+ * the VM on which to create the BridgeServer
+ * @param rName
+ * the name of the Region to create on the BridgeServerf
+ * @param port
+ * the TCP port on which the BridgeServer should listen
+ */
+ public static class BridgeServerCacheLoader extends TestCacheLoader implements Declarable {
+
+ public BridgeServerCacheLoader() {}
+
+ @Override
+ public Object load2(LoaderHelper helper) {
+ if (helper.getArgument() instanceof Integer) {
+ try {
+ Thread.sleep(((Integer) helper.getArgument()).intValue());
+ }
+ catch (InterruptedException ugh) { fail("interrupted"); }
+ }
+ Object ret = helper.getKey();
+
+ if( ret instanceof String)
+ {
+ if(ret != null && ret.equals(NON_EXISTENT_KEY))
+ return null;//return null
+ }
+ return ret;
+
+ }
+
+ public void init(Properties props) {}
+ }
+
+ public final static String BridgeServerKey = "BridgeServerKey";
+ public void createBridgeServer(VM vm, final String rName, final int port) {
+ vm.invoke(new CacheSerializableRunnable("Create Region on Server") {
+ @Override
+ public void run2() {
+ try {
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.DISTRIBUTED_ACK); // can't be local since used with registerInterest
+ factory.setCacheLoader(new BridgeServerCacheLoader());
+ beginCacheXml();
+ createRootRegion(rName, factory.create());
+ startBridgeServer(port);
+ finishCacheXml(rName + "-" + port);
+
+ Region region = getRootRegion(rName);
+ assertNotNull(region);
+ region.put(BridgeServerKey, new Integer(port)); // A unique key/value to identify the BridgeServer
+ }
+ catch(Exception e) {
+ getSystem().getLogWriter().severe(e);
+ fail("Failed to start CacheServer " + e);
+ }
+ }
+ });
+ }
+
+ public static int[] createUniquePorts(int numToCreate) {
+ return AvailablePortHelper.getRandomAvailableTCPPorts(numToCreate);
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
index 67b6790..1285f3e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
@@ -12,7 +12,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache.client.*;
@@ -30,7 +30,7 @@ import java.util.*;
* @author darrel
* @since 6.5
*/
- public class Bug41957DUnitTest extends BridgeTestCase {
+ public class Bug41957DUnitTest extends ClientServerTestCase {
public Bug41957DUnitTest(String name) {
super(name);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index 0cf66a5..d27f524 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -13,7 +13,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.offheap.SimpleMemoryAllocatorImpl;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.server.CacheServer;
@@ -28,7 +28,7 @@ import java.util.*;
* @author Barry Oglesby
* @since 5.7
*/
- public class ClientServerGetAllDUnitTest extends BridgeTestCase {
+ public class ClientServerGetAllDUnitTest extends ClientServerTestCase {
public ClientServerGetAllDUnitTest(String name) {
super(name);
@@ -63,7 +63,7 @@ import java.util.*;
keys.add("key-"+i);
}
- keys.add(BridgeTestCase.NON_EXISTENT_KEY); // this will not be load CacheLoader
+ keys.add(ClientServerTestCase.NON_EXISTENT_KEY); // this will not be load CacheLoader
// Invoke getAll
Region region = getRootRegion(regionName);
@@ -79,13 +79,13 @@ import java.util.*;
String key = (String) i.next();
assertTrue(result.containsKey(key));
Object value = result.get(key);
- if(!key.equals(BridgeTestCase.NON_EXISTENT_KEY))
+ if(!key.equals(ClientServerTestCase.NON_EXISTENT_KEY))
assertEquals(key, value);
else
assertEquals(null, value);
}
- assertEquals(null, region.get(BridgeTestCase.NON_EXISTENT_KEY));
+ assertEquals(null, region.get(ClientServerTestCase.NON_EXISTENT_KEY));
}
});
@@ -115,7 +115,7 @@ import java.util.*;
keys.add("key-"+i);
}
- keys.add(BridgeTestCase.NON_EXISTENT_KEY); // this will not be load CacheLoader
+ keys.add(ClientServerTestCase.NON_EXISTENT_KEY); // this will not be load CacheLoader
// Invoke getAll
Region region = getRootRegion(regionName);
@@ -131,13 +131,13 @@ import java.util.*;
String key = (String) i.next();
assertTrue(result.containsKey(key));
Object value = result.get(key);
- if(!key.equals(BridgeTestCase.NON_EXISTENT_KEY))
+ if(!key.equals(ClientServerTestCase.NON_EXISTENT_KEY))
assertEquals(key, value);
else
assertEquals(null, value);
}
- assertEquals(null, region.get(BridgeTestCase.NON_EXISTENT_KEY));
+ assertEquals(null, region.get(ClientServerTestCase.NON_EXISTENT_KEY));
}
});
checkServerForOrphans(server, regionName);
@@ -392,7 +392,7 @@ import java.util.*;
keys.add("key-"+i);
}
- keys.add(BridgeTestCase.NON_EXISTENT_KEY); // this will not be load CacheLoader
+ keys.add(ClientServerTestCase.NON_EXISTENT_KEY); // this will not be load CacheLoader
// Invoke getAll
Region region = getRootRegion(regionName);
@@ -408,13 +408,13 @@ import java.util.*;
String key = (String) i.next();
assertTrue(result.containsKey(key));
Object value = result.get(key);
- if(!key.equals(BridgeTestCase.NON_EXISTENT_KEY))
+ if(!key.equals(ClientServerTestCase.NON_EXISTENT_KEY))
assertEquals(key, value);
else
assertEquals(null, value);
}
- assertEquals(null, region.get(BridgeTestCase.NON_EXISTENT_KEY));
+ assertEquals(null, region.get(ClientServerTestCase.NON_EXISTENT_KEY));
}
});
@@ -467,7 +467,7 @@ import java.util.*;
for (int i=0; i<5; i++) {
keys.add("key-"+i);
}
- keys.add(BridgeTestCase.NON_EXISTENT_KEY); // this will not be load CacheLoader
+ keys.add(ClientServerTestCase.NON_EXISTENT_KEY); // this will not be load CacheLoader
// Invoke getAll
@@ -484,12 +484,12 @@ import java.util.*;
String key = (String) i.next();
assertTrue(result.containsKey(key));
Object value = result.get(key);
- if(!key.equals(BridgeTestCase.NON_EXISTENT_KEY))
+ if(!key.equals(ClientServerTestCase.NON_EXISTENT_KEY))
assertEquals(key, value);
else
assertEquals(null, value);
}
- assertEquals(null, region.get(BridgeTestCase.NON_EXISTENT_KEY));
+ assertEquals(null, region.get(ClientServerTestCase.NON_EXISTENT_KEY));
}
});
@@ -702,7 +702,7 @@ import java.util.*;
fail("Expected " + helper.getArgument() + " to be " + CALLBACK_ARG);
}
} else {
- if (!helper.getKey().equals(BridgeTestCase.NON_EXISTENT_KEY)) {
+ if (!helper.getKey().equals(ClientServerTestCase.NON_EXISTENT_KEY)) {
fail("Expected callback arg to be " + CALLBACK_ARG + " but it was null");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
index 10ab959..c7d7923 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.compression.Compressor;
import com.gemstone.gemfire.compression.SnappyCompressor;
import com.gemstone.gemfire.distributed.DistributedSystem;
@@ -1376,7 +1376,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
props.setProperty(DistributionConfig.CLIENT_CONFLATION_PROP_NAME, conflate);
new DeltaPropagationDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- pool = BridgeTestCase.configureConnectionPool(factory, "localhost", ports,
+ pool = ClientServerTestCase.configureConnectionPool(factory, "localhost", ports,
true, Integer.parseInt(rLevel), 2, null, 1000, 250, false, -2);
factory.setScope(Scope.LOCAL);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
index 9f1bc68..d72a9d6 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
@@ -160,7 +160,7 @@ public class EventTrackerDUnitTest extends CacheTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, hostName, port, -1, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, port, -1, false, -1, -1, null);
createRegion(regionName, factory.create());
}
});
@@ -233,7 +233,7 @@ public class EventTrackerDUnitTest extends CacheTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, hostName, port, -1, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, port, -1, false, -1, -1, null);
createRegion(regionName, factory.create());
}
});
@@ -311,7 +311,7 @@ public class EventTrackerDUnitTest extends CacheTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, hostName, port, -1, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, port, -1, false, -1, -1, null);
createRootRegion("partitioned", factory.create());
createRootRegion("replicate", factory.create());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
index 62624f2..e17c77d 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.client.internal.Connection;
import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -272,7 +272,7 @@ public class HABug36773DUnitTest extends DistributedTestCase
new HABug36773DUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPool(factory, DistributedTestCase.getIPLiteral(), new int[] {PORT1,PORT2}, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, DistributedTestCase.getIPLiteral(), new int[] {PORT1,PORT2}, true, -1, 2, null);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index 65ddf4b..158848c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -160,7 +160,7 @@ public class HAOverflowMemObjectSizerDUnitTest extends DistributedTestCase {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setDataPolicy(DataPolicy.NORMAL);
- BridgeTestCase.configureConnectionPool(factory, host, port1.intValue(), -1, true, -1, 2, null, -1, -1, false);
+ ClientServerTestCase.configureConnectionPool(factory, host, port1.intValue(), -1, true, -1, 2, null, -1, -1, false);
RegionAttributes attrs = factory.create();
Region region = cache.createRegion(regionName, attrs);
assertNotNull(region);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
index f0776ba..b4932a3 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -166,7 +166,7 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase
new Bug36853EventsExpiryDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPool(factory, hostName, port.intValue(),-1, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, port.intValue(),-1, true, -1, 2, null);
factory.addCacheListener(new CacheListenerAdapter() {
public void afterCreate(EntryEvent event)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
index 3a97ea4..c2e7d85 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
@@ -226,7 +226,7 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase
new EventIdOptimizationDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, hostName, port.intValue(),-1, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, port.intValue(),-1, true, -1, 2, null);
final CacheServer bs1 = cache.addCacheServer();
bs1.setPort(port.intValue());
@@ -248,7 +248,7 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase
props.setProperty("locators", "");
new EventIdOptimizationDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, hostName, port.intValue(),-1, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, port.intValue(),-1, true, -1, 2, null);
factory.setScope(Scope.DISTRIBUTED_ACK);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
index 7762679..c7598b1 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -135,7 +135,7 @@ public class FailoverDUnitTest extends DistributedTestCase
*/
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPoolWithName(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null, "FailoverPool");
+ ClientServerTestCase.configureConnectionPoolWithName(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null, "FailoverPool");
factory.setCacheListener(new CacheListenerAdapter() {
public void afterUpdate(EntryEvent event)
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
index 580e009..d92c00a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
@@ -19,7 +19,7 @@ import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -152,7 +152,7 @@ public class HABugInPutDUnitTest extends DistributedTestCase
new HABugInPutDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
index 5f3fca4..1e93273 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
@@ -19,7 +19,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionEvent;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -603,7 +603,7 @@ public class HAClearDUnitTest extends DistributedTestCase
new HAClearDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
if (isListenerAttached) {
factory.setCacheListener(new CacheListenerAdapter() {
public void afterRegionClear(RegionEvent event)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
index 2eaef5d..ffec42d 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionEvent;
import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
@@ -311,7 +311,7 @@ public class HAConflationDUnitTest extends CacheTestCase
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
new HAConflationDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, host, new int[] { PORT1 }, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host, new int[] { PORT1 }, true, -1, -1, null);
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setEnableConflation(true);
if (isListenerPresent.booleanValue() == true) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
index 03e17ff..830decd 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -269,7 +269,7 @@ public class HADuplicateDUnitTest extends DistributedTestCase
props.setProperty("locators", "");
new HADuplicateDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
factory.setScope(Scope.DISTRIBUTED_ACK);
CacheListener clientListener = new HAValidateDuplicateListener();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index b87b2e6..06beb27 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.client.internal.QueueStateImpl.SequenceIdAndExpirationObject;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -160,7 +160,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase
props.setProperty("locators", "");
new HAEventIdPropagationDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- PoolImpl pi = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1}, true, -1, 2, null);
+ PoolImpl pi = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1}, true, -1, 2, null);
factory.setScope(Scope.DISTRIBUTED_ACK);
CacheListener clientListener = new HAEventIdPropagationListenerForClient();
factory.setCacheListener(clientListener);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
index dd73c39..7ff64db 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -176,7 +176,7 @@ public class HAGIIDUnitTest extends DistributedTestCase
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
new HAGIIDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, host, new int[] {PORT1,PORT2}, true, -1, 2, null, 1000, -1, false, -1);
+ ClientServerTestCase.configureConnectionPool(factory, host, new int[] {PORT1,PORT2}, true, -1, 2, null, 1000, -1, false, -1);
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.addCacheListener(HAGIIDUnitTest.checker);
RegionAttributes attrs = factory.create();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8408378/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index 3f887f5..c46dd19 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
@@ -205,7 +205,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
new HARQueueNewImplDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, host, port1
+ ClientServerTestCase.configureConnectionPool(factory, host, port1
.intValue(), port2.intValue(), true, Integer.parseInt(rLevel), 2, null,
1000, 250, false);
[09/17] incubator-geode git commit: renamed BridgeServerCacheLoader
to CacheServerCacheLoader
Posted by ds...@apache.org.
renamed BridgeServerCacheLoader to CacheServerCacheLoader
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9ea8f35d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9ea8f35d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9ea8f35d
Branch: refs/heads/feature/GEODE-243
Commit: 9ea8f35d77f076cabd36f998d7ddbcbcecc998c2
Parents: 09eac4d
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 11:45:34 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 11:45:34 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache30/ClientServerTestCase.java | 28 ++++++++++----------
.../internal/cache/Bug41957DUnitTest.java | 2 +-
.../cache/ClientServerGetAllDUnitTest.java | 6 ++---
3 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ea8f35d/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
index 7a546a1..c645549 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
@@ -305,20 +305,9 @@ public class ClientServerTestCase extends CacheTestCase {
return system.getProperties();
}
- /**
- * Create a bridgeserver that has a value for every key queried and a unique
- * key/value in the specified Region that uniquely identifies each instance.
- *
- * @param vm
- * the VM on which to create the BridgeServer
- * @param rName
- * the name of the Region to create on the BridgeServerf
- * @param port
- * the TCP port on which the BridgeServer should listen
- */
- public static class BridgeServerCacheLoader extends TestCacheLoader implements Declarable {
+ public static class CacheServerCacheLoader extends TestCacheLoader implements Declarable {
- public BridgeServerCacheLoader() {}
+ public CacheServerCacheLoader() {}
@Override
public Object load2(LoaderHelper helper) {
@@ -343,6 +332,17 @@ public class ClientServerTestCase extends CacheTestCase {
}
public final static String BridgeServerKey = "BridgeServerKey";
+ /**
+ * Create a server that has a value for every key queried and a unique
+ * key/value in the specified Region that uniquely identifies each instance.
+ *
+ * @param vm
+ * the VM on which to create the server
+ * @param rName
+ * the name of the Region to create on the server
+ * @param port
+ * the TCP port on which the server should listen
+ */
public void createBridgeServer(VM vm, final String rName, final int port) {
vm.invoke(new CacheSerializableRunnable("Create Region on Server") {
@Override
@@ -350,7 +350,7 @@ public class ClientServerTestCase extends CacheTestCase {
try {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK); // can't be local since used with registerInterest
- factory.setCacheLoader(new BridgeServerCacheLoader());
+ factory.setCacheLoader(new CacheServerCacheLoader());
beginCacheXml();
createRootRegion(rName, factory.create());
startBridgeServer(port);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ea8f35d/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
index 1285f3e..81fdadb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
@@ -79,7 +79,7 @@ import java.util.*;
// Create Region
AttributesFactory factory = new AttributesFactory();
- factory.setCacheLoader(new BridgeServerCacheLoader());
+ factory.setCacheLoader(new CacheServerCacheLoader());
if (createPR) {
factory.setDataPolicy(DataPolicy.PARTITION);
factory.setPartitionAttributes((new PartitionAttributesFactory()).create());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ea8f35d/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index d27f524..8716ccb 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -663,9 +663,9 @@ import java.util.*;
factory.setOffHeap(true);
}
if (expectCallback) {
- factory.setCacheLoader(new CallbackBridgeServerCacheLoader());
+ factory.setCacheLoader(new CallbackCacheServerCacheLoader());
} else {
- factory.setCacheLoader(new BridgeServerCacheLoader());
+ factory.setCacheLoader(new CacheServerCacheLoader());
}
if (createPR) {
factory.setDataPolicy(DataPolicy.PARTITION);
@@ -694,7 +694,7 @@ import java.util.*;
private static final String CALLBACK_ARG = "ClientServerGetAllDUnitTestCB";
- private static class CallbackBridgeServerCacheLoader extends BridgeServerCacheLoader {
+ private static class CallbackCacheServerCacheLoader extends CacheServerCacheLoader {
@Override
public Object load2(LoaderHelper helper) {
if (helper.getArgument() instanceof String) {
[06/17] incubator-geode git commit: renamed BridgeWriterMisc tests to
ClientServerMisc
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/725e4bf5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
new file mode 100755
index 0000000..6fe8b3a
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -0,0 +1,1381 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheWriterException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EvictionAttributes;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.NoAvailableServersException;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.Connection;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.client.internal.RegisterInterestTracker;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.cache30.LRUEvictionControllerDUnitTest;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableCallable;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
+
+import junit.framework.AssertionFailedError;
+
+/**
+ * Tests corner cases between Region, BridgeWriter and PoolImpl
+ *
+ * @author Yogesh Mahajan
+ *
+ */
+public class ClientServerMiscDUnitTest extends CacheTestCase
+{
+// private static Cache cache = null;
+
+ protected static PoolImpl pool = null;
+
+ protected static Connection conn = null;
+
+ private static Cache static_cache;
+
+ private static int PORT1;
+
+ private static final String k1 = "k1";
+
+ private static final String k2 = "k2";
+
+ private static final String server_k1 = "server-k1";
+
+ private static final String server_k2 = "server-k2";
+
+ private static final String REGION_NAME1 = "ClientServerMiscDUnitTest_region1";
+
+ private static final String REGION_NAME2 = "ClientServerMiscDUnitTest_region2";
+
+ private static final String PR_REGION_NAME = "ClientServerMiscDUnitTest_PRregion";
+
+ private static Host host;
+
+ private static VM server1;
+
+ private static VM server2;
+
+ private static RegionAttributes attrs;
+
+
+ // variables for concurrent map API test
+ Properties props = new Properties();
+ final int putRange_1Start = 1;
+ final int putRange_1End = 5;
+ final int putRange_2Start = 6;
+ final int putRange_2End = 10;
+ final int putRange_3Start = 11;
+ final int putRange_3End = 15;
+ final int putRange_4Start = 16;
+ final int putRange_4End = 20;
+ final int removeRange_1Start = 2;
+ final int removeRange_1End = 4;
+ final int removeRange_2Start = 7;
+ final int removeRange_2End = 9;
+
+
+
+ /** constructor */
+ public ClientServerMiscDUnitTest(String name) {
+ super(name);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ host = Host.getHost(0);
+ server1 = host.getVM(0);
+ server2 = host.getVM(1);
+ }
+
+ private int initServerCache(boolean notifyBySub) {
+ Object[] args = new Object[] { notifyBySub, getMaxThreads()};
+ return ((Integer)server1.invoke(ClientServerMiscDUnitTest.class,
+ "createServerCache",
+ args)).intValue();
+ }
+
+ private int initServerCache2(boolean notifyBySub) {
+ Object[] args = new Object[] {notifyBySub, getMaxThreads()};
+ return ((Integer)server2.invoke(ClientServerMiscDUnitTest.class,
+ "createServerCache",
+ args)).intValue();
+ }
+
+
+ public void testConcurrentOperationsWithDRandPR() throws Exception {
+ int port1 = initServerCache(true); // vm0
+ int port2 = initServerCache2(true); // vm1
+ String serverName = getServerHostName(Host.getHost(0));
+ host.getVM(2).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port1});
+ host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2});
+ getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
+ concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
+ // TODO add verification in vm3
+ getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
+ concurrentMapTest(host.getVM(2), "/" + PR_REGION_NAME);
+ // TODO add verification in vm3
+ }
+
+ public void testConcurrentOperationsWithDRandPRandEmptyClient() throws Exception {
+ int port1 = initServerCache(true); // vm0
+ int port2 = initServerCache2(true); // vm1
+ String serverName = getServerHostName(Host.getHost(0));
+ host.getVM(2).invoke(this.getClass(), "createEmptyClientCache", new Object[]{serverName, port1});
+ host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2});
+ getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
+ concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
+ // TODO add verification in vm3
+ getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
+ concurrentMapTest(host.getVM(2), "/" + PR_REGION_NAME);
+ // TODO add verification in vm3
+ }
+
+ /**
+ * Do putIfAbsent(), replace(Object, Object),
+ * replace(Object, Object, Object), remove(Object, Object) operations
+ */
+ public void concurrentMapTest(final VM clientVM, final String rName) {
+
+ //String exceptionStr = "";
+ clientVM.invoke(new CacheSerializableRunnable("doConcurrentMapOperations") {
+ public void run2() throws CacheException {
+ Cache cache = getCache();
+ final Region pr = cache.getRegion(rName);
+ assertNotNull(rName + " not created", pr);
+ boolean isEmpty = pr.getAttributes().getDataPolicy() == DataPolicy.EMPTY;
+
+ // test successful putIfAbsent
+ for (int i = putRange_1Start; i <= putRange_1End; i++) {
+ Object putResult = pr.putIfAbsent(Integer.toString(i),
+ Integer.toString(i));
+ assertNull("Expected null, but got " + putResult + " for key " + i,
+ putResult);
+ }
+ int size;
+ if (!isEmpty) {
+ size = pr.size();
+ assertEquals("Size doesn't return expected value", putRange_1End, size);
+ assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
+ pr.isEmpty());
+ }
+
+ // test unsuccessful putIfAbsent
+ for (int i = putRange_1Start; i <= putRange_1End; i++) {
+ Object putResult = pr.putIfAbsent(Integer.toString(i),
+ Integer.toString(i + 1));
+ assertEquals("for i=" + i, Integer.toString(i), putResult);
+ assertEquals("for i=" + i, Integer.toString(i), pr.get(Integer.toString(i)));
+ }
+ if (!isEmpty) {
+ size = pr.size();
+ assertEquals("Size doesn't return expected value", putRange_1End, size);
+ assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
+ pr.isEmpty());
+ }
+
+ // test successful replace(key, oldValue, newValue)
+ for (int i = putRange_1Start; i <= putRange_1End; i++) {
+ boolean replaceSucceeded = pr.replace(Integer.toString(i),
+ Integer.toString(i),
+ "replaced" + i);
+ assertTrue("for i=" + i, replaceSucceeded);
+ assertEquals("for i=" + i, "replaced" + i, pr.get(Integer.toString(i)));
+ }
+ if (!isEmpty) {
+ size = pr.size();
+ assertEquals("Size doesn't return expected value", putRange_1End, size);
+ assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
+ pr.isEmpty());
+ }
+
+ // test unsuccessful replace(key, oldValue, newValue)
+ for (int i = putRange_1Start; i <= putRange_2End; i++) {
+ boolean replaceSucceeded = pr.replace(Integer.toString(i),
+ Integer.toString(i), // wrong expected old value
+ "not" + i);
+ assertFalse("for i=" + i, replaceSucceeded);
+ assertEquals("for i=" + i,
+ i <= putRange_1End ? "replaced" + i : null,
+ pr.get(Integer.toString(i)));
+ }
+ if (!isEmpty) {
+ size = pr.size();
+ assertEquals("Size doesn't return expected value", putRange_1End, size);
+ assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
+ pr.isEmpty());
+ }
+
+ // test successful replace(key, value)
+ for (int i = putRange_1Start; i <= putRange_1End; i++) {
+ Object replaceResult = pr.replace(Integer.toString(i),
+ "twice replaced" + i);
+ assertEquals("for i=" + i, "replaced" + i, replaceResult);
+ assertEquals("for i=" + i,
+ "twice replaced" + i,
+ pr.get(Integer.toString(i)));
+ }
+ if (!isEmpty) {
+ size = pr.size();
+ assertEquals("Size doesn't return expected value", putRange_1End, size);
+ assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
+ pr.isEmpty());
+ }
+
+ // test unsuccessful replace(key, value)
+ for (int i = putRange_2Start; i <= putRange_2End; i++) {
+ Object replaceResult = pr.replace(Integer.toString(i),
+ "thrice replaced" + i);
+ assertNull("for i=" + i, replaceResult);
+ assertNull("for i=" + i, pr.get(Integer.toString(i)));
+ }
+ if (!isEmpty) {
+ size = pr.size();
+ assertEquals("Size doesn't return expected value", putRange_1End, size);
+ assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
+ pr.isEmpty());
+ }
+
+ // test unsuccessful remove(key, value)
+ for (int i = putRange_1Start; i <= putRange_2End; i++) {
+ boolean removeResult = pr.remove(Integer.toString(i),
+ Integer.toString(-i));
+ assertFalse("for i=" + i, removeResult);
+ assertEquals("for i=" + i,
+ i <= putRange_1End ? "twice replaced" + i : null,
+ pr.get(Integer.toString(i)));
+ }
+ if (!isEmpty) {
+ size = pr.size();
+ assertEquals("Size doesn't return expected value", putRange_1End, size);
+ assertFalse("isEmpty doesnt return proper state of the PartitionedRegion",
+ pr.isEmpty());
+ }
+
+ // test successful remove(key, value)
+ for (int i = putRange_1Start; i <= putRange_1End; i++) {
+ boolean removeResult = pr.remove(Integer.toString(i),
+ "twice replaced" + i);
+ assertTrue("for i=" + i, removeResult);
+ assertEquals("for i=" + i, null, pr.get(Integer.toString(i)));
+ }
+ if (!isEmpty) {
+ size = pr.size();
+ assertEquals("Size doesn't return expected value", 0, size);
+ pr.localClear();
+ assertTrue("isEmpty doesnt return proper state of the PartitionedRegion",
+ pr.isEmpty());
+ }
+
+ if (!isEmpty) {
+ // bug #42169 - entry not updated on server when locally destroyed on client
+ String key42169 = "key42169";
+ pr.put(key42169, "initialValue42169");
+ pr.localDestroy(key42169);
+ boolean success = pr.replace(key42169, "initialValue42169", "newValue42169");
+ assertTrue("expected replace to succeed", success);
+ pr.destroy(key42169);
+ pr.put(key42169, "secondRound");
+ pr.localDestroy(key42169);
+ Object result = pr.putIfAbsent(key42169, null);
+ assertEquals("expected putIfAbsent to fail", result, "secondRound");
+ pr.destroy(key42169);
+ }
+
+ if (isEmpty) {
+ String key41265 = "key41265";
+ boolean success = pr.remove(key41265, null);
+ assertFalse("expected remove to fail because key does not exist", success);
+ }
+
+ // test null values
+
+ // putIfAbsent with null value creates invalid entry
+ Object oldValue = pr.putIfAbsent("keyForNull", null);
+ assertNull(oldValue);
+ if (!isEmpty) {
+ assertTrue(pr.containsKey("keyForNull"));
+ assertTrue(!pr.containsValueForKey("keyForNull"));
+ }
+
+ // replace allows null value for oldValue, meaning invalidated entry
+ assertTrue(pr.replace("keyForNull", null, "no longer invalid"));
+
+ // replace does not allow null value for new value
+ try {
+ pr.replace("keyForNull", "no longer invalid", null);
+ fail("expected a NullPointerException");
+ } catch (NullPointerException expected) {
+ }
+
+ // other variant of replace does not allow null value for new value
+ try {
+ pr.replace("keyForNull", null);
+ fail ("expected a NullPointerException");
+ } catch (NullPointerException expected) {
+ }
+
+ // replace with null oldvalue matches invalidated entry
+ pr.putIfAbsent("otherKeyForNull", null);
+ int puts = ((GemFireCacheImpl)pr.getCache()).getCachePerfStats().getPuts();
+ boolean success = pr.replace("otherKeyForNull", null, "no longer invalid");
+ assertTrue(success);
+ int newputs = ((GemFireCacheImpl)pr.getCache()).getCachePerfStats().getPuts();
+ assertTrue("stats not updated properly or replace malfunctioned", newputs == puts+1);
+
+ }
+ });
+ }
+
+ /**
+ * Test for single BridgeWriter used across two regions: notify by subscription is true.
+ * For region1 the interest list is empty , for region 2 the intetest list is all keys.
+ * If an update/create is made on region1 , the client should not receive any.
+ * If the create/update is on region2 , the client should receive the update.
+ */
+ public void testSameBridgeWriterForTwoRegionHavingDifferentInterestList()
+ throws Exception
+ {
+ // start server first
+ PORT1 = initServerCache(true);
+ createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+ populateCache();
+ registerInterest();
+ server1.invoke(ClientServerMiscDUnitTest.class, "put");
+
+// pause(5000 + 5000 + 10000);
+ /*final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
+ try {
+ Thread.yield();
+ Thread.sleep(maxWaitTime);
+ }
+ catch (InterruptedException e) {
+ fail("interrupted");
+ }*/
+ verifyUpdates();
+
+ }
+
+ /**
+ * Test for single BridgeWriter used across two regions: notify by subscription is true.
+ * Both the regions have registered interest in all the keys.
+ * Now close region1 on the client.
+ * The region1 should get removed from the interest list on CCP at server.
+ * Any update on region1 on server should not get pushed to the client.
+ * Ensure that the message related is not added to the client's queue at all
+ * ( which is diferent from not receiving a callbak on the client).
+ * If an update on region2 is made on the server , then client should receive the calback
+ */
+ public void testSameBridgeWriterForTwoRegionHavingALLKEYSInterest()
+ throws Exception
+ {
+ // start server first
+ PORT1 = initServerCache(true);
+ createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+ populateCache();
+ registerInterestInBothTheRegions();
+ closeRegion1();
+ pause(6000);
+ server1.invoke(ClientServerMiscDUnitTest.class,
+ "verifyInterestListOnServer");
+ server1.invoke(ClientServerMiscDUnitTest.class, "put");
+ //pause(5000);
+ verifyUpdatesOnRegion2();
+ }
+
+ /** Test for single BridgeWriter used across two regions: notify by subscription is true.
+ * Both the regions have registered interest in all the keys.
+ * Close both the regions. When the last region is closed ,
+ * it should close the ConnectionProxy on the client ,
+ * close all the server connection threads on the server &
+ * remove the CacheClientProxy from the CacheClient notifier
+ */
+ public void testRegionCloseWithSameBridgeWriter() throws Exception
+ {
+ // start server first
+ PORT1 = initServerCache(true);
+ pool = (PoolImpl)createClientCache(getServerHostName(Host.getHost(0)),PORT1);
+ populateCache();
+ registerInterestInBothTheRegions();
+ closeBothRegions();
+ //pause(5000);
+ assertEquals(false, pool.isDestroyed());
+ pool.destroy();
+ assertEquals(true, pool.isDestroyed());
+ server1.invoke(ClientServerMiscDUnitTest.class,
+ "verifyNoCacheClientProxyOnServer");
+
+ }
+
+ /**
+ * Test for single BridgeWriter used across two regions: notify by
+ * subscription is true. Both the regions have registered interest in all the
+ * keys. Destroy region1 on the client. It should reach the server , kill the
+ * region on the server , propagate it to the interested clients , but it
+ * should keep CacheClient Proxy alive. Destroy Region2 . It should reach
+ * server , close conenction proxy , destroy the region2 on the server ,
+ * remove the cache client proxy from the cache client notifier & propagate it
+ * to the clients. Then create third region and verify that no
+ * CacheClientProxy is created on server
+ */
+ public void testCCPDestroyOnLastDestroyRegion() throws Exception
+ {
+ PORT1 = initServerCache(true);
+ PoolImpl pool = (PoolImpl)createClientCache(getServerHostName(Host.getHost(0)),PORT1);
+ destroyRegion1();
+ // pause(5000);
+ server1.invoke(ClientServerMiscDUnitTest.class,
+ "verifyCacheClientProxyOnServer", new Object[] { new String(
+ REGION_NAME1) });
+ Connection conn = pool.acquireConnection();
+ assertNotNull(conn);
+ assertEquals(1, pool.getConnectedServerCount());
+ assertEquals(false, pool.isDestroyed());
+ destroyRegion2();
+ assertEquals(false, pool.isDestroyed());
+ destroyPRRegion();
+ assertEquals(false, pool.isDestroyed());
+ pool.destroy();
+ assertEquals(true, pool.isDestroyed());
+ // pause(5000);
+ server1.invoke(ClientServerMiscDUnitTest.class,
+ "verifyNoCacheClientProxyOnServer");
+ try {
+ getCache().createRegion(REGION_NAME2, attrs);
+ fail("expected IllegalStateException");
+ } catch (IllegalStateException expected) {
+ }
+ }
+
+ /**
+ * Test for single BridgeWriter used across two regions:If notify by
+ * subscription is false , both the regions should receive invalidates for the
+ * updates on server in their respective regions
+ *
+ */
+ public void testInvalidatesPropagateOnTwoRegionsHavingCommonBridgeWriter()
+ throws Exception
+ {
+ // start server first
+ PORT1 = initServerCache(false);
+ createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+ registerInterestForInvalidatesInBothTheRegions();
+ populateCache();
+ server1.invoke(ClientServerMiscDUnitTest.class, "put");
+ //pause(5000);
+ verifyInvalidatesOnBothRegions();
+
+ }
+
+ /**
+ * Test for bug 43407, where LRU in the client caused an entry to be
+ * evicted with DESTROY(), then the client invalidated the entry and
+ * did a get(). After the get() the entry was not seen to be in the
+ * client's cache. This turned out to be expected behavior, but we
+ * now have this test to guarantee that the product behaves as expected.
+ */
+ public void testBug43407()
+ throws Exception
+ {
+ // start server first
+ PORT1 = initServerCache(false);
+ createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+ registerInterestForInvalidatesInBothTheRegions();
+ Region region = static_cache.getRegion(REGION_NAME1);
+ populateCache();
+ region.put("invalidationKey", "invalidationValue");
+ region.localDestroy("invalidationKey");
+ if (region.containsKey("invalidationKey")) {
+ fail("region still contains invalidationKey");
+ }
+ region.invalidate("invalidationKey");
+ if (region.containsKey("invalidationKey")) {
+ fail("this test expects the entry is not created on invalidate() if not there before the operation");
+ }
+ Object value = region.get("invalidationKey");
+ if (value != null) {
+ fail("this test expected a null response to get('invalidationKey')");
+ }
+ if (!region.containsKeyOnServer("invalidationKey")) {
+ fail("expected an entry on the server after invalidation");
+ }
+ // bug 43407 asserts that there should be an entry, but the product does not
+ // do this. This verifies that the product does not behave as asserted in that bug
+ if (region.containsKey("invalidationKey")) {
+ fail("expected no entry after invalidation when entry was not in client but was on server");
+ }
+ }
+
+ /**
+ * Create cache, create bridge writer, notify-by-subscription=false,
+ * create a region and on client and on server.
+ * Do not attach Bridge writer to region ,
+ * populate some entries on region both on client and server.
+ * Update the entries on server the client.
+ * The client should not have entry invalidate.
+ *
+ * @throws Exception
+ */
+ public void testInvalidatesPropagateOnRegionHavingNoBridgeWriter()
+ throws Exception
+ {
+ // start server first
+ PORT1 = initServerCache(false);
+ Properties props = new Properties();
+ props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+ props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+ new ClientServerMiscDUnitTest("temp").createCache(props);
+ String host = getServerHostName(server1.getHost());
+ PoolImpl p = (PoolImpl)PoolManager.createFactory()
+ .addServer(host, PORT1)
+ .setSubscriptionEnabled(true)
+ .setThreadLocalConnections(true)
+ .setReadTimeout(1000)
+ .setSocketBufferSize(32768)
+ .setMinConnections(3)
+ .setSubscriptionRedundancy(-1)
+ .setPingInterval(2000)
+ // .setRetryAttempts(5)
+ // .setRetryInterval(2000)
+ .create("testInvalidatesPropagateOnRegionHavingNoBridgeWriter");
+
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.DISTRIBUTED_ACK);
+ // factory.setPoolName(p.getName());
+
+ attrs = factory.create();
+ final Region region1 = getCache().createRegion(REGION_NAME1, attrs);
+ final Region region2 = getCache().createRegion(REGION_NAME2, attrs);
+ assertNotNull(region1);
+ assertNotNull(region2);
+ pool = p;
+ conn = pool.acquireConnection();
+ assertNotNull(conn);
+
+ populateCache();
+ server1.invoke(ClientServerMiscDUnitTest.class, "put");
+ // pause(5000);
+ WaitCriterion wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = region1.getEntry(k1).getValue();
+ return k1.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ // assertEquals(region1.getEntry(k1).getValue(), k1);
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = region1.getEntry(k2).getValue();
+ return k2.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = region2.getEntry(k1).getValue();
+ return k1.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ // assertEquals(region1.getEntry(k2).getValue(), k2);
+ // assertEquals(region2.getEntry(k1).getValue(), k1);
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = region2.getEntry(k2).getValue();
+ return k2.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ // assertEquals(region2.getEntry(k2).getValue(), k2);
+ }
+
+ /**
+ * Create proxy before cache creation, create cache, create two regions,
+ * attach same bridge writer to both of the regions Region interests AL_KEYS
+ * on both the regions, notify-by-subscription=true . The CCP should have both
+ * the regions in interest list.
+ *
+ * @throws Exception
+ */
+
+ public void testProxyCreationBeforeCacheCreation() throws Exception
+ {
+ Properties props = new Properties();
+ props.setProperty("mcast-port", "0");
+ props.setProperty("locators", "");
+ DistributedSystem ds = getSystem(props);
+ assertNotNull(ds);
+ ds.disconnect();
+ ds = getSystem(props);
+ PORT1 = initServerCache(true);
+ String host = getServerHostName(server1.getHost());
+ Pool p = PoolManager.createFactory()
+ .addServer(host, PORT1)
+ .setSubscriptionEnabled(true)
+ .setSubscriptionRedundancy(-1)
+ // .setRetryAttempts(5)
+ .create("testProxyCreationBeforeCacheCreationPool");
+
+ Cache cache = getCache();
+ assertNotNull(cache);
+
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.DISTRIBUTED_ACK);
+ factory.setPoolName(p.getName());
+
+ RegionAttributes myAttrs = factory.create();
+ Region region1 = cache.createRegion(REGION_NAME1, myAttrs);
+ Region region2 = cache.createRegion(REGION_NAME2, myAttrs);
+ assertNotNull(region1);
+ assertNotNull(region2);
+ //region1.registerInterest(CacheClientProxy.ALL_KEYS);
+ region2.registerInterest("ALL_KEYS");
+ pause(6000);
+ server1.invoke(ClientServerMiscDUnitTest.class,
+ "verifyInterestListOnServer");
+
+ }
+ /**
+ *
+ * Cycling a DistributedSystem with an initialized BridgeWriter causes interest registration NPE
+ *
+ * Test Scenario:
+ *
+ * Create a DistributedSystem (DS1).
+ * Create a BridgeWriter (BW), initialize (creates a proxy with DS1 memberid)
+ * Disconnect DS1. Create a DistributedSystem (DS2).
+ * Create a Region with BW, it attempts to register interest using DS2 memberid, gets NPE.
+ *
+ * @throws Exception
+ */
+ public void testBug35380() throws Exception
+ {
+ Properties props = new Properties();
+ props.setProperty("mcast-port", "0");
+ props.setProperty("locators", "");
+ DistributedSystem ds = getSystem(props);
+ assertNotNull(ds);
+
+ PORT1 = initServerCache(true);
+ String host = getServerHostName(server1.getHost());
+ Pool p = PoolManager.createFactory()
+ .addServer(host, PORT1)
+ .setSubscriptionEnabled(true)
+ .setSubscriptionRedundancy(-1)
+ //.setRetryAttempts(5)
+ .create("testBug35380Pool");
+
+ Cache cache = getCache();
+
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.DISTRIBUTED_ACK);
+ factory.setPoolName(p.getName());
+
+ RegionAttributes myAttrs = factory.create();
+ Region region1 = cache.createRegion(REGION_NAME1, myAttrs);
+ Region region2 = cache.createRegion(REGION_NAME2, myAttrs);
+ assertNotNull(region1);
+ assertNotNull(region2);
+
+ region2.registerInterest("ALL_KEYS");
+
+ ds.disconnect();
+ Properties prop = new Properties();
+ prop.setProperty("mcast-port", "0");
+ prop.setProperty("locators", "");
+ ds = getSystem(prop);
+
+ cache = getCache();
+ assertNotNull(cache);
+
+ AttributesFactory factory1 = new AttributesFactory();
+ factory1.setScope(Scope.DISTRIBUTED_ACK);
+ //reuse writer from prev DS
+ factory1.setPoolName(p.getName());
+
+ RegionAttributes attrs1 = factory1.create();
+ try {
+ cache.createRegion(REGION_NAME1, attrs1);
+ fail("expected ShutdownException");
+ }
+ catch(IllegalStateException expected) {
+ }
+ catch (DistributedSystemDisconnectedException expected) {
+ }
+ }
+
+
+ private void createCache(Properties props) throws Exception {
+ createCacheV(props);
+ }
+ private Cache createCacheV(Properties props) throws Exception
+ {
+ DistributedSystem ds = getSystem(props);
+ assertNotNull(ds);
+ ds.disconnect();
+ ds = getSystem(props);
+ Cache cache = getCache();
+ assertNotNull(cache);
+ return cache;
+ }
+
+ public static void createClientCacheV(String h, int port)
+ throws Exception {
+ _createClientCache(h, port, false);
+ }
+
+ public static void createEmptyClientCache(String h, int port)
+ throws Exception {
+ _createClientCache(h, port, true);
+ }
+
+ public static Pool createClientCache(String h, int port)
+ throws Exception {
+ return _createClientCache(h, port, false);
+ }
+
+ public static Pool _createClientCache(String h, int port, boolean empty)
+ throws Exception {
+ Properties props = new Properties();
+ props.setProperty("mcast-port", "0");
+ props.setProperty("locators", "");
+ Cache cache = new ClientServerMiscDUnitTest("temp").createCacheV(props);
+ ClientServerMiscDUnitTest.static_cache = cache;
+ PoolImpl p = (PoolImpl)PoolManager.createFactory()
+ .addServer(h, port)
+ .setSubscriptionEnabled(true)
+ .setThreadLocalConnections(true)
+ .setReadTimeout(1000)
+ .setSocketBufferSize(32768)
+ .setMinConnections(3)
+ .setSubscriptionRedundancy(-1)
+ .setPingInterval(2000)
+ // .setRetryAttempts(5)
+ // .setRetryInterval(2000)
+ .create("ClientServerMiscDUnitTestPool");
+
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.DISTRIBUTED_ACK);
+ if (empty) {
+ factory.setDataPolicy(DataPolicy.EMPTY);
+ }
+ factory.setPoolName(p.getName());
+
+ attrs = factory.create();
+ Region region1 = cache.createRegion(REGION_NAME1, attrs);
+ Region region2 = cache.createRegion(REGION_NAME2, attrs);
+ Region prRegion = cache.createRegion(PR_REGION_NAME, attrs);
+ assertNotNull(region1);
+ assertNotNull(region2);
+ assertNotNull(prRegion);
+ pool = p;
+// conn = pool.acquireConnection();
+// assertNotNull(conn);
+ // TODO does this WaitCriterion actually help?
+ WaitCriterion wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ try {
+ conn = pool.acquireConnection();
+ if (conn == null) {
+ excuse = "acquireConnection returned null?";
+ return false;
+ }
+ return true;
+ } catch (NoAvailableServersException e) {
+ excuse = "Cannot find a server: " + e;
+ return false;
+ }
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ return p;
+ }
+
+ public static Integer createServerCache(Boolean notifyBySubscription, Integer maxThreads)
+ throws Exception {
+ Cache cache = new ClientServerMiscDUnitTest("temp").createCacheV(new Properties());
+ unsetSlowDispatcherFlag();
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.DISTRIBUTED_ACK);
+ factory.setEnableConflation(true);
+ factory.setDataPolicy(DataPolicy.REPLICATE);
+ RegionAttributes myAttrs = factory.create();
+ Region r1 = cache.createRegion(REGION_NAME1, myAttrs);
+ Region r2 = cache.createRegion(REGION_NAME2, myAttrs);
+ factory = new AttributesFactory();
+ factory.setDataPolicy(DataPolicy.PARTITION);
+ RegionAttributes prAttrs = factory.create();
+ Region pr = cache.createRegion(PR_REGION_NAME, prAttrs);
+ assertNotNull(r1);
+ assertNotNull(r2);
+ assertNotNull(pr);
+
+ CacheServer server = cache.addCacheServer();
+ int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+ r1.getCache().getDistributedSystem().getLogWriter().info("Starting server on port " + port);
+ server.setPort(port);
+ server.setMaxThreads(maxThreads.intValue());
+ server.setNotifyBySubscription(notifyBySubscription.booleanValue());
+ server.start();
+ r1.getCache().getDistributedSystem().getLogWriter().info("Started server on port " + server.getPort());
+ return new Integer(server.getPort());
+
+ }
+
+ protected int getMaxThreads() {
+ return 0;
+ }
+
+ public static void registerInterest()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ assertNotNull(r);
+ //r.registerInterestRegex(CacheClientProxy.ALL_KEYS);
+ r.registerInterest("ALL_KEYS");
+ }
+ catch (CacheWriterException e) {
+ e.printStackTrace();
+ fail("Test failed due to CacheWriterException during registerInterest", e);
+ }
+ }
+
+ public static void registerInterestForInvalidatesInBothTheRegions()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
+ assertNotNull(r1);
+ Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ assertNotNull(r2);
+ r1.registerInterest("ALL_KEYS", false, false);
+ r2.registerInterest("ALL_KEYS", false, false);
+ }
+ catch (CacheWriterException e) {
+ e.printStackTrace();
+ fail(
+ "Test failed due to CacheWriterException during registerInterestnBothRegions",
+ e);
+ }
+ }
+
+ public static void registerInterestInBothTheRegions()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
+ assertNotNull(r1);
+ Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ assertNotNull(r2);
+ r1.registerInterest("ALL_KEYS");
+ r2.registerInterest("ALL_KEYS");
+ }
+ catch (CacheWriterException e) {
+ e.printStackTrace();
+ fail(
+ "Test failed due to CacheWriterException during registerInterestnBothRegions",
+ e);
+ }
+ }
+
+ public static void closeRegion1()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
+ assertNotNull(r1);
+ r1.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ fail("Test failed due to Exception during closeRegion1", e);
+ }
+ }
+
+ public static void closeBothRegions()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
+ Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ Region pr = cache.getRegion(Region.SEPARATOR + PR_REGION_NAME);
+ assertNotNull(r1);
+ assertNotNull(r2);
+ assertNotNull(pr);
+ r1.close();
+ r2.close();
+ pr.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ fail("Test failed due to Exception during closeBothRegions", e);
+ }
+ }
+
+ public static void destroyRegion1()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
+ assertNotNull(r1);
+ r1.destroyRegion();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ fail("Test failed due to Exception during closeBothRegions", e);
+ }
+ }
+
+ public static void destroyRegion2()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ assertNotNull(r2);
+ r2.destroyRegion();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ fail("Test failed due to Exception during closeBothRegions", e);
+ }
+ }
+
+ public static void destroyPRRegion() {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r2 = cache.getRegion(Region.SEPARATOR + PR_REGION_NAME);
+ assertNotNull(r2);
+ r2.destroyRegion();
+ } catch (Exception e) {
+ // e.printStackTrace();
+ fail("Test failed due to Exception during closeBothRegions", e);
+ }
+ }
+
+ public static void verifyInterestListOnServer()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ assertEquals("More than one BridgeServer", 1, cache.getCacheServers()
+ .size());
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
+ .iterator().next();
+ assertNotNull(bs);
+ assertNotNull(bs.getAcceptor());
+ assertNotNull(bs.getAcceptor().getCacheClientNotifier());
+ Iterator iter_prox = bs.getAcceptor().getCacheClientNotifier()
+ .getClientProxies().iterator();
+ while (iter_prox.hasNext()) {
+ CacheClientProxy ccp = (CacheClientProxy)iter_prox.next();
+ // CCP should not contain region1
+ Set akr = ccp.cils[RegisterInterestTracker.interestListIndex].regions;
+ assertNotNull(akr);
+ assertTrue(!akr.contains(Region.SEPARATOR + REGION_NAME1));
+ // CCP should contain region2
+ assertTrue(akr.contains(Region.SEPARATOR + REGION_NAME2));
+ assertEquals(1, akr.size());
+ }
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ fail("while setting verifyInterestListOnServer " + ex);
+ }
+ }
+
+ public static void verifyNoCacheClientProxyOnServer()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ assertEquals("More than one BridgeServer", 1, cache.getCacheServers()
+ .size());
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
+ .iterator().next();
+ assertNotNull(bs);
+ assertNotNull(bs.getAcceptor());
+ final CacheClientNotifier ccn = bs.getAcceptor().getCacheClientNotifier();
+
+ assertNotNull(ccn);
+ WaitCriterion wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ return ccn.getClientProxies().size() == 0;
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 40 * 1000, 1000, true);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ fail("while setting verifyNoCacheClientProxyOnServer " + ex);
+ }
+ }
+
+ public static void verifyCacheClientProxyOnServer(String regionName)
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ assertNull(cache.getRegion(Region.SEPARATOR + regionName));
+ verifyCacheClientProxyOnServer();
+
+ //assertEquals(1, bs.getAcceptor().getCacheClientNotifier().getClientProxies().size());
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ fail("while setting verifyNoCacheClientProxyOnServer " + ex);
+ }
+ }
+
+ public static void verifyCacheClientProxyOnServer()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ assertEquals("More than one BridgeServer", 1, cache.getCacheServers()
+ .size());
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
+ .iterator().next();
+ assertNotNull(bs);
+ assertNotNull(bs.getAcceptor());
+ final CacheClientNotifier ccn = bs.getAcceptor().getCacheClientNotifier();
+
+ assertNotNull(ccn);
+ WaitCriterion wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ return ccn.getClientProxies().size() == 1;
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 40 * 1000, 1000, true);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ fail("while setting verifyNoCacheClientProxyOnServer " + ex);
+ }
+ }
+
+ public static void populateCache()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
+ Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ assertNotNull(r1);
+ assertNotNull(r2);
+
+ if (!r1.containsKey(k1))
+ r1.create(k1, k1);
+ if (!r1.containsKey(k2))
+ r1.create(k2, k2);
+ if (!r2.containsKey(k1))
+ r2.create(k1, k1);
+ if (!r2.containsKey(k2))
+ r2.create(k2, k2);
+
+ assertEquals(r1.getEntry(k1).getValue(), k1);
+ assertEquals(r1.getEntry(k2).getValue(), k2);
+ assertEquals(r2.getEntry(k1).getValue(), k1);
+ assertEquals(r2.getEntry(k2).getValue(), k2);
+ }
+ catch (Exception ex) {
+ fail("failed while createEntries()", ex);
+ }
+ }
+
+ public static void put()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
+ Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ assertNotNull(r1);
+ assertNotNull(r2);
+
+ r1.put(k1, server_k1);
+ r1.put(k2, server_k2);
+
+ r2.put(k1, server_k1);
+ r2.put(k2, server_k2);
+
+ assertEquals(r1.getEntry(k1).getValue(), server_k1);
+ assertEquals(r1.getEntry(k2).getValue(), server_k2);
+ assertEquals(r2.getEntry(k1).getValue(), server_k1);
+ assertEquals(r2.getEntry(k2).getValue(), server_k2);
+ }
+ catch (Exception ex) {
+ fail("failed while put()", ex);
+ }
+ }
+
+ public static void verifyUpdates()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
+ final Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ assertNotNull(r1);
+ assertNotNull(r2);
+ // verify updates
+ WaitCriterion wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r1.getEntry(k1).getValue();
+ return k1.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ // assertEquals(k1, r1.getEntry(k1).getValue());
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r1.getEntry(k2).getValue();
+ return k2.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ // assertEquals(k2, r1.getEntry(k2).getValue());
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r2.getEntry(k1).getValue();
+ return server_k1.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ // assertEquals(server_k1, r2.getEntry(k1).getValue());
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r2.getEntry(k2).getValue();
+ return server_k2.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ // assertEquals(server_k2, r2.getEntry(k2).getValue());
+ }
+ catch (Exception ex) {
+ fail("failed while verifyUpdates()", ex);
+ }
+ }
+
+ public static void verifyInvalidatesOnBothRegions()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME1);
+ final Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ assertNotNull(r1);
+ assertNotNull(r2);
+
+ WaitCriterion wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r1.getEntry(k1).getValue();
+ return val == null;
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+
+ // assertNull(r1.getEntry(k1).getValue());
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r1.getEntry(k1).getValue();
+ return val == null;
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+
+ // assertNull(r1.getEntry(k2).getValue());
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r1.getEntry(k2).getValue();
+ return val == null;
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+
+
+ // assertNull(r2.getEntry(k1).getValue());
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r2.getEntry(k1).getValue();
+ return val == null;
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+
+ // assertNull(r2.getEntry(k2).getValue());
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r2.getEntry(k2).getValue();
+ return val == null;
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+ }
+ catch (Exception ex) {
+ fail("failed while verifyInvalidatesOnBothRegions()", ex);
+ }
+ }
+
+ public static void verifyUpdatesOnRegion2()
+ {
+ try {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ final Region r2 = cache.getRegion(Region.SEPARATOR + REGION_NAME2);
+ assertNotNull(r2);
+ WaitCriterion wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r2.getEntry(k1).getValue();
+ return server_k1.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ // assertEquals(server_k1, r2.getEntry(k1).getValue());
+ wc = new WaitCriterion() {
+ String excuse;
+ public boolean done() {
+ Object val = r2.getEntry(k2).getValue();
+ return server_k2.equals(val);
+ }
+ public String description() {
+ return excuse;
+ }
+ };
+ DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+
+ // assertEquals(server_k2, r2.getEntry(k2).getValue());
+ }
+ catch (Exception ex) {
+ fail("failed while verifyUpdatesOnRegion2()", ex);
+ }
+ }
+
+ public void tearDown2() throws Exception
+ {
+ super.tearDown2();
+ // close the clients first
+ closeCache();
+ // then close the servers
+ server1.invoke(ClientServerMiscDUnitTest.class, "closeCache");
+
+ }
+
+ public static void closeCache()
+ {
+ Cache cache = new ClientServerMiscDUnitTest("temp").getCache();
+ if (cache != null && !cache.isClosed()) {
+ cache.close();
+ cache.getDistributedSystem().disconnect();
+ }
+ }
+
+ /**
+ * set the boolean for starting the dispatcher thread a bit later to FALSE.
+ * This is just a precaution in case any test set it to true and did not unset
+ * it on completion.
+ *
+ */
+ public static void unsetSlowDispatcherFlag()
+ {
+ CacheClientProxy.isSlowStartForTesting = false;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/725e4bf5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
new file mode 100644
index 0000000..9b7c13e
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
@@ -0,0 +1,27 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets;
+
+
+/**
+ * Just like parent but enables server thread pool
+ * (ie. selector)
+ *
+ * @author darrel
+ *
+ */
+public class ClientServerMiscSelectorDUnitTest extends ClientServerMiscDUnitTest
+{
+ public ClientServerMiscSelectorDUnitTest(String name) {
+ super(name);
+ }
+
+ protected int getMaxThreads() {
+ return 2;
+ }
+}
[10/17] incubator-geode git commit: renamed BridgeServerLoadMessage
to CacheServerLoadMessage
Posted by ds...@apache.org.
renamed BridgeServerLoadMessage to CacheServerLoadMessage
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/183ed7a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/183ed7a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/183ed7a0
Branch: refs/heads/feature/GEODE-243
Commit: 183ed7a01d252ea6e93ecfe194b8d762acbbb259
Parents: 9ea8f35
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 11:51:11 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 11:51:11 2015 -0700
----------------------------------------------------------------------
.../internal/BridgeServerLoadMessage.java | 99 --------------------
.../client/internal/CacheServerLoadMessage.java | 99 ++++++++++++++++++++
.../cache/server/internal/LoadMonitor.java | 6 +-
.../gemstone/gemfire/internal/DSFIDFactory.java | 4 +-
.../internal/DataSerializableFixedID.java | 2 +-
.../sanctionedDataSerializables.txt | 2 +-
6 files changed, 106 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183ed7a0/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage.java
deleted file mode 100644
index a419216..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.cache.client.internal;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.cache.server.ServerLoad;
-import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.InternalLocator;
-import com.gemstone.gemfire.distributed.internal.SerialDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.distributed.internal.ServerLocator;
-import com.gemstone.gemfire.internal.InternalDataSerializer;
-
-/**
- * A message from bridge server to locator to update the locator
- * with new load information from the bridge server.
- * Also includes the id of any clients whose estimate is no
- * longer needed on the server-locator.
- * @author dsmith
- * @since 5.7
- *
- */
-public class BridgeServerLoadMessage extends SerialDistributionMessage {
- protected ServerLoad load;
- protected ServerLocation location;
- protected ArrayList clientIds;
-
- public BridgeServerLoadMessage() {
- super();
- }
-
- public BridgeServerLoadMessage(ServerLoad load, ServerLocation location,
- ArrayList clientIds) {
- super();
- this.load = load;
- this.location = location;
- this.clientIds = clientIds;
- }
-
- @Override
- protected void process(DistributionManager dm) {
- updateLocalLocators();
- }
-
- public void updateLocalLocators() {
- List locators = Locator.getLocators();
- for (int i=0; i < locators.size(); i++) {
- InternalLocator l = (InternalLocator)locators.get(i);
- ServerLocator serverLocator = l.getServerLocatorAdvisee();
- if(serverLocator != null) {
- serverLocator.updateLoad(location, load, this.clientIds);
- }
- }
- }
-
-
-
- public int getDSFID() {
- return BRIDGE_SERVER_LOAD_MESSAGE;
- }
-
- @Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
- load = new ServerLoad();
- InternalDataSerializer.invokeFromData(load, in);
- location = new ServerLocation();
- InternalDataSerializer.invokeFromData(location, in);
- this.clientIds = DataSerializer.readArrayList(in);
- }
-
- @Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
- InternalDataSerializer.invokeToData(load, out);
- InternalDataSerializer.invokeToData(location, out);
- DataSerializer.writeArrayList(this.clientIds, out);
- }
-
- @Override
- protected Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183ed7a0/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
new file mode 100644
index 0000000..e4f63dc
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
@@ -0,0 +1,99 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.cache.server.ServerLoad;
+import com.gemstone.gemfire.distributed.Locator;
+import com.gemstone.gemfire.distributed.internal.DistributionManager;
+import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.distributed.internal.SerialDistributionMessage;
+import com.gemstone.gemfire.distributed.internal.ServerLocation;
+import com.gemstone.gemfire.distributed.internal.ServerLocator;
+import com.gemstone.gemfire.internal.InternalDataSerializer;
+
+/**
+ * A message from a server to a locator to update the locator
+ * with new load information from the server.
+ * Also includes the id of any clients whose estimate is no
+ * longer needed on the server-locator.
+ * @author dsmith
+ * @since 5.7
+ *
+ */
+public class CacheServerLoadMessage extends SerialDistributionMessage {
+ protected ServerLoad load;
+ protected ServerLocation location;
+ protected ArrayList clientIds;
+
+ public CacheServerLoadMessage() {
+ super();
+ }
+
+ public CacheServerLoadMessage(ServerLoad load, ServerLocation location,
+ ArrayList clientIds) {
+ super();
+ this.load = load;
+ this.location = location;
+ this.clientIds = clientIds;
+ }
+
+ @Override
+ protected void process(DistributionManager dm) {
+ updateLocalLocators();
+ }
+
+ public void updateLocalLocators() {
+ List locators = Locator.getLocators();
+ for (int i=0; i < locators.size(); i++) {
+ InternalLocator l = (InternalLocator)locators.get(i);
+ ServerLocator serverLocator = l.getServerLocatorAdvisee();
+ if(serverLocator != null) {
+ serverLocator.updateLoad(location, load, this.clientIds);
+ }
+ }
+ }
+
+
+
+ public int getDSFID() {
+ return CACHE_SERVER_LOAD_MESSAGE;
+ }
+
+ @Override
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ super.fromData(in);
+ load = new ServerLoad();
+ InternalDataSerializer.invokeFromData(load, in);
+ location = new ServerLocation();
+ InternalDataSerializer.invokeFromData(location, in);
+ this.clientIds = DataSerializer.readArrayList(in);
+ }
+
+ @Override
+ public void toData(DataOutput out) throws IOException {
+ super.toData(out);
+ InternalDataSerializer.invokeToData(load, out);
+ InternalDataSerializer.invokeToData(location, out);
+ DataSerializer.writeArrayList(this.clientIds, out);
+ }
+
+ @Override
+ protected Object clone() throws CloneNotSupportedException {
+ return super.clone();
+ }
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183ed7a0/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java
index c516407..129ba2c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java
@@ -14,7 +14,7 @@ import org.apache.logging.log4j.Logger;
import com.gemstone.gemfire.CancelException;
import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.cache.client.internal.BridgeServerLoadMessage;
+import com.gemstone.gemfire.cache.client.internal.CacheServerLoadMessage;
import com.gemstone.gemfire.cache.server.ServerLoad;
import com.gemstone.gemfire.cache.server.ServerLoadProbe;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
@@ -195,8 +195,8 @@ public class LoadMonitor implements ConnectionListener {
stats.setLoad(load);
if (locators != null) {
- BridgeServerLoadMessage message =
- new BridgeServerLoadMessage(load, location, myClientIds);
+ CacheServerLoadMessage message =
+ new CacheServerLoadMessage(load, location, myClientIds);
message.setRecipients(locators);
MembershipManager mgr = advisor.getDistributionManager().getMembershipManager();
if (mgr == null || !mgr.isBeingSick()) { // test hook
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183ed7a0/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
index 2181de4..d556ce2 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.admin.internal.PrepareBackupResponse;
import com.gemstone.gemfire.admin.internal.SystemMemberCacheEventProcessor;
import com.gemstone.gemfire.admin.jmx.internal.StatAlertNotification;
import com.gemstone.gemfire.cache.InterestResultPolicy;
-import com.gemstone.gemfire.cache.client.internal.BridgeServerLoadMessage;
+import com.gemstone.gemfire.cache.client.internal.CacheServerLoadMessage;
import com.gemstone.gemfire.cache.client.internal.locator.ClientConnectionRequest;
import com.gemstone.gemfire.cache.client.internal.locator.ClientConnectionResponse;
import com.gemstone.gemfire.cache.client.internal.locator.ClientReplacementRequest;
@@ -860,7 +860,7 @@ public final class DSFIDFactory implements DataSerializableFixedID {
registerDSFID(ALERTS_NOTIF_MESSAGE, AlertsNotificationMessage.class);
registerDSFID(FIND_DURABLE_QUEUE, FindDurableQueueMessage.class);
registerDSFID(FIND_DURABLE_QUEUE_REPLY, FindDurableQueueReply.class);
- registerDSFID(BRIDGE_SERVER_LOAD_MESSAGE, BridgeServerLoadMessage.class);
+ registerDSFID(CACHE_SERVER_LOAD_MESSAGE, CacheServerLoadMessage.class);
registerDSFID(CACHE_SERVER_PROFILE, CacheServerProfile.class);
registerDSFID(CONTROLLER_PROFILE, ControllerProfile.class);
registerDSFID(DLOCK_QUERY_MESSAGE,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183ed7a0/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
index 8a4d31e..84f038a 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
@@ -346,7 +346,7 @@ public interface DataSerializableFixedID extends SerializationVersions {
public static final byte CONCURRENT_HASH_MAP = 21;
public static final byte FIND_DURABLE_QUEUE = 22;
public static final byte FIND_DURABLE_QUEUE_REPLY = 23;
- public static final byte BRIDGE_SERVER_LOAD_MESSAGE = 24;
+ public static final byte CACHE_SERVER_LOAD_MESSAGE = 24;
/** A header byte meaning that the next element in the stream is a
* <code>ObjectPartList</code>.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183ed7a0/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index e46e70a..1665a3f 100644
--- a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -34,7 +34,7 @@ com/gemstone/gemfire/cache/SubscriptionAttributes,2
fromData,14,2a2bb9000f0100b80010b50003b1
toData,14,2b2ab40003b4000db9000e0200b1
-com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage,2
+com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage,2
fromData,52,2a2bb7000c2abb000d59b7000eb500022ab400022bb8000f2abb001059b70011b500032ab400032bb8000f2a2bb80012b50004b1
toData,30,2a2bb700132ab400022bb800142ab400032bb800142ab400042bb80015b1