You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/31 23:15:00 UTC
[01/35] geode git commit: GEODE-2960 : Trim field parameter values
from create lucene index. [Forced Update!]
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2632-19 22f4a4f3e -> d5dc97c81 (forced update)
GEODE-2960 : Trim field parameter values from create lucene index.
* Added logic to trim leading and trailing spaces from values provided against 'field'.
* Modified existing test case to verify changes.
This closes #541
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d50489c6
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d50489c6
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d50489c6
Branch: refs/heads/feature/GEODE-2632-19
Commit: d50489c6c526ab996c4ff8883283a6e8f7a228a1
Parents: d3543d2
Author: Deepak Dixit <de...@gmail.com>
Authored: Fri May 26 16:59:41 2017 +0530
Committer: nabarun <nn...@pivotal.io>
Committed: Tue May 30 11:59:34 2017 -0700
----------------------------------------------------------------------
.../geode/cache/lucene/internal/cli/LuceneIndexCommands.java | 7 ++++++-
.../configuration/LuceneClusterConfigurationDUnitTest.java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/d50489c6/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index 9317e2e..2fa9356 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -53,6 +53,7 @@ import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
@@ -184,7 +185,11 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
this.securityService.authorizeRegionManage(regionPath);
try {
final InternalCache cache = getCache();
- LuceneIndexInfo indexInfo = new LuceneIndexInfo(indexName, regionPath, fields, analyzers);
+ // trim fields for any leading trailing spaces.
+ String[] trimmedFields =
+ Arrays.stream(fields).map(field -> field.trim()).toArray(size -> new String[size]);
+ LuceneIndexInfo indexInfo =
+ new LuceneIndexInfo(indexName, regionPath, trimmedFields, analyzers);
final ResultCollector<?, ?> rc =
this.executeFunctionOnAllMembers(createIndexFunction, indexInfo);
final List<CliFunctionResult> funcResults = (List<CliFunctionResult>) rc.getResult();
http://git-wip-us.apache.org/repos/asf/geode/blob/d50489c6/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
index 7acff1b..867dc2e 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
@@ -259,7 +259,7 @@ public class LuceneClusterConfigurationDUnitTest {
CommandStringBuilder csb = new CommandStringBuilder(LuceneCliStrings.LUCENE_CREATE_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, indexName);
csb.addOption(LuceneCliStrings.LUCENE__REGION_PATH, REGION_NAME);
- csb.addOption(LuceneCliStrings.LUCENE_CREATE_INDEX__FIELD, "field1,field2,field3");
+ csb.addOption(LuceneCliStrings.LUCENE_CREATE_INDEX__FIELD, "'field1, field2, field3'");
gfshConnector.executeAndVerifyCommand(csb.toString());
}
[34/35] geode git commit: milestone
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
index 267a5b2..45ab383 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
@@ -39,6 +39,7 @@ import org.apache.geode.internal.offheap.OffHeapHelper;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
public class GetAll70 extends BaseCommand {
@@ -50,7 +51,7 @@ public class GetAll70 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
index db97d53..70e31e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
@@ -39,6 +39,7 @@ import org.apache.geode.internal.offheap.OffHeapHelper;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
/**
@@ -56,7 +57,7 @@ public class GetAllWithCallback extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null, callbackPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
index 201b5c0..51a4f66 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
@@ -31,6 +31,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
/**
* {@link Command} for {@link GetClientPRMetadataCommand}
@@ -49,7 +50,7 @@ public class GetClientPRMetadataCommand extends BaseCommand {
private GetClientPRMetadataCommand() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
index 7b370fe..2fa4fe0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
@@ -29,6 +29,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
/**
* {@link Command} for {@link GetClientPRMetadataCommand66}
@@ -47,7 +48,7 @@ public class GetClientPRMetadataCommand66 extends BaseCommand {
private GetClientPRMetadataCommand66() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
index 6be9353..1979e7f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
@@ -28,6 +28,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
/**
* {@link Command} for {@link GetClientPartitionAttributesOp} operation
@@ -45,7 +46,7 @@ public class GetClientPartitionAttributesCommand extends BaseCommand {
@SuppressWarnings("unchecked")
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
regionFullPath = clientMessage.getPart(0).getString();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
index 251f4da..d5f349b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
@@ -31,6 +31,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
/**
* {@link Command} for {@link GetClientPartitionAttributesOp} operation for 6.6 clients
@@ -50,7 +51,7 @@ public class GetClientPartitionAttributesCommand66 extends BaseCommand {
@SuppressWarnings("unchecked")
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
regionFullPath = clientMessage.getPart(0).getString();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
index 2c1f26c..2253f04 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
@@ -34,7 +35,7 @@ public class GetFunctionAttribute extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
String functionId = clientMessage.getPart(0).getString();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
index 15215de..d3319b8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.TypeRegistry;
@@ -36,7 +37,7 @@ public class GetPDXEnumById extends BaseCommand {
private GetPDXEnumById() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
index 40c62a7..cf8f793 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.TypeRegistry;
@@ -36,7 +37,7 @@ public class GetPDXIdForEnum extends BaseCommand {
private GetPDXIdForEnum() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
index c1de0fc..1ebe864 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
@@ -36,7 +37,7 @@ public class GetPDXIdForType extends BaseCommand {
private GetPDXIdForType() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
index 16e9dd0..fd4a57a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
@@ -36,7 +37,7 @@ public class GetPDXTypeById extends BaseCommand {
private GetPDXTypeById() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
index 7753584..f5c0dfd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
@@ -23,6 +23,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.pdx.internal.EnumInfo;
public class GetPdxEnums70 extends BaseCommand {
@@ -36,7 +37,7 @@ public class GetPdxEnums70 extends BaseCommand {
private GetPdxEnums70() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
index c31a375..ee2fb1b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
@@ -23,6 +23,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.pdx.internal.PdxType;
public class GetPdxTypes70 extends BaseCommand {
@@ -36,7 +37,7 @@ public class GetPdxTypes70 extends BaseCommand {
private GetPdxTypes70() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
index 040e1c2..8ce19d2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
@@ -36,7 +37,7 @@ public class Invalid extends BaseCommand {
private Invalid() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
logger.error(
LocalizedMessage.create(LocalizedStrings.Invalid_0_INVALID_MESSAGE_TYPE_WITH_TX_1_FROM_2,
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
index 801b3ad..dad758c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
@@ -36,6 +36,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.util.Breadcrumbs;
import org.apache.geode.security.GemFireSecurityException;
@@ -48,7 +49,7 @@ public class Invalidate extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, callbackArgPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
index 66de347..1fc3031 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
@@ -37,6 +37,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
public class KeySet extends BaseCommand {
@@ -48,7 +49,7 @@ public class KeySet extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
index ac9901c..a5bfb37 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
@@ -20,6 +20,8 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.security.SecurityService;
+
import java.io.IOException;
@@ -34,7 +36,7 @@ public class MakePrimary extends BaseCommand {
private MakePrimary() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
Part isClientReadyPart = clientMessage.getPart(0);
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java
index 9a79540..476e681 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java
@@ -19,6 +19,7 @@ import java.io.IOException;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
/**
* TODO: Javadoc everything and edit as needed
@@ -28,7 +29,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
public class ManagementCommand extends BaseCommand {
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
// TODO Auto-generated method stub
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
index 121ec37..46c9ef1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
@@ -20,6 +20,8 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.security.SecurityService;
+
import java.io.IOException;
public class PeriodicAck extends BaseCommand {
@@ -33,7 +35,7 @@ public class PeriodicAck extends BaseCommand {
private PeriodicAck() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
index adcfd14..06a5aff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
@@ -17,14 +17,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.*;
import org.apache.geode.distributed.internal.DistributionStats;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
@@ -39,7 +37,7 @@ public class Ping extends BaseCommand {
private Ping() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
final boolean isDebugEnabled = logger.isDebugEnabled();
if (isDebugEnabled) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
index 76c8184..36beb96 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
@@ -37,6 +37,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.GemFireSecurityException;
public class Put extends BaseCommand {
@@ -49,7 +50,7 @@ public class Put extends BaseCommand {
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
index 6f1583a..3556db2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
@@ -41,6 +41,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.GemFireSecurityException;
/**
@@ -55,7 +56,7 @@ public class Put61 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long p_start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long p_start)
throws IOException, InterruptedException {
long start = p_start;
Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
index a078372..50f9db0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
@@ -48,6 +48,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.util.Breadcrumbs;
import org.apache.geode.security.GemFireSecurityException;
@@ -63,7 +64,7 @@ public class Put65 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long p_start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long p_start)
throws IOException, InterruptedException {
long start = p_start;
Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
index ba8b145..10eeb3e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
@@ -46,6 +46,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class PutAll extends BaseCommand {
@@ -59,7 +60,7 @@ public class PutAll extends BaseCommand {
private PutAll() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, numberOfKeysPart = null, keyPart = null, valuePart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
index fb2bdb8..1e0c194 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
@@ -49,6 +49,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class PutAll70 extends BaseCommand {
@@ -62,7 +63,7 @@ public class PutAll70 extends BaseCommand {
private PutAll70() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startp)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long startp)
throws IOException, InterruptedException {
long start = startp; // copy this since we need to modify it
Part regionNamePart = null, numberOfKeysPart = null, keyPart = null, valuePart = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
index c6c26f7..acf8017 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
@@ -50,6 +50,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.util.Breadcrumbs;
public class PutAll80 extends BaseCommand {
@@ -75,7 +76,7 @@ public class PutAll80 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startp)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long startp)
throws IOException, InterruptedException {
long start = startp; // copy this since we need to modify it
Part regionNamePart = null, numberOfKeysPart = null, keyPart = null, valuePart = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
index ea5c875..17c51b6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
@@ -21,6 +21,7 @@ import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.GemFireSecurityException;
public class PutUserCredentials extends BaseCommand {
@@ -32,7 +33,7 @@ public class PutUserCredentials extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
boolean isSecureMode = clientMessage.isSecureMode();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
index b7d2810..927da30 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
@@ -31,6 +31,7 @@ import org.apache.geode.internal.cache.tier.sockets.BaseCommandQuery;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class Query extends BaseCommandQuery {
@@ -43,7 +44,7 @@ public class Query extends BaseCommandQuery {
protected Query() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
// Based on MessageType.DESTROY
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
index e52fa3f..47083cf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
@@ -32,6 +32,7 @@ import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class Query651 extends BaseCommandQuery {
@@ -44,7 +45,7 @@ public class Query651 extends BaseCommandQuery {
protected Query651() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
// Based on MessageType.DESTROY
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
index 053b2a8..3299df8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.Command;
@@ -26,6 +25,7 @@ import org.apache.geode.internal.cache.tier.sockets.CacheServerHelper;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
public class RegisterDataSerializers extends BaseCommand {
@@ -37,7 +37,7 @@ public class RegisterDataSerializers extends BaseCommand {
private RegisterDataSerializers() {}
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
if (logger.isDebugEnabled()) {
logger.debug("{}: Received register dataserializer request ({} parts) from {}",
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
index df5a46c..64a42c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
import org.apache.geode.internal.cache.EnumListenerEvent;
@@ -36,6 +35,7 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
public class RegisterInstantiators extends BaseCommand {
@@ -49,7 +49,7 @@ public class RegisterInstantiators extends BaseCommand {
private RegisterInstantiators() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
if (logger.isDebugEnabled()) {
logger.debug("{}: Received register instantiator request ({} parts) from {}",
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
index edd917a..21e88b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
@@ -36,6 +36,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class RegisterInterest extends BaseCommand {
@@ -46,7 +47,7 @@ public class RegisterInterest extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
index bad3bed..371788f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
@@ -40,6 +40,7 @@ import org.apache.geode.internal.cache.vmotion.VMotionObserverHolder;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
* @since GemFire 6.1
@@ -60,7 +61,7 @@ public class RegisterInterest61 extends BaseCommand {
RegisterInterest61() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
index 5f5fafa..117e284 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
@@ -30,6 +30,7 @@ import org.apache.geode.cache.DynamicRegionFactory;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.operations.RegisterInterestOperationContext;
import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
import java.util.ArrayList;
@@ -49,7 +50,7 @@ public class RegisterInterestList extends BaseCommand {
RegisterInterestList() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, numberOfKeysPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
index 40a3c25..05de03c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
@@ -30,6 +30,7 @@ import org.apache.geode.cache.DynamicRegionFactory;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.operations.RegisterInterestOperationContext;
import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
import java.util.ArrayList;
@@ -49,7 +50,7 @@ public class RegisterInterestList61 extends BaseCommand {
RegisterInterestList61() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, numberOfKeysPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
index 6a2ad95..734fdbc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
@@ -31,6 +31,7 @@ import org.apache.geode.cache.DynamicRegionFactory;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.operations.RegisterInterestOperationContext;
import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
import java.util.List;
@@ -55,7 +56,7 @@ public class RegisterInterestList66 extends BaseCommand {
RegisterInterestList66() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null;// numberOfKeysPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
index a295c54..2d3cd5c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
@@ -48,6 +48,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.util.Breadcrumbs;
public class RemoveAll extends BaseCommand {
@@ -61,7 +62,7 @@ public class RemoveAll extends BaseCommand {
protected RemoveAll() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startp)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long startp)
throws IOException, InterruptedException {
long start = startp; // copy this since we need to modify it
Part regionNamePart = null, numberOfKeysPart = null, keyPart = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
index cc42e0d..446f581 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.GemFireSecurityException;
public class RemoveUserAuth extends BaseCommand {
@@ -33,7 +34,7 @@ public class RemoveUserAuth extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
boolean isSecureMode = clientMessage.isSecureMode();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
index 6f97d31..74a1562 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
@@ -38,6 +38,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.i18n.StringId;
@@ -52,7 +53,7 @@ public class Request extends BaseCommand {
Request() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
Part regionNamePart = null, keyPart = null, valuePart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
index a6d6578..2432035 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
@@ -32,6 +32,7 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
/**
* Represents a request for (full) value of a given event from ha container
@@ -49,7 +50,7 @@ public class RequestEventValue extends BaseCommand {
private RequestEventValue() {}
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
Part eventIDPart = null, valuePart = null;
EventID event = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
index cd12ea7..9df6972 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
@@ -24,6 +24,7 @@ import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
/**
* Command for performing Rollback on the server
@@ -39,7 +40,7 @@ public class RollbackCommand extends BaseCommand {
private RollbackCommand() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
TXManagerImpl txMgr = (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
index c4515ab..41f95bd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
@@ -32,6 +32,7 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.GemFireSecurityException;
@@ -56,7 +57,7 @@ public class Size extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
StringBuilder errMessage = new StringBuilder();
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
index 9fc3fd1..0fc57bb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
@@ -33,6 +33,7 @@ import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
/**
* Used for bootstrapping txState/PeerTXStateStub on the server. This command is send when in client
@@ -49,7 +50,7 @@ public class TXFailoverCommand extends BaseCommand {
private TXFailoverCommand() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
// Build the TXId for the transaction
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
index 03270d6..3a9974b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
@@ -30,6 +30,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.MessageTooLargeException;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
import java.util.concurrent.Executor;
@@ -68,8 +69,7 @@ public class TXSynchronizationCommand extends BaseCommand {
* long)
*/
@Override
- public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
- long start) throws IOException, ClassNotFoundException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start) throws IOException, ClassNotFoundException, InterruptedException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
index 199ac18..cf00f5e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
@@ -31,6 +31,7 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
@@ -45,7 +46,7 @@ public class UnregisterInterest extends BaseCommand {
UnregisterInterest() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws ClassNotFoundException, IOException {
Part regionNamePart = null, keyPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
index 1968bff..80d5abc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
@@ -32,6 +32,7 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
@@ -46,7 +47,7 @@ public class UnregisterInterestList extends BaseCommand {
private UnregisterInterestList() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
Part regionNamePart = null, keyPart = null, numberOfKeysPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
index 2f434fb..7a2eb86 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
@@ -20,6 +20,7 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.*;
import org.apache.geode.distributed.internal.DistributionStats;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
@@ -35,7 +36,7 @@ public class UpdateClientNotification extends BaseCommand {
private UpdateClientNotification() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
CacheServerStats stats = serverConnection.getCacheServerStats();
{
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/lang/Initializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/Initializer.java b/geode-core/src/main/java/org/apache/geode/internal/lang/Initializer.java
index 2037371..3c0384d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/Initializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/Initializer.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.lang;
/**
- * The Initializer class is a utility class to identify Initable objects and initialize them by
+ * The ConfigInitialization class is a utility class to identify Initable objects and initialize them by
* calling their init method.
* <p/>
*
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/security/CustomSecurityService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/CustomSecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/CustomSecurityService.java
new file mode 100644
index 0000000..e7b0a51
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/CustomSecurityService.java
@@ -0,0 +1,205 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security;
+
+import java.util.Properties;
+import java.util.concurrent.Callable;
+
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadState;
+
+import org.apache.geode.management.internal.security.ResourceOperation;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.security.SecurityManager;
+
+public class CustomSecurityService implements SecurityService {
+
+ CustomSecurityService() {
+ // nothing
+ }
+
+ @Override
+ public void initSecurity(final Properties securityProps) {
+
+ }
+
+ @Override
+ public void setSecurityManager(final SecurityManager securityManager) {
+
+ }
+
+ @Override
+ public void setPostProcessor(final PostProcessor postProcessor) {
+
+ }
+
+ @Override
+ public ThreadState bindSubject(final Subject subject) {
+ return null;
+ }
+
+ @Override
+ public Subject getSubject() {
+ return null;
+ }
+
+ @Override
+ public Subject login(final Properties credentials) {
+ return null;
+ }
+
+ @Override
+ public void logout() {
+
+ }
+
+ @Override
+ public Callable associateWith(final Callable callable) {
+ return null;
+ }
+
+ @Override
+ public void authorize(final ResourceOperation resourceOperation) {
+
+ }
+
+ @Override
+ public void authorizeClusterManage() {
+
+ }
+
+ @Override
+ public void authorizeClusterWrite() {
+
+ }
+
+ @Override
+ public void authorizeClusterRead() {
+
+ }
+
+ @Override
+ public void authorizeDataManage() {
+
+ }
+
+ @Override
+ public void authorizeDataWrite() {
+
+ }
+
+ @Override
+ public void authorizeDataRead() {
+
+ }
+
+ @Override
+ public void authorizeRegionManage(final String regionName) {
+
+ }
+
+ @Override
+ public void authorizeRegionManage(final String regionName, final String key) {
+
+ }
+
+ @Override
+ public void authorizeRegionWrite(final String regionName) {
+
+ }
+
+ @Override
+ public void authorizeRegionWrite(final String regionName, final String key) {
+
+ }
+
+ @Override
+ public void authorizeRegionRead(final String regionName) {
+
+ }
+
+ @Override
+ public void authorizeRegionRead(final String regionName, final String key) {
+
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation) {
+
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation, final String regionName) {
+
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation, final String regionName, final String key) {
+
+ }
+
+ @Override
+ public void authorize(final ResourcePermission context) {
+
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+ @Override
+ public boolean needPostProcess() {
+ return false;
+ }
+
+ @Override
+ public Object postProcess(final String regionPath, final Object key, final Object value, final boolean valueIsSerialized) {
+ return null;
+ }
+
+ @Override
+ public Object postProcess(final Object principal, final String regionPath, final Object key, final Object value, final boolean valueIsSerialized) {
+ return null;
+ }
+
+ @Override
+ public boolean isClientSecurityRequired() {
+ return false;
+ }
+
+ @Override
+ public boolean isIntegratedSecurity() {
+ return true;
+ }
+
+ @Override
+ public boolean isPeerSecurityRequired() {
+ return false;
+ }
+
+ @Override
+ public SecurityManager getSecurityManager() {
+ return null;
+ }
+
+ @Override
+ public PostProcessor getPostProcessor() {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/security/DisabledSecurityService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/DisabledSecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/DisabledSecurityService.java
new file mode 100644
index 0000000..47cfc7b
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/DisabledSecurityService.java
@@ -0,0 +1,208 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security;
+
+import java.util.Properties;
+import java.util.concurrent.Callable;
+
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadState;
+
+import org.apache.geode.management.internal.security.ResourceOperation;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.security.SecurityManager;
+
+/**
+ * No-op security service that does nothing.
+ */
+public class DisabledSecurityService implements SecurityService {
+
+ public DisabledSecurityService() {
+ // nothing
+ }
+
+ @Override
+ public void initSecurity(final Properties securityProps) {
+ // nothing
+ }
+
+ @Override
+ public void setSecurityManager(final SecurityManager securityManager) {
+ // nothing
+ }
+
+ @Override
+ public void setPostProcessor(final PostProcessor postProcessor) {
+ // nothing
+ }
+
+ @Override
+ public ThreadState bindSubject(final Subject subject) {
+ return null;
+ }
+
+ @Override
+ public Subject getSubject() {
+ return null;
+ }
+
+ @Override
+ public Subject login(final Properties credentials) {
+ return null;
+ }
+
+ @Override
+ public void logout() {
+ // nothing
+ }
+
+ @Override
+ public Callable associateWith(final Callable callable) {
+ return null;
+ }
+
+ @Override
+ public void authorize(final ResourceOperation resourceOperation) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeClusterManage() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeClusterWrite() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeClusterRead() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeDataManage() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeDataWrite() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeDataRead() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionManage(final String regionName) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionManage(final String regionName, final String key) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionWrite(final String regionName) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionWrite(final String regionName, final String key) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionRead(final String regionName) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionRead(final String regionName, final String key) {
+ // nothing
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation) {
+ // nothing
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation, final String regionName) {
+ // nothing
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation, final String regionName, final String key) {
+ // nothing
+ }
+
+ @Override
+ public void authorize(final ResourcePermission context) {
+ // nothing
+ }
+
+ @Override
+ public void close() {
+ // nothing
+ }
+
+ @Override
+ public boolean needPostProcess() {
+ return false;
+ }
+
+ @Override
+ public Object postProcess(final String regionPath, final Object key, final Object value, final boolean valueIsSerialized) {
+ return null;
+ }
+
+ @Override
+ public Object postProcess(final Object principal, final String regionPath, final Object key, final Object value, final boolean valueIsSerialized) {
+ return null;
+ }
+
+ @Override
+ public boolean isClientSecurityRequired() {
+ return false;
+ }
+
+ @Override
+ public boolean isIntegratedSecurity() {
+ return false;
+ }
+
+ @Override
+ public boolean isPeerSecurityRequired() {
+ return false;
+ }
+
+ @Override
+ public SecurityManager getSecurityManager() {
+ return null;
+ }
+
+ @Override
+ public PostProcessor getPostProcessor() {
+ return null;
+ }
+}
[23/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
index d123ea2..6f1583a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java
@@ -55,7 +55,7 @@ public class Put61 extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long p_start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long p_start)
throws IOException, InterruptedException {
long start = p_start;
Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null;
@@ -64,36 +64,36 @@ public class Put61 extends BaseCommand {
Part eventPart = null;
StringBuffer errMessage = new StringBuffer();
boolean isDelta = false;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
// requiresResponse = true;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
start = DistributionStats.getStatTime();
stats.incReadPutRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- keyPart = msg.getPart(1);
+ regionNamePart = clientMessage.getPart(0);
+ keyPart = clientMessage.getPart(1);
try {
- isDelta = (Boolean) msg.getPart(2).getObject();
+ isDelta = (Boolean) clientMessage.getPart(2).getObject();
} catch (Exception e) {
- writeException(msg, MessageType.PUT_DELTA_ERROR, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, MessageType.PUT_DELTA_ERROR, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
// CachePerfStats not available here.
return;
}
- valuePart = msg.getPart(3);
- eventPart = msg.getPart(4);
- if (msg.getNumberOfParts() > 5) {
- callbackArgPart = msg.getPart(5);
+ valuePart = clientMessage.getPart(3);
+ eventPart = clientMessage.getPart(4);
+ if (clientMessage.getNumberOfParts() > 5) {
+ callbackArgPart = clientMessage.getPart(5);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -102,16 +102,16 @@ public class Put61 extends BaseCommand {
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
final boolean isDebugEnabled = logger.isDebugEnabled();
if (isDebugEnabled) {
logger.debug("{}: Received 6.1{}put request ({} bytes) from {} for region {} key {}",
- servConn.getName(), (isDelta ? " delta " : " "), msg.getPayloadLength(),
- servConn.getSocketString(), regionName, key);
+ serverConnection.getName(), (isDelta ? " delta " : " "), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key);
}
// Process the put request
@@ -119,27 +119,28 @@ public class Put61 extends BaseCommand {
if (key == null) {
String putMsg = " The input key for the 6.1 put request is null";
if (isDebugEnabled) {
- logger.debug("{}:{}", servConn.getName(), putMsg);
+ logger.debug("{}:{}", serverConnection.getName(), putMsg);
}
errMessage.append(putMsg);
}
if (regionName == null) {
String putMsg = " The input region name for the 6.1 put request is null";
if (isDebugEnabled) {
- logger.debug("{}:{}", servConn.getName(), putMsg);
+ logger.debug("{}:{}", serverConnection.getName(), putMsg);
}
errMessage.append(putMsg);
}
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = " was not found during 6.1 put request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -147,11 +148,12 @@ public class Put61 extends BaseCommand {
// Invalid to 'put' a null value in an existing key
String putMsg = " Attempted to 6.1 put a null value for existing key " + key;
if (isDebugEnabled) {
- logger.debug("{}:{}", servConn.getName(), putMsg);
+ logger.debug("{}:{}", serverConnection.getName(), putMsg);
}
errMessage.append(putMsg);
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -160,7 +162,8 @@ public class Put61 extends BaseCommand {
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
try {
Object value = null;
@@ -169,13 +172,13 @@ public class Put61 extends BaseCommand {
}
boolean isObject = valuePart.isObject();
boolean isMetaRegion = region.isUsedForMetaRegion();
- msg.setMetaRegion(isMetaRegion);
+ clientMessage.setMetaRegion(isMetaRegion);
this.securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = null;
if (!isMetaRegion) {
- authzRequest = servConn.getAuthzRequest();
+ authzRequest = serverConnection.getAuthzRequest();
}
if (authzRequest != null) {
if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
@@ -199,8 +202,8 @@ public class Put61 extends BaseCommand {
// Create the null entry. Since the value is null, the value of the
// isObject
// the true after null doesn't matter and is not used.
- result = region.basicBridgeCreate(key, null, true, callbackArg, servConn.getProxyID(), true,
- new EventIDHolder(eventId), false);
+ result = region.basicBridgeCreate(key, null, true, callbackArg,
+ serverConnection.getProxyID(), true, new EventIDHolder(eventId), false);
} else {
// Put the entry
byte[] delta = null;
@@ -208,50 +211,50 @@ public class Put61 extends BaseCommand {
delta = valuePart.getSerializedForm();
}
result = region.basicBridgePut(key, value, delta, isObject, callbackArg,
- servConn.getProxyID(), true, new EventIDHolder(eventId));
+ serverConnection.getProxyID(), true, new EventIDHolder(eventId));
}
if (result) {
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
} else {
- String message = servConn.getName() + ": Failed to 6.1 put entry for region " + regionName
- + " key " + key + " value " + valuePart;
+ String message = serverConnection.getName() + ": Failed to 6.1 put entry for region "
+ + regionName + " key " + key + " value " + valuePart;
if (isDebugEnabled) {
logger.debug(message);
}
throw new Exception(message);
}
} catch (RegionDestroyedException rde) {
- writeException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, rde, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (ResourceException re) {
- writeException(msg, re, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, re, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (InvalidDeltaException ide) {
logger.info(LocalizedMessage.create(
LocalizedStrings.UpdateOperation_ERROR_APPLYING_DELTA_FOR_KEY_0_OF_REGION_1,
new Object[] {key, regionName}));
- writeException(msg, MessageType.PUT_DELTA_ERROR, ide, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, MessageType.PUT_DELTA_ERROR, ide, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
region.getCachePerfStats().incDeltaFullValuesRequested();
return;
} catch (Exception ce) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ce);
+ checkForInterrupt(serverConnection, ce);
// If an exception occurs during the put, preserve the connection
- writeException(msg, ce, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ce, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (ce instanceof GemFireSecurityException) {
// Fine logging for security exceptions since these are already
// logged by the security logger
if (isDebugEnabled) {
- logger.debug("{}: Unexpected Security exception", servConn.getName(), ce);
+ logger.debug("{}: Unexpected Security exception", serverConnection.getName(), ce);
}
} else if (isDebugEnabled) {
- logger.debug("{}: Unexpected Exception", servConn.getName(), ce);
+ logger.debug("{}: Unexpected Exception", serverConnection.getName(), ce);
}
return;
} finally {
@@ -264,18 +267,19 @@ public class Put61 extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeReplyWithRefreshMetadata(msg, servConn, pr, pr.getNetworkHopType());
+ writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, pr.getNetworkHopType());
pr.clearNetworkHopData();
} else {
- writeReply(msg, servConn);
+ writeReply(clientMessage, serverConnection);
}
} else {
- writeReply(msg, servConn);
+ writeReply(clientMessage, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
if (isDebugEnabled) {
logger.debug("{}: Sent 6.1 put response back to {} for region {} key {} value {}",
- servConn.getName(), servConn.getSocketString(), regionName, key, valuePart);
+ serverConnection.getName(), serverConnection.getSocketString(), regionName, key,
+ valuePart);
}
stats.incWritePutResponseTime(DistributionStats.getStatTime() - start);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
index d53c89e..a078372 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java
@@ -63,7 +63,7 @@ public class Put65 extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long p_start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long p_start)
throws IOException, InterruptedException {
long start = p_start;
Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null;
@@ -72,11 +72,11 @@ public class Put65 extends BaseCommand {
Part eventPart = null;
StringBuffer errMessage = new StringBuffer();
boolean isDelta = false;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
// requiresResponse = true;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
start = DistributionStats.getStatTime();
@@ -84,50 +84,50 @@ public class Put65 extends BaseCommand {
}
// Retrieve the data from the message parts
int idx = 0;
- regionNamePart = msg.getPart(idx++);
+ regionNamePart = clientMessage.getPart(idx++);
Operation operation;
try {
- operation = (Operation) msg.getPart(idx++).getObject();
+ operation = (Operation) clientMessage.getPart(idx++).getObject();
if (operation == null) { // native clients send a null since the op is java-serialized
operation = Operation.UPDATE;
}
} catch (ClassNotFoundException e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- int flags = msg.getPart(idx++).getInt();
+ int flags = clientMessage.getPart(idx++).getInt();
boolean requireOldValue = ((flags & 0x01) == 0x01);
boolean haveExpectedOldValue = ((flags & 0x02) == 0x02);
Object expectedOldValue = null;
if (haveExpectedOldValue) {
try {
- expectedOldValue = msg.getPart(idx++).getObject();
+ expectedOldValue = clientMessage.getPart(idx++).getObject();
} catch (ClassNotFoundException e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
- keyPart = msg.getPart(idx++);
+ keyPart = clientMessage.getPart(idx++);
try {
- isDelta = ((Boolean) msg.getPart(idx).getObject()).booleanValue();
+ isDelta = ((Boolean) clientMessage.getPart(idx).getObject()).booleanValue();
idx += 1;
} catch (Exception e) {
- writeException(msg, MessageType.PUT_DELTA_ERROR, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, MessageType.PUT_DELTA_ERROR, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
// CachePerfStats not available here.
return;
}
- valuePart = msg.getPart(idx++);
- eventPart = msg.getPart(idx++);
- if (msg.getNumberOfParts() > idx) {
- callbackArgPart = msg.getPart(idx++);
+ valuePart = clientMessage.getPart(idx++);
+ eventPart = clientMessage.getPart(idx++);
+ if (clientMessage.getNumberOfParts() > idx) {
+ callbackArgPart = clientMessage.getPart(idx++);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -136,8 +136,8 @@ public class Put65 extends BaseCommand {
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -145,8 +145,9 @@ public class Put65 extends BaseCommand {
if (isDebugEnabled) {
logger.debug(
"{}: Received {}put request ({} bytes) from {} for region {} key {} txId {} posdup: {}",
- servConn.getName(), (isDelta ? " delta " : " "), msg.getPayloadLength(),
- servConn.getSocketString(), regionName, key, msg.getTransactionId(), msg.isRetry());
+ serverConnection.getName(), (isDelta ? " delta " : " "), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key, clientMessage.getTransactionId(),
+ clientMessage.isRetry());
}
// Process the put request
@@ -154,27 +155,28 @@ public class Put65 extends BaseCommand {
if (key == null) {
String putMsg = " The input key for the put request is null";
if (isDebugEnabled) {
- logger.debug("{}:{}", servConn.getName(), putMsg);
+ logger.debug("{}:{}", serverConnection.getName(), putMsg);
}
errMessage.append(putMsg);
}
if (regionName == null) {
String putMsg = " The input region name for the put request is null";
if (isDebugEnabled) {
- logger.debug("{}:{}", servConn.getName(), putMsg);
+ logger.debug("{}:{}", serverConnection.getName(), putMsg);
}
errMessage.append(putMsg);
}
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = " was not found during put request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -182,11 +184,12 @@ public class Put65 extends BaseCommand {
// Invalid to 'put' a null value in an existing key
String putMsg = " Attempted to put a null value for existing key " + key;
if (isDebugEnabled) {
- logger.debug("{}:{}", servConn.getName(), putMsg);
+ logger.debug("{}:{}", serverConnection.getName(), putMsg);
}
errMessage.append(putMsg);
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -194,13 +197,13 @@ public class Put65 extends BaseCommand {
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventIDHolder clientEvent =
- new EventIDHolder(new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId));
+ EventIDHolder clientEvent = new EventIDHolder(
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId));
Breadcrumbs.setEventId(clientEvent.getEventId());
// msg.isRetry might be set by v7.0 and later clients
- if (msg.isRetry()) {
+ if (clientMessage.isRetry()) {
// if (logger.isDebugEnabled()) {
// logger.debug("DEBUG: encountered isRetry in Put65");
// }
@@ -226,13 +229,13 @@ public class Put65 extends BaseCommand {
}
boolean isObject = valuePart.isObject();
boolean isMetaRegion = region.isUsedForMetaRegion();
- msg.setMetaRegion(isMetaRegion);
+ clientMessage.setMetaRegion(isMetaRegion);
this.securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = null;
if (!isMetaRegion) {
- authzRequest = servConn.getAuthzRequest();
+ authzRequest = serverConnection.getAuthzRequest();
}
if (authzRequest != null) {
if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
@@ -257,7 +260,7 @@ public class Put65 extends BaseCommand {
// to be publicly accessible.
if (operation == Operation.PUT_IF_ABSENT) {
// try {
- if (msg.isRetry() && clientEvent.getVersionTag() != null) {
+ if (clientMessage.isRetry() && clientEvent.getVersionTag() != null) {
// bug #46590 the operation was successful the last time since it
// was applied to the cache, so return success and the recovered
// version tag
@@ -267,16 +270,16 @@ public class Put65 extends BaseCommand {
}
// invoke basicBridgePutIfAbsent anyway to ensure that the event is distributed to all
// servers - bug #51664
- region.basicBridgePutIfAbsent(key, value, isObject, callbackArg, servConn.getProxyID(),
- true, clientEvent);
+ region.basicBridgePutIfAbsent(key, value, isObject, callbackArg,
+ serverConnection.getProxyID(), true, clientEvent);
oldValue = null;
} else {
oldValue = region.basicBridgePutIfAbsent(key, value, isObject, callbackArg,
- servConn.getProxyID(), true, clientEvent);
+ serverConnection.getProxyID(), true, clientEvent);
}
sendOldValue = true;
oldValueIsObject = true;
- Version clientVersion = servConn.getClientVersion();
+ Version clientVersion = serverConnection.getClientVersion();
if (oldValue instanceof CachedDeserializable) {
oldValue = ((CachedDeserializable) oldValue).getSerializedValue();
} else if (oldValue instanceof byte[]) {
@@ -299,7 +302,7 @@ public class Put65 extends BaseCommand {
} else if (operation == Operation.REPLACE) {
// try {
if (requireOldValue) { // <V> replace(<K>, <V>)
- if (msg.isRetry() && clientEvent.isConcurrencyConflict()
+ if (clientMessage.isRetry() && clientEvent.isConcurrencyConflict()
&& clientEvent.getVersionTag() != null) {
if (isDebugEnabled) {
logger.debug("replace(k,v) operation was successful last time with version {}",
@@ -307,10 +310,10 @@ public class Put65 extends BaseCommand {
}
}
oldValue = region.basicBridgeReplace(key, value, isObject, callbackArg,
- servConn.getProxyID(), true, clientEvent);
+ serverConnection.getProxyID(), true, clientEvent);
sendOldValue = !clientEvent.isConcurrencyConflict();
oldValueIsObject = true;
- Version clientVersion = servConn.getClientVersion();
+ Version clientVersion = serverConnection.getClientVersion();
if (oldValue instanceof CachedDeserializable) {
oldValue = ((CachedDeserializable) oldValue).getSerializedValue();
} else if (oldValue instanceof byte[]) {
@@ -330,8 +333,8 @@ public class Put65 extends BaseCommand {
} else { // boolean replace(<K>, <V>, <V>) {
boolean didPut;
didPut = region.basicBridgeReplace(key, expectedOldValue, value, isObject, callbackArg,
- servConn.getProxyID(), true, clientEvent);
- if (msg.isRetry() && clientEvent.getVersionTag() != null) {
+ serverConnection.getProxyID(), true, clientEvent);
+ if (clientMessage.isRetry() && clientEvent.getVersionTag() != null) {
if (isDebugEnabled) {
logger.debug("replace(k,v,v) operation was successful last time with version {}",
clientEvent.getVersionTag());
@@ -356,9 +359,9 @@ public class Put65 extends BaseCommand {
// Create the null entry. Since the value is null, the value of the
// isObject
// the true after null doesn't matter and is not used.
- result = region.basicBridgeCreate(key, null, true, callbackArg, servConn.getProxyID(), true,
- clientEvent, false);
- if (msg.isRetry() && clientEvent.isConcurrencyConflict()
+ result = region.basicBridgeCreate(key, null, true, callbackArg,
+ serverConnection.getProxyID(), true, clientEvent, false);
+ if (clientMessage.isRetry() && clientEvent.isConcurrencyConflict()
&& clientEvent.getVersionTag() != null) {
result = true;
if (isDebugEnabled) {
@@ -372,16 +375,17 @@ public class Put65 extends BaseCommand {
if (isDelta) {
delta = valuePart.getSerializedForm();
}
- TXManagerImpl txMgr = (TXManagerImpl) servConn.getCache().getCacheTransactionManager();
+ TXManagerImpl txMgr =
+ (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager();
// bug 43068 - use create() if in a transaction and op is CREATE
if (txMgr.getTXState() != null && operation.isCreate()) {
result = region.basicBridgeCreate(key, (byte[]) value, isObject, callbackArg,
- servConn.getProxyID(), true, clientEvent, true);
+ serverConnection.getProxyID(), true, clientEvent, true);
} else {
result = region.basicBridgePut(key, value, delta, isObject, callbackArg,
- servConn.getProxyID(), true, clientEvent);
+ serverConnection.getProxyID(), true, clientEvent);
}
- if (msg.isRetry() && clientEvent.isConcurrencyConflict()
+ if (clientMessage.isRetry() && clientEvent.isConcurrencyConflict()
&& clientEvent.getVersionTag() != null) {
if (isDebugEnabled) {
logger.debug("put(k,v) operation was successful last time with version {}",
@@ -391,46 +395,46 @@ public class Put65 extends BaseCommand {
}
}
if (result) {
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
} else {
- String message = servConn.getName() + ": Failed to put entry for region " + regionName
- + " key " + key + " value " + valuePart;
+ String message = serverConnection.getName() + ": Failed to put entry for region "
+ + regionName + " key " + key + " value " + valuePart;
if (isDebugEnabled) {
logger.debug(message);
}
throw new Exception(message);
}
} catch (RegionDestroyedException rde) {
- writeException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, rde, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (ResourceException re) {
- writeException(msg, re, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, re, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (InvalidDeltaException ide) {
logger.info(LocalizedMessage.create(
LocalizedStrings.UpdateOperation_ERROR_APPLYING_DELTA_FOR_KEY_0_OF_REGION_1,
new Object[] {key, regionName}));
- writeException(msg, MessageType.PUT_DELTA_ERROR, ide, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, MessageType.PUT_DELTA_ERROR, ide, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
region.getCachePerfStats().incDeltaFullValuesRequested();
return;
} catch (Exception ce) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ce);
+ checkForInterrupt(serverConnection, ce);
// If an exception occurs during the put, preserve the connection
- writeException(msg, ce, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ce, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (ce instanceof GemFireSecurityException) {
// Fine logging for security exceptions since these are already
// logged by the security logger
if (isDebugEnabled) {
- logger.debug("{}: Unexpected Security exception", servConn.getName(), ce);
+ logger.debug("{}: Unexpected Security exception", serverConnection.getName(), ce);
}
} else if (isDebugEnabled) {
- logger.debug("{}: Unexpected Exception", servConn.getName(), ce);
+ logger.debug("{}: Unexpected Exception", serverConnection.getName(), ce);
}
return;
} finally {
@@ -443,21 +447,22 @@ public class Put65 extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeReplyWithRefreshMetadata(msg, servConn, pr, sendOldValue, oldValueIsObject, oldValue,
- pr.getNetworkHopType(), clientEvent.getVersionTag());
+ writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, sendOldValue,
+ oldValueIsObject, oldValue, pr.getNetworkHopType(), clientEvent.getVersionTag());
pr.clearNetworkHopData();
} else {
- writeReply(msg, servConn, sendOldValue, oldValueIsObject, oldValue,
+ writeReply(clientMessage, serverConnection, sendOldValue, oldValueIsObject, oldValue,
clientEvent.getVersionTag());
}
} else {
- writeReply(msg, servConn, sendOldValue, oldValueIsObject, oldValue,
+ writeReply(clientMessage, serverConnection, sendOldValue, oldValueIsObject, oldValue,
clientEvent.getVersionTag());
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
if (isDebugEnabled) {
logger.debug("{}: Sent put response back to {} for region {} key {} value {}",
- servConn.getName(), servConn.getSocketString(), regionName, key, valuePart);
+ serverConnection.getName(), serverConnection.getSocketString(), regionName, key,
+ valuePart);
}
stats.incWritePutResponseTime(DistributionStats.getStatTime() - start);
@@ -471,7 +476,7 @@ public class Put65 extends BaseCommand {
replyMsg.setMessageType(MessageType.REPLY);
replyMsg.setNumberOfParts(sendOldValue ? 3 : 1);
replyMsg.setTransactionId(origMsg.getTransactionId());
- replyMsg.addBytesPart(OK_BYTES);
+ replyMsg.addBytesPart(okBytes());
if (sendOldValue) {
replyMsg.addIntPart(oldValueIsObject ? 1 : 0);
replyMsg.addObjPart(oldValue);
@@ -499,7 +504,7 @@ public class Put65 extends BaseCommand {
replyMsg.send(servConn);
pr.getPrStats().incPRMetaDataSentCount();
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADAT tx: {} parts={}", servConn.getName(),
+ logger.trace("{}: rpl with REFRESH_METADATA tx: {} parts={}", servConn.getName(),
origMsg.getTransactionId(), replyMsg.getNumberOfParts());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
index 38eb7ef..395dbce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
@@ -62,7 +62,7 @@ public class Put70 extends Put65 {
}
replyMsg.setNumberOfParts(parts);
replyMsg.setTransactionId(origMsg.getTransactionId());
- replyMsg.addBytesPart(OK_BYTES);
+ replyMsg.addBytesPart(okBytes());
replyMsg.addIntPart(flags);
if (sendOldValue) {
replyMsg.addObjPart(oldValue);
@@ -114,7 +114,7 @@ public class Put70 extends Put65 {
replyMsg.send(servConn);
pr.getPrStats().incPRMetaDataSentCount();
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADAT tx: {} parts={}", servConn.getName(),
+ logger.trace("{}: rpl with REFRESH_METADATA tx: {} parts={}", servConn.getName(),
origMsg.getTransactionId(), replyMsg.getNumberOfParts());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
index 0bcfd1b..ba8b145 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java
@@ -59,7 +59,7 @@ public class PutAll extends BaseCommand {
private PutAll() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, numberOfKeysPart = null, keyPart = null, valuePart = null;
String regionName = null;
@@ -67,12 +67,12 @@ public class PutAll extends BaseCommand {
Object key = null;
Part eventPart = null;
StringBuffer errMessage = new StringBuffer();
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
boolean replyWithMetaData = false;
// requiresResponse = true;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
start = DistributionStats.getStatTime();
@@ -82,64 +82,68 @@ public class PutAll extends BaseCommand {
try {
// Retrieve the data from the message parts
// part 0: region name
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
if (regionName == null) {
String putAllMsg =
LocalizedStrings.PutAll_THE_INPUT_REGION_NAME_FOR_THE_PUTALL_REQUEST_IS_NULL
.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), putAllMsg);
+ logger.warn("{}: {}", serverConnection.getName(), putAllMsg);
errMessage.append(putAllMsg);
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
LocalRegion region = (LocalRegion) crHelper.getRegion(regionName);
if (region == null) {
String reason = " was not found during put request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// part 1: eventID
- eventPart = msg.getPart(1);
+ eventPart = clientMessage.getPart(1);
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
// part 2: number of keys
- numberOfKeysPart = msg.getPart(2);
+ numberOfKeysPart = clientMessage.getPart(2);
numberOfKeys = numberOfKeysPart.getInt();
// building the map
Map map = new LinkedHashMap();
// Map isObjectMap = new LinkedHashMap();
for (int i = 0; i < numberOfKeys; i++) {
- keyPart = msg.getPart(3 + i * 2);
+ keyPart = clientMessage.getPart(3 + i * 2);
key = keyPart.getStringOrObject();
if (key == null) {
String putAllMsg =
LocalizedStrings.PutAll_ONE_OF_THE_INPUT_KEYS_FOR_THE_PUTALL_REQUEST_IS_NULL
.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), putAllMsg);
+ logger.warn("{}: {}", serverConnection.getName(), putAllMsg);
errMessage.append(putAllMsg);
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- valuePart = msg.getPart(3 + i * 2 + 1);
+ valuePart = clientMessage.getPart(3 + i * 2 + 1);
if (valuePart.isNull()) {
String putAllMsg =
LocalizedStrings.PutAll_ONE_OF_THE_INPUT_VALUES_FOR_THE_PUTALL_REQUEST_IS_NULL
.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), putAllMsg);
+ logger.warn("{}: {}", serverConnection.getName(), putAllMsg);
errMessage.append(putAllMsg);
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -155,15 +159,16 @@ public class PutAll extends BaseCommand {
// isObjectMap.put(key, new Boolean(isObject));
} // for
- if (msg.getNumberOfParts() == (3 + 2 * numberOfKeys + 1)) {// it means optional timeout has
- // been added
- int timeout = msg.getPart(3 + 2 * numberOfKeys).getInt();
- servConn.setRequestSpecificTimeout(timeout);
+ if (clientMessage.getNumberOfParts() == (3 + 2 * numberOfKeys + 1)) {// it means optional
+ // timeout has
+ // been added
+ int timeout = clientMessage.getPart(3 + 2 * numberOfKeys).getInt();
+ serverConnection.setRequestSpecificTimeout(timeout);
}
this.securityService.authorizeRegionWrite(regionName);
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
authzRequest.createRegionAuthorize(regionName);
@@ -179,41 +184,43 @@ public class PutAll extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug("{}: Received putAll request ({} bytes) from {} for region {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName);
}
region.basicBridgePutAll(map, Collections.<Object, VersionTag>emptyMap(),
- servConn.getProxyID(), eventId, false, null);
+ serverConnection.getProxyID(), eventId, false, null);
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeReplyWithRefreshMetadata(msg, servConn, pr, pr.getNetworkHopType());
+ writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr,
+ pr.getNetworkHopType());
pr.clearNetworkHopData();
replyWithMetaData = true;
}
}
} catch (RegionDestroyedException rde) {
- writeException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, rde, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (ResourceException re) {
- writeException(msg, re, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, re, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (PutAllPartialResultException pre) {
- writeException(msg, pre, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, pre, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (Exception ce) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ce);
+ checkForInterrupt(serverConnection, ce);
// If an exception occurs during the put, preserve the connection
- writeException(msg, ce, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ce, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
logger.warn(LocalizedMessage.create(LocalizedStrings.Generic_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), ce);
+ serverConnection.getName()), ce);
return;
} finally {
long oldStart = start;
@@ -223,12 +230,12 @@ public class PutAll extends BaseCommand {
// Increment statistics and write the reply
if (!replyWithMetaData) {
- writeReply(msg, servConn);
+ writeReply(clientMessage, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent putAll response back to {} for region {}", servConn.getName(),
- servConn.getSocketString(), regionName);
+ logger.debug("{}: Sent putAll response back to {} for region {}", serverConnection.getName(),
+ serverConnection.getSocketString(), regionName);
}
stats.incWritePutAllResponseTime(DistributionStats.getStatTime() - start);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
index c5fcbae..fb2bdb8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll70.java
@@ -62,7 +62,7 @@ public class PutAll70 extends BaseCommand {
private PutAll70() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long startp)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startp)
throws IOException, InterruptedException {
long start = startp; // copy this since we need to modify it
Part regionNamePart = null, numberOfKeysPart = null, keyPart = null, valuePart = null;
@@ -74,11 +74,11 @@ public class PutAll70 extends BaseCommand {
VersionedObjectList response = null;
StringBuffer errMessage = new StringBuffer();
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
// requiresResponse = true;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
start = DistributionStats.getStatTime();
@@ -88,40 +88,42 @@ public class PutAll70 extends BaseCommand {
try {
// Retrieve the data from the message parts
// part 0: region name
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
if (regionName == null) {
String putAllMsg =
LocalizedStrings.PutAll_THE_INPUT_REGION_NAME_FOR_THE_PUTALL_REQUEST_IS_NULL
.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), putAllMsg);
+ logger.warn("{}: {}", serverConnection.getName(), putAllMsg);
errMessage.append(putAllMsg);
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
LocalRegion region = (LocalRegion) crHelper.getRegion(regionName);
if (region == null) {
String reason = " was not found during put request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// part 1: eventID
- eventPart = msg.getPart(1);
+ eventPart = clientMessage.getPart(1);
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
// part 2: invoke callbacks (used by import)
- Part callbacksPart = msg.getPart(2);
+ Part callbacksPart = clientMessage.getPart(2);
boolean skipCallbacks = callbacksPart.getInt() == 1 ? true : false;
// part 3: number of keys
- numberOfKeysPart = msg.getPart(3);
+ numberOfKeysPart = clientMessage.getPart(3);
numberOfKeys = numberOfKeysPart.getInt();
// building the map
@@ -129,28 +131,30 @@ public class PutAll70 extends BaseCommand {
Map<Object, VersionTag> retryVersions = new LinkedHashMap<Object, VersionTag>();
// Map isObjectMap = new LinkedHashMap();
for (int i = 0; i < numberOfKeys; i++) {
- keyPart = msg.getPart(4 + i * 2);
+ keyPart = clientMessage.getPart(4 + i * 2);
key = keyPart.getStringOrObject();
if (key == null) {
String putAllMsg =
LocalizedStrings.PutAll_ONE_OF_THE_INPUT_KEYS_FOR_THE_PUTALL_REQUEST_IS_NULL
.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), putAllMsg);
+ logger.warn("{}: {}", serverConnection.getName(), putAllMsg);
errMessage.append(putAllMsg);
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- valuePart = msg.getPart(4 + i * 2 + 1);
+ valuePart = clientMessage.getPart(4 + i * 2 + 1);
if (valuePart.isNull()) {
String putAllMsg =
LocalizedStrings.PutAll_ONE_OF_THE_INPUT_VALUES_FOR_THE_PUTALL_REQUEST_IS_NULL
.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), putAllMsg);
+ logger.warn("{}: {}", serverConnection.getName(), putAllMsg);
errMessage.append(putAllMsg);
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -170,7 +174,7 @@ public class PutAll70 extends BaseCommand {
value = valuePart.getSerializedForm();
}
// put serializedform for auth. It will be modified with auth callback
- if (msg.isRetry()) {
+ if (clientMessage.isRetry()) {
// Constuct the thread id/sequence id information for this element in the
// put all map
@@ -198,15 +202,16 @@ public class PutAll70 extends BaseCommand {
// isObjectMap.put(key, new Boolean(isObject));
} // for
- if (msg.getNumberOfParts() == (4 + 2 * numberOfKeys + 1)) {// it means optional timeout has
- // been added
- int timeout = msg.getPart(4 + 2 * numberOfKeys).getInt();
- servConn.setRequestSpecificTimeout(timeout);
+ if (clientMessage.getNumberOfParts() == (4 + 2 * numberOfKeys + 1)) {// it means optional
+ // timeout has
+ // been added
+ int timeout = clientMessage.getPart(4 + 2 * numberOfKeys).getInt();
+ serverConnection.setRequestSpecificTimeout(timeout);
}
this.securityService.authorizeRegionWrite(regionName);
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
authzRequest.createRegionAuthorize(regionName);
@@ -231,11 +236,12 @@ public class PutAll70 extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug("{}: Received putAll request ({} bytes) from {} for region {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName);
}
- response = region.basicBridgePutAll(map, retryVersions, servConn.getProxyID(), eventId,
- skipCallbacks, null);
+ response = region.basicBridgePutAll(map, retryVersions, serverConnection.getProxyID(),
+ eventId, skipCallbacks, null);
if (!region.getConcurrencyChecksEnabled()) {
// the client only needs this if versioning is being used
response = null;
@@ -244,33 +250,34 @@ public class PutAll70 extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeReplyWithRefreshMetadata(msg, response, servConn, pr, pr.getNetworkHopType());
+ writeReplyWithRefreshMetadata(clientMessage, response, serverConnection, pr,
+ pr.getNetworkHopType());
pr.clearNetworkHopData();
replyWithMetaData = true;
}
}
} catch (RegionDestroyedException rde) {
- writeException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, rde, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (ResourceException re) {
- writeException(msg, re, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, re, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (PutAllPartialResultException pre) {
- writeException(msg, pre, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, pre, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (Exception ce) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ce);
+ checkForInterrupt(serverConnection, ce);
// If an exception occurs during the put, preserve the connection
- writeException(msg, ce, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ce, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
// if (logger.fineEnabled()) {
logger.warn(LocalizedMessage.create(LocalizedStrings.Generic_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), ce);
+ serverConnection.getName()), ce);
// }
return;
} finally {
@@ -279,11 +286,11 @@ public class PutAll70 extends BaseCommand {
stats.incProcessPutAllTime(start - oldStart);
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending putAll70 response back to {} for region {}: {}", servConn.getName(),
- servConn.getSocketString(), regionName, response);
+ logger.debug("{}: Sending putAll70 response back to {} for region {}: {}",
+ serverConnection.getName(), serverConnection.getSocketString(), regionName, response);
}
// Starting in 7.0.1 we do not send the keys back
- if (response != null && Version.GFE_70.compareTo(servConn.getClientVersion()) < 0) {
+ if (response != null && Version.GFE_70.compareTo(serverConnection.getClientVersion()) < 0) {
if (logger.isDebugEnabled()) {
logger.debug("setting putAll keys to null");
}
@@ -292,14 +299,14 @@ public class PutAll70 extends BaseCommand {
// Increment statistics and write the reply
if (!replyWithMetaData) {
- writeReply(msg, response, servConn);
+ writeReply(clientMessage, response, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
stats.incWritePutAllResponseTime(DistributionStats.getStatTime() - start);
}
@Override
- protected void writeReply(Message origMsg, ServerConnection servConn) throws IOException {
+ protected void writeReply(Message origMsg, ServerConnection serverConnection) throws IOException {
throw new UnsupportedOperationException();
}
@@ -311,7 +318,7 @@ public class PutAll70 extends BaseCommand {
replyMsg.setMessageType(MessageType.REPLY);
replyMsg.setNumberOfParts(2);
replyMsg.setTransactionId(origMsg.getTransactionId());
- replyMsg.addBytesPart(OK_BYTES);
+ replyMsg.addBytesPart(okBytes());
if (response != null) {
response.clearObjects();
replyMsg.addObjPart(response);
@@ -323,7 +330,7 @@ public class PutAll70 extends BaseCommand {
}
@Override
- protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection servConn,
+ protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection serverConnection,
PartitionedRegion pr, byte nwHop) throws IOException {
throw new UnsupportedOperationException();
}
@@ -343,7 +350,7 @@ public class PutAll70 extends BaseCommand {
replyMsg.send(servConn);
pr.getPrStats().incPRMetaDataSentCount();
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADAT tx: {}", servConn.getName(),
+ logger.trace("{}: rpl with REFRESH_METADATA tx: {}", servConn.getName(),
origMsg.getTransactionId());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
index a6285ed..c6c26f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll80.java
@@ -75,7 +75,7 @@ public class PutAll80 extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long startp)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startp)
throws IOException, InterruptedException {
long start = startp; // copy this since we need to modify it
Part regionNamePart = null, numberOfKeysPart = null, keyPart = null, valuePart = null;
@@ -87,12 +87,12 @@ public class PutAll80 extends BaseCommand {
VersionedObjectList response = null;
StringBuffer errMessage = new StringBuffer();
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
// requiresResponse = true;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); // new in 8.0
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); // new in 8.0
{
long oldStart = start;
start = DistributionStats.getStatTime();
@@ -102,60 +102,63 @@ public class PutAll80 extends BaseCommand {
try {
// Retrieve the data from the message parts
// part 0: region name
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
if (regionName == null) {
String putAllMsg =
LocalizedStrings.PutAll_THE_INPUT_REGION_NAME_FOR_THE_PUTALL_REQUEST_IS_NULL
.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), putAllMsg);
+ logger.warn("{}: {}", serverConnection.getName(), putAllMsg);
errMessage.append(putAllMsg);
- writeChunkedErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
LocalRegion region = (LocalRegion) crHelper.getRegion(regionName);
if (region == null) {
String reason = " was not found during putAll request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
final int BASE_PART_COUNT = getBasePartCount();
// part 1: eventID
- eventPart = msg.getPart(1);
+ eventPart = clientMessage.getPart(1);
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
Breadcrumbs.setEventId(eventId);
// part 2: invoke callbacks (used by import)
- Part callbacksPart = msg.getPart(2);
+ Part callbacksPart = clientMessage.getPart(2);
boolean skipCallbacks = callbacksPart.getInt() == 1 ? true : false;
// part 3: flags
- int flags = msg.getPart(3).getInt();
+ int flags = clientMessage.getPart(3).getInt();
boolean clientIsEmpty = (flags & PutAllOp.FLAG_EMPTY) != 0;
boolean clientHasCCEnabled = (flags & PutAllOp.FLAG_CONCURRENCY_CHECKS) != 0;
// part 4: number of keys
- numberOfKeysPart = msg.getPart(4);
+ numberOfKeysPart = clientMessage.getPart(4);
numberOfKeys = numberOfKeysPart.getInt();
- Object callbackArg = getOptionalCallbackArg(msg);
+ Object callbackArg = getOptionalCallbackArg(clientMessage);
if (logger.isDebugEnabled()) {
StringBuilder buffer = new StringBuilder();
- buffer.append(servConn.getName()).append(": Received ").append(this.putAllClassName())
- .append(" request from ").append(servConn.getSocketString()).append(" for region ")
- .append(regionName).append(callbackArg != null ? (" callbackArg " + callbackArg) : "")
- .append(" with ").append(numberOfKeys).append(" entries.");
+ buffer.append(serverConnection.getName()).append(": Received ")
+ .append(this.putAllClassName()).append(" request from ")
+ .append(serverConnection.getSocketString()).append(" for region ").append(regionName)
+ .append(callbackArg != null ? (" callbackArg " + callbackArg) : "").append(" with ")
+ .append(numberOfKeys).append(" entries.");
logger.debug(buffer.toString());
}
// building the map
@@ -163,30 +166,30 @@ public class PutAll80 extends BaseCommand {
Map<Object, VersionTag> retryVersions = new LinkedHashMap<Object, VersionTag>();
// Map isObjectMap = new LinkedHashMap();
for (int i = 0; i < numberOfKeys; i++) {
- keyPart = msg.getPart(BASE_PART_COUNT + i * 2);
+ keyPart = clientMessage.getPart(BASE_PART_COUNT + i * 2);
key = keyPart.getStringOrObject();
if (key == null) {
String putAllMsg =
LocalizedStrings.PutAll_ONE_OF_THE_INPUT_KEYS_FOR_THE_PUTALL_REQUEST_IS_NULL
.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), putAllMsg);
+ logger.warn("{}: {}", serverConnection.getName(), putAllMsg);
errMessage.append(putAllMsg);
- writeChunkedErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(),
- servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- valuePart = msg.getPart(BASE_PART_COUNT + i * 2 + 1);
+ valuePart = clientMessage.getPart(BASE_PART_COUNT + i * 2 + 1);
if (valuePart.isNull()) {
String putAllMsg =
LocalizedStrings.PutAll_ONE_OF_THE_INPUT_VALUES_FOR_THE_PUTALL_REQUEST_IS_NULL
.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), putAllMsg);
+ logger.warn("{}: {}", serverConnection.getName(), putAllMsg);
errMessage.append(putAllMsg);
- writeChunkedErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(),
- servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -206,7 +209,7 @@ public class PutAll80 extends BaseCommand {
value = valuePart.getSerializedForm();
}
// put serializedform for auth. It will be modified with auth callback
- if (msg.isRetry()) {
+ if (clientMessage.isRetry()) {
// Constuct the thread id/sequence id information for this element in the
// put all map
@@ -234,16 +237,17 @@ public class PutAll80 extends BaseCommand {
// isObjectMap.put(key, new Boolean(isObject));
} // for
- if (msg.getNumberOfParts() == (BASE_PART_COUNT + 2 * numberOfKeys + 1)) {// it means optional
- // timeout has been
- // added
- int timeout = msg.getPart(BASE_PART_COUNT + 2 * numberOfKeys).getInt();
- servConn.setRequestSpecificTimeout(timeout);
+ if (clientMessage.getNumberOfParts() == (BASE_PART_COUNT + 2 * numberOfKeys + 1)) {// it means
+ // optional
+ // timeout has been
+ // added
+ int timeout = clientMessage.getPart(BASE_PART_COUNT + 2 * numberOfKeys).getInt();
+ serverConnection.setRequestSpecificTimeout(timeout);
}
this.securityService.authorizeRegionWrite(regionName);
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
authzRequest.createRegionAuthorize(regionName);
@@ -267,8 +271,8 @@ public class PutAll80 extends BaseCommand {
*/
}
- response = region.basicBridgePutAll(map, retryVersions, servConn.getProxyID(), eventId,
- skipCallbacks, callbackArg);
+ response = region.basicBridgePutAll(map, retryVersions, serverConnection.getProxyID(),
+ eventId, skipCallbacks, callbackArg);
if (!region.getConcurrencyChecksEnabled() || clientIsEmpty || !clientHasCCEnabled) {
// the client only needs this if versioning is being used and the client
// has storage
@@ -283,32 +287,33 @@ public class PutAll80 extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeReplyWithRefreshMetadata(msg, response, servConn, pr, pr.getNetworkHopType());
+ writeReplyWithRefreshMetadata(clientMessage, response, serverConnection, pr,
+ pr.getNetworkHopType());
pr.clearNetworkHopData();
replyWithMetaData = true;
}
}
} catch (RegionDestroyedException rde) {
- writeChunkedException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, rde, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (ResourceException re) {
- writeChunkedException(msg, re, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, re, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (PutAllPartialResultException pre) {
- writeChunkedException(msg, pre, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, pre, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (Exception ce) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ce);
+ checkForInterrupt(serverConnection, ce);
// If an exception occurs during the put, preserve the connection
- writeChunkedException(msg, ce, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, ce, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
logger.warn(LocalizedMessage.create(LocalizedStrings.Generic_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), ce);
+ serverConnection.getName()), ce);
return;
} finally {
long oldStart = start;
@@ -316,21 +321,21 @@ public class PutAll80 extends BaseCommand {
stats.incProcessPutAllTime(start - oldStart);
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending {} response back to {} for regin {} {}", servConn.getName(),
- putAllClassName(), servConn.getSocketString(), regionName,
+ logger.debug("{}: Sending {} response back to {} for regin {} {}", serverConnection.getName(),
+ putAllClassName(), serverConnection.getSocketString(), regionName,
(logger.isTraceEnabled() ? ": " + response : ""));
}
// Increment statistics and write the reply
if (!replyWithMetaData) {
- writeReply(msg, response, servConn);
+ writeReply(clientMessage, response, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
stats.incWritePutAllResponseTime(DistributionStats.getStatTime() - start);
}
@Override
- protected void writeReply(Message origMsg, ServerConnection servConn) throws IOException {
+ protected void writeReply(Message origMsg, ServerConnection serverConnection) throws IOException {
throw new UnsupportedOperationException();
}
@@ -351,7 +356,7 @@ public class PutAll80 extends BaseCommand {
}
replyMsg.sendHeader();
if (listSize > 0) {
- int chunkSize = 2 * maximumChunkSize;
+ int chunkSize = 2 * MAXIMUM_CHUNK_SIZE;
// Chunker will stream over the list in its toData method
VersionedObjectList.Chunker chunk =
new VersionedObjectList.Chunker(response, chunkSize, false, false);
@@ -383,7 +388,7 @@ public class PutAll80 extends BaseCommand {
}
@Override
- protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection servConn,
+ protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection serverConnection,
PartitionedRegion pr, byte nwHop) throws IOException {
throw new UnsupportedOperationException();
}
@@ -411,7 +416,7 @@ public class PutAll80 extends BaseCommand {
replyMsg.setLastChunk(false);
replyMsg.sendChunk(servConn);
- int chunkSize = 2 * maximumChunkSize; // maximumChunkSize
+ int chunkSize = 2 * MAXIMUM_CHUNK_SIZE; // MAXIMUM_CHUNK_SIZE
// Chunker will stream over the list in its toData method
VersionedObjectList.Chunker chunk =
new VersionedObjectList.Chunker(response, chunkSize, false, false);
@@ -437,7 +442,7 @@ public class PutAll80 extends BaseCommand {
}
pr.getPrStats().incPRMetaDataSentCount();
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADAT tx: {}", servConn.getName(),
+ logger.trace("{}: rpl with REFRESH_METADATA tx: {}", servConn.getName(),
origMsg.getTransactionId());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
index 198eed6..ea5c875 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
@@ -32,39 +32,40 @@ public class PutUserCredentials extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException, InterruptedException {
- boolean isSecureMode = msg.isSecureMode();
+ boolean isSecureMode = clientMessage.isSecureMode();
// if (!isSecureMode)
// client has not send secuirty header, need to send exception and log this in security (file)
if (isSecureMode) {
- int numberOfParts = msg.getNumberOfParts();
+ int numberOfParts = clientMessage.getNumberOfParts();
if (numberOfParts == 1) {
// need to get credentials
try {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- byte[] uniqueId = servConn.setCredentials(msg);
- writeResponse(uniqueId, null, msg, false, servConn);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ byte[] uniqueId = serverConnection.setCredentials(clientMessage);
+ writeResponse(uniqueId, null, clientMessage, false, serverConnection);
} catch (GemFireSecurityException gfse) {
- if (servConn.getSecurityLogWriter().warningEnabled()) {
- servConn.getSecurityLogWriter().warning(LocalizedStrings.ONE_ARG, servConn.getName()
- + ": Security exception: " + gfse.toString()
- + (gfse.getCause() != null ? ", caused by: " + gfse.getCause().toString() : ""));
+ if (serverConnection.getSecurityLogWriter().warningEnabled()) {
+ serverConnection.getSecurityLogWriter().warning(LocalizedStrings.ONE_ARG,
+ serverConnection.getName() + ": Security exception: " + gfse.toString()
+ + (gfse.getCause() != null ? ", caused by: " + gfse.getCause().toString()
+ : ""));
}
- writeException(msg, gfse, false, servConn);
+ writeException(clientMessage, gfse, false, serverConnection);
} catch (Exception ex) {
- if (servConn.getLogWriter().warningEnabled()) {
- servConn.getLogWriter().warning(
+ if (serverConnection.getLogWriter().warningEnabled()) {
+ serverConnection.getLogWriter().warning(
LocalizedStrings.CacheClientNotifier_AN_EXCEPTION_WAS_THROWN_FOR_CLIENT_0_1,
- new Object[] {servConn.getProxyID(), ""}, ex);
+ new Object[] {serverConnection.getProxyID(), ""}, ex);
}
- writeException(msg, ex, false, servConn);
+ writeException(clientMessage, ex, false, serverConnection);
} finally {
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
index d3c0393..b7d2810 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
@@ -43,38 +43,38 @@ public class Query extends BaseCommandQuery {
protected Query() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
// Based on MessageType.DESTROY
// Added by gregp 10/18/05
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
// Retrieve the data from the message parts
- String queryString = msg.getPart(0).getString();
+ String queryString = clientMessage.getPart(0).getString();
// this is optional part for message specific timeout, which right now send by native client
// need to take care while adding new message
- if (msg.getNumberOfParts() == 3) {
- int timeout = msg.getPart(2).getInt();
- servConn.setRequestSpecificTimeout(timeout);
+ if (clientMessage.getNumberOfParts() == 3) {
+ int timeout = clientMessage.getPart(2).getInt();
+ serverConnection.setRequestSpecificTimeout(timeout);
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received query request from {} queryString: {}", servConn.getName(),
- servConn.getSocketString(), queryString);
+ logger.debug("{}: Received query request from {} queryString: {}", serverConnection.getName(),
+ serverConnection.getSocketString(), queryString);
}
try {
// Create query
QueryService queryService =
- servConn.getCachedRegionHelper().getCache().getLocalQueryService();
+ serverConnection.getCachedRegionHelper().getCache().getLocalQueryService();
org.apache.geode.cache.query.Query query = queryService.newQuery(queryString);
Set regionNames = ((DefaultQuery) query).getRegionsInQuery(null);
// Authorization check
QueryOperationContext queryContext = null;
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
queryContext = authzRequest.queryAuthorize(queryString, regionNames);
String newQueryString = queryContext.getQuery();
@@ -88,11 +88,12 @@ public class Query extends BaseCommandQuery {
}
}
- processQuery(msg, query, queryString, regionNames, start, null, queryContext, servConn, true);
+ processQuery(clientMessage, query, queryString, regionNames, start, null, queryContext,
+ serverConnection, true);
} catch (QueryInvalidException e) {
throw new QueryInvalidException(e.getMessage() + queryString);
} catch (QueryExecutionLowMemoryException e) {
- writeQueryResponseException(msg, e, false, servConn);
+ writeQueryResponseException(clientMessage, e, serverConnection);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
index 5849431..e52fa3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
@@ -44,40 +44,41 @@ public class Query651 extends BaseCommandQuery {
protected Query651() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
// Based on MessageType.DESTROY
// Added by gregp 10/18/05
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
// Retrieve the data from the message parts
- String queryString = msg.getPart(0).getString();
+ String queryString = clientMessage.getPart(0).getString();
long compiledQueryId = 0;
Object[] queryParams = null;
try {
- if (msg.getMessageType() == MessageType.QUERY_WITH_PARAMETERS) {
+ if (clientMessage.getMessageType() == MessageType.QUERY_WITH_PARAMETERS) {
// Query with parameters supported from 6.6 onwards.
- int params = msg.getPart(1).getInt(); // Number of parameters.
+ int params = clientMessage.getPart(1).getInt(); // Number of parameters.
// In case of native client there will be extra two parameters at 2 and 3 index.
int paramStartIndex = 2;
- if (msg.getNumberOfParts() > (1 /* type */ + 1 /* query string */ + 1 /* params length */
- + params /* number of params */)) {
- int timeout = msg.getPart(3).getInt();
- servConn.setRequestSpecificTimeout(timeout);
+ if (clientMessage
+ .getNumberOfParts() > (1 /* type */ + 1 /* query string */ + 1 /* params length */
+ + params /* number of params */)) {
+ int timeout = clientMessage.getPart(3).getInt();
+ serverConnection.setRequestSpecificTimeout(timeout);
paramStartIndex = 4;
}
// Get the query execution parameters.
queryParams = new Object[params];
for (int i = 0; i < queryParams.length; i++) {
- queryParams[i] = msg.getPart(i + paramStartIndex).getObject();
+ queryParams[i] = clientMessage.getPart(i + paramStartIndex).getObject();
}
} else {
// this is optional part for message specific timeout, which right now send by native client
// need to take care while adding new message
- if (msg.getNumberOfParts() == 3) {
- int timeout = msg.getPart(2).getInt();
- servConn.setRequestSpecificTimeout(timeout);
+ if (clientMessage.getNumberOfParts() == 3) {
+ int timeout = clientMessage.getPart(2).getInt();
+ serverConnection.setRequestSpecificTimeout(timeout);
}
}
} catch (ClassNotFoundException cne) {
@@ -85,19 +86,19 @@ public class Query651 extends BaseCommandQuery {
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received query request from {} queryString: {}{}", servConn.getName(),
- servConn.getSocketString(), queryString,
+ logger.debug("{}: Received query request from {} queryString: {}{}",
+ serverConnection.getName(), serverConnection.getSocketString(), queryString,
(queryParams != null ? (" with num query parameters :" + queryParams.length) : ""));
}
try {
// Create query
QueryService queryService =
- servConn.getCachedRegionHelper().getCache().getLocalQueryService();
+ serverConnection.getCachedRegionHelper().getCache().getLocalQueryService();
org.apache.geode.cache.query.Query query = null;
if (queryParams != null) {
// Its a compiled query.
- CacheClientNotifier ccn = servConn.getAcceptor().getCacheClientNotifier();
+ CacheClientNotifier ccn = serverConnection.getAcceptor().getCacheClientNotifier();
query = ccn.getCompiledQuery(queryString);
if (query == null) {
// This is first time the query is seen by this server.
@@ -114,7 +115,7 @@ public class Query651 extends BaseCommandQuery {
// Authorization check
QueryOperationContext queryContext = null;
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
queryContext = authzRequest.queryAuthorize(queryString, regionNames, queryParams);
String newQueryString = queryContext.getQuery();
@@ -128,8 +129,8 @@ public class Query651 extends BaseCommandQuery {
}
}
- processQueryUsingParams(msg, query, queryString, regionNames, start, null, queryContext,
- servConn, true, queryParams);
+ processQueryUsingParams(clientMessage, query, queryString, regionNames, start, null,
+ queryContext, serverConnection, true, queryParams);
} catch (QueryInvalidException e) {
throw new QueryInvalidException(e.getMessage() + queryString);
}
[20/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
index 4028ab3..929093d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
@@ -15,6 +15,8 @@
package org.apache.geode.internal.cache.ha;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.number.OrderingComparison.*;
import static org.junit.Assert.*;
import java.io.IOException;
@@ -23,101 +25,75 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.awaitility.Awaitility;
-
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ErrorCollector;
+import org.junit.rules.TestName;
-import org.apache.geode.LogWriter;
-import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.cache.util.CacheListenerAdapter;
-import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.test.dunit.ThreadUtils;
+import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a test for the APIs of a HARegionQueue and verifies that the head, tail and size counters
* are updated properly.
+ *
+ * TODO: need to rewrite a bunch of tests in HARegionQueueJUnitTest
*/
@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class HARegionQueueJUnitTest {
- /** The cache instance */
- protected InternalCache cache = null;
+ /** total number of threads doing put operations */
+ private static final int TOTAL_PUT_THREADS = 10;
- /** Logger for this test */
- protected LogWriter logger;
+ private static HARegionQueue hrqForTestSafeConflationRemoval;
+ private static List list1;
- /** The <code>RegionQueue</code> instance */
- protected HARegionQueue rq;
+ protected InternalCache cache;
+ private HARegionQueue haRegionQueue;
- /** total number of threads doing put operations */
- private static final int TOTAL_PUT_THREADS = 10;
+ @Rule
+ public DistributedRestoreSystemProperties restoreSystemProperties =
+ new DistributedRestoreSystemProperties();
- boolean expiryCalled = false;
+ @Rule
+ public ErrorCollector errorCollector = new ErrorCollector();
- volatile boolean encounteredException = false;
- boolean allowExpiryToProceed = false;
- boolean complete = false;
+ @Rule
+ public TestName testName = new TestName();
@Before
public void setUp() throws Exception {
- cache = createCache();
- logger = cache.getLogger();
- encounteredException = false;
+ this.cache = createCache();
}
@After
public void tearDown() throws Exception {
- cache.close();
- }
-
- /**
- * Creates the cache instance for the test
- */
- private InternalCache createCache() throws CacheException {
- return (InternalCache) new CacheFactory().set(MCAST_PORT, "0").create();
- }
-
- /**
- * Creates HA region-queue object
- */
- private HARegionQueue createHARegionQueue(String name)
- throws IOException, ClassNotFoundException, CacheException, InterruptedException {
- HARegionQueue regionqueue = HARegionQueue.getHARegionQueueInstance(name, cache,
- HARegionQueue.NON_BLOCKING_HA_QUEUE, false);
- return regionqueue;
- }
-
- /**
- * Creates region-queue object
- */
- private HARegionQueue createHARegionQueue(String name, HARegionQueueAttributes attrs)
- throws IOException, ClassNotFoundException, CacheException, InterruptedException {
- HARegionQueue regionqueue = HARegionQueue.getHARegionQueueInstance(name, cache, attrs,
- HARegionQueue.NON_BLOCKING_HA_QUEUE, false);
- return regionqueue;
+ this.cache.close();
+ hrqForTestSafeConflationRemoval = null;
}
/**
@@ -129,14 +105,10 @@ public class HARegionQueueJUnitTest {
*/
@Test
public void testQueuePutWithoutConflation() throws Exception {
- logger.info("HARegionQueueJUnitTest : testQueuePutWithoutConflation BEGIN");
-
- rq = createHARegionQueue("testOfferNoConflation");
+ this.haRegionQueue = createHARegionQueue(this.testName.getMethodName());
int putPerProducer = 20;
createAndRunProducers(false, false, false, putPerProducer);
- assertEquals(putPerProducer * TOTAL_PUT_THREADS, rq.size());
-
- logger.info("HARegionQueueJUnitTest : testQueuePutWithoutConflation END");
+ assertThat(this.haRegionQueue.size(), is(putPerProducer * TOTAL_PUT_THREADS));
}
/**
@@ -149,14 +121,10 @@ public class HARegionQueueJUnitTest {
*/
@Test
public void testQueuePutWithConflation() throws Exception {
- logger.info("HARegionQueueJUnitTest : testQueuePutWithConflation BEGIN");
-
- rq = createHARegionQueue("testOfferConflation");
+ this.haRegionQueue = createHARegionQueue(this.testName.getMethodName());
int putPerProducer = 20;
createAndRunProducers(true, false, true, putPerProducer);
- assertEquals(putPerProducer, rq.size());
-
- logger.info("HARegionQueueJUnitTest : testQueuePutWithConflation END");
+ assertThat(this.haRegionQueue.size(), is(putPerProducer));
}
/**
@@ -166,319 +134,150 @@ public class HARegionQueueJUnitTest {
* 3)Wait till all put-threads complete their job <br>
* 4)verify that the size of the queue is equal to the total number of puts done by one thread (as
* rest of them will be duplicates and hence will be replaced)
- *
- * TODO:Dinesh : Work on optimizing the handling of receiving duplicate events
*/
@Test
public void testQueuePutWithDuplicates() throws Exception {
- logger.info("HARegionQueueJUnitTest : testQueuePutWithDuplicates BEGIN");
-
- rq = createHARegionQueue("testQueuePutWithDuplicates");
+ this.haRegionQueue = createHARegionQueue(this.testName.getMethodName());
int putPerProducer = 20;
- // createAndRunProducers(false, true, true, putPerProducer);
- /* Suyog: Only one thread can enter DACE at a time */
createAndRunProducers(false, false, true, putPerProducer);
- assertEquals(putPerProducer * TOTAL_PUT_THREADS, rq.size());
-
- logger.info("HARegionQueueJUnitTest : testQueuePutWithDuplicates END");
- }
-
- /**
- * Creates and runs the put threads which will create the conflatable objects and add them to the
- * queue
- *
- * @param generateSameKeys - if all the producers need to put objects with same set of keys
- * (needed for conflation testing)
- * @param generateSameIds - if all the producers need to put objects with same set of ids (needed
- * for duplicates testing)
- * @param conflationEnabled - true if all producers need to put objects with conflation enabled,
- * false otherwise.
- * @param putPerProducer - number of objects offered to the queue by each producer
- * @throws Exception - thrown if any problem occurs in test execution
- */
- private void createAndRunProducers(boolean generateSameKeys, boolean generateSameIds,
- boolean conflationEnabled, int putPerProducer) throws Exception {
- Producer[] putThreads = new Producer[TOTAL_PUT_THREADS];
-
- int i = 0;
-
- // Create the put-threads, each generating same/different set of ids/keys as
- // per the parameters
- for (i = 0; i < TOTAL_PUT_THREADS; i++) {
- String keyPrefix = null;
- long startId;
- if (generateSameKeys) {
- keyPrefix = "key";
- } else {
- keyPrefix = i + "key";
- }
- if (generateSameIds) {
- startId = 1;
- } else {
- startId = i * 100000;
- }
- putThreads[i] =
- new Producer("Producer-" + i, keyPrefix, startId, putPerProducer, conflationEnabled);
- }
-
- // start the put-threads
- for (i = 0; i < TOTAL_PUT_THREADS; i++) {
- putThreads[i].start();
- }
-
- // call join on the put-threads so that this thread waits till they complete
- // before doing verfication
- for (i = 0; i < TOTAL_PUT_THREADS; i++) {
- ThreadUtils.join(putThreads[i], 30 * 1000);
- }
- assertFalse(encounteredException);
+ assertThat(this.haRegionQueue.size(), is(putPerProducer * TOTAL_PUT_THREADS));
}
/*
* Test method for 'org.apache.geode.internal.cache.ha.HARegionQueue.addDispatchedMessage(Object)'
*/
@Test
- public void testAddDispatchedMessageObject() {
- try {
- // HARegionQueue haRegionQueue = new HARegionQueue("testing", cache);
- HARegionQueue haRegionQueue = createHARegionQueue("testing");
- assertTrue(HARegionQueue.getDispatchedMessagesMapForTesting().isEmpty());
- // TODO:
-
- haRegionQueue.addDispatchedMessage(new ThreadIdentifier(new byte[1], 1), 1);
- haRegionQueue.addDispatchedMessage(new ThreadIdentifier(new byte[1], 2), 2);
+ public void testAddDispatchedMessageObject() throws Exception {
+ this.haRegionQueue = createHARegionQueue(this.testName.getMethodName());
+ assertThat(HARegionQueue.getDispatchedMessagesMapForTesting().isEmpty(), is(true));
- assertTrue(!HARegionQueue.getDispatchedMessagesMapForTesting().isEmpty());
- // HARegionQueue.getDispatchedMessagesMapForTesting().clear();
+ this.haRegionQueue.addDispatchedMessage(new ThreadIdentifier(new byte[1], 1), 1);
+ this.haRegionQueue.addDispatchedMessage(new ThreadIdentifier(new byte[1], 2), 2);
- } catch (Exception e) {
- throw new AssertionError("Test encountered an exception due to ", e);
- }
+ assertThat(!HARegionQueue.getDispatchedMessagesMapForTesting().isEmpty(), is(true));
}
/**
* tests the blocking peek functionality of BlockingHARegionQueue
*/
@Test
- public void testBlockQueue() {
- exceptionInThread = false;
- testFailed = false;
- try {
- final HARegionQueue bQ = HARegionQueue.getHARegionQueueInstance("testing", cache,
- HARegionQueue.BLOCKING_HA_QUEUE, false);
- Thread[] threads = new Thread[10];
- final CyclicBarrier barrier = new CyclicBarrier(threads.length + 1);
- for (int i = 0; i < threads.length; i++) {
- threads[i] = new Thread() {
- public void run() {
- try {
- barrier.await();
- long startTime = System.currentTimeMillis();
- Object obj = bQ.peek();
- if (obj == null) {
- testFailed = true;
- message.append(
- " Failed : failed since object was null and was not expected to be null \n");
- }
- long totalTime = System.currentTimeMillis() - startTime;
+ public void testBlockQueue() throws Exception {
+ HARegionQueue regionQueue = HARegionQueue.getHARegionQueueInstance(
+ this.testName.getMethodName(), this.cache, HARegionQueue.BLOCKING_HA_QUEUE, false);
+ Thread[] threads = new Thread[10];
+ int threadsLength = threads.length;
+ CyclicBarrier barrier = new CyclicBarrier(threadsLength + 1);
+
+ for (int i = 0; i < threadsLength; i++) {
+ threads[i] = new Thread() {
+ @Override
+ public void run() {
+ try {
+ barrier.await();
+ long startTime = System.currentTimeMillis();
+ Object obj = regionQueue.peek();
+ if (obj == null) {
+ errorCollector.addError(new AssertionError(
+ "Failed : failed since object was null and was not expected to be null"));
+ }
+ long totalTime = System.currentTimeMillis() - startTime;
- if (totalTime < 2000) {
- testFailed = true;
- message
- .append(" Failed : Expected time to be greater than 2000 but it is not so ");
- }
- } catch (Exception e) {
- exceptionInThread = true;
- exception = e;
+ if (totalTime < 2000) {
+ errorCollector.addError(new AssertionError(
+ " Failed : Expected time to be greater than 2000 but it is not so "));
}
+ } catch (Exception e) {
+ errorCollector.addError(e);
}
- };
-
- }
-
- for (int k = 0; k < threads.length; k++) {
- threads[k].start();
- }
- barrier.await();
- Thread.sleep(5000);
-
- EventID id = new EventID(new byte[] {1}, 1, 1);
- bQ.put(new ConflatableObject("key", "value", id, false, "testing"));
-
- long startTime = System.currentTimeMillis();
- for (int k = 0; k < threads.length; k++) {
- ThreadUtils.join(threads[k], 60 * 1000);
- }
-
- long totalTime = System.currentTimeMillis() - startTime;
-
- if (totalTime >= 60000) {
- fail(" Test taken too long ");
- }
-
- if (testFailed) {
- fail(" test failed due to " + message);
- }
-
- } catch (Exception e) {
- throw new AssertionError(" Test failed due to ", e);
+ }
+ };
}
- }
-
- private static volatile int counter = 0;
-
- protected boolean exceptionInThread = false;
-
- protected boolean testFailed = false;
-
- protected StringBuffer message = new StringBuffer();
-
- protected Exception exception = null;
- private synchronized int getCounter() {
- return ++counter;
- }
-
- /**
- * Thread to perform PUTs into the queue
- */
- class Producer extends Thread {
- /** total number of puts by this thread */
- long totalPuts = 0;
-
- /** sleep between successive puts */
- long sleeptime = 10;
-
- /** prefix to keys of all objects put by this thread */
- String keyPrefix;
+ for (Thread thread1 : threads) {
+ thread1.start();
+ }
- /** startingId for sequence-ids of all objects put by this thread */
- long startingId;
+ barrier.await();
- /** name of this producer thread */
- String producerName;
+ Thread.sleep(5000);
- /**
- * boolean to indicate whether this thread should create conflation enabled entries
- */
- boolean createConflatables;
+ EventID id = new EventID(new byte[] {1}, 1, 1);
+ regionQueue
+ .put(new ConflatableObject("key", "value", id, false, this.testName.getMethodName()));
- /**
- * Constructor
- *
- * @param name - name for this thread
- * @param keyPrefix - prefix to keys of all objects put by this thread
- * @param startingId - startingId for sequence-ids of all objects put by this thread
- * @param totalPuts total number of puts by this thread
- * @param createConflatableEvents - boolean to indicate whether this thread should create
- * conflation enabled entries
- */
- Producer(String name, String keyPrefix, long startingId, long totalPuts,
- boolean createConflatableEvents) {
- super(name);
- this.producerName = name;
- this.keyPrefix = keyPrefix;
- this.startingId = startingId;
- this.totalPuts = totalPuts;
- this.createConflatables = createConflatableEvents;
- setDaemon(true);
+ long startTime = System.currentTimeMillis();
+ for (Thread thread : threads) {
+ ThreadUtils.join(thread, 60 * 1000);
}
- /** Create Conflatable objects and put them into the Queue. */
- @Override
- public void run() {
- if (producerName == null) {
- producerName = Thread.currentThread().getName();
- }
- for (long i = 0; i < totalPuts; i++) {
- String REGION_NAME = "test";
- try {
- ConflatableObject event = new ConflatableObject(keyPrefix + i, "val" + i,
- new EventID(new byte[] {1}, startingId, startingId + i), createConflatables,
- REGION_NAME);
-
- logger.fine("putting for key = " + keyPrefix + i);
- rq.put(event);
- Thread.sleep(sleeptime);
- } catch (VirtualMachineError e) {
- SystemFailure.initiateFailure(e);
- throw e;
- } catch (Throwable e) {
- logger.severe("Exception while running Producer;continue running.", e);
- encounteredException = true;
- break;
- }
- }
- logger.info(producerName + " : Puts completed");
+ long totalTime = System.currentTimeMillis() - startTime;
+
+ if (totalTime >= 60000) {
+ fail(" Test taken too long ");
}
}
/**
- * tests whether expiry of entry in the regin queue occurs as expected
+ * tests whether expiry of entry in the region queue occurs as expected
*/
@Test
- public void testExpiryPositive()
- throws InterruptedException, IOException, ClassNotFoundException {
+ public void testExpiryPositive() throws Exception {
HARegionQueueAttributes haa = new HARegionQueueAttributes();
haa.setExpiryTime(1);
- HARegionQueue regionqueue = createHARegionQueue("testing", haa);
+
+ HARegionQueue regionQueue = createHARegionQueue(this.testName.getMethodName(), haa);
long start = System.currentTimeMillis();
- regionqueue.put(
- new ConflatableObject("key", "value", new EventID(new byte[] {1}, 1, 1), true, "testing"));
- Map map = (Map) regionqueue.getConflationMapForTesting().get("testing");
+
+ regionQueue.put(new ConflatableObject("key", "value", new EventID(new byte[] {1}, 1, 1), true,
+ this.testName.getMethodName()));
+
+ Map map = (Map) regionQueue.getConflationMapForTesting().get(this.testName.getMethodName());
waitAtLeast(1000, start, () -> {
- assertEquals(Collections.EMPTY_MAP, map);
- assertEquals(Collections.EMPTY_SET, regionqueue.getRegion().keys());
+ assertThat(map, is(Collections.emptyMap()));
+ assertThat(regionQueue.getRegion().keys(), is(Collections.emptySet()));
});
}
/**
- * Wait until a given runnable stops throwing exceptions. It should take at least
- * minimumElapsedTime after the supplied start time to happen.
- *
- * This is useful for validating that an entry doesn't expire until a certain amount of time has
- * passed
- */
- protected void waitAtLeast(final int minimumElapsedTIme, final long start,
- final Runnable runnable) {
- Awaitility.await().atMost(1, TimeUnit.MINUTES).until(runnable);
- long elapsed = System.currentTimeMillis() - start;
- assertTrue(elapsed >= minimumElapsedTIme);
- }
-
- /**
* tests whether expiry of a conflated entry in the region queue occurs as expected
*/
@Test
- public void testExpiryPositiveWithConflation()
- throws InterruptedException, IOException, ClassNotFoundException {
+ public void testExpiryPositiveWithConflation() throws Exception {
HARegionQueueAttributes haa = new HARegionQueueAttributes();
haa.setExpiryTime(1);
- HARegionQueue regionqueue = createHARegionQueue("testing", haa);
+
+ HARegionQueue regionQueue = createHARegionQueue(this.testName.getMethodName(), haa);
long start = System.currentTimeMillis();
- regionqueue.put(
- new ConflatableObject("key", "value", new EventID(new byte[] {1}, 1, 1), true, "testing"));
- regionqueue.put(new ConflatableObject("key", "newValue", new EventID(new byte[] {1}, 1, 2),
- true, "testing"));
- assertTrue(
+
+ regionQueue.put(new ConflatableObject("key", "value", new EventID(new byte[] {1}, 1, 1), true,
+ this.testName.getMethodName()));
+
+ regionQueue.put(new ConflatableObject("key", "newValue", new EventID(new byte[] {1}, 1, 2),
+ true, this.testName.getMethodName()));
+
+ assertThat(
" Expected region size not to be zero since expiry time has not been exceeded but it is not so ",
- !(regionqueue.size() == 0));
- assertTrue(
+ !regionQueue.isEmpty(), is(true));
+ assertThat(
" Expected the available id's size not to be zero since expiry time has not been exceeded but it is not so ",
- !(regionqueue.getAvalaibleIds().size() == 0));
- assertTrue(
+ !regionQueue.getAvalaibleIds().isEmpty(), is(true));
+ assertThat(
" Expected conflation map size not to be zero since expiry time has not been exceeded but it is not so "
- + ((((Map) (regionqueue.getConflationMapForTesting().get("testing"))).get("key"))),
- !((((Map) (regionqueue.getConflationMapForTesting().get("testing"))).get("key")) == null));
- assertTrue(
+ + ((Map) regionQueue.getConflationMapForTesting().get(this.testName.getMethodName()))
+ .get("key"),
+ ((Map) regionQueue.getConflationMapForTesting().get(this.testName.getMethodName()))
+ .get("key"),
+ not(sameInstance(null)));
+ assertThat(
" Expected eventID map size not to be zero since expiry time has not been exceeded but it is not so ",
- !(regionqueue.getEventsMapForTesting().size() == 0));
+ !regionQueue.getEventsMapForTesting().isEmpty(), is(true));
waitAtLeast(1000, start, () -> {
- assertEquals(Collections.EMPTY_SET, regionqueue.getRegion().keys());
- assertEquals(Collections.EMPTY_SET, regionqueue.getAvalaibleIds());
- assertEquals(Collections.EMPTY_MAP, regionqueue.getConflationMapForTesting().get("testing"));
- assertEquals(Collections.EMPTY_MAP, regionqueue.getEventsMapForTesting());
+ assertThat(regionQueue.getRegion().keys(), is(Collections.emptySet()));
+ assertThat(regionQueue.getAvalaibleIds(), is(Collections.emptySet()));
+ assertThat(regionQueue.getConflationMapForTesting().get(this.testName.getMethodName()),
+ is(Collections.emptyMap()));
+ assertThat(regionQueue.getEventsMapForTesting(), is(Collections.emptyMap()));
});
}
@@ -486,38 +285,37 @@ public class HARegionQueueJUnitTest {
* tests a ThreadId not being expired if it was updated
*/
@Test
- public void testNoExpiryOfThreadId() {
- try {
- HARegionQueueAttributes haa = new HARegionQueueAttributes();
- haa.setExpiryTime(45);
- // RegionQueue regionqueue = new HARegionQueue("testing", cache, haa);
- HARegionQueue regionqueue = createHARegionQueue("testing", haa);
- EventID ev1 = new EventID(new byte[] {1}, 1, 1);
- EventID ev2 = new EventID(new byte[] {1}, 1, 2);
- Conflatable cf1 = new ConflatableObject("key", "value", ev1, true, "testing");
- Conflatable cf2 = new ConflatableObject("key", "value2", ev2, true, "testing");
- regionqueue.put(cf1);
- final long tailKey = regionqueue.tailKey.get();
- regionqueue.put(cf2);
- // Invalidate will trigger the expiration of the entry
- // See HARegionQueue.createCacheListenerForHARegion
- regionqueue.getRegion().invalidate(tailKey);
- assertTrue(
- " Expected region size not to be zero since expiry time has not been exceeded but it is not so ",
- !(regionqueue.size() == 0));
- assertTrue(" Expected the available id's size not to have counter 1 but it has ",
- !(regionqueue.getAvalaibleIds().contains(new Long(1))));
- assertTrue(" Expected the available id's size to have counter 2 but it does not have ",
- (regionqueue.getAvalaibleIds().contains(new Long(2))));
- assertTrue(" Expected eventID map not to have the first event, but it has",
- !(regionqueue.getCurrentCounterSet(ev1).contains(new Long(1))));
- assertTrue(" Expected eventID map to have the second event, but it does not",
- (regionqueue.getCurrentCounterSet(ev2).contains(new Long(2))));
- }
+ public void testNoExpiryOfThreadId() throws Exception {
+ HARegionQueueAttributes haa = new HARegionQueueAttributes();
+ haa.setExpiryTime(45);
- catch (Exception e) {
- throw new AssertionError("test failed due to ", e);
- }
+ HARegionQueue regionQueue = createHARegionQueue(this.testName.getMethodName(), haa);
+ EventID ev1 = new EventID(new byte[] {1}, 1, 1);
+ EventID ev2 = new EventID(new byte[] {1}, 1, 2);
+ Conflatable cf1 =
+ new ConflatableObject("key", "value", ev1, true, this.testName.getMethodName());
+ Conflatable cf2 =
+ new ConflatableObject("key", "value2", ev2, true, this.testName.getMethodName());
+
+ regionQueue.put(cf1);
+ long tailKey = regionQueue.tailKey.get();
+ regionQueue.put(cf2);
+
+ // Invalidate will trigger the expiration of the entry
+ // See HARegionQueue.createCacheListenerForHARegion
+ regionQueue.getRegion().invalidate(tailKey);
+
+ assertThat(
+ " Expected region size not to be zero since expiry time has not been exceeded but it is not so ",
+ !regionQueue.isEmpty(), is(true));
+ assertThat(" Expected the available id's size not to have counter 1 but it has ",
+ !regionQueue.getAvalaibleIds().contains(1L), is(true));
+ assertThat(" Expected the available id's size to have counter 2 but it does not have ",
+ regionQueue.getAvalaibleIds().contains(2L), is(true));
+ assertThat(" Expected eventID map not to have the first event, but it has",
+ !regionQueue.getCurrentCounterSet(ev1).contains(1L), is(true));
+ assertThat(" Expected eventID map to have the second event, but it does not",
+ regionQueue.getCurrentCounterSet(ev2).contains(2L), is(true));
}
/**
@@ -525,66 +323,64 @@ public class HARegionQueueJUnitTest {
* being put in the queue
*/
@Test
- public void testQRMComingBeforeLocalPut() {
- try {
- // RegionQueue regionqueue = new HARegionQueue("testing", cache);
- HARegionQueue regionqueue = createHARegionQueue("testing");
- EventID id = new EventID(new byte[] {1}, 1, 1);
- regionqueue.removeDispatchedEvents(id);
- regionqueue.put(new ConflatableObject("key", "value", id, true, "testing"));
- assertTrue(" Expected key to be null since QRM for the message id had already arrived ",
- !regionqueue.getRegion().containsKey(new Long(1)));
- } catch (Exception e) {
- throw new AssertionError("test failed due to ", e);
- }
+ public void testQRMComingBeforeLocalPut() throws Exception {
+ HARegionQueue regionQueue = createHARegionQueue(this.testName.getMethodName());
+ EventID id = new EventID(new byte[] {1}, 1, 1);
+
+ regionQueue.removeDispatchedEvents(id);
+ regionQueue.put(new ConflatableObject("key", "value", id, true, this.testName.getMethodName()));
+
+ assertThat(" Expected key to be null since QRM for the message id had already arrived ",
+ !regionQueue.getRegion().containsKey(1L), is(true));
}
/**
* test verifies correct expiry of ThreadIdentifier in the HARQ if no corresponding put comes
*/
@Test
- public void testOnlyQRMComing() throws InterruptedException, IOException, ClassNotFoundException {
+ public void testOnlyQRMComing() throws Exception {
HARegionQueueAttributes harqAttr = new HARegionQueueAttributes();
harqAttr.setExpiryTime(1);
- // RegionQueue regionqueue = new HARegionQueue("testing", cache, harqAttr);
- HARegionQueue regionqueue = createHARegionQueue("testing", harqAttr);
+
+ HARegionQueue regionQueue = createHARegionQueue(this.testName.getMethodName(), harqAttr);
EventID id = new EventID(new byte[] {1}, 1, 1);
long start = System.currentTimeMillis();
- regionqueue.removeDispatchedEvents(id);
- assertTrue(" Expected testingID to be present since only QRM achieved ",
- regionqueue.getRegion().containsKey(new ThreadIdentifier(new byte[] {1}, 1)));
+
+ regionQueue.removeDispatchedEvents(id);
+
+ assertThat(" Expected testingID to be present since only QRM achieved ",
+ regionQueue.getRegion().containsKey(new ThreadIdentifier(new byte[] {1}, 1)), is(true));
+
waitAtLeast(1000, start,
- () -> assertTrue(
+ () -> assertThat(
" Expected testingID not to be present since it should have expired after 2.5 seconds",
- !regionqueue.getRegion().containsKey(new ThreadIdentifier(new byte[] {1}, 1))));
+ !regionQueue.getRegion().containsKey(new ThreadIdentifier(new byte[] {1}, 1)),
+ is(true)));
}
/**
* test all relevant data structures are updated on a local put
*/
@Test
- public void testPutPath() {
- try {
- HARegionQueue regionqueue = createHARegionQueue("testing");
- Conflatable cf =
- new ConflatableObject("key", "value", new EventID(new byte[] {1}, 1, 1), true, "testing");
- regionqueue.put(cf);
- assertTrue(" Expected region peek to return cf but it is not so ",
- (regionqueue.peek().equals(cf)));
- assertTrue(
- " Expected the available id's size not to be zero since expiry time has not been exceeded but it is not so ",
- !(regionqueue.getAvalaibleIds().size() == 0));
- assertTrue(
- " Expected conflation map to have entry for this key since expiry time has not been exceeded but it is not so ",
- ((((Map) (regionqueue.getConflationMapForTesting().get("testing"))).get("key"))
- .equals(new Long(1))));
- assertTrue(
- " Expected eventID map size not to be zero since expiry time has not been exceeded but it is not so ",
- !(regionqueue.getEventsMapForTesting().size() == 0));
+ public void testPutPath() throws Exception {
+ HARegionQueue regionQueue = createHARegionQueue(this.testName.getMethodName());
+ Conflatable cf = new ConflatableObject("key", "value", new EventID(new byte[] {1}, 1, 1), true,
+ this.testName.getMethodName());
- } catch (Exception e) {
- throw new AssertionError("Exception occurred in test due to ", e);
- }
+ regionQueue.put(cf);
+
+ assertThat(" Expected region peek to return cf but it is not so ", regionQueue.peek(), is(cf));
+ assertThat(
+ " Expected the available id's size not to be zero since expiry time has not been exceeded but it is not so ",
+ !regionQueue.getAvalaibleIds().isEmpty(), is(true));
+ assertThat(
+ " Expected conflation map to have entry for this key since expiry time has not been exceeded but it is not so ",
+ ((Map) regionQueue.getConflationMapForTesting().get(this.testName.getMethodName()))
+ .get("key"),
+ is(1L));
+ assertThat(
+ " Expected eventID map size not to be zero since expiry time has not been exceeded but it is not so ",
+ !regionQueue.getEventsMapForTesting().isEmpty(), is(true));
}
/**
@@ -592,58 +388,64 @@ public class HARegionQueueJUnitTest {
* there - verify the next five entries and their relevant data is present
*/
@Test
- public void testQRMDispatch() {
- try {
- HARegionQueue regionqueue = createHARegionQueue("testing");
- Conflatable[] cf = new Conflatable[10];
- // put 10 conflatable objects
- for (int i = 0; i < 10; i++) {
- cf[i] = new ConflatableObject("key" + i, "value", new EventID(new byte[] {1}, 1, i), true,
- "testing");
- regionqueue.put(cf[i]);
- }
- // remove the first 5 by giving the right sequence id
- regionqueue.removeDispatchedEvents(new EventID(new byte[] {1}, 1, 4));
- // verify 1-5 not in region
- for (long i = 1; i < 6; i++) {
- assertTrue(!regionqueue.getRegion().containsKey(new Long(i)));
- }
- // verify 6-10 still in region queue
- for (long i = 6; i < 11; i++) {
- assertTrue(regionqueue.getRegion().containsKey(new Long(i)));
- }
- // verify 1-5 not in conflation map
- for (long i = 0; i < 5; i++) {
- assertTrue(!((Map) regionqueue.getConflationMapForTesting().get("testing"))
- .containsKey("key" + i));
- }
- // verify 6-10 in conflation map
- for (long i = 5; i < 10; i++) {
- assertTrue(
- ((Map) regionqueue.getConflationMapForTesting().get("testing")).containsKey("key" + i));
- }
+ public void testQRMDispatch() throws Exception {
+ HARegionQueue regionQueue = createHARegionQueue(this.testName.getMethodName());
+ Conflatable[] cf = new Conflatable[10];
+
+ // put 10 conflatable objects
+ for (int i = 0; i < 10; i++) {
+ cf[i] = new ConflatableObject("key" + i, "value", new EventID(new byte[] {1}, 1, i), true,
+ this.testName.getMethodName());
+ regionQueue.put(cf[i]);
+ }
- EventID eid = new EventID(new byte[] {1}, 1, 6);
- // verify 1-5 not in eventMap
- for (long i = 1; i < 6; i++) {
- assertTrue(!regionqueue.getCurrentCounterSet(eid).contains(new Long(i)));
- }
- // verify 6-10 in event Map
- for (long i = 6; i < 11; i++) {
- assertTrue(regionqueue.getCurrentCounterSet(eid).contains(new Long(i)));
- }
+ // remove the first 5 by giving the right sequence id
+ regionQueue.removeDispatchedEvents(new EventID(new byte[] {1}, 1, 4));
- // verify 1-5 not in available Id's map
- for (long i = 1; i < 6; i++) {
- assertTrue(!regionqueue.getAvalaibleIds().contains(new Long(i)));
- }
+ // verify 1-5 not in region
+ for (int i = 1; i < 6; i++) {
+ assertThat(!regionQueue.getRegion().containsKey((long) i), is(true));
+ }
- // verify 6-10 in available id's map
- for (long i = 6; i < 11; i++) {
- assertTrue(regionqueue.getAvalaibleIds().contains(new Long(i)));
- }
- } catch (Exception e) {
- throw new AssertionError("Exception occurred in test due to ", e);
+ // verify 6-10 still in region queue
+ for (int i = 6; i < 11; i++) {
+ assertThat(regionQueue.getRegion().containsKey((long) i), is(true));
+ }
+
+ // verify 1-5 not in conflation map
+ for (int i = 0; i < 5; i++) {
+ assertThat(
+ !((Map) regionQueue.getConflationMapForTesting().get(this.testName.getMethodName()))
+ .containsKey("key" + i),
+ is(true));
+ }
+
+ // verify 6-10 in conflation map
+ for (int i = 5; i < 10; i++) {
+ assertThat(((Map) regionQueue.getConflationMapForTesting().get(this.testName.getMethodName()))
+ .containsKey("key" + i), is(true));
+ }
+
+ EventID eid = new EventID(new byte[] {1}, 1, 6);
+
+ // verify 1-5 not in eventMap
+ for (int i = 1; i < 6; i++) {
+ assertThat(!regionQueue.getCurrentCounterSet(eid).contains((long) i), is(true));
+ }
+
+ // verify 6-10 in event Map
+ for (int i = 6; i < 11; i++) {
+ assertThat(regionQueue.getCurrentCounterSet(eid).contains((long) i), is(true));
+ }
+
+ // verify 1-5 not in available Id's map
+ for (int i = 1; i < 6; i++) {
+ assertThat(!regionQueue.getAvalaibleIds().contains((long) i), is(true));
+ }
+
+ // verify 6-10 in available id's map
+ for (int i = 6; i < 11; i++) {
+ assertThat(regionQueue.getAvalaibleIds().contains((long) i), is(true));
}
}
@@ -652,68 +454,74 @@ public class HARegionQueueJUnitTest {
* 1-7 not there - verify data for 8-10 is there
*/
@Test
- public void testQRMBeforePut() {
- try {
- HARegionQueue regionqueue = createHARegionQueue("testing");
+ public void testQRMBeforePut() throws Exception {
+ HARegionQueue regionQueue = createHARegionQueue(this.testName.getMethodName());
- EventID[] ids = new EventID[10];
+ EventID[] ids = new EventID[10];
- for (int i = 0; i < 10; i++) {
- ids[i] = new EventID(new byte[] {1}, 1, i);
- }
+ for (int i = 0; i < 10; i++) {
+ ids[i] = new EventID(new byte[] {1}, 1, i);
+ }
- // first get the qrm message for the seventh id
- regionqueue.removeDispatchedEvents(ids[6]);
- Conflatable[] cf = new Conflatable[10];
- // put 10 conflatable objects
- for (int i = 0; i < 10; i++) {
- cf[i] = new ConflatableObject("key" + i, "value", ids[i], true, "testing");
- regionqueue.put(cf[i]);
- }
+ // first get the qrm message for the seventh id
+ regionQueue.removeDispatchedEvents(ids[6]);
+ Conflatable[] cf = new Conflatable[10];
- // verify 1-7 not in region
- Set values = (Set) regionqueue.getRegion().values();
- for (int i = 0; i < 7; i++) {
- System.out.println(i);
- assertTrue(!values.contains(cf[i]));
- }
- // verify 8-10 still in region queue
- for (int i = 7; i < 10; i++) {
- System.out.println(i);
- assertTrue(values.contains(cf[i]));
- }
- // verify 1-8 not in conflation map
- for (long i = 0; i < 7; i++) {
- assertTrue(!((Map) regionqueue.getConflationMapForTesting().get("testing"))
- .containsKey("key" + i));
- }
- // verify 8-10 in conflation map
- for (long i = 7; i < 10; i++) {
- assertTrue(
- ((Map) regionqueue.getConflationMapForTesting().get("testing")).containsKey("key" + i));
- }
+ // put 10 conflatable objects
+ for (int i = 0; i < 10; i++) {
+ cf[i] =
+ new ConflatableObject("key" + i, "value", ids[i], true, this.testName.getMethodName());
+ regionQueue.put(cf[i]);
+ }
- EventID eid = new EventID(new byte[] {1}, 1, 6);
- // verify 1-7 not in eventMap
- for (long i = 4; i < 11; i++) {
- assertTrue(!regionqueue.getCurrentCounterSet(eid).contains(new Long(i)));
- }
- // verify 8-10 in event Map
- for (long i = 1; i < 4; i++) {
- assertTrue(regionqueue.getCurrentCounterSet(eid).contains(new Long(i)));
- }
+ // verify 1-7 not in region
+ Set values = (Set) regionQueue.getRegion().values();
- // verify 1-7 not in available Id's map
- for (long i = 4; i < 11; i++) {
- assertTrue(!regionqueue.getAvalaibleIds().contains(new Long(i)));
- }
+ for (int i = 0; i < 7; i++) {
+ System.out.println(i);
+ assertThat(!values.contains(cf[i]), is(true));
+ }
- // verify 8-10 in available id's map
- for (long i = 1; i < 4; i++) {
- assertTrue(regionqueue.getAvalaibleIds().contains(new Long(i)));
- }
- } catch (Exception e) {
- throw new AssertionError("Exception occurred in test due to ", e);
+ // verify 8-10 still in region queue
+ for (int i = 7; i < 10; i++) {
+ System.out.println(i);
+ assertThat(values.contains(cf[i]), is(true));
+ }
+
+ // verify 1-8 not in conflation map
+ for (int i = 0; i < 7; i++) {
+ assertThat(
+ !((Map) regionQueue.getConflationMapForTesting().get(this.testName.getMethodName()))
+ .containsKey("key" + i),
+ is(true));
+ }
+
+ // verify 8-10 in conflation map
+ for (int i = 7; i < 10; i++) {
+ assertThat(((Map) regionQueue.getConflationMapForTesting().get(this.testName.getMethodName()))
+ .containsKey("key" + i), is(true));
+ }
+
+ EventID eid = new EventID(new byte[] {1}, 1, 6);
+
+ // verify 1-7 not in eventMap
+ for (int i = 4; i < 11; i++) {
+ assertThat(!regionQueue.getCurrentCounterSet(eid).contains((long) i), is(true));
+ }
+
+ // verify 8-10 in event Map
+ for (int i = 1; i < 4; i++) {
+ assertThat(regionQueue.getCurrentCounterSet(eid).contains((long) i), is(true));
+ }
+
+ // verify 1-7 not in available Id's map
+ for (int i = 4; i < 11; i++) {
+ assertThat(!regionQueue.getAvalaibleIds().contains((long) i), is(true));
+ }
+
+ // verify 8-10 in available id's map
+ for (int i = 1; i < 4; i++) {
+ assertThat(regionQueue.getAvalaibleIds().contains((long) i), is(true));
}
}
@@ -721,33 +529,33 @@ public class HARegionQueueJUnitTest {
* test to verify conflation happens as expected
*/
@Test
- public void testConflation() {
- try {
- HARegionQueue regionqueue = createHARegionQueue("testing");
- EventID ev1 = new EventID(new byte[] {1}, 1, 1);
- EventID ev2 = new EventID(new byte[] {1}, 2, 2);
- Conflatable cf1 = new ConflatableObject("key", "value", ev1, true, "testing");
- Conflatable cf2 = new ConflatableObject("key", "value2", ev2, true, "testing");
- regionqueue.put(cf1);
- Map conflationMap = regionqueue.getConflationMapForTesting();
- assertTrue(((Map) (conflationMap.get("testing"))).get("key").equals(new Long(1)));
- regionqueue.put(cf2);
- // verify the conflation map has recorded the new key
- assertTrue(((Map) (conflationMap.get("testing"))).get("key").equals(new Long(2)));
- // the old key should not be present
- assertTrue(!regionqueue.getRegion().containsKey(new Long(1)));
- // available ids should not contain the old id (the old position)
- assertTrue(!regionqueue.getAvalaibleIds().contains(new Long(1)));
- // available id should have the new id (the new position)
- assertTrue(regionqueue.getAvalaibleIds().contains(new Long(2)));
- // events map should not contain the old position
- assertTrue(regionqueue.getCurrentCounterSet(ev1).isEmpty());
- // events map should contain the new position
- assertTrue(regionqueue.getCurrentCounterSet(ev2).contains(new Long(2)));
-
- } catch (Exception e) {
- throw new AssertionError("Exception occurred in test due to ", e);
- }
+ public void testConflation() throws Exception {
+ HARegionQueue regionQueue = createHARegionQueue(this.testName.getMethodName());
+ EventID ev1 = new EventID(new byte[] {1}, 1, 1);
+ EventID ev2 = new EventID(new byte[] {1}, 2, 2);
+ Conflatable cf1 =
+ new ConflatableObject("key", "value", ev1, true, this.testName.getMethodName());
+ Conflatable cf2 =
+ new ConflatableObject("key", "value2", ev2, true, this.testName.getMethodName());
+ regionQueue.put(cf1);
+
+ Map conflationMap = regionQueue.getConflationMapForTesting();
+ assertThat(((Map) conflationMap.get(this.testName.getMethodName())).get("key"), is(1L));
+
+ regionQueue.put(cf2);
+
+ // verify the conflation map has recorded the new key
+ assertThat(((Map) conflationMap.get(this.testName.getMethodName())).get("key"), is(2L));
+ // the old key should not be present
+ assertThat(!regionQueue.getRegion().containsKey(1L), is(true));
+ // available ids should not contain the old id (the old position)
+ assertThat(!regionQueue.getAvalaibleIds().contains(1L), is(true));
+ // available id should have the new id (the new position)
+ assertThat(regionQueue.getAvalaibleIds().contains(2L), is(true));
+ // events map should not contain the old position
+ assertThat(regionQueue.getCurrentCounterSet(ev1).isEmpty(), is(true));
+ // events map should contain the new position
+ assertThat(regionQueue.getCurrentCounterSet(ev2).contains(2L), is(true));
}
/**
@@ -755,97 +563,58 @@ public class HARegionQueueJUnitTest {
* events which are of ID greater than that contained in QRM should stay
*/
@Test
- public void testQRM() {
- try {
- RegionQueue regionqueue = createHARegionQueue("testing");
- for (int i = 0; i < 10; ++i) {
- regionqueue.put(new ConflatableObject("key" + (i + 1), "value",
- new EventID(new byte[] {1}, 1, i + 1), true, "testing"));
- }
- EventID qrmID = new EventID(new byte[] {1}, 1, 5);
- ((HARegionQueue) regionqueue).removeDispatchedEvents(qrmID);
- Map conflationMap = ((HARegionQueue) regionqueue).getConflationMapForTesting();
- assertTrue(((Map) (conflationMap.get("testing"))).size() == 5);
-
- Set availableIDs = ((HARegionQueue) regionqueue).getAvalaibleIds();
- Set counters = ((HARegionQueue) regionqueue).getCurrentCounterSet(qrmID);
- assertTrue(availableIDs.size() == 5);
- assertTrue(counters.size() == 5);
- for (int i = 5; i < 10; ++i) {
- assertTrue(((Map) (conflationMap.get("testing"))).containsKey("key" + (i + 1)));
- assertTrue(availableIDs.contains(new Long((i + 1))));
- assertTrue(counters.contains(new Long((i + 1))));
- }
- Region rgn = ((HARegionQueue) regionqueue).getRegion();
- assertTrue(rgn.keySet().size() == 6);
+ public void testQRM() throws Exception {
+ RegionQueue regionqueue = createHARegionQueue(this.testName.getMethodName());
- } catch (Exception e) {
- throw new AssertionError("Exception occurred in test due to ", e);
+ for (int i = 0; i < 10; ++i) {
+ regionqueue.put(new ConflatableObject("key" + (i + 1), "value",
+ new EventID(new byte[] {1}, 1, i + 1), true, this.testName.getMethodName()));
}
- }
- protected static HARegionQueue hrqFortestSafeConflationRemoval;
+ EventID qrmID = new EventID(new byte[] {1}, 1, 5);
+ ((HARegionQueue) regionqueue).removeDispatchedEvents(qrmID);
+ Map conflationMap = ((HARegionQueue) regionqueue).getConflationMapForTesting();
+ assertThat(((Map) conflationMap.get(this.testName.getMethodName())).size(), is(5));
- /**
- * This test tests safe removal from the conflation map. i.e operations should only remove old
- * values and not the latest value
- */
- @Test
- public void testSafeConflationRemoval() {
- try {
- hrqFortestSafeConflationRemoval = new HARQTestClass("testSafeConflationRemoval",
+ Set availableIDs = ((HARegionQueue) regionqueue).getAvalaibleIds();
+ Set counters = ((HARegionQueue) regionqueue).getCurrentCounterSet(qrmID);
- cache, this);
- Conflatable cf1 = new ConflatableObject("key1", "value", new EventID(new byte[] {1}, 1, 1),
- true, "testSafeConflationRemoval");
- hrqFortestSafeConflationRemoval.put(cf1);
- hrqFortestSafeConflationRemoval.removeDispatchedEvents(new EventID(new byte[] {1}, 1, 1));
- Map map =
-
- (Map) hrqFortestSafeConflationRemoval.getConflationMapForTesting()
- .get("testSafeConflationRemoval");
- assertTrue(
- "Expected the counter to be 2 since it should not have been deleted but it is not so ",
- map.get("key1").equals(new Long(2)));
- hrqFortestSafeConflationRemoval = null;
- } catch (Exception e) {
- throw new AssertionError("Test failed due to ", e);
+ assertThat(availableIDs.size(), is(5));
+ assertThat(counters.size(), is(5));
+
+ for (int i = 5; i < 10; ++i) {
+ assertThat(
+ ((Map) (conflationMap.get(this.testName.getMethodName()))).containsKey("key" + (i + 1)),
+ is(true));
+ assertThat(availableIDs.contains((long) (i + 1)), is(true));
+ assertThat(counters.contains((long) (i + 1)), is(true));
}
+
+ Region rgn = ((HARegionQueue) regionqueue).getRegion();
+ assertThat(rgn.keySet().size(), is(6));
}
/**
- * Extends HARegionQueue for testing purposes. used by testSafeConflationRemoval
+ * This test tests safe removal from the conflation map. i.e operations should only remove old
+ * values and not the latest value
*/
- static class HARQTestClass extends HARegionQueue.TestOnlyHARegionQueue {
+ @Test
+ public void testSafeConflationRemoval() throws Exception {
+ hrqForTestSafeConflationRemoval = new HARQTestClass("testSafeConflationRemoval", this.cache);
+ Conflatable cf1 = new ConflatableObject("key1", "value", new EventID(new byte[] {1}, 1, 1),
+ true, "testSafeConflationRemoval");
- public HARQTestClass(String REGION_NAME, InternalCache cache, HARegionQueueJUnitTest test)
- throws IOException, ClassNotFoundException, CacheException, InterruptedException {
- super(REGION_NAME, cache);
- }
+ hrqForTestSafeConflationRemoval.put(cf1);
+ hrqForTestSafeConflationRemoval.removeDispatchedEvents(new EventID(new byte[] {1}, 1, 1));
- ConcurrentMap createConcurrentMap() {
- return new ConcHashMap();
- }
- }
+ Map map = (Map) hrqForTestSafeConflationRemoval.getConflationMapForTesting()
+ .get("testSafeConflationRemoval");
- /**
- * Used to override the remove method for testSafeConflationRemoval
- */
- static class ConcHashMap extends ConcurrentHashMap implements ConcurrentMap {
- public boolean remove(Object arg0, Object arg1) {
- Conflatable cf2 = new ConflatableObject("key1", "value2", new EventID(new byte[] {1}, 1, 2),
- true, "testSafeConflationRemoval");
- try {
- hrqFortestSafeConflationRemoval.put(cf2);
- } catch (Exception e) {
- throw new AssertionError("Exception occurred in trying to put ", e);
- }
- return super.remove(arg0, arg1);
- }
+ assertThat(
+ "Expected the counter to be 2 since it should not have been deleted but it is not so ",
+ map.get("key1"), is(2L));
}
- static List list1;
-
/**
* This test tests remove operation is causing the insertion of sequence ID for existing
* ThreadIdentifier object and concurrently the QRM thread is iterating over the Map to form the
@@ -864,80 +633,86 @@ public class HARegionQueueJUnitTest {
* It is then verified to see that all the sequence should be greater than x
*/
@Test
- public void testConcurrentDispatcherAndRemovalForSameRegionSameThreadId() {
- try {
- final long numberOfIterations = 1000;
- final HARegionQueue hrq = createHARegionQueue("testConcurrentDispatcherAndRemoval");
- HARegionQueue.stopQRMThread();
- final ThreadIdentifier[] ids = new ThreadIdentifier[(int) numberOfIterations];
- for (int i = 0; i < numberOfIterations; i++) {
- ids[i] = new ThreadIdentifier(new byte[] {1}, i);
- hrq.addDispatchedMessage(ids[i], i);
- }
- Thread thread1 = new Thread() {
- public void run() {
- try {
- Thread.sleep(600);
- } catch (InterruptedException e) {
- fail("interrupted");
- }
- list1 = HARegionQueue.createMessageListForTesting();
- };
- };
- Thread thread2 = new Thread() {
- public void run() {
- try {
- Thread.sleep(480);
- } catch (InterruptedException e) {
- fail("interrupted");
- }
- for (int i = 0; i < numberOfIterations; i++) {
- hrq.addDispatchedMessage(ids[i], i + numberOfIterations);
- }
- };
- };
- thread1.start();
- thread2.start();
- ThreadUtils.join(thread1, 30 * 1000);
- ThreadUtils.join(thread2, 30 * 1000);
- List list2 = HARegionQueue.createMessageListForTesting();
- Iterator iterator = list1.iterator();
- boolean doOnce = false;
- EventID id = null;
- Map map = new HashMap();
- while (iterator.hasNext()) {
- if (!doOnce) {
- iterator.next();
- iterator.next();
- doOnce = true;
- } else {
- id = (EventID) iterator.next();
- map.put(new Long(id.getThreadID()), new Long(id.getSequenceID()));
+ public void testConcurrentDispatcherAndRemovalForSameRegionSameThreadId() throws Exception {
+ long numberOfIterations = 1000;
+ HARegionQueue hrq = createHARegionQueue(this.testName.getMethodName());
+ HARegionQueue.stopQRMThread();
+ ThreadIdentifier[] ids = new ThreadIdentifier[(int) numberOfIterations];
+
+ for (int i = 0; i < numberOfIterations; i++) {
+ ids[i] = new ThreadIdentifier(new byte[] {1}, i);
+ hrq.addDispatchedMessage(ids[i], i);
+ }
+
+ Thread thread1 = new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(600);
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
}
+ list1 = HARegionQueue.createMessageListForTesting();
}
- iterator = list2.iterator();
- doOnce = false;
- id = null;
- while (iterator.hasNext()) {
- if (!doOnce) {
- iterator.next();
- iterator.next();
- doOnce = true;
- } else {
- id = (EventID) iterator.next();
- map.put(new Long(id.getThreadID()), new Long(id.getSequenceID()));
+ };
+
+ Thread thread2 = new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(480);
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
+ }
+ for (int i = 0; i < numberOfIterations; i++) {
+ hrq.addDispatchedMessage(ids[i], i + numberOfIterations);
}
}
- iterator = map.values().iterator();
- Long max = new Long(numberOfIterations);
- Long next;
- while (iterator.hasNext()) {
- next = ((Long) iterator.next());
- assertTrue(" Expected all the sequence ID's to be greater than " + max
- + " but it is not so. Got sequence id " + next, next.compareTo(max) >= 0);
+ };
+
+ thread1.start();
+ thread2.start();
+ ThreadUtils.join(thread1, 30 * 1000);
+ ThreadUtils.join(thread2, 30 * 1000);
+ List list2 = HARegionQueue.createMessageListForTesting();
+ Iterator iterator = list1.iterator();
+ boolean doOnce = false;
+ EventID id;
+ Map map = new HashMap();
+
+ while (iterator.hasNext()) {
+ if (!doOnce) {
+ iterator.next();
+ iterator.next();
+ doOnce = true;
+ } else {
+ id = (EventID) iterator.next();
+ map.put(new Long(id.getThreadID()), id.getSequenceID());
+ }
+ }
+
+ iterator = list2.iterator();
+ doOnce = false;
+
+ while (iterator.hasNext()) {
+ if (!doOnce) {
+ iterator.next();
+ iterator.next();
+ doOnce = true;
+ } else {
+ id = (EventID) iterator.next();
+ map.put(id.getThreadID(), id.getSequenceID());
}
- } catch (Exception e) {
- throw new AssertionError("Test failed due to : ", e);
+ }
+
+ iterator = map.values().iterator();
+ Long max = numberOfIterations;
+ while (iterator.hasNext()) {
+ Long next = (Long) iterator.next();
+ assertThat(
+ " Expected all the sequence ID's to be greater than " + max
+ + " but it is not so. Got sequence id " + next,
+ next.compareTo(max), greaterThanOrEqualTo(0));
}
}
@@ -958,77 +733,81 @@ public class HARegionQueueJUnitTest {
* It is then verified to see that the map size should be 2x
*/
@Test
- public void testConcurrentDispatcherAndRemovalForSameRegionDifferentThreadId() {
- try {
- final long numberOfIterations = 1000;
- final HARegionQueue hrq = createHARegionQueue("testConcurrentDispatcherAndRemoval");
- HARegionQueue.stopQRMThread();
- final ThreadIdentifier[] ids = new ThreadIdentifier[(int) numberOfIterations];
- for (int i = 0; i < numberOfIterations; i++) {
- ids[i] = new ThreadIdentifier(new byte[] {1}, i);
- hrq.addDispatchedMessage(ids[i], i);
- }
- Thread thread1 = new Thread() {
- public void run() {
- try {
- Thread.sleep(600);
- } catch (InterruptedException e) {
- fail("interrupted");
- }
- list1 = HARegionQueue.createMessageListForTesting();
- };
- };
- Thread thread2 = new Thread() {
- public void run() {
- try {
- Thread.sleep(480);
- } catch (InterruptedException e) {
- fail("interrupted");
- }
- for (int i = 0; i < numberOfIterations; i++) {
- ids[i] = new ThreadIdentifier(new byte[] {1}, i + numberOfIterations);
- hrq.addDispatchedMessage(ids[i], i + numberOfIterations);
- }
- };
- };
- thread1.start();
- thread2.start();
- ThreadUtils.join(thread1, 30 * 1000);
- ThreadUtils.join(thread2, 30 * 1000);
- List list2 = HARegionQueue.createMessageListForTesting();
- Iterator iterator = list1.iterator();
- boolean doOnce = false;
- EventID id = null;
- Map map = new HashMap();
- while (iterator.hasNext()) {
- if (!doOnce) {
- iterator.next();
- iterator.next();
- doOnce = true;
- } else {
- id = (EventID) iterator.next();
- map.put(new Long(id.getThreadID()), new Long(id.getSequenceID()));
+ public void testConcurrentDispatcherAndRemovalForSameRegionDifferentThreadId() throws Exception {
+ int numberOfIterations = 1000;
+ HARegionQueue hrq = createHARegionQueue(this.testName.getMethodName());
+ HARegionQueue.stopQRMThread();
+ ThreadIdentifier[] ids = new ThreadIdentifier[(int) numberOfIterations];
+
+ for (int i = 0; i < numberOfIterations; i++) {
+ ids[i] = new ThreadIdentifier(new byte[] {1}, i);
+ hrq.addDispatchedMessage(ids[i], i);
+ }
+
+ Thread thread1 = new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(600);
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
}
+ list1 = HARegionQueue.createMessageListForTesting();
}
- iterator = list2.iterator();
- doOnce = false;
- id = null;
- while (iterator.hasNext()) {
- if (!doOnce) {
- iterator.next();
- iterator.next();
- doOnce = true;
- } else {
- id = (EventID) iterator.next();
- map.put(new Long(id.getThreadID()), new Long(id.getSequenceID()));
+ };
+
+ Thread thread2 = new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(480);
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
+ }
+ for (int i = 0; i < numberOfIterations; i++) {
+ ids[i] = new ThreadIdentifier(new byte[] {1}, i + numberOfIterations);
+ hrq.addDispatchedMessage(ids[i], i + numberOfIterations);
}
}
- assertTrue(
- " Expected the map size to be " + (2 * numberOfIterations) + " but it is " + map.size(),
- map.size() == (2 * numberOfIterations));
- } catch (Exception e) {
- throw new AssertionError("Test failed due to an unexpected exception : ", e);
+ };
+
+ thread1.start();
+ thread2.start();
+ ThreadUtils.join(thread1, 30 * 1000);
+ ThreadUtils.join(thread2, 30 * 1000);
+ List list2 = HARegionQueue.createMessageListForTesting();
+ Iterator iterator = list1.iterator();
+ boolean doOnce = false;
+ EventID id;
+ Map map = new HashMap();
+
+ while (iterator.hasNext()) {
+ if (!doOnce) {
+ iterator.next();
+ iterator.next();
+ doOnce = true;
+ } else {
+ id = (EventID) iterator.next();
+ map.put(id.getThreadID(), id.getSequenceID());
+ }
+ }
+
+ iterator = list2.iterator();
+ doOnce = false;
+
+ while (iterator.hasNext()) {
+ if (!doOnce) {
+ iterator.next();
+ iterator.next();
+ doOnce = true;
+ } else {
+ id = (EventID) iterator.next();
+ map.put(id.getThreadID(), id.getSequenceID());
+ }
}
+ assertThat(
+ " Expected the map size to be " + 2 * numberOfIterations + " but it is " + map.size(),
+ map.size(), is(2 * numberOfIterations));
}
/**
@@ -1050,101 +829,96 @@ public class HARegionQueueJUnitTest {
* It is then verified to see that a total of x entries are present in the map
*/
@Test
- public void testConcurrentDispatcherAndRemovalForMultipleRegionsSameThreadId() {
- try {
- final long numberOfIterations = 10000;
- final HARegionQueue hrq1 = createHARegionQueue("testConcurrentDispatcherAndRemoval1");
-
- final HARegionQueue hrq2 = createHARegionQueue("testConcurrentDispatcherAndRemoval2");
+ public void testConcurrentDispatcherAndRemovalForMultipleRegionsSameThreadId() throws Exception {
+ int numberOfIterations = 10000;
+ HARegionQueue hrq1 = createHARegionQueue(this.testName.getMethodName() + "-1");
+ HARegionQueue hrq2 = createHARegionQueue(this.testName.getMethodName() + "-2");
+ HARegionQueue hrq3 = createHARegionQueue(this.testName.getMethodName() + "-3");
+ HARegionQueue hrq4 = createHARegionQueue(this.testName.getMethodName() + "-4");
+ HARegionQueue hrq5 = createHARegionQueue(this.testName.getMethodName() + "-5");
- final HARegionQueue hrq3 = createHARegionQueue("testConcurrentDispatcherAndRemoval3");
+ HARegionQueue.stopQRMThread();
- final HARegionQueue hrq4 = createHARegionQueue("testConcurrentDispatcherAndRemoval4");
+ ThreadIdentifier[] ids = new ThreadIdentifier[(int) numberOfIterations];
- final HARegionQueue hrq5 = createHARegionQueue("testConcurrentDispatcherAndRemoval5");
+ for (int i = 0; i < numberOfIterations; i++) {
+ ids[i] = new ThreadIdentifier(new byte[] {1}, i);
+ hrq1.addDispatchedMessage(ids[i], i);
+ hrq2.addDispatchedMessage(ids[i], i);
- HARegionQueue.stopQRMThread();
- final ThreadIdentifier[] ids = new ThreadIdentifier[(int) numberOfIterations];
-
- for (int i = 0; i < numberOfIterations; i++) {
- ids[i] = new ThreadIdentifier(new byte[] {1}, i);
- hrq1.addDispatchedMessage(ids[i], i);
- hrq2.addDispatchedMessage(ids[i], i);
+ }
+ Thread thread1 = new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(600);
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
+ }
+ list1 = HARegionQueue.createMessageListForTesting();
}
+ };
- Thread thread1 = new Thread() {
- public void run() {
- try {
- Thread.sleep(600);
- } catch (InterruptedException e) {
- fail("interrupted");
- }
- list1 = HARegionQueue.createMessageListForTesting();
- };
- };
- Thread thread2 = new Thread() {
- public void run() {
- try {
- Thread.sleep(480);
- } catch (InterruptedException e) {
- fail("interrupted");
- }
- for (int i = 0; i < numberOfIterations; i++) {
- hrq3.addDispatchedMessage(ids[i], i);
- hrq4.addDispatchedMessage(ids[i], i);
- hrq5.addDispatchedMessage(ids[i], i);
- }
- };
- };
- thread1.start();
- thread2.start();
- ThreadUtils.join(thread1, 30 * 1000);
- ThreadUtils.join(thread2, 30 * 1000);
- List list2 = HARegionQueue.createMessageListForTesting();
- Iterator iterator = list1.iterator();
- boolean doOnce = true;
- EventID id = null;
- Map map = new HashMap();
- while (iterator.hasNext()) {
- if (!doOnce) {
- iterator.next(); // read the total message size
- doOnce = true;
- } else {
- iterator.next();// region name;
- int size = ((Integer) iterator.next()).intValue();
- for (int i = 0; i < size; i++) {
- id = (EventID) iterator.next();
- map.put(new ThreadIdentifier(id.getMembershipID(), id.getThreadID()),
- new Long(id.getSequenceID()));
- }
+ Thread thread2 = new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(480);
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
+ }
+ for (int i = 0; i < numberOfIterations; i++) {
+ hrq3.addDispatchedMessage(ids[i], i);
+ hrq4.addDispatchedMessage(ids[i], i);
+ hrq5.addDispatchedMessage(ids[i], i);
}
}
-
- iterator = list2.iterator();
- doOnce = true;
- id = null;
- while (iterator.hasNext()) {
- if (!doOnce) {
- iterator.next(); // read the total message size
- doOnce = true;
- } else {
- iterator.next();// region name;
- int size = ((Integer) iterator.next()).intValue();
- for (int i = 0; i < size; i++) {
- id = (EventID) iterator.next();
- map.put(new ThreadIdentifier(id.getMembershipID(), id.getThreadID()),
- new Long(id.getSequenceID()));
- }
+ };
+
+ thread1.start();
+ thread2.start();
+ ThreadUtils.join(thread1, 30 * 1000);
+ ThreadUtils.join(thread2, 30 * 1000);
+ List list2 = HARegionQueue.createMessageListForTesting();
+ Iterator iterator = list1.iterator();
+ boolean doOnce = true;
+ EventID id;
+ Map map = new HashMap();
+
+ while (iterator.hasNext()) {
+ if (!doOnce) {
+ iterator.next(); // read the total message size
+ doOnce = true;
+ } else {
+ iterator.next();// region name;
+ int size = (Integer) iterator.next();
+ for (int i = 0; i < size; i++) {
+ id = (EventID) iterator.next();
+ map.put(new ThreadIdentifier(id.getMembershipID(), id.getThreadID()), id.getSequenceID());
}
}
- assertTrue(
- " Expected the map size to be " + (numberOfIterations) + " but it is " + map.size(),
- map.size() == (numberOfIterations));
+ }
- } catch (Exception e) {
- throw new AssertionError("Test failed due to : ", e);
+ iterator = list2.iterator();
+ doOnce = true;
+
+ while (iterator.hasNext()) {
+ if (!doOnce) {
+ iterator.next(); // read the total message size
+ doOnce = true;
+ } else {
+ iterator.next();// region name;
+ int size = (Integer) iterator.next();
+ for (int i = 0; i < size; i++) {
+ id = (EventID) iterator.next();
+ map.put(new ThreadIdentifier(id.getMembershipID(), id.getThreadID()), id.getSequenceID());
+ }
+ }
}
+
+ assertThat(" Expected the map size to be " + numberOfIterations + " but it is " + map.size(),
+ map.size(), is(numberOfIterations));
}
/**
@@ -1168,203 +942,179 @@ public class HARegionQueueJUnitTest {
* It is then verified to see that the map size should be 2x * number of regions
*/
@Test
- public void testConcurrentDispatcherAndRemovalForMultipleRegionsDifferentThreadId() {
- try {
- final long numberOfIterations = 1000;
- final HARegionQueue hrq1 =
-
- createHARegionQueue("testConcurrentDispatcherAndRemoval1");
-
- final HARegionQueue hrq2 =
-
- createHARegionQueue("testConcurrentDispatcherAndRemoval2");
- final HARegionQueue hrq3 =
-
- createHARegionQueue("testConcurrentDispatcherAndRemoval3");
- final HARegionQueue hrq4 =
-
- createHARegionQueue("testConcurrentDispatcherAndRemoval4");
- final HARegionQueue hrq5 =
-
- createHARegionQueue("testConcurrentDispatcherAndRemoval5");
-
- HARegionQueue.stopQRMThread();
-
- final ThreadIdentifier[] ids1 = new ThreadIdentifier[(int) numberOfIterations];
- final ThreadIdentifier[] ids2 = new ThreadIdentifier[(int) numberOfIterations];
- final ThreadIdentifier[] ids3 = new ThreadIdentifier[(int) numberOfIterations];
- final ThreadIdentifier[] ids4 = new ThreadIdentifier[(int) numberOfIterations];
- final ThreadIdentifier[] ids5 = new ThreadIdentifier[(int) numberOfIterations];
+ public void testConcurrentDispatcherAndRemovalForMultipleRegionsDifferentThreadId()
+ throws Exception {
+ int numberOfIterations = 1000;
+ HARegionQueue hrq1 = createHARegionQueue(this.testName.getMethodName() + "-1");
+ HARegionQueue hrq2 = createHARegionQueue(this.testName.getMethodName() + "-2");
+ HARegionQueue hrq3 = createHARegionQueue(this.testName.getMethodName() + "-3");
+ HARegionQueue hrq4 = createHARegionQueue(this.testName.getMethodName() + "-4");
+ HARegionQueue hrq5 = createHARegionQueue(this.testName.getMethodName() + "-5");
+
+ HARegionQueue.stopQRMThread();
+
+ ThreadIdentifier[] ids1 = new ThreadIdentifier[(int) numberOfIterations];
+ ThreadIdentifier[] ids2 = new ThreadIdentifier[(int) numberOfIterations];
+ ThreadIdentifier[] ids3 = new ThreadIdentifier[(int) numberOfIterations];
+ ThreadIdentifier[] ids4 = new ThreadIdentifier[(int) numberOfIterations];
+ ThreadIdentifier[] ids5 = new ThreadIdentifier[(int) numberOfIterations];
+
+ for (int i = 0; i < numberOfIterations; i++) {
+ ids1[i] = new ThreadIdentifier(new byte[] {1}, i);
+ ids2[i] = new ThreadIdentifier(new byte[] {2}, i);
+ ids3[i] = new ThreadIdentifier(new byte[] {3}, i);
+ ids4[i] = new ThreadIdentifier(new byte[] {4}, i);
+ ids5[i] = new ThreadIdentifier(new byte[] {5}, i);
+ hrq1.addDispatchedMessage(ids1[i], i);
+ hrq2.addDispatchedMessage(ids2[i], i);
+ hrq3.addDispatchedMessage(ids3[i], i);
+ hrq4.addDispatchedMessage(ids4[i], i);
+ hrq5.addDispatchedMessage(ids5[i], i);
+ }
- for (int i = 0; i < numberOfIterations; i++) {
- ids1[i] = new ThreadIdentifier(new byte[] {1}, i);
- ids2[i] = new ThreadIdentifier(new byte[] {2}, i);
- ids3[i] = new ThreadIdentifier(new byte[] {3}, i);
- ids4[i] = new ThreadIdentifier(new byte[] {4}, i);
- ids5[i] = new ThreadIdentifier(new byte[] {5}, i);
- hrq1.addDispatchedMessage(ids1[i], i);
- hrq2.addDispatchedMessage(ids2[i], i);
- hrq3.addDispatchedMessage(ids3[i], i);
- hrq4.addDispatchedMessage(ids4[i], i);
- hrq5.addDispatchedMessage(ids5[i], i);
+ Thread thread1 = new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(600);
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
+ }
+ list1 = HARegionQueue.createMessageListForTesting();
}
+ };
- Thread thread1 = new Thread() {
- public void run() {
- try {
- Thread.sleep(600);
- } catch (InterruptedException e) {
- fail("interrupted");
- }
- list1 = HARegionQueue.createMessageListForTesting();
- };
- };
- Thread thread2 = new Thread() {
- public void run() {
- try {
- Thread.sleep(480);
- } catch (InterruptedException e) {
- fail("Interrupted");
- }
- for (int i = 0; i < numberOfIterations; i++) {
- ids1[i] = new ThreadIdentifier(new byte[] {1}, i + numberOfIterations);
- ids2[i] = new ThreadIdentifier(new byte[] {2}, i + numberOfIterations);
- ids3[i] = new ThreadIdentifier(new byte[] {3}, i + numberOfIterations);
- ids4[i] = new ThreadIdentifier(new byte[] {4}, i + numberOfIterations);
- ids5[i] = new ThreadIdentifier(new byte[] {5}, i + numberOfIterations);
-
- hrq1.addDispatchedMessage(ids1[i], i + numberOfIterations);
- hrq2.addDispatchedMessage(ids2[i], i + numberOfIterations);
- hrq3.addDispatchedMessage(ids3[i], i + numberOfIterations);
- hrq4.addDispatchedMessage(ids4[i], i + numberOfIterations);
- hrq5.addDispatchedMessage(ids5[i], i + numberOfIterations);
- }
- };
- };
- thread1.start();
- thread2.start();
- ThreadUtils.join(thread1, 30 * 1000);
- ThreadUtils.join(thread2, 30 * 1000);
- List list2 = HARegionQueue.createMessageListForTesting();
- Iterator iterator = list1.iterator();
- boolean doOnce = true;
- EventID id = null;
- Map map = new HashMap();
- while (iterator.hasNext()) {
- if (!doOnce) {
- iterator.next(); // read the total message size
- doOnce = true;
- } else {
- iterator.next();// region name;
- int size = ((Integer) iterator.next()).intValue();
- System.out.println(" size of list 1 iteration x " + size);
- for (int i = 0; i < size; i++) {
-
- id = (EventID) iterator.next();
- map.put(new ThreadIdentifier(id.getMembershipID(), id.getThreadID()),
- new Long(id.getSequenceID()));
- }
+ Thread thread2 = new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(480);
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
+ }
+ for (int i = 0; i < numberOfIterations; i++) {
+ ids1[i] = new ThreadIdentifier(new byte[] {1}, i + numberOfIterations);
+ ids2[i] = new ThreadIdentifier(new byte[] {2}, i + numberOfIterations);
+ ids3[i] = new ThreadIdentifier(new byte[] {3}, i + numberOfIterations);
+ ids4[i] = new ThreadIdentifier(new byte[] {4}, i + numberOfIterations);
+ ids5[i] = new ThreadIdentifier(new byte[] {5}, i + numberOfIterations);
+
+ hrq1.addDispatchedMessage(ids1[i], i + numberOfIterations);
+ hrq2.addDispatchedMessage(ids2[i], i + numberOfIterations);
+ hrq3.addDispatchedMessage(ids3[i], i + numberOfIterations);
+ hrq4.addDispatchedMessage(ids4[i], i + numberOfIterations);
+ hrq5.addDispatchedMessage(ids5[i], i + numberOfIterations);
}
}
-
- iterator = list2.iterator();
- doOnce = true;
- id = null;
- while (iterator.hasNext()) {
- if (!doOnce) {
- iterator.next(); // read the total message size
- doOnce = true;
- } else {
- iterator.next();// region name;
- int size = ((Integer) iterator.next()).intValue();
- System.out.println(" size of list 2 iteration x " + size);
- for (int i = 0; i < size; i++) {
- id = (EventID) iterator.next();
- map.put(new ThreadIdentifier(id.getMembershipID(), id.getThreadID()),
- new Long(id.getSequenceID()));
- }
+ };
+
+ thread1.start();
+ thread2.start();
+ ThreadUtils.join(thread1, 30 * 1000);
+ ThreadUtils.join(thread2, 30 * 1000);
+ List list2 = HARegionQueue.createMessageListForTesting();
+ Iterator iterator = list1.iterator();
+ boolean doOnce = true;
+ EventID id = null;
+ Map map = new HashMap();
+
+ while (iterator.hasNext()) {
+ if (!doOnce) {
+ iterator.next(); // read the total message size
+ doOnce = true;
+ } else {
+ iterator.next(); // region name;
+ int size = (Integer) iterator.next();
+ System.out.println(" size of list 1 iteration x " + size);
+ for (int i = 0; i < size; i++) {
+ id = (EventID) iterator.next();
+ map.put(new ThreadIdentifier(id.getMembershipID(), id.getThreadID()), id.getSequenceID());
}
}
+ }
- assertTrue(" Expected the map size to be " + (numberOfIterations * 2 * 5) + " but it is "
- + map.size(), map.size() == (numberOfIterations * 2 * 5));
+ iterator = list2.iterator();
+ doOnce = true;
- } catch (Exception e) {
- throw new AssertionError("Test failed due to : ", e);
+ while (iterator.hasNext()) {
+ if (!doOnce) {
+ iterator.next(); // read the total message size
+ doOnce = true;
+ } else {
+ iterator.next(); // region name;
+ int size = (Integer) iterator.next();
+ System.out.println(" size of list 2 iteration x " + size);
+ for (int i = 0; i < size; i++) {
+ id = (EventID) iterator.next();
+ map.put(new ThreadIdentifier(id.getMembershipID(), id.getThreadID()), id.getSequenceID());
+ }
+ }
}
+
+ assertThat(
+ " Expected the map size to be " + numberOfIterations * 2 * 5 + " but it is " + map.size(),
+ map.size(), is(numberOfIterations * 2 * 5));
}
/**
- * Concurrent Peek on Blokcing Queue waiting with for a Put . If concurrent take is also happening
+ * Concurrent Peek on Blocking Queue waiting with for a Put . If concurrent take is also happening
* such that the object is removed first then the peek should block & not return with null.
*/
@Test
- public void testBlockingQueueForConcurrentPeekAndTake() {
- exceptionInThread = false;
- testFailed = false;
- try {
- final TestBlockingHARegionQueue bQ =
- new TestBlockingHARegionQueue("testBlockQueueForConcurrentPeekAndTake", cache);
- Thread[] threads = new Thread[3];
- for (int i = 0; i < 3; i++) {
- threads[i] = new Thread() {
- public void run() {
- try {
- long startTime = System.currentTimeMillis();
- Object obj = bQ.peek();
- if (obj == null) {
- testFailed = true;
- message.append(
- " Failed : failed since object was null and was not expected to be null \n");
- }
- long totalTime = System.currentTimeMillis() - startTime;
+ public void testBlockingQueueForConcurrentPeekAndTake() throws Exception {
+ TestBlockingHARegionQueue regionQueue =
+ new TestBlockingHARegionQueue("testBlockQueueForConcurrentPeekAndTake", this.cache);
+ Thread[] threads = new Thread[3];
+
+ for (int i = 0; i < 3; i++) {
+ threads[i] = new Thread() {
+ @Override
+ public void run() {
+ try {
+ long startTime = System.currentTimeMillis();
+ Object obj = regionQueue.peek();
+ if (obj == null) {
+ errorCollector.addError(new AssertionError(
+ "Failed : failed since object was null and was not expected to be null"));
+ }
+ long totalTime = System.currentTimeMillis() - startTime;
- if (totalTime < 4000) {
- testFailed = true;
- message
- .append(" Failed : Expected time to be greater than 4000 but it is not so ");
- }
- } catch (Exception e) {
- exceptionInThread = true;
- exception = e;
+ if (totalTime < 4000) {
+ errorCollector.addError(new AssertionError(
+ "Failed : Expected time to be greater than 4000 but it is not so"));
}
+ } catch (Exception e) {
+ errorCollector.addError(e);
}
- };
-
- }
-
- for (int k = 0; k < 3; k++) {
- threads[k].start();
- }
- Thread.sleep(4000);
-
- EventID id = new EventID(new byte[] {1}, 1, 1);
- EventID id1 = new EventID(new byte[] {1}, 1, 2);
+ }
+ };
+ }
- bQ.takeFirst = true;
- bQ.put(new ConflatableObject("key", "value", id, true, "testing"));
+ for (int k = 0; k < 3; k++) {
+ threads[k].start();
+ }
- Thread.sleep(2000);
+ Thread.sleep(4000);
- bQ.put(new ConflatableObject("key1", "value1", id1, true, "testing"));
+ EventID id = new EventID(new byte[] {1}, 1, 1);
+ EventID id1 = new EventID(new byte[] {1}, 1, 2);
- long startTime = System.currentTimeMillis();
- for (int k = 0; k < 3; k++) {
- ThreadUtils.join(threads[k], 180 * 1000);
- }
+ regionQueue.takeFirst = true;
+ regionQueue.put(new ConflatableObject("key", "value", id, true, this.testName.getMethodName()));
- long totalTime = System.currentTimeMillis() - startTime;
+ Thread.sleep(2000);
- if (totalTime >= 180000) {
- fail(" Test taken too long ");
- }
+ regionQueue
+ .put(new ConflatableObject("key1", "value1", id1, true, this.testName.getMethodName()));
- if (testFailed) {
- fail(" test failed due to " + message);
- }
+ long startTime = System.currentTimeMillis();
+ for (int k = 0; k < 3; k++) {
+ ThreadUtils.join(threads[k], 180 * 1000);
+ }
- } catch (Exception e) {
- throw new AssertionError(" Test failed due to ", e);
+ long totalTime = System.currentTimeMillis() - startTime;
+ if (totalTime >= 180000) {
+ fail(" Test taken too long ");
}
}
@@ -1373,71 +1123,60 @@ public class HARegionQueueJUnitTest {
* QRM thread , the peek should block correctly.
*/
@Test
- public void testBlockingQueueForTakeWhenPeekInProgress() {
- exceptionInThread = false;
- testFailed = false;
- try {
- final TestBlockingHARegionQueue bQ =
- new TestBlockingHARegionQueue("testBlockQueueForTakeWhenPeekInProgress", cache);
- Thread[] threads = new Thread[3];
- for (int i = 0; i < 3; i++) {
- threads[i] = new Thread() {
- public void run() {
- try {
- long startTime = System.currentTimeMillis();
- Object obj = bQ.peek();
- if (obj == null) {
- testFailed = true;
- message.append(
- " Failed : failed since object was null and was not expected to be null \n");
- }
- long totalTime = System.currentTimeMillis() - startTime;
+ public void testBlockingQueueForTakeWhenPeekInProgress() throws Exception {
+ TestBlockingHARegionQueue regionQueue =
+ new TestBlockingHARegionQueue("testBlockQueueForTakeWhenPeekInProgress", this.cache);
+ Thread[] threads = new Thread[3];
+
+ for (int i = 0; i < 3; i++) {
+ threads[i] = new Thread() {
+ @Override
+ public void run() {
+ try {
+ long startTime = System.currentTimeMillis();
+ Object obj = regionQueue.peek();
+ if (obj == null) {
+ errorCollector.addError(new AssertionError(
+ "Failed : failed since object was null and was not expected to be null"));
+ }
+ long totalTime = System.currentTimeMillis() - startTime;
- if (totalTime < 4000) {
- testFailed = true;
- message
- .append(" Failed : Expected time to be greater than 4000 but it is not so ");
- }
- } catch (Exception e) {
- exceptionInThread = true;
- exception = e;
+ if (totalTime < 4000) {
+ errorCollector.addError(new AssertionError(
+ "Failed : Expected time to be greater than 4000 but it is not so"));
}
+ } catch (Exception e) {
+ errorCollector.addError(e);
}
- };
- }
-
- for (int k = 0; k < 3; k++) {
- threads[k].start();
- }
- Thread.sleep(4000);
-
- EventID id = new EventID(new byte[] {1}, 1, 1);
- EventID id1 = new EventID(new byte[] {1}, 1, 2);
+ }
+ };
+ }
- bQ.takeWhenPeekInProgress = true;
- bQ.put(new ConflatableObject("key", "value", id, true, "testing"));
+ for (int k = 0; k < 3; k++) {
+ threads[k].start();
+ }
- Thread.sleep(2000);
+ Thread.sleep(4000);
- bQ.put(new ConflatableObject("key1", "value1", id1, true, "testing"));
+ EventID id = new EventID(new byte[] {1}, 1, 1);
+ EventID id1 = new EventID(new byte[] {1}, 1, 2);
- long startTime = System.currentTimeMillis();
- for (int k = 0; k < 3; k++) {
- ThreadUtils.join(threads[k], 60 * 1000);
- }
+ regionQueue.takeWhenPeekInProgress = true;
+ regionQueue.put(new ConflatableObject("key", "value", id, true, this.testName.getMethodName()));
- long totalTime = System.currentTimeMillis() - startTime;
+ Thread.sleep(2000);
- if (totalTime >= 60000) {
- fail(" Test taken too long ");
- }
+ regionQueue
+ .put(new ConflatableObject("key1", "value1", id1, true, this.testName.getMethodName()));
- if (testFailed) {
- fail(" test failed due to " + message);
- }
+ long startTime = System.currentTimeMillis();
+ for (int k = 0; k < 3; k++) {
+ ThreadUtils.join(threads[k], 60 * 1000);
+ }
- } catch (Exception e) {
- throw new AssertionError(" Test failed due to ", e);
+ long totalTime = System.currentTimeMillis() - startTime;
+ if (totalTime >= 60000) {
+ fail(" Test taken too long ");
}
}
@@ -1451,138 +1190,88 @@ public class HARegionQueueJUnitTest {
* violation. This test will validate that behaviour
*/
@Test
- public void testConcurrentEventExpiryAndTake() {
- try {
- HARegionQueueAttributes haa = new HARegionQueueAttributes();
- haa.setExpiryTime(3);
- final RegionQueue regionqueue =
- new HARegionQueue.TestOnlyHARegionQueue("testing", cache, haa) {
- CacheListener createCacheListenerForHARegion() {
+ public void testConcurrentEventExpiryAndTake() throws Exception {
+ AtomicBoolean complete = new AtomicBoolean(false);
+ AtomicBoolean expiryCalled = new AtomicBoolean(false);
+ AtomicBoolean allowExpiryToProceed = new AtomicBoolean(false);
- return new CacheListenerAdapter() {
+ HARegionQueueAttributes haa = new HARegionQueueAttributes();
+ haa.setExpiryTime(3);
- public void afterInvalidate(EntryEvent event) {
+ RegionQueue regionqueue =
+ new HARegionQueue.TestOnlyHARegionQueue(this.testName.getMethodName(), this.cache, haa) {
+ @Override
+ CacheListener createCacheListenerForHARegion() {
- if (event.getKey() instanceof Long) {
- synchronized (HARegionQueueJUnitTest.this) {
- expiryCalled = true;
- HARegionQueueJUnitTest.this.notify();
+ return new CacheListenerAdapter() {
- } ;
- Thread.yield();
+ @Override
+ public void afterInvalidate(EntryEvent event) {
- synchronized (HARegionQueueJUnitTest.this) {
- if (!allowExpiryToProceed) {
- try {
- HARegionQueueJUnitTest.this.wait();
- } catch (InterruptedException e1) {
- encounteredException = true;
- }
+ if (event.getKey() instanceof Long) {
+ synchronized (HARegionQueueJUnitTest.this) {
+ expiryCalled.set(true);
+ HARegionQueueJUnitTest.this.notifyAll();
+ }
+
+ Thread.yield();
+
+ synchronized (HARegionQueueJUnitTest.this) {
+ while (!allowExpiryToProceed.get()) {
+ try {
+ HARegionQueueJUnitTest.this.wait();
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
+ break;
}
}
- try {
- expireTheEventOrThreadIdentifier(event);
- } catch (CacheException e) {
- e.printStackTrace();
- encounteredException = true;
- } finally {
- synchronized (HARegionQueueJUnitTest.this) {
- complete = true;
- HARegionQueueJUnitTest.this.notify();
- }
+ }
+
+ try {
+ expireTheEventOrThreadIdentifier(event);
+ } catch (CacheException e) {
+ errorCollector.addError(e);
+ } finally {
+ synchronized (HARegionQueueJUnitTest.this) {
+ complete.set(true);
+ HARegionQueueJUnitTest.this.notifyAll();
}
}
}
- };
- }
- };
- EventID ev1 = new EventID(new byte[] {1}, 1, 1);
+ }
+ };
+ }
+ };
- Conflatable cf1 = new ConflatableObject("key", "value", ev1, true, "testing");
+ EventID ev1 = new EventID(new byte[] {1}, 1, 1);
+ Conflatable cf1 =
+ new ConflatableObject("key", "value", ev1, true, this.testName.getMethodName());
+ regionqueue.put(cf1);
- regionqueue.put(cf1);
- synchronized (this) {
- if (!expiryCalled) {
- this.wait();
- }
- }
- try {
- Object o = regionqueue.take();
- assertNull(o);
- } catch (Exception e) {
- throw new AssertionError("Test failed due to exception ", e);
- } finally {
- synchronized (this) {
- this.allowExpiryToProceed = true;
- this.notify();
- }
+ synchronized (this) {
+
<TRUNCATED>
[17/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
index ac9b5da..18929eb 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
@@ -44,30 +44,32 @@ public class CloseCQ extends BaseCQCommand {
private CloseCQ() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- ClientProxyMembershipID id = servConn.getProxyID();
- CacheServerStats stats = servConn.getCacheServerStats();
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ ClientProxyMembershipID id = serverConnection.getProxyID();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
// Based on MessageType.QUERY
// Added by Rao 2/1/2007
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
- String cqName = msg.getPart(0).getString();
+ String cqName = clientMessage.getPart(0).getString();
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received close CQ request from {} cqName: {}", servConn.getName(),
- servConn.getSocketString(), cqName);
+ logger.debug("{}: Received close CQ request from {} cqName: {}", serverConnection.getName(),
+ serverConnection.getSocketString(), cqName);
}
// Process the query request
if (cqName == null) {
String err =
LocalizedStrings.CloseCQ_THE_CQNAME_FOR_THE_CQ_CLOSE_REQUEST_IS_NULL.toLocalizedString();
- sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg.getTransactionId(), null, servConn);
+ sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null,
+ serverConnection);
return;
}
@@ -85,7 +87,7 @@ public class CloseCQ extends BaseCQCommand {
}
InternalCqQuery cqQuery = cqService.getCq(serverCqName);
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
String queryStr = null;
Set cqRegionNames = null;
@@ -102,22 +104,24 @@ public class CloseCQ extends BaseCQCommand {
// getMembershipID());
cqService.closeCq(cqName, id);
if (cqQuery != null)
- servConn.removeCq(cqName, cqQuery.isDurable());
+ serverConnection.removeCq(cqName, cqQuery.isDurable());
} catch (CqException cqe) {
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(), cqe, servConn);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe,
+ serverConnection);
return;
} catch (Exception e) {
String err =
LocalizedStrings.CloseCQ_EXCEPTION_WHILE_CLOSING_CQ_CQNAME_0.toLocalizedString(cqName);
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, msg.getTransactionId(), e, servConn);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e,
+ serverConnection);
return;
}
// Send OK to client
sendCqResponse(MessageType.REPLY,
- LocalizedStrings.CloseCQ_CQ_CLOSED_SUCCESSFULLY.toLocalizedString(), msg.getTransactionId(),
- null, servConn);
- servConn.setAsTrue(RESPONDED);
+ LocalizedStrings.CloseCQ_CQ_CLOSED_SUCCESSFULLY.toLocalizedString(),
+ clientMessage.getTransactionId(), null, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
{
long oldStart = start;
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
index 9bddbc7..86d53f5 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
@@ -52,28 +52,28 @@ public class ExecuteCQ extends BaseCQCommand {
private ExecuteCQ() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
- AcceptorImpl acceptor = servConn.getAcceptor();
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- ClientProxyMembershipID id = servConn.getProxyID();
- CacheServerStats stats = servConn.getCacheServerStats();
+ AcceptorImpl acceptor = serverConnection.getAcceptor();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ ClientProxyMembershipID id = serverConnection.getProxyID();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
// Retrieve the data from the message parts
- String cqName = msg.getPart(0).getString();
- String cqQueryString = msg.getPart(1).getString();
- int cqState = msg.getPart(2).getInt();
+ String cqName = clientMessage.getPart(0).getString();
+ String cqQueryString = clientMessage.getPart(1).getString();
+ int cqState = clientMessage.getPart(2).getInt();
- Part isDurablePart = msg.getPart(3);
+ Part isDurablePart = clientMessage.getPart(3);
byte[] isDurableByte = isDurablePart.getSerializedForm();
boolean isDurable = (isDurableByte == null || isDurableByte[0] == 0) ? false : true;
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received {} request from {} CqName: {} queryString: {}", servConn.getName(),
- MessageType.getString(msg.getMessageType()), servConn.getSocketString(), cqName,
- cqQueryString);
+ logger.debug("{}: Received {} request from {} CqName: {} queryString: {}",
+ serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()),
+ serverConnection.getSocketString(), cqName, cqQueryString);
}
DefaultQueryService qService = null;
@@ -87,7 +87,7 @@ public class ExecuteCQ extends BaseCQCommand {
qService = (DefaultQueryService) crHelper.getCache().getLocalQueryService();
// Authorization check
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
query = qService.newQuery(cqQueryString);
cqRegionNames = ((DefaultQuery) query).getRegionsInQuery(null);
@@ -108,10 +108,11 @@ public class ExecuteCQ extends BaseCQCommand {
cqQuery = cqServiceForExec.executeCq(cqName, cqQueryString, cqState, id,
acceptor.getCacheClientNotifier(), isDurable, false, 0, null);
} catch (CqException cqe) {
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(), cqe, servConn);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe,
+ serverConnection);
return;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
+ writeChunkedException(clientMessage, e, serverConnection);
return;
}
@@ -119,7 +120,7 @@ public class ExecuteCQ extends BaseCQCommand {
boolean sendResults = false;
boolean successQuery = false;
- if (msg.getMessageType() == MessageType.EXECUTECQ_WITH_IR_MSG_TYPE) {
+ if (clientMessage.getMessageType() == MessageType.EXECUTECQ_WITH_IR_MSG_TYPE) {
sendResults = true;
}
@@ -130,8 +131,8 @@ public class ExecuteCQ extends BaseCQCommand {
cqRegionNames = ((DefaultQuery) query).getRegionsInQuery(null);
}
((DefaultQuery) query).setIsCqQuery(true);
- successQuery = processQuery(msg, query, cqQueryString, cqRegionNames, start, cqQuery,
- executeCQContext, servConn, sendResults);
+ successQuery = processQuery(clientMessage, query, cqQueryString, cqRegionNames, start,
+ cqQuery, executeCQContext, serverConnection, sendResults);
// Update the CQ statistics.
cqQuery.getVsdStats().setCqInitialResultsTime((DistributionStats.getStatTime()) - oldstart);
@@ -153,12 +154,12 @@ public class ExecuteCQ extends BaseCQCommand {
// Send OK to client
sendCqResponse(MessageType.REPLY,
LocalizedStrings.ExecuteCQ_CQ_CREATED_SUCCESSFULLY.toLocalizedString(),
- msg.getTransactionId(), null, servConn);
+ clientMessage.getTransactionId(), null, serverConnection);
long start2 = DistributionStats.getStatTime();
stats.incProcessCreateCqTime(start2 - oldstart);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
index de61445..fcc45de 100755
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
@@ -60,31 +60,31 @@ public class ExecuteCQ61 extends BaseCQCommand {
private ExecuteCQ61() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
- AcceptorImpl acceptor = servConn.getAcceptor();
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- ClientProxyMembershipID id = servConn.getProxyID();
- CacheServerStats stats = servConn.getCacheServerStats();
+ AcceptorImpl acceptor = serverConnection.getAcceptor();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ ClientProxyMembershipID id = serverConnection.getProxyID();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
// Retrieve the data from the message parts
- String cqName = msg.getPart(0).getString();
- String cqQueryString = msg.getPart(1).getString();
- int cqState = msg.getPart(2).getInt();
+ String cqName = clientMessage.getPart(0).getString();
+ String cqQueryString = clientMessage.getPart(1).getString();
+ int cqState = clientMessage.getPart(2).getInt();
- Part isDurablePart = msg.getPart(3);
+ Part isDurablePart = clientMessage.getPart(3);
byte[] isDurableByte = isDurablePart.getSerializedForm();
boolean isDurable = (isDurableByte == null || isDurableByte[0] == 0) ? false : true;
// region data policy
- Part regionDataPolicyPart = msg.getPart(msg.getNumberOfParts() - 1);
+ Part regionDataPolicyPart = clientMessage.getPart(clientMessage.getNumberOfParts() - 1);
byte[] regionDataPolicyPartBytes = regionDataPolicyPart.getSerializedForm();
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received {} request from {} CqName: {} queryString: {}", servConn.getName(),
- MessageType.getString(msg.getMessageType()), servConn.getSocketString(), cqName,
- cqQueryString);
+ logger.debug("{}: Received {} request from {} CqName: {} queryString: {}",
+ serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()),
+ serverConnection.getSocketString(), cqName, cqQueryString);
}
// Check if the Server is running in NotifyBySubscription=true mode.
@@ -96,8 +96,8 @@ public class ExecuteCQ61 extends BaseCQCommand {
String err =
LocalizedStrings.ExecuteCQ_SERVER_NOTIFYBYSUBSCRIPTION_MODE_IS_SET_TO_FALSE_CQ_EXECUTION_IS_NOT_SUPPORTED_IN_THIS_MODE
.toLocalizedString();
- sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg.getTransactionId(), null,
- servConn);
+ sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(),
+ null, serverConnection);
return;
}
}
@@ -113,7 +113,7 @@ public class ExecuteCQ61 extends BaseCQCommand {
qService = (DefaultQueryService) crHelper.getCache().getLocalQueryService();
// Authorization check
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
query = qService.newQuery(cqQueryString);
cqRegionNames = ((DefaultQuery) query).getRegionsInQuery(null);
@@ -141,16 +141,17 @@ public class ExecuteCQ61 extends BaseCQCommand {
// registering cq with serverConnection so that when CCP will require auth info it can access
// that
// registering cq auth before as possibility that you may get event
- servConn.setCq(cqName, isDurable);
+ serverConnection.setCq(cqName, isDurable);
cqQuery = (ServerCQImpl) cqServiceForExec.executeCq(cqName, cqQueryString, cqState, id, ccn,
isDurable, true, regionDataPolicyPartBytes[0], null);
} catch (CqException cqe) {
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(), cqe, servConn);
- servConn.removeCq(cqName, isDurable);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe,
+ serverConnection);
+ serverConnection.removeCq(cqName, isDurable);
return;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.removeCq(cqName, isDurable);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.removeCq(cqName, isDurable);
return;
}
@@ -158,7 +159,7 @@ public class ExecuteCQ61 extends BaseCQCommand {
boolean sendResults = false;
boolean successQuery = false;
- if (msg.getMessageType() == MessageType.EXECUTECQ_WITH_IR_MSG_TYPE) {
+ if (clientMessage.getMessageType() == MessageType.EXECUTECQ_WITH_IR_MSG_TYPE) {
sendResults = true;
}
@@ -173,8 +174,8 @@ public class ExecuteCQ61 extends BaseCQCommand {
cqRegionNames = ((DefaultQuery) query).getRegionsInQuery(null);
}
((DefaultQuery) query).setIsCqQuery(true);
- successQuery = processQuery(msg, query, cqQueryString, cqRegionNames, start, cqQuery,
- executeCQContext, servConn, sendResults);
+ successQuery = processQuery(clientMessage, query, cqQueryString, cqRegionNames, start,
+ cqQuery, executeCQContext, serverConnection, sendResults);
// Update the CQ statistics.
@@ -203,12 +204,12 @@ public class ExecuteCQ61 extends BaseCQCommand {
// Send OK to client
sendCqResponse(MessageType.REPLY,
LocalizedStrings.ExecuteCQ_CQ_CREATED_SUCCESSFULLY.toLocalizedString(),
- msg.getTransactionId(), null, servConn);
+ clientMessage.getTransactionId(), null, serverConnection);
long start2 = DistributionStats.getStatTime();
stats.incProcessCreateCqTime(start2 - oldstart);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java
index 69be347..0fab303 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java
@@ -36,32 +36,34 @@ public class GetCQStats extends BaseCQCommand {
private GetCQStats() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
final boolean isDebugEnabled = logger.isDebugEnabled();
if (isDebugEnabled) {
- logger.debug("{}: Received close all client CQs request from {}", servConn.getName(),
- servConn.getSocketString());
+ logger.debug("{}: Received close all client CQs request from {}", serverConnection.getName(),
+ serverConnection.getSocketString());
}
// Retrieve the data from the message parts
- String cqName = msg.getPart(0).getString();
+ String cqName = clientMessage.getPart(0).getString();
if (isDebugEnabled) {
- logger.debug("{}: Received close CQ request from {} cqName: {}", servConn.getName(),
- servConn.getSocketString(), cqName);
+ logger.debug("{}: Received close CQ request from {} cqName: {}", serverConnection.getName(),
+ serverConnection.getSocketString(), cqName);
}
// Process the query request
if (cqName == null) {
String err = "The cqName for the cq stats request is null";
- sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg.getTransactionId(), null, servConn);
+ sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null,
+ serverConnection);
return;
}
@@ -74,13 +76,14 @@ public class GetCQStats extends BaseCQCommand {
cqService.start();
} catch (Exception e) {
String err = "Exception while Getting the CQ Statistics. ";
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, msg.getTransactionId(), e, servConn);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e,
+ serverConnection);
return;
}
// Send OK to client
- sendCqResponse(MessageType.REPLY, "cq stats sent successfully.", msg.getTransactionId(), null,
- servConn);
- servConn.setAsTrue(RESPONDED);
+ sendCqResponse(MessageType.REPLY, "cq stats sent successfully.",
+ clientMessage.getTransactionId(), null, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
{
long oldStart = start;
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
index a2d201d..c14bd72 100755
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
@@ -44,19 +44,20 @@ public class GetDurableCQs extends BaseCQCommand {
private GetDurableCQs() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
- AcceptorImpl acceptor = servConn.getAcceptor();
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- ClientProxyMembershipID id = servConn.getProxyID();
- CacheServerStats stats = servConn.getCacheServerStats();
+ AcceptorImpl acceptor = serverConnection.getAcceptor();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ ClientProxyMembershipID id = serverConnection.getProxyID();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received {} request from {}", servConn.getName(),
- MessageType.getString(msg.getMessageType()), servConn.getSocketString());
+ logger.debug("{}: Received {} request from {}", serverConnection.getName(),
+ MessageType.getString(clientMessage.getMessageType()),
+ serverConnection.getSocketString());
}
DefaultQueryService qService = null;
@@ -68,7 +69,7 @@ public class GetDurableCQs extends BaseCQCommand {
this.securityService.authorizeClusterRead();
// Authorization check
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
authzRequest.getDurableCQsAuthorize();
}
@@ -76,34 +77,35 @@ public class GetDurableCQs extends BaseCQCommand {
cqServiceForExec = qService.getCqService();
List<String> durableCqs = cqServiceForExec.getAllDurableClientCqs(id);
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
- List durableCqList = new ArrayList(maximumChunkSize);
+ List durableCqList = new ArrayList(MAXIMUM_CHUNK_SIZE);
final boolean isTraceEnabled = logger.isTraceEnabled();
for (Iterator it = durableCqs.iterator(); it.hasNext();) {
Object durableCqName = it.next();
durableCqList.add(durableCqName);
if (isTraceEnabled) {
- logger.trace("{}: getDurableCqsResponse <{}>; list size was {}", servConn.getName(),
- durableCqName, durableCqList.size());
+ logger.trace("{}: getDurableCqsResponse <{}>; list size was {}",
+ serverConnection.getName(), durableCqName, durableCqList.size());
}
- if (durableCqList.size() == maximumChunkSize) {
+ if (durableCqList.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
- sendDurableCqsResponseChunk(durableCqList, false, servConn);
+ sendDurableCqsResponseChunk(durableCqList, false, serverConnection);
durableCqList.clear();
}
}
// Send the last chunk even if the list is of zero size.
- sendDurableCqsResponseChunk(durableCqList, true, servConn);
+ sendDurableCqsResponseChunk(durableCqList, true, serverConnection);
} catch (CqException cqe) {
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(), cqe, servConn);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe,
+ serverConnection);
return;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
+ writeChunkedException(clientMessage, e, serverConnection);
return;
}
}
@@ -114,7 +116,7 @@ public class GetDurableCQs extends BaseCQCommand {
chunkedResponseMsg.setNumberOfParts(1);
chunkedResponseMsg.setLastChunk(lastChunk);
- chunkedResponseMsg.addObjPart(list, zipValues);
+ chunkedResponseMsg.addObjPart(list, false);
if (logger.isDebugEnabled()) {
logger.debug("{}: Sending {} durableCQs response chunk{}", servConn.getName(),
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java
index a8fec9f..5f0118b 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java
@@ -36,39 +36,42 @@ public class MonitorCQ extends BaseCQCommand {
private MonitorCQ() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
- int op = msg.getPart(0).getInt();
+ int op = clientMessage.getPart(0).getInt();
if (op < 1) {
// This should have been taken care at the client - remove?
String err = LocalizedStrings.MonitorCQ__0_THE_MONITORCQ_OPERATION_IS_INVALID
- .toLocalizedString(servConn.getName());
- sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg.getTransactionId(), null, servConn);
+ .toLocalizedString(serverConnection.getName());
+ sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null,
+ serverConnection);
return;
}
String regionName = null;
- if (msg.getNumberOfParts() == 2) {
+ if (clientMessage.getNumberOfParts() == 2) {
// This will be enable/disable on region.
- regionName = msg.getPart(1).getString();
+ regionName = clientMessage.getPart(1).getString();
if (regionName == null) {
// This should have been taken care at the client - remove?
String err =
LocalizedStrings.MonitorCQ__0_A_NULL_REGION_NAME_WAS_PASSED_FOR_MONITORCQ_OPERATION
- .toLocalizedString(servConn.getName());
- sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg.getTransactionId(), null,
- servConn);
+ .toLocalizedString(serverConnection.getName());
+ sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(),
+ null, serverConnection);
return;
}
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received MonitorCq request from {} op: {}{}", servConn.getName(),
- servConn.getSocketString(), op, (regionName != null) ? " RegionName: " + regionName : "");
+ logger.debug("{}: Received MonitorCq request from {} op: {}{}", serverConnection.getName(),
+ serverConnection.getSocketString(), op,
+ (regionName != null) ? " RegionName: " + regionName : "");
}
this.securityService.authorizeClusterRead();
@@ -85,12 +88,14 @@ public class MonitorCQ extends BaseCQCommand {
throw new CqException(
LocalizedStrings.CqService_INVALID_CQ_MONITOR_REQUEST_RECEIVED.toLocalizedString());
} catch (CqException cqe) {
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(), cqe, servConn);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe,
+ serverConnection);
return;
} catch (Exception e) {
String err = LocalizedStrings.MonitorCQ_EXCEPTION_WHILE_HANDLING_THE_MONITOR_REQUEST_OP_IS_0
.toLocalizedString(Integer.valueOf(op));
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, msg.getTransactionId(), e, servConn);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e,
+ serverConnection);
return;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java
index 94304d3..99fbef1 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java
@@ -44,30 +44,32 @@ public class StopCQ extends BaseCQCommand {
private StopCQ() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- ClientProxyMembershipID id = servConn.getProxyID();
- CacheServerStats stats = servConn.getCacheServerStats();
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ ClientProxyMembershipID id = serverConnection.getProxyID();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
// Based on MessageType.QUERY
// Added by Rao 2/1/2007
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
- String cqName = msg.getPart(0).getString();
+ String cqName = clientMessage.getPart(0).getString();
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received stop CQ request from {} cqName: {}", servConn.getName(),
- servConn.getSocketString(), cqName);
+ logger.debug("{}: Received stop CQ request from {} cqName: {}", serverConnection.getName(),
+ serverConnection.getSocketString(), cqName);
}
// Process the query request
if (cqName == null) {
String err =
LocalizedStrings.StopCQ_THE_CQNAME_FOR_THE_CQ_STOP_REQUEST_IS_NULL.toLocalizedString();
- sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg.getTransactionId(), null, servConn);
+ sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null,
+ serverConnection);
return;
}
@@ -86,7 +88,7 @@ public class StopCQ extends BaseCQCommand {
this.securityService.authorizeDataManage();
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
String queryStr = null;
Set cqRegionNames = null;
@@ -100,23 +102,25 @@ public class StopCQ extends BaseCQCommand {
}
cqService.stopCq(cqName, id);
if (cqQuery != null)
- servConn.removeCq(cqName, cqQuery.isDurable());
+ serverConnection.removeCq(cqName, cqQuery.isDurable());
} catch (CqException cqe) {
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(), cqe, servConn);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe,
+ serverConnection);
return;
} catch (Exception e) {
String err =
LocalizedStrings.StopCQ_EXCEPTION_WHILE_STOPPING_CQ_NAMED_0.toLocalizedString(cqName);
- sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, msg.getTransactionId(), e, servConn);
+ sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e,
+ serverConnection);
return;
}
// Send OK to client
sendCqResponse(MessageType.REPLY,
- LocalizedStrings.StopCQ_CQ_STOPPED_SUCCESSFULLY.toLocalizedString(), msg.getTransactionId(),
- null, servConn);
+ LocalizedStrings.StopCQ_CQ_STOPPED_SUCCESSFULLY.toLocalizedString(),
+ clientMessage.getTransactionId(), null, serverConnection);
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
{
long oldStart = start;
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UnitTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UnitTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UnitTest.java
index 5614212..58d12a0 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UnitTest.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UnitTest.java
@@ -20,7 +20,7 @@ package org.apache.geode.test.junit.categories;
*
* <p>
* <ul>
- * A {@code UnitTest} should <bold>not<bold> do any of the following:
+ * A {@code UnitTest} should <strong>not</strong> do any of the following:
* <li>communicate with a database
* <li>communicate across the network
* <li>access the file system
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java
new file mode 100644
index 0000000..5557f1b
--- /dev/null
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.test.junit.rules.serializable;
+
+import org.junit.rules.ErrorCollector;
+
+import java.io.Serializable;
+
+public class SerializableErrorCollector extends ErrorCollector implements Serializable {
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index f403447..702e6c8 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
+import static org.apache.geode.internal.cache.tier.sockets.Message.MAX_MESSAGE_SIZE_PROPERTY;
import static org.apache.geode.test.dunit.Assert.*;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -31,8 +33,8 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* DUnit test for operations on ParallelGatewaySender
@@ -40,6 +42,10 @@ import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
+ @Rule
+ public DistributedRestoreSystemProperties restoreSystemProperties =
+ new DistributedRestoreSystemProperties();
+
@Override
protected final void postSetUpWANTestBase() throws Exception {
IgnoredException.addIgnoredException("Broken pipe||Unexpected IOException");
@@ -582,13 +588,14 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
@Test
public void testParallelGatewaySenderMessageTooLargeException() {
+ vm4.invoke(() -> System.setProperty(MAX_MESSAGE_SIZE_PROPERTY, String.valueOf(1024 * 1024)));
+
Integer[] locatorPorts = createLNAndNYLocators();
Integer lnPort = locatorPorts[0];
Integer nyPort = locatorPorts[1];
// Create and start sender with reduced maximum message size and 1 dispatcher thread
String regionName = getTestMethodName() + "_PR";
- vm4.invoke(() -> setMaximumMessageSize(1024 * 1024));
vm4.invoke(() -> createCache(lnPort));
vm4.invoke(() -> setNumDispatcherThreadsForTheRun(1));
vm4.invoke(() -> createSender("ln", 2, true, 100, 100, false, false, null, false));
@@ -617,12 +624,6 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
ignoredGIOE.remove();
}
- private void setMaximumMessageSize(int maximumMessageSizeBytes) {
- Message.MAX_MESSAGE_SIZE = maximumMessageSizeBytes;
- LogWriterUtils.getLogWriter().info("Set gemfire.client.max-message-size: "
- + System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "client.max-message-size"));
- }
-
private void createSendersReceiversAndPartitionedRegion(Integer lnPort, Integer nyPort,
boolean createAccessors, boolean startSenders) {
// Note: This is a test-specific method used by several test to create
[33/35] geode git commit: milestone
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/security/EnabledSecurityService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/EnabledSecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/EnabledSecurityService.java
new file mode 100644
index 0000000..81d28be
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/EnabledSecurityService.java
@@ -0,0 +1,418 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.security.AccessController;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+import org.apache.commons.lang.SerializationException;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.ShiroException;
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.realm.Realm;
+import org.apache.shiro.session.mgt.DefaultSessionManager;
+import org.apache.shiro.session.mgt.SessionManager;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.support.SubjectThreadState;
+import org.apache.shiro.util.ThreadContext;
+import org.apache.shiro.util.ThreadState;
+
+import org.apache.geode.GemFireIOException;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.security.shiro.CustomAuthRealm;
+import org.apache.geode.internal.security.shiro.GeodeAuthenticationToken;
+import org.apache.geode.internal.security.shiro.ShiroPrincipal;
+import org.apache.geode.internal.util.BlobHelper;
+import org.apache.geode.management.internal.security.ResourceOperation;
+import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.security.GemFireSecurityException;
+import org.apache.geode.security.NotAuthorizedException;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.security.ResourcePermission.Operation;
+import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.security.SecurityManager;
+
+/**
+ * Security service with SecurityManager and an optional PostProcessor.
+ *
+ * TODO: rename EnabledSecurityService to IntegratedSecurityService
+ */
+public class EnabledSecurityService implements SecurityService {
+ private static Logger logger = LogService.getLogger(LogService.SECURITY_LOGGER_NAME);
+
+ private final SecurityManager securityManager;
+
+ private final PostProcessor postProcessor;
+
+ EnabledSecurityService(final SecurityManager securityManager, final PostProcessor postProcessor) {
+ this.securityManager = securityManager;
+ this.postProcessor = postProcessor;
+
+ // initialize Shiro
+ Realm realm = new CustomAuthRealm(securityManager);
+ DefaultSecurityManager shiroManager = new DefaultSecurityManager(realm);
+ SecurityUtils.setSecurityManager(shiroManager);
+ increaseShiroGlobalSessionTimeout(shiroManager);
+ }
+
+ @Override
+ public void initSecurity(final Properties securityProps) {
+ // nothing
+ }
+
+ @Override
+ public void setSecurityManager(final SecurityManager securityManager) {
+ // nothing
+ }
+
+ @Override
+ public void setPostProcessor(final PostProcessor postProcessor) {
+ // nothing
+ }
+
+ /**
+ * It first looks the shiro subject in AccessControlContext since JMX will use multiple threads to
+ * process operations from the same client, then it looks into Shiro's thead context.
+ *
+ * @return the shiro subject, null if security is not enabled
+ */
+ @Override
+ public Subject getSubject() {
+ Subject currentUser;
+
+ // First try get the principal out of AccessControlContext instead of Shiro's Thread context
+ // since threads can be shared between JMX clients.
+ javax.security.auth.Subject jmxSubject =
+ javax.security.auth.Subject.getSubject(AccessController.getContext());
+
+ if (jmxSubject != null) {
+ Set<ShiroPrincipal> principals = jmxSubject.getPrincipals(ShiroPrincipal.class);
+ if (!principals.isEmpty()) {
+ ShiroPrincipal principal = principals.iterator().next();
+ currentUser = principal.getSubject();
+ ThreadContext.bind(currentUser);
+ return currentUser;
+ }
+ }
+
+ // in other cases like rest call, client operations, we get it from the current thread
+ currentUser = SecurityUtils.getSubject();
+
+ if (currentUser == null || currentUser.getPrincipal() == null) {
+ throw new GemFireSecurityException("Error: Anonymous User");
+ }
+
+ return currentUser;
+ }
+
+ /**
+ * @return null if security is not enabled, otherwise return a shiro subject
+ */
+ @Override
+ public Subject login(final Properties credentials) {
+ if (credentials == null) {
+ return null;
+ }
+
+ // this makes sure it starts with a clean user object
+ ThreadContext.remove();
+
+ Subject currentUser = SecurityUtils.getSubject();
+ GeodeAuthenticationToken token = new GeodeAuthenticationToken(credentials);
+ try {
+ logger.info("Logging in " + token.getPrincipal());
+ currentUser.login(token);
+ } catch (ShiroException e) {
+ logger.info(e.getMessage(), e);
+ throw new AuthenticationFailedException(
+ "Authentication error. Please check your credentials.", e);
+ }
+
+ return currentUser;
+ }
+
+ @Override
+ public void logout() {
+ Subject currentUser = getSubject();
+ if (currentUser == null) {
+ return;
+ }
+
+ try {
+ logger.info("Logging out " + currentUser.getPrincipal());
+ currentUser.logout();
+ } catch (ShiroException e) {
+ logger.info(e.getMessage(), e);
+ throw new GemFireSecurityException(e.getMessage(), e);
+ }
+
+ // clean out Shiro's thread local content
+ ThreadContext.remove();
+ }
+
+ @Override // TODO: give Callable a type
+ public Callable associateWith(final Callable callable) {
+ Subject currentUser = getSubject();
+ if (currentUser == null) {
+ return callable;
+ }
+
+ return currentUser.associateWith(callable);
+ }
+
+ /**
+ * Binds the passed-in subject to the executing thread. Usage:
+ *
+ * <pre>
+ * ThreadState state = null;
+ * try {
+ * state = IntegratedSecurityService.bindSubject(subject);
+ * //do the rest of the work as this subject
+ * } finally {
+ * if(state!=null) state.clear();
+ * }
+ * </pre>
+ */
+ @Override
+ public ThreadState bindSubject(final Subject subject) {
+ if (subject == null) {
+ return null;
+ }
+
+ ThreadState threadState = new SubjectThreadState(subject);
+ threadState.bind();
+ return threadState;
+ }
+
+ @Override
+ public void authorize(final ResourceOperation resourceOperation) {
+ if (resourceOperation == null) {
+ return;
+ }
+
+ authorize(resourceOperation.resource().name(), resourceOperation.operation().name(), null);
+ }
+
+ @Override
+ public void authorizeClusterManage() {
+ authorize("CLUSTER", "MANAGE");
+ }
+
+ @Override
+ public void authorizeClusterWrite() {
+ authorize("CLUSTER", "WRITE");
+ }
+
+ @Override
+ public void authorizeClusterRead() {
+ authorize("CLUSTER", "READ");
+ }
+
+ @Override
+ public void authorizeDataManage() {
+ authorize("DATA", "MANAGE");
+ }
+
+ @Override
+ public void authorizeDataWrite() {
+ authorize("DATA", "WRITE");
+ }
+
+ @Override
+ public void authorizeDataRead() {
+ authorize("DATA", "READ");
+ }
+
+ @Override
+ public void authorizeRegionManage(final String regionName) {
+ authorize("DATA", "MANAGE", regionName);
+ }
+
+ @Override
+ public void authorizeRegionManage(final String regionName, final String key) {
+ authorize("DATA", "MANAGE", regionName, key);
+ }
+
+ @Override
+ public void authorizeRegionWrite(final String regionName) {
+ authorize("DATA", "WRITE", regionName);
+ }
+
+ @Override
+ public void authorizeRegionWrite(final String regionName, final String key) {
+ authorize("DATA", "WRITE", regionName, key);
+ }
+
+ @Override
+ public void authorizeRegionRead(final String regionName) {
+ authorize("DATA", "READ", regionName);
+ }
+
+ @Override
+ public void authorizeRegionRead(final String regionName, final String key) {
+ authorize("DATA", "READ", regionName, key);
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation) {
+ authorize(resource, operation, null);
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation, final String regionName) {
+ authorize(resource, operation, regionName, null);
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation, String regionName, final String key) {
+ regionName = StringUtils.stripStart(regionName, "/");
+ authorize(new ResourcePermission(resource, operation, regionName, key));
+ }
+
+ @Override
+ public void authorize(final ResourcePermission context) {
+ Subject currentUser = getSubject();
+ if (currentUser == null) {
+ return;
+ }
+ if (context == null) {
+ return;
+ }
+ if (context.getResource() == Resource.NULL && context.getOperation() == Operation.NULL) {
+ return;
+ }
+
+ try {
+ currentUser.checkPermission(context);
+ } catch (ShiroException e) {
+ String msg = currentUser.getPrincipal() + " not authorized for " + context;
+ logger.info(msg);
+ throw new NotAuthorizedException(msg, e);
+ }
+ }
+
+ @Override
+ public void close() {
+ if (this.securityManager != null) {
+ this.securityManager.close();
+ }
+
+ if (this.postProcessor != null) {
+ this.postProcessor.close();
+ }
+
+ ThreadContext.remove();
+ SecurityUtils.setSecurityManager(null);
+ }
+
+ /**
+ * postProcess call already has this logic built in, you don't need to call this everytime you
+ * call postProcess. But if your postProcess is pretty involved with preparations and you need to
+ * bypass it entirely, call this first.
+ */
+ @Override
+ public boolean needPostProcess() {
+ return this.postProcessor != null;
+ }
+
+ @Override
+ public Object postProcess(final String regionPath, final Object key, final Object value, final boolean valueIsSerialized) {
+ return postProcess(null, regionPath, key, value, valueIsSerialized);
+ }
+
+ @Override
+ public Object postProcess(Object principal, final String regionPath, final Object key, final Object value, final boolean valueIsSerialized) {
+ if (!needPostProcess()) {
+ return value;
+ }
+
+ if (principal == null) {
+ Subject subject = getSubject();
+ if (subject == null) {
+ return value;
+ }
+ principal = (Serializable) subject.getPrincipal();
+ }
+
+ String regionName = StringUtils.stripStart(regionPath, "/");
+ Object newValue;
+
+ // if the data is a byte array, but the data itself is supposed to be an object, we need to
+ // deserialize it before we pass it to the callback.
+ if (valueIsSerialized && value instanceof byte[]) {
+ try {
+ Object oldObj = EntryEventImpl.deserialize((byte[]) value);
+ Object newObj = this.postProcessor.processRegionValue(principal, regionName, key, oldObj);
+ newValue = BlobHelper.serializeToBlob(newObj);
+ } catch (IOException | SerializationException e) {
+ throw new GemFireIOException("Exception de/serializing entry value", e);
+ }
+ } else {
+ newValue = this.postProcessor.processRegionValue(principal, regionName, key, value);
+ }
+
+ return newValue;
+ }
+
+ @Override
+ public SecurityManager getSecurityManager() {
+ return this.securityManager;
+ }
+
+ @Override
+ public PostProcessor getPostProcessor() {
+ return this.postProcessor;
+ }
+
+ @Override
+ public boolean isIntegratedSecurity() {
+ return true;
+ }
+
+ @Override
+ public boolean isClientSecurityRequired() {
+ return true;
+ }
+
+ @Override
+ public boolean isPeerSecurityRequired() {
+ return true;
+ }
+
+ private void increaseShiroGlobalSessionTimeout(final DefaultSecurityManager shiroManager) {
+ SessionManager sessionManager = shiroManager.getSessionManager();
+ if (DefaultSessionManager.class.isInstance(sessionManager)) {
+ DefaultSessionManager defaultSessionManager = (DefaultSessionManager) sessionManager;
+ defaultSessionManager.setGlobalSessionTimeout(Long.MAX_VALUE);
+ long value = defaultSessionManager.getGlobalSessionTimeout();
+ if (value != Long.MAX_VALUE) {
+ logger.error("Unable to set Shiro Global Session Timeout. Current value is '{}'.", value);
+ }
+ } else {
+ logger.error("Unable to set Shiro Global Session Timeout. Current SessionManager is '{}'.",
+ sessionManager == null ? "null" : sessionManager.getClass());
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/security/LegacySecurityService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/LegacySecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/LegacySecurityService.java
new file mode 100644
index 0000000..0e8bdbe
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/LegacySecurityService.java
@@ -0,0 +1,218 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security;
+
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.util.Properties;
+import java.util.concurrent.Callable;
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.config.Ini.Section;
+import org.apache.shiro.config.IniSecurityManagerFactory;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadState;
+
+import org.apache.geode.management.internal.security.ResourceOperation;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.security.SecurityManager;
+
+/**
+ * Legacy security service with ClientAuthenticator and/or PeerAuthenticator.
+ */
+public class LegacySecurityService implements SecurityService {
+
+ private final boolean hasClientAuthenticator;
+
+ private final boolean hasPeerAuthenticator;
+
+ LegacySecurityService(final String clientAuthenticator, final String peerAuthenticator) {
+ this.hasClientAuthenticator = clientAuthenticator != null;
+ this.hasPeerAuthenticator = peerAuthenticator != null;
+ }
+
+ @Override
+ public void initSecurity(final Properties securityProps) {
+ // nothing
+ }
+
+ @Override
+ public void setSecurityManager(final SecurityManager securityManager) {
+ // nothing
+ }
+
+ @Override
+ public void setPostProcessor(final PostProcessor postProcessor) {
+ // nothing
+ }
+
+ @Override
+ public ThreadState bindSubject(final Subject subject) {
+ return null;
+ }
+
+ @Override
+ public Subject getSubject() {
+ return null;
+ }
+
+ @Override
+ public Subject login(final Properties credentials) {
+ return null;
+ }
+
+ @Override
+ public void logout() {
+ // nothing
+ }
+
+ @Override
+ public Callable associateWith(final Callable callable) {
+ return null;
+ }
+
+ @Override
+ public void authorize(final ResourceOperation resourceOperation) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeClusterManage() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeClusterWrite() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeClusterRead() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeDataManage() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeDataWrite() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeDataRead() {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionManage(final String regionName) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionManage(final String regionName, final String key) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionWrite(final String regionName) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionWrite(final String regionName, final String key) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionRead(final String regionName) {
+ // nothing
+ }
+
+ @Override
+ public void authorizeRegionRead(final String regionName, final String key) {
+ // nothing
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation) {
+ // nothing
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation, final String regionName) {
+ // nothing
+ }
+
+ @Override
+ public void authorize(final String resource, final String operation, final String regionName, final String key) {
+ // nothing
+ }
+
+ @Override
+ public void authorize(final ResourcePermission context) {
+ // nothing
+ }
+
+ @Override
+ public void close() {
+ // nothing
+ }
+
+ @Override
+ public boolean needPostProcess() {
+ return false;
+ }
+
+ @Override
+ public Object postProcess(final String regionPath, final Object key, final Object value, final boolean valueIsSerialized) {
+ return null;
+ }
+
+ @Override
+ public Object postProcess(final Object principal, final String regionPath, final Object key, final Object value, final boolean valueIsSerialized) {
+ return null;
+ }
+
+ @Override
+ public boolean isClientSecurityRequired() {
+ return this.hasClientAuthenticator;
+ }
+
+ @Override
+ public boolean isIntegratedSecurity() {
+ return false;
+ }
+
+ @Override
+ public boolean isPeerSecurityRequired() {
+ return this.hasPeerAuthenticator;
+ }
+
+ @Override
+ public SecurityManager getSecurityManager() {
+ return null;
+ }
+
+ @Override
+ public PostProcessor getPostProcessor() {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java
index 14784c3..1a5375a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java
@@ -30,6 +30,12 @@ import java.util.concurrent.Callable;
public interface SecurityService {
+ void initSecurity(Properties securityProps); // TODO:KIRK
+
+ void setSecurityManager(SecurityManager securityManager); // TODO:KIRK
+
+ void setPostProcessor(PostProcessor postProcessor); // TODO:KIRK
+
ThreadState bindSubject(Subject subject);
Subject getSubject();
@@ -74,8 +80,6 @@ public interface SecurityService {
void authorize(ResourcePermission context);
- void initSecurity(Properties securityProps);
-
void close();
boolean needPostProcess();
@@ -93,21 +97,17 @@ public interface SecurityService {
SecurityManager getSecurityManager();
- void setSecurityManager(SecurityManager securityManager);
-
PostProcessor getPostProcessor();
- void setPostProcessor(PostProcessor postProcessor);
-
/**
* this method would never return null, it either throws an exception or returns an object
*/
- public static <T> T getObjectOfTypeFromClassName(String className, Class<T> expectedClazz) {
- Class actualClass = null;
+ static <T> T getObjectOfTypeFromClassName(String className, Class<T> expectedClazz) {
+ Class actualClass;
try {
actualClass = ClassLoadUtil.classFromName(className);
- } catch (Exception ex) {
- throw new GemFireSecurityException("Instance could not be obtained, " + ex.toString(), ex);
+ } catch (Exception e) {
+ throw new GemFireSecurityException("Instance could not be obtained, " + e, e);
}
if (!expectedClazz.isAssignableFrom(actualClass)) {
@@ -115,22 +115,22 @@ public interface SecurityService {
"Instance could not be obtained. Expecting a " + expectedClazz.getName() + " class.");
}
- T actualObject = null;
try {
- actualObject = (T) actualClass.newInstance();
+ return (T) actualClass.newInstance();
} catch (Exception e) {
throw new GemFireSecurityException(
"Instance could not be obtained. Error instantiating " + actualClass.getName(), e);
}
- return actualObject;
}
/**
* this method would never return null, it either throws an exception or returns an object
+ *
+ * TODO: expectedClazz is unused
*/
- public static <T> T getObjectOfTypeFromFactoryMethod(String factoryMethodName,
+ static <T> T getObjectOfTypeFromFactoryMethod(String factoryMethodName,
Class<T> expectedClazz) {
- T actualObject = null;
+ T actualObject;
try {
Method factoryMethod = ClassLoadUtil.methodFromName(factoryMethodName);
actualObject = (T) factoryMethod.invoke(null, (Object[]) null);
@@ -153,17 +153,17 @@ public interface SecurityService {
* @return an object of type expectedClazz. This method would never return null. It either returns
* an non-null object or throws exception.
*/
- public static <T> T getObjectOfType(String classOrMethod, Class<T> expectedClazz) {
- T object = null;
+ static <T> T getObjectOfType(String classOrMethod, Class<T> expectedClazz) {
+ T object;
try {
object = getObjectOfTypeFromClassName(classOrMethod, expectedClazz);
- } catch (Exception e) {
+ } catch (Exception ignore) {
object = getObjectOfTypeFromFactoryMethod(classOrMethod, expectedClazz);
}
return object;
}
- public static Properties getCredentials(Properties securityProps) {
+ static Properties getCredentials(Properties securityProps) {
Properties credentials = null;
if (securityProps.containsKey(ResourceConstants.USER_NAME)
&& securityProps.containsKey(ResourceConstants.PASSWORD)) {
@@ -177,6 +177,7 @@ public interface SecurityService {
}
static SecurityService getSecurityService() {
+ // TODO:KIRK
return IntegratedSecurityService.getSecurityService();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
new file mode 100644
index 0000000..83781a7
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security;
+
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+
+import java.util.Properties;
+
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.cache.CacheConfig;
+import org.apache.geode.internal.security.shiro.ConfigInitialization;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.SecurityManager;
+
+public class SecurityServiceFactory {
+
+ private SecurityServiceFactory() {
+ // do not instantiate
+ }
+
+ public static SecurityService create(CacheConfig cacheConfig, DistributionConfig distributionConfig) {
+ Properties securityConfig = getSecurityConfig(distributionConfig);
+ SecurityManager securityManager = getSecurityManager(getSecurityManagerFromConfig(cacheConfig), securityConfig);
+ PostProcessor postProcessor = getPostProcessor(getPostProcessorFromConfig(cacheConfig), securityConfig);
+
+ SecurityService securityService = create(securityConfig, securityManager, postProcessor);
+ // securityService.initSecurity(distributionConfig.getSecurityProps());
+ return securityService;
+ }
+
+ static SecurityService create(Properties securityConfig, SecurityManager securityManager, PostProcessor postProcessor) {
+ SecurityServiceType type = determineType(securityConfig, securityManager);
+ switch (type) {
+ case CUSTOM:
+ String shiroConfig = securityConfig.getProperty(SECURITY_SHIRO_INIT);
+ ConfigInitialization configInitialization = new ConfigInitialization(shiroConfig);
+ configInitialization.initialize();
+ return new CustomSecurityService();
+ case ENABLED:
+ return new EnabledSecurityService(securityManager, postProcessor);
+ case LEGACY:
+ String clientAuthenticator = securityConfig.getProperty(SECURITY_CLIENT_AUTHENTICATOR);
+ String peerAuthenticator = securityConfig.getProperty(SECURITY_PEER_AUTHENTICATOR);
+ return new LegacySecurityService(clientAuthenticator, peerAuthenticator);
+ default:
+ return new DisabledSecurityService();
+ }
+ }
+
+ static SecurityServiceType determineType(Properties securityConfig, SecurityManager securityManager) {
+ boolean hasShiroConfig = securityConfig.getProperty(SECURITY_SHIRO_INIT) != null;
+ if (hasShiroConfig) {
+ return SecurityServiceType.CUSTOM;
+ }
+
+ boolean hasSecurityManager = securityManager != null;
+ if (hasSecurityManager) {
+ return SecurityServiceType.ENABLED;
+ }
+
+ boolean hasClientAuthenticator = securityConfig.getProperty(SECURITY_CLIENT_AUTHENTICATOR) != null;
+ boolean hasPeerAuthenticator = securityConfig.getProperty(SECURITY_PEER_AUTHENTICATOR) != null;
+ if (hasClientAuthenticator || hasPeerAuthenticator) {
+ return SecurityServiceType.LEGACY;
+ }
+
+ return SecurityServiceType.DISABLED;
+ }
+
+ static SecurityManager getSecurityManager(SecurityManager securityManager, Properties securityConfig) {
+ if (securityManager != null) {
+ return securityManager;
+ }
+
+ String securityManagerConfig = securityConfig.getProperty(SECURITY_MANAGER);
+ if (StringUtils.isNotBlank(securityManagerConfig)) {
+ securityManager = SecurityService.getObjectOfTypeFromClassName(securityManagerConfig, SecurityManager.class);
+ securityManager.init(securityConfig);
+ }
+
+ return securityManager;
+ }
+
+ static PostProcessor getPostProcessor(PostProcessor postProcessor, Properties securityConfig) {
+ if (postProcessor != null) {
+ return postProcessor;
+ }
+
+ String postProcessorConfig = securityConfig.getProperty(SECURITY_POST_PROCESSOR);
+ if (StringUtils.isNotBlank(postProcessorConfig)) {
+ postProcessor =
+ SecurityService.getObjectOfTypeFromClassName(postProcessorConfig, PostProcessor.class);
+ postProcessor.init(securityConfig);
+ }
+
+ return postProcessor;
+ }
+
+ private static Properties getSecurityConfig(DistributionConfig distributionConfig) {
+ if (distributionConfig == null) {
+ return new Properties();
+ }
+ return distributionConfig.getSecurityProps();
+ }
+
+ private static SecurityManager getSecurityManagerFromConfig(CacheConfig cacheConfig) {
+ if (cacheConfig == null) {
+ return null;
+ }
+ return cacheConfig.getSecurityManager();
+ }
+
+ private static PostProcessor getPostProcessorFromConfig(CacheConfig cacheConfig) {
+ if (cacheConfig == null) {
+ return null;
+ }
+ return cacheConfig.getPostProcessor();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceType.java b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceType.java
new file mode 100644
index 0000000..99df876
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceType.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security;
+
+public enum SecurityServiceType {
+ /** Integrated Security is Enabled */
+ ENABLED,
+ /** Security is Disabled */
+ DISABLED,
+ /** Legacy Security is Enabled */
+ LEGACY,
+ /** Shiro Config is specified */
+ CUSTOM
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/security/shiro/ConfigInitialization.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/shiro/ConfigInitialization.java b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/ConfigInitialization.java
new file mode 100644
index 0000000..18b5dca
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/ConfigInitialization.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security.shiro;
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.config.Ini.Section;
+import org.apache.shiro.config.IniSecurityManagerFactory;
+
+public class ConfigInitialization {
+
+ private final String shiroConfig;
+
+ public ConfigInitialization(String shiroConfig) {
+ this.shiroConfig = shiroConfig;
+ }
+
+ public void initialize() {
+ IniSecurityManagerFactory factory = new IniSecurityManagerFactory("classpath:" + this.shiroConfig);
+
+ // we will need to make sure that shiro uses a case sensitive permission resolver
+ Section main = factory.getIni().addSection("main");
+ main.put("geodePermissionResolver",
+ "org.apache.geode.internal.security.shiro.GeodePermissionResolver");
+ if (!main.containsKey("iniRealm.permissionResolver")) {
+ main.put("iniRealm.permissionResolver", "$geodePermissionResolver");
+ }
+
+ org.apache.shiro.mgt.SecurityManager securityManager = factory.getInstance();
+ SecurityUtils.setSecurityManager(securityManager);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/security/shiro/JMXShiroAuthenticator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/shiro/JMXShiroAuthenticator.java b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/JMXShiroAuthenticator.java
index 2a641d3..49d38f5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/shiro/JMXShiroAuthenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/JMXShiroAuthenticator.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.security.shiro;
-import static org.apache.geode.management.internal.security.ResourceConstants.*;
+import static org.apache.geode.management.internal.security.ResourceConstants.MISSING_CREDENTIALS_MESSAGE;
+
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.security.AuthenticationFailedException;
import java.security.Principal;
import java.util.Collections;
@@ -26,18 +30,16 @@ import javax.management.remote.JMXConnectionNotification;
import javax.management.remote.JMXPrincipal;
import javax.security.auth.Subject;
-import org.apache.geode.internal.security.IntegratedSecurityService;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.geode.security.AuthenticationFailedException;
-
/**
* this will make JMX authentication to use Shiro for Authentication
*/
-
public class JMXShiroAuthenticator implements JMXAuthenticator, NotificationListener {
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
+ private final SecurityService securityService;
+
+ public JMXShiroAuthenticator(SecurityService securityService) {
+ this.securityService = securityService;
+ }
@Override
public Subject authenticate(Object credentials) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
index 767cf94..55957b2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
@@ -19,6 +19,7 @@ import java.util.Map;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.management.DependenciesNotFoundException;
import org.apache.geode.management.internal.cli.CliUtil;
@@ -124,7 +125,7 @@ public abstract class CommandService {
.toLocalizedString(new Object[] {nonExistingDependency}));
}
- localCommandService = new MemberCommandService(cache);
+ localCommandService = new MemberCommandService((InternalCache) cache);
}
return localCommandService;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
index 3e6e4484..554dc66 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
@@ -91,7 +91,7 @@ public class ManagementAgent {
private JMXConnectorServer jmxConnectorServer;
private JMXShiroAuthenticator shiroAuthenticator;
private final DistributionConfig config;
- private SecurityService securityService = SecurityService.getSecurityService();
+ private final SecurityService securityService;
private boolean isHttpServiceRunning = false;
/**
@@ -103,8 +103,9 @@ public class ManagementAgent {
private static final String PULSE_USESSL_MANAGER = "pulse.useSSL.manager";
private static final String PULSE_USESSL_LOCATOR = "pulse.useSSL.locator";
- public ManagementAgent(DistributionConfig config) {
+ public ManagementAgent(DistributionConfig config, SecurityService securityService) {
this.config = config;
+ this.securityService = securityService;
}
public synchronized boolean isRunning() {
@@ -465,14 +466,14 @@ public class ManagementAgent {
};
if (securityService.isIntegratedSecurity()) {
- shiroAuthenticator = new JMXShiroAuthenticator();
+ shiroAuthenticator = new JMXShiroAuthenticator(this.securityService);
env.put(JMXConnectorServer.AUTHENTICATOR, shiroAuthenticator);
jmxConnectorServer.addNotificationListener(shiroAuthenticator, null,
jmxConnectorServer.getAttributes());
// always going to assume authorization is needed as well, if no custom AccessControl, then
// the CustomAuthRealm
// should take care of that
- MBeanServerWrapper mBeanServerWrapper = new MBeanServerWrapper();
+ MBeanServerWrapper mBeanServerWrapper = new MBeanServerWrapper(this.securityService);
jmxConnectorServer.setMBeanServerForwarder(mBeanServerWrapper);
registerAccessControlMBean();
} else {
@@ -501,7 +502,7 @@ public class ManagementAgent {
private void registerAccessControlMBean() {
try {
- AccessControlMBean acc = new AccessControlMBean();
+ AccessControlMBean acc = new AccessControlMBean(this.securityService);
ObjectName accessControlMBeanON = new ObjectName(ResourceConstants.OBJECT_NAME_ACCESSCONTROL);
MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
index fc8eb97..11402f1 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
@@ -144,7 +144,7 @@ public class SystemManagementService extends BaseManagementService {
this.notificationHub = new NotificationHub(repo);
if (system.getConfig().getJmxManager()) {
- this.agent = new ManagementAgent(system.getConfig());
+ this.agent = new ManagementAgent(system.getConfig(), cache.getSecurityService());
} else {
this.agent = null;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
index 26b903b..31d6c0a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
@@ -50,7 +50,6 @@ import java.util.Set;
*/
@SuppressWarnings("unused")
public abstract class AbstractCommandsSupport implements CommandMarker {
- protected static SecurityService securityService = SecurityService.getSecurityService();
protected static void assertArgument(final boolean valid, final String message,
final Object... args) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
index 6e1a74e..d829b3e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
@@ -89,8 +89,6 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
public static final Set<RegionShortcut> PERSISTENT_OVERFLOW_SHORTCUTS = new TreeSet<>();
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
-
static {
PERSISTENT_OVERFLOW_SHORTCUTS.add(RegionShortcut.PARTITION_PERSISTENT);
PERSISTENT_OVERFLOW_SHORTCUTS.add(RegionShortcut.PARTITION_REDUNDANT_PERSISTENT);
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
index a38e545..696108e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
@@ -33,8 +33,6 @@ import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.partition.PartitionRebalanceInfo;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.security.IntegratedSecurityService;
-import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.DistributedRegionMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.cli.CliMetaData;
@@ -49,6 +47,7 @@ import org.apache.geode.management.internal.cli.functions.DataCommandFunction;
import org.apache.geode.management.internal.cli.functions.ExportDataFunction;
import org.apache.geode.management.internal.cli.functions.ImportDataFunction;
import org.apache.geode.management.internal.cli.functions.RebalanceFunction;
+import org.apache.geode.management.internal.cli.functions.SelectExecStep;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.multistep.CLIMultiStepHelper;
import org.apache.geode.management.internal.cli.multistep.CLIStep;
@@ -93,8 +92,6 @@ public class DataCommands implements CommandMarker {
private final ImportDataFunction importDataFunction = new ImportDataFunction();
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
-
private Gfsh getGfsh() {
return Gfsh.getCurrentInstance();
}
@@ -750,7 +747,7 @@ public class DataCommands implements CommandMarker {
optionContext = ConverterHint.MEMBERIDNAME, mandatory = true,
help = CliStrings.EXPORT_DATA__MEMBER__HELP) String memberNameOrId) {
- this.securityService.authorizeRegionRead(regionName);
+ getCache().getSecurityService().authorizeRegionRead(regionName);
final DistributedMember targetMember = CliUtil.getDistributedMemberByNameOrId(memberNameOrId);
Result result;
@@ -808,7 +805,7 @@ public class DataCommands implements CommandMarker {
@CliOption(key = CliStrings.IMPORT_DATA__INVOKE_CALLBACKS, unspecifiedDefaultValue = "false",
help = CliStrings.IMPORT_DATA__INVOKE_CALLBACKS__HELP) boolean invokeCallbacks) {
- this.securityService.authorizeRegionWrite(regionName);
+ getCache().getSecurityService().authorizeRegionWrite(regionName);
Result result;
@@ -869,8 +866,8 @@ public class DataCommands implements CommandMarker {
@CliOption(key = {CliStrings.PUT__PUTIFABSENT}, help = CliStrings.PUT__PUTIFABSENT__HELP,
unspecifiedDefaultValue = "false") boolean putIfAbsent) {
- this.securityService.authorizeRegionWrite(regionPath);
InternalCache cache = getCache();
+ cache.getSecurityService().authorizeRegionWrite(regionPath);
DataCommandResult dataResult;
if (StringUtils.isEmpty(regionPath)) {
return makePresentationResult(DataCommandResult.createPutResult(key, null, null,
@@ -940,9 +937,9 @@ public class DataCommands implements CommandMarker {
@CliOption(key = CliStrings.GET__LOAD, unspecifiedDefaultValue = "true",
specifiedDefaultValue = "true",
help = CliStrings.GET__LOAD__HELP) Boolean loadOnCacheMiss) {
- this.securityService.authorizeRegionRead(regionPath, key);
InternalCache cache = getCache();
+ cache.getSecurityService().authorizeRegionRead(regionPath, key);
DataCommandResult dataResult;
if (StringUtils.isEmpty(regionPath)) {
@@ -968,7 +965,7 @@ public class DataCommands implements CommandMarker {
request.setRegionName(regionPath);
request.setValueClass(valueClass);
request.setLoadOnCacheMiss(loadOnCacheMiss);
- Subject subject = this.securityService.getSubject();
+ Subject subject = cache.getSecurityService().getSubject();
if (subject != null) {
request.setPrincipal(subject.getPrincipal());
}
@@ -1005,7 +1002,7 @@ public class DataCommands implements CommandMarker {
help = CliStrings.LOCATE_ENTRY__RECURSIVE__HELP,
unspecifiedDefaultValue = "false") boolean recursive) {
- this.securityService.authorizeRegionRead(regionPath, key);
+ getCache().getSecurityService().authorizeRegionRead(regionPath, key);
DataCommandResult dataResult;
@@ -1068,9 +1065,9 @@ public class DataCommands implements CommandMarker {
}
if (removeAllKeys) {
- this.securityService.authorizeRegionWrite(regionPath);
+ cache.getSecurityService().authorizeRegionWrite(regionPath);
} else {
- this.securityService.authorizeRegionWrite(regionPath, key);
+ cache.getSecurityService().authorizeRegionWrite(regionPath, key);
}
@SuppressWarnings("rawtypes")
@@ -1116,7 +1113,7 @@ public class DataCommands implements CommandMarker {
}
Object[] arguments = new Object[] {query, stepName, interactive};
- CLIStep exec = new DataCommandFunction.SelectExecStep(arguments);
+ CLIStep exec = new SelectExecStep(arguments);
CLIStep display = new DataCommandFunction.SelectDisplayStep(arguments);
CLIStep move = new DataCommandFunction.SelectMoveStep(arguments);
CLIStep quit = new DataCommandFunction.SelectQuitStep(arguments);
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
index 407424a..51e378a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
@@ -84,8 +84,6 @@ public class IndexCommands extends AbstractCommandsSupport {
private static final Set<IndexInfo> indexDefinitions =
Collections.synchronizedSet(new HashSet<IndexInfo>());
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
-
@Override
protected Set<DistributedMember> getMembers(final InternalCache cache) {
// TODO determine what this does (as it is untested and unmockable!)
@@ -202,7 +200,7 @@ public class IndexCommands extends AbstractCommandsSupport {
Result result = null;
AtomicReference<XmlEntity> xmlEntity = new AtomicReference<>();
- this.securityService.authorizeRegionManage(regionPath);
+ getCache().getSecurityService().authorizeRegionManage(regionPath);
try {
final Cache cache = CacheFactory.getAnyInstance();
@@ -361,9 +359,9 @@ public class IndexCommands extends AbstractCommandsSupport {
// requires data manage permission on all regions
if (StringUtils.isNotBlank(regionPath)) {
regionName = regionPath.startsWith("/") ? regionPath.substring(1) : regionPath;
- this.securityService.authorizeRegionManage(regionName);
+ getCache().getSecurityService().authorizeRegionManage(regionName);
} else {
- this.securityService.authorizeDataManage();
+ getCache().getSecurityService().authorizeDataManage();
}
IndexInfo indexInfo = new IndexInfo(indexName, regionName);
@@ -485,7 +483,7 @@ public class IndexCommands extends AbstractCommandsSupport {
Result result = null;
XmlEntity xmlEntity = null;
- this.securityService.authorizeRegionManage(regionPath);
+ getCache().getSecurityService().authorizeRegionManage(regionPath);
int idxType = IndexInfo.RANGE_INDEX;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
index e2164a3..9270a94 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
@@ -94,9 +94,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
protected static final String SELECT_STEP_EXEC = "SELECT_EXEC";
private static final int NESTED_JSON_LENGTH = 20;
- // this needs to be static so that it won't get serialized
- private static SecurityService securityService = SecurityService.getSecurityService();
-
@Override
public String getId() {
return DataCommandFunction.class.getName();
@@ -296,7 +293,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
List<SelectResultRow> list, AtomicInteger nestedObjectCount) throws GfJsonException {
for (Object object : selectResults) {
// Post processing
- object = securityService.postProcess(principal, null, null, object, false);
+ object = getCache().getSecurityService().postProcess(principal, null, null, object, false);
if (object instanceof Struct) {
StructImpl impl = (StructImpl) object;
@@ -836,7 +833,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
return list;
}
- private static DataCommandResult cachedResult = null;
+ static DataCommandResult cachedResult = null;
public static class SelectDisplayStep extends CLIMultiStepHelper.LocalStep {
@@ -915,107 +912,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
}
}
- public static class SelectExecStep extends CLIMultiStepHelper.RemoteStep {
-
- private static final long serialVersionUID = 1L;
-
- private static SecurityService securityService = SecurityService.getSecurityService();
-
- public SelectExecStep(Object[] arguments) {
- super(SELECT_STEP_EXEC, arguments);
- }
-
- @Override
- public Result exec() {
- String remainingQuery = (String) commandArguments[0];
- boolean interactive = (Boolean) commandArguments[2];
- DataCommandResult result = _select(remainingQuery);
- int endCount = 0;
- cachedResult = result;
- if (interactive) {
- endCount = getPageSize();
- } else {
- if (result.getSelectResult() != null) {
- endCount = result.getSelectResult().size();
- }
- }
- if (interactive) {
- return result.pageResult(0, endCount, SELECT_STEP_DISPLAY);
- } else {
- return CLIMultiStepHelper.createBannerResult(new String[] {}, new Object[] {},
- SELECT_STEP_END);
- }
- }
-
- public DataCommandResult _select(String query) {
- InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
- DataCommandResult dataResult;
-
- if (StringUtils.isEmpty(query)) {
- dataResult = DataCommandResult.createSelectInfoResult(null, null, -1, null,
- CliStrings.QUERY__MSG__QUERY_EMPTY, false);
- return dataResult;
- }
-
- Object array[] = DataCommands.replaceGfshEnvVar(query, CommandExecutionContext.getShellEnv());
- query = (String) array[1];
- query = addLimit(query);
-
- @SuppressWarnings("deprecation")
- QCompiler compiler = new QCompiler();
- Set<String> regionsInQuery;
- try {
- CompiledValue compiledQuery = compiler.compileQuery(query);
- Set<String> regions = new HashSet<>();
- compiledQuery.getRegionsInQuery(regions, null);
-
- // authorize data read on these regions
- for (String region : regions) {
- securityService.authorizeRegionRead(region);
- }
-
- regionsInQuery = Collections.unmodifiableSet(regions);
- if (regionsInQuery.size() > 0) {
- Set<DistributedMember> members =
- DataCommands.getQueryRegionsAssociatedMembers(regionsInQuery, cache, false);
- if (members != null && members.size() > 0) {
- DataCommandFunction function = new DataCommandFunction();
- DataCommandRequest request = new DataCommandRequest();
- request.setCommand(CliStrings.QUERY);
- request.setQuery(query);
- Subject subject = securityService.getSubject();
- if (subject != null) {
- request.setPrincipal(subject.getPrincipal());
- }
- dataResult = DataCommands.callFunctionForRegion(request, function, members);
- dataResult.setInputQuery(query);
- return dataResult;
- } else {
- return DataCommandResult.createSelectInfoResult(null, null, -1, null, CliStrings.format(
- CliStrings.QUERY__MSG__REGIONS_NOT_FOUND, regionsInQuery.toString()), false);
- }
- } else {
- return DataCommandResult.createSelectInfoResult(null, null, -1, null,
- CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY,
- "Region mentioned in query probably missing /"),
- false);
- }
- } catch (QueryInvalidException qe) {
- logger.error("{} Failed Error {}", query, qe.getMessage(), qe);
- return DataCommandResult.createSelectInfoResult(null, null, -1, null,
- CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY, qe.getMessage()), false);
- }
- }
-
- private String addLimit(String query) {
- if (StringUtils.containsIgnoreCase(query, " limit")
- || StringUtils.containsIgnoreCase(query, " count(")) {
- return query;
- }
- return query + " limit " + getFetchSize();
- }
- }
-
public static class SelectQuitStep extends CLIMultiStepHelper.RemoteStep {
public SelectQuitStep(Object[] arguments) {
@@ -1063,7 +959,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
return pageSize;
}
- private static int getFetchSize() {
+ static int getFetchSize() {
return CommandExecutionContext.getShellFetchSize();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SelectExecStep.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SelectExecStep.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SelectExecStep.java
new file mode 100644
index 0000000..bd58534
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SelectExecStep.java
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.management.internal.cli.functions;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.query.QueryInvalidException;
+import org.apache.geode.cache.query.internal.CompiledValue;
+import org.apache.geode.cache.query.internal.QCompiler;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.management.cli.Result;
+import org.apache.geode.management.internal.cli.commands.DataCommands;
+import org.apache.geode.management.internal.cli.domain.DataCommandRequest;
+import org.apache.geode.management.internal.cli.domain.DataCommandResult;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.cli.multistep.CLIMultiStepHelper;
+import org.apache.geode.management.internal.cli.remote.CommandExecutionContext;
+import org.apache.logging.log4j.Logger;
+import org.apache.shiro.subject.Subject;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public class SelectExecStep extends CLIMultiStepHelper.RemoteStep {
+ private static final Logger logger = LogService.getLogger();
+
+ private static final long serialVersionUID = 1L;
+
+ public SelectExecStep(Object[] arguments) {
+ super(DataCommandFunction.SELECT_STEP_EXEC, arguments);
+ }
+
+ @Override
+ public Result exec() {
+ String remainingQuery = (String) commandArguments[0];
+ boolean interactive = (Boolean) commandArguments[2];
+ DataCommandResult result = _select(remainingQuery);
+ int endCount = 0;
+ DataCommandFunction.cachedResult = result;
+ if (interactive) {
+ endCount = DataCommandFunction.getPageSize();
+ } else {
+ if (result.getSelectResult() != null) {
+ endCount = result.getSelectResult().size();
+ }
+ }
+ if (interactive) {
+ return result.pageResult(0, endCount, DataCommandFunction.SELECT_STEP_DISPLAY);
+ } else {
+ return CLIMultiStepHelper.createBannerResult(new String[] {}, new Object[] {},
+ DataCommandFunction.SELECT_STEP_END);
+ }
+ }
+
+ public DataCommandResult _select(String query) {
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
+ DataCommandResult dataResult;
+
+ if (StringUtils.isEmpty(query)) {
+ dataResult = DataCommandResult.createSelectInfoResult(null, null, -1, null,
+ CliStrings.QUERY__MSG__QUERY_EMPTY, false);
+ return dataResult;
+ }
+
+ Object array[] = DataCommands.replaceGfshEnvVar(query, CommandExecutionContext.getShellEnv());
+ query = (String) array[1];
+ query = addLimit(query);
+
+ @SuppressWarnings("deprecation")
+ QCompiler compiler = new QCompiler();
+ Set<String> regionsInQuery;
+ try {
+ CompiledValue compiledQuery = compiler.compileQuery(query);
+ Set<String> regions = new HashSet<>();
+ compiledQuery.getRegionsInQuery(regions, null);
+
+ // authorize data read on these regions
+ for (String region : regions) {
+ cache.getSecurityService().authorizeRegionRead(region);
+ }
+
+ regionsInQuery = Collections.unmodifiableSet(regions);
+ if (regionsInQuery.size() > 0) {
+ Set<DistributedMember> members =
+ DataCommands.getQueryRegionsAssociatedMembers(regionsInQuery, cache, false);
+ if (members != null && members.size() > 0) {
+ DataCommandFunction function = new DataCommandFunction();
+ DataCommandRequest request = new DataCommandRequest();
+ request.setCommand(CliStrings.QUERY);
+ request.setQuery(query);
+ Subject subject = cache.getSecurityService().getSubject();
+ if (subject != null) {
+ request.setPrincipal(subject.getPrincipal());
+ }
+ dataResult = DataCommands.callFunctionForRegion(request, function, members);
+ dataResult.setInputQuery(query);
+ return dataResult;
+ } else {
+ return DataCommandResult.createSelectInfoResult(null, null, -1, null, CliStrings.format(
+ CliStrings.QUERY__MSG__REGIONS_NOT_FOUND, regionsInQuery.toString()), false);
+ }
+ } else {
+ return DataCommandResult.createSelectInfoResult(null, null, -1, null,
+ CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY,
+ "Region mentioned in query probably missing /"),
+ false);
+ }
+ } catch (QueryInvalidException qe) {
+ logger.error("{} Failed Error {}", query, qe.getMessage(), qe);
+ return DataCommandResult.createSelectInfoResult(null, null, -1, null,
+ CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY, qe.getMessage()), false);
+ }
+ }
+
+ private String addLimit(String query) {
+ if (StringUtils.containsIgnoreCase(query, " limit")
+ || StringUtils.containsIgnoreCase(query, " count(")) {
+ return query;
+ }
+ return query + " limit " + DataCommandFunction.getFetchSize();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandProcessor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandProcessor.java
index c2c6e14..f7d78cc 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandProcessor.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.management.internal.cli.remote;
+import org.apache.geode.internal.security.DisabledSecurityService;
import org.apache.geode.internal.security.IntegratedSecurityService;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.cli.CommandProcessingException;
@@ -49,16 +50,17 @@ public class CommandProcessor {
private volatile boolean isStopped = false;
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
+ private final SecurityService securityService;
public CommandProcessor() throws ClassNotFoundException, IOException {
- this(null);
+ this(null, new DisabledSecurityService());
}
- public CommandProcessor(Properties cacheProperties) throws ClassNotFoundException, IOException {
+ public CommandProcessor(Properties cacheProperties, SecurityService securityService) throws ClassNotFoundException, IOException {
this.gfshParser = new GfshParser(cacheProperties);
this.executionStrategy = new RemoteExecutionStrategy();
this.logWrapper = LogWrapper.getInstance();
+ this.securityService = securityService;
}
protected RemoteExecutionStrategy getExecutionStrategy() {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/MemberCommandService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/MemberCommandService.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/MemberCommandService.java
index a19c5cb..1d7494e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/MemberCommandService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/MemberCommandService.java
@@ -18,6 +18,7 @@ import java.io.IOException;
import java.util.Map;
import org.apache.geode.cache.Cache;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.CommandService;
import org.apache.geode.management.cli.CommandServiceException;
import org.apache.geode.management.cli.CommandStatement;
@@ -28,10 +29,10 @@ import org.apache.geode.management.cli.Result;
public class MemberCommandService extends CommandService {
private final Object modLock = new Object();
- private Cache cache;
+ private InternalCache cache;
private CommandProcessor commandProcessor;
- public MemberCommandService(Cache cache) throws CommandServiceException {
+ public MemberCommandService(InternalCache cache) throws CommandServiceException {
this.cache = cache;
try {
this.commandProcessor = new CommandProcessor(cache.getDistributedSystem().getProperties());
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMBean.java
index 6514a33..dbc6c6b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/security/AccessControlMBean.java
@@ -26,7 +26,11 @@ import org.apache.geode.security.GemFireSecurityException;
*/
public class AccessControlMBean implements AccessControlMXBean {
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
+ private final SecurityService securityService;
+
+ public AccessControlMBean(SecurityService securityService) {
+ this.securityService = securityService;
+ }
@Override
public boolean authorize(String resource, String permission) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/security/MBeanServerWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/security/MBeanServerWrapper.java b/geode-core/src/main/java/org/apache/geode/management/internal/security/MBeanServerWrapper.java
index fe79efb..345d688 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/security/MBeanServerWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/security/MBeanServerWrapper.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.management.internal.security;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.management.internal.ManagementConstants;
+import org.apache.geode.security.GemFireSecurityException;
+import org.apache.geode.security.ResourcePermission;
+
import java.io.ObjectInputStream;
import java.util.Set;
import javax.management.Attribute;
@@ -42,25 +47,22 @@ import javax.management.ReflectionException;
import javax.management.loading.ClassLoaderRepository;
import javax.management.remote.MBeanServerForwarder;
-import org.apache.geode.internal.security.IntegratedSecurityService;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.management.internal.ManagementConstants;
-import org.apache.geode.security.GemFireSecurityException;
-import org.apache.geode.security.ResourcePermission;
-
/**
* This class intercepts all MBean requests for GemFire MBeans and passed it to
* ManagementInterceptor for authorization
*
* @since Geode 1.0
- *
*/
public class MBeanServerWrapper implements MBeanServerForwarder {
+
+ // TODO: make volatile or verify this is thread-safe
private MBeanServer mbs;
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
+ private final SecurityService securityService;
- public MBeanServerWrapper() {}
+ public MBeanServerWrapper(SecurityService securityService) {
+ this.securityService = securityService;
+ }
private void checkDomain(ObjectName name) {
if (ManagementConstants.OBJECTNAME__DEFAULTDOMAIN.equals(name.getDomain()))
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
index 54c29f8..0a18ec5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.management.internal.web.controllers;
import org.apache.geode.internal.cache.GemFireCacheImpl;
@@ -20,8 +19,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.geode.internal.security.IntegratedSecurityService;
-import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.util.ArrayUtils;
import org.apache.geode.management.DistributedSystemMXBean;
import org.apache.geode.management.ManagementService;
@@ -85,8 +82,6 @@ public abstract class AbstractCommandsController {
private MemberMXBean managingMemberMXBeanProxy;
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
-
private Class accessControlKlass;
private InternalCache getCache() {
@@ -576,10 +571,9 @@ public abstract class AbstractCommandsController {
return new ResponseEntity<String>(result, HttpStatus.OK);
}
};
- return this.securityService.associateWith(callable);
+ return getCache().getSecurityService().associateWith(callable);
}
-
/**
* Executes the specified command as entered by the user using the GemFire Shell (Gfsh). Note,
* Gfsh performs validation of the command during parsing before sending the command to the
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
index 56d9b9e..ffe1895 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptor.java
@@ -14,10 +14,11 @@
*/
package org.apache.geode.management.internal.web.controllers.support;
-import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.security.IntegratedSecurityService;
+import org.apache.geode.internal.security.DisabledSecurityService;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.cli.multistep.CLIMultiStepHelper;
import org.apache.geode.management.internal.security.ResourceConstants;
@@ -48,9 +49,7 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter {
private static final Logger logger = LogService.getLogger();
- private Cache cache;
-
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
+ private final SecurityService securityService;
private static final ThreadLocal<Map<String, String>> ENV =
new ThreadLocal<Map<String, String>>() {
@@ -65,10 +64,26 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter {
protected static final String SECURITY_VARIABLE_REQUEST_HEADER_PREFIX =
DistributionConfig.SECURITY_PREFIX_NAME;
+ public LoginHandlerInterceptor() {
+ this(findSecurityService());
+ }
+
+ LoginHandlerInterceptor(SecurityService securityService) {
+ this.securityService = securityService;
+ }
+
public static Map<String, String> getEnvironment() {
return ENV.get();
}
+ private static SecurityService findSecurityService() {
+ InternalCache cache = GemFireCacheImpl.getInstance();
+ if (cache != null) {
+ return cache.getSecurityService();
+ }
+ return new DisabledSecurityService();
+ }
+
@Override
public boolean preHandle(final HttpServletRequest request, final HttpServletResponse response,
final Object handler) throws Exception {
@@ -104,11 +119,6 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter {
return true;
}
- public void setSecurityService(SecurityService securityService) {
- this.securityService = securityService;
- }
-
-
@Override
public void afterCompletion(final HttpServletRequest request, final HttpServletResponse response,
final Object handler, final Exception ex) throws Exception {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/security/PostProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/security/PostProcessor.java b/geode-core/src/main/java/org/apache/geode/security/PostProcessor.java
index 707e3cf..bad58d8 100644
--- a/geode-core/src/main/java/org/apache/geode/security/PostProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/security/PostProcessor.java
@@ -28,7 +28,7 @@ public interface PostProcessor {
* Given the security props of the server, properly initialize the post processor for the server.
* Initialized at cache creation
*
- * @param securityProps
+ * @param securityProps security properties
*/
default void init(Properties securityProps) {}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
index d0f5793..ee8b6fa 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
@@ -390,7 +390,8 @@ public class BlockingHARegionJUnitTest {
}
} catch (Exception e) {
exceptionOccurred = true;
- exceptionString.append(" Exception occurred due to " + e);
+ exceptionString.append(" Exception occurred due to ").append(e);
+ break;
}
}
}
@@ -414,9 +415,13 @@ public class BlockingHARegionJUnitTest {
for (int i = 0; i < numberOfTakes; i++) {
try {
assertNotNull(this.regionQueue.take());
+ if (Thread.currentThread().isInterrupted()) {
+ break;
+ }
} catch (Exception e) {
exceptionOccurred = true;
- exceptionString.append(" Exception occurred due to " + e);
+ exceptionString.append(" Exception occurred due to ").append(e);
+ break;
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
index 3a6c2a3..5b71065 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
@@ -100,7 +100,7 @@ public class ContainsKey66Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.containsKey66.cmdExecute(this.message, this.serverConnection, 0);
+ this.containsKey66.cmdExecute(, this.message, 0);
verify(this.responseMessage).send(this.serverConnection);
}
@@ -110,7 +110,7 @@ public class ContainsKey66Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.containsKey66.cmdExecute(this.message, this.serverConnection, 0);
+ this.containsKey66.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.responseMessage).send(this.serverConnection);
@@ -123,7 +123,7 @@ public class ContainsKey66Test {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME), eq(KEY));
- this.containsKey66.cmdExecute(this.message, this.serverConnection, 0);
+ this.containsKey66.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
@@ -134,7 +134,7 @@ public class ContainsKey66Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.containsKey66.cmdExecute(this.message, this.serverConnection, 0);
+ this.containsKey66.cmdExecute(, this.message, 0);
verify(this.authzRequest).containsKeyAuthorize(eq(REGION_NAME), eq(KEY));
verify(this.responseMessage).send(this.serverConnection);
@@ -147,7 +147,7 @@ public class ContainsKey66Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.containsKeyAuthorize(eq(REGION_NAME), eq(KEY));
- this.containsKey66.cmdExecute(this.message, this.serverConnection, 0);
+ this.containsKey66.cmdExecute(, this.message, 0);
verify(this.authzRequest).containsKeyAuthorize(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
index bc1be3e..625d37a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
@@ -88,7 +88,7 @@ public class ContainsKeyTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- containsKey.cmdExecute(this.message, this.serverConnection, 0);
+ containsKey.cmdExecute(, this.message, 0);
verify(this.replyMessage).send(this.serverConnection);
}
@@ -98,7 +98,7 @@ public class ContainsKeyTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- containsKey.cmdExecute(this.message, this.serverConnection, 0);
+ containsKey.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.replyMessage).send(this.serverConnection);
@@ -111,7 +111,7 @@ public class ContainsKeyTest {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME), eq(KEY));
- containsKey.cmdExecute(this.message, this.serverConnection, 0);
+ containsKey.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
@@ -123,7 +123,7 @@ public class ContainsKeyTest {
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- containsKey.cmdExecute(this.message, this.serverConnection, 0);
+ containsKey.cmdExecute(, this.message, 0);
verify(this.authzRequest).containsKeyAuthorize(eq(REGION_NAME), eq(KEY));
verify(this.replyMessage).send(this.serverConnection);
@@ -136,7 +136,7 @@ public class ContainsKeyTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.containsKeyAuthorize(eq(REGION_NAME), eq(KEY));
- containsKey.cmdExecute(this.message, this.serverConnection, 0);
+ containsKey.cmdExecute(, this.message, 0);
verify(this.authzRequest).containsKeyAuthorize(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
index c946e8a..3d8f264 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
@@ -98,7 +98,7 @@ public class CreateRegionTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.createRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.createRegion.cmdExecute(, this.message, 0);
verify(this.responseMessage).send(this.serverConnection);
}
@@ -110,7 +110,7 @@ public class CreateRegionTest {
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
// act
- this.createRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.createRegion.cmdExecute(, this.message, 0);
// assert
verify(this.securityService).authorizeDataManage();
@@ -123,7 +123,7 @@ public class CreateRegionTest {
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
doThrow(new NotAuthorizedException("")).when(this.securityService).authorizeDataManage();
- this.createRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.createRegion.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeDataManage();
verify(this.errorResponseMessage).send(eq(this.serverConnection));
@@ -134,7 +134,7 @@ public class CreateRegionTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.createRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.createRegion.cmdExecute(, this.message, 0);
verify(this.authzRequest).createRegionAuthorize(eq(PARENT_REGION_NAME + '/' + REGION_NAME));
verify(this.responseMessage).send(this.serverConnection);
@@ -147,7 +147,7 @@ public class CreateRegionTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.createRegionAuthorize(eq(PARENT_REGION_NAME + '/' + REGION_NAME));
- this.createRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.createRegion.cmdExecute(, this.message, 0);
verify(this.authzRequest).createRegionAuthorize(eq(PARENT_REGION_NAME + '/' + REGION_NAME));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
[21/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
index f7baba4..6f97d31 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java
@@ -52,15 +52,16 @@ public class Request extends BaseCommand {
Request() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
Part regionNamePart = null, keyPart = null, valuePart = null;
String regionName = null;
Object callbackArg = null, key = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
StringId errMessage = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
// requiresResponse = true;
{
long oldStart = start;
@@ -68,18 +69,18 @@ public class Request extends BaseCommand {
stats.incReadGetRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- int parts = msg.getNumberOfParts();
- regionNamePart = msg.getPart(0);
- keyPart = msg.getPart(1);
+ int parts = clientMessage.getNumberOfParts();
+ regionNamePart = clientMessage.getPart(0);
+ keyPart = clientMessage.getPart(1);
// valuePart = null; (redundant assignment)
if (parts > 2) {
- valuePart = msg.getPart(2);
+ valuePart = clientMessage.getPart(2);
try {
callbackArg = valuePart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
// responded = true;
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -87,15 +88,15 @@ public class Request extends BaseCommand {
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
// responded = true;
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
logger.debug("{}: Received get request ({} bytes) from {} for region {} key {} txId {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName, key,
- msg.getTransactionId());
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key, clientMessage.getTransactionId());
}
// Process the get request
@@ -109,31 +110,31 @@ public class Request extends BaseCommand {
errMessage = LocalizedStrings.Request_THE_INPUT_REGION_NAME_FOR_THE_GET_REQUEST_IS_NULL;
}
String s = errMessage.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), s);
- writeErrorResponse(msg, MessageType.REQUESTDATAERROR, s, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), s);
+ writeErrorResponse(clientMessage, MessageType.REQUESTDATAERROR, s, serverConnection);
// responded = true;
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
} else {
- Region region = servConn.getCache().getRegion(regionName);
+ Region region = serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = LocalizedStrings.Request__0_WAS_NOT_FOUND_DURING_GET_REQUEST
.toLocalizedString(regionName);
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} else {
GetOperationContext getContext = null;
try {
this.securityService.authorizeRegionRead(regionName, key.toString());
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
getContext = authzRequest.getAuthorize(regionName, key, callbackArg);
callbackArg = getContext.getCallbackArg();
}
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -141,10 +142,10 @@ public class Request extends BaseCommand {
// the value if it is a byte[].
Object[] valueAndIsObject = new Object[3];
try {
- getValueAndIsObject(region, key, callbackArg, servConn, valueAndIsObject);
+ getValueAndIsObject(region, key, callbackArg, serverConnection, valueAndIsObject);
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -154,7 +155,7 @@ public class Request extends BaseCommand {
try {
- AuthorizeRequestPP postAuthzRequest = servConn.getPostAuthzRequest();
+ AuthorizeRequestPP postAuthzRequest = serverConnection.getPostAuthzRequest();
if (postAuthzRequest != null) {
getContext = postAuthzRequest.getAuthorize(regionName, key, data, isObject, getContext);
byte[] serializedValue = getContext.getSerializedValue();
@@ -166,8 +167,8 @@ public class Request extends BaseCommand {
isObject = getContext.isObject();
}
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
{
@@ -179,20 +180,21 @@ public class Request extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeResponseWithRefreshMetadata(data, callbackArg, msg, isObject, servConn, pr,
- pr.getNetworkHopType());
+ writeResponseWithRefreshMetadata(data, callbackArg, clientMessage, isObject,
+ serverConnection, pr, pr.getNetworkHopType());
pr.clearNetworkHopData();
} else {
- writeResponse(data, callbackArg, msg, isObject, servConn);
+ writeResponse(data, callbackArg, clientMessage, isObject, serverConnection);
}
} else {
- writeResponse(data, callbackArg, msg, isObject, servConn);
+ writeResponse(data, callbackArg, clientMessage, isObject, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
logger.debug("{}: Wrote get response back to {} for region {} key {} value: {}",
- servConn.getName(), servConn.getSocketString(), regionName, key, data);
+ serverConnection.getName(), serverConnection.getSocketString(), regionName, key,
+ data);
}
stats.incWriteGetResponseTime(DistributionStats.getStatTime() - start);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
index 3fd84d6..a6d6578 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
@@ -49,57 +49,60 @@ public class RequestEventValue extends BaseCommand {
private RequestEventValue() {}
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
Part eventIDPart = null, valuePart = null;
EventID event = null;
Object callbackArg = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
StringBuffer errMessage = new StringBuffer();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
// Retrieve the data from the message parts
- int parts = msg.getNumberOfParts();
- eventIDPart = msg.getPart(0);
+ int parts = clientMessage.getNumberOfParts();
+ eventIDPart = clientMessage.getPart(0);
if (eventIDPart == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.RequestEventValue_0_THE_EVENT_ID_FOR_THE_GET_EVENT_VALUE_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage.append(" The event id for the get event value request is null.");
- writeErrorResponse(msg, MessageType.REQUESTDATAERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.REQUESTDATAERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} else {
try {
event = (EventID) eventIDPart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (parts > 1) {
- valuePart = msg.getPart(1);
+ valuePart = clientMessage.getPart(1);
try {
if (valuePart != null) {
callbackArg = valuePart.getObject();
}
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
if (logger.isTraceEnabled()) {
- logger.trace("{}: Received get event value request ({} bytes) from {}", servConn.getName(),
- msg.getPayloadLength(), servConn.getSocketString());
+ logger.trace("{}: Received get event value request ({} bytes) from {}",
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString());
}
- CacheClientNotifier ccn = servConn.getAcceptor().getCacheClientNotifier();
+ CacheClientNotifier ccn = serverConnection.getAcceptor().getCacheClientNotifier();
// Get the ha container.
HAContainerWrapper haContainer = (HAContainerWrapper) ccn.getHaContainer();
if (haContainer == null) {
String reason = " was not found during get event value request";
- writeRegionDestroyedEx(msg, "ha container", reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, "ha container", reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} else {
Object[] valueAndIsObject = new Object[2];
try {
@@ -110,8 +113,9 @@ public class RequestEventValue extends BaseCommand {
LocalizedStrings.RequestEventValue_UNABLE_TO_FIND_A_CLIENT_UPDATE_MESSAGE_FOR_0,
event));
String msgStr = "No value found for " + event + " in " + haContainer.getName();
- writeErrorResponse(msg, MessageType.REQUEST_EVENT_VALUE_ERROR, msgStr, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.REQUEST_EVENT_VALUE_ERROR, msgStr,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} else {
if (logger.isDebugEnabled()) {
@@ -130,20 +134,22 @@ public class RequestEventValue extends BaseCommand {
valueAndIsObject[1] = Boolean.valueOf(((ClientUpdateMessageImpl) data).valueIsObject());
}
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
Object data = valueAndIsObject[0];
boolean isObject = (Boolean) valueAndIsObject[1];
- writeResponse(data, callbackArg, msg, isObject, servConn);
- servConn.setAsTrue(RESPONDED);
- ccn.getClientProxy(servConn.getProxyID()).getStatistics().incDeltaFullMessagesSent();
+ writeResponse(data, callbackArg, clientMessage, isObject, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
+ ccn.getClientProxy(serverConnection.getProxyID()).getStatistics()
+ .incDeltaFullMessagesSent();
if (logger.isDebugEnabled()) {
logger.debug("{}: Wrote get event value response back to {} for ha container {}",
- servConn.getName(), servConn.getSocketString(), haContainer.getName());
+ serverConnection.getName(), serverConnection.getSocketString(),
+ haContainer.getName());
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
index a579170..cd12ea7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RollbackCommand.java
@@ -39,18 +39,18 @@ public class RollbackCommand extends BaseCommand {
private RollbackCommand() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException, InterruptedException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- TXManagerImpl txMgr = (TXManagerImpl) servConn.getCache().getCacheTransactionManager();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ TXManagerImpl txMgr = (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager();
InternalDistributedMember client =
- (InternalDistributedMember) servConn.getProxyID().getDistributedMember();
- int uniqId = msg.getTransactionId();
+ (InternalDistributedMember) serverConnection.getProxyID().getDistributedMember();
+ int uniqId = clientMessage.getTransactionId();
TXId txId = new TXId(client, uniqId);
if (txMgr.isHostedTxRecentlyCompleted(txId)) {
if (logger.isDebugEnabled()) {
logger.debug("TX: found a recently rolled back tx: {}", txId);
- sendRollbackReply(msg, servConn);
+ sendRollbackReply(clientMessage, serverConnection);
txMgr.removeHostedTXState(txId);
return;
}
@@ -60,16 +60,16 @@ public class RollbackCommand extends BaseCommand {
if (txState != null) {
txId = txState.getTxId();
txMgr.rollback();
- sendRollbackReply(msg, servConn);
+ sendRollbackReply(clientMessage, serverConnection);
} else {
// could not find TxState in the host server.
// Protect against a failover command received so late,
// and it is removed from the failoverMap due to capacity.
- sendRollbackReply(msg, servConn);
+ sendRollbackReply(clientMessage, serverConnection);
}
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} finally {
if (logger.isDebugEnabled()) {
logger.debug("TX: removing tx state for {}", txId);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
index c78f4d9..c4515ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java
@@ -56,18 +56,18 @@ public class Size extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
StringBuilder errMessage = new StringBuilder();
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
long oldStart = start;
start = DistributionStats.getStatTime();
stats.incReadSizeRequestTime(start - oldStart);
// Retrieve the data from the message parts
- Part regionNamePart = msg.getPart(0);
+ Part regionNamePart = clientMessage.getPart(0);
String regionName = regionNamePart.getString();
if (regionName == null) {
@@ -76,8 +76,9 @@ public class Size extends BaseCommand {
errMessage
.append(LocalizedStrings.BaseCommand__THE_INPUT_REGION_NAME_FOR_THE_0_REQUEST_IS_NULL
.toLocalizedString("size"));
- writeErrorResponse(msg, MessageType.SIZE_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.SIZE_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -85,38 +86,39 @@ public class Size extends BaseCommand {
if (region == null) {
String reason = LocalizedStrings.BaseCommand__0_WAS_NOT_FOUND_DURING_1_REQUEST
.toLocalizedString(regionName, "size");
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// Size the entry
try {
this.securityService.authorizeRegionRead(regionName);
- writeSizeResponse(region.size(), msg, servConn);
+ writeSizeResponse(region.size(), clientMessage, serverConnection);
} catch (RegionDestroyedException rde) {
- writeException(msg, rde, false, servConn);
+ writeException(clientMessage, rde, false, serverConnection);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// If an exception occurs during the destroy, preserve the connection
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
if (e instanceof GemFireSecurityException) {
// Fine logging for security exceptions since these are already
// logged by the security logger
if (logger.isDebugEnabled()) {
- logger.debug("{}: Unexpected Security exception", servConn.getName(), e);
+ logger.debug("{}: Unexpected Security exception", serverConnection.getName(), e);
}
} else {
logger.warn(LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), e);
+ serverConnection.getName()), e);
}
} finally {
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent size response for region {}", servConn.getName(), regionName);
+ logger.debug("{}: Sent size response for region {}", serverConnection.getName(),
+ regionName);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
stats.incWriteSizeResponseTime(DistributionStats.getStatTime() - start);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
index 72eab50..9fc3fd1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
@@ -49,23 +49,23 @@ public class TXFailoverCommand extends BaseCommand {
private TXFailoverCommand() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException, InterruptedException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
// Build the TXId for the transaction
InternalDistributedMember client =
- (InternalDistributedMember) servConn.getProxyID().getDistributedMember();
- int uniqId = msg.getTransactionId();
+ (InternalDistributedMember) serverConnection.getProxyID().getDistributedMember();
+ int uniqId = clientMessage.getTransactionId();
if (logger.isDebugEnabled()) {
logger.debug("TX: Transaction {} from {} is failing over to this server", uniqId, client);
}
TXId txId = new TXId(client, uniqId);
- TXManagerImpl mgr = (TXManagerImpl) servConn.getCache().getCacheTransactionManager();
+ TXManagerImpl mgr = (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager();
mgr.waitForCompletingTransaction(txId); // in case it's already completing here in another
// thread
if (mgr.isHostedTxRecentlyCompleted(txId)) {
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
mgr.removeHostedTXState(txId);
return;
}
@@ -75,7 +75,7 @@ public class TXFailoverCommand extends BaseCommand {
if (!tx.isRealDealLocal()) {
// send message to all peers to find out who hosts the transaction
FindRemoteTXMessageReplyProcessor processor =
- FindRemoteTXMessage.send(servConn.getCache(), txId);
+ FindRemoteTXMessage.send(serverConnection.getCache(), txId);
try {
processor.waitForRepliesUninterruptibly();
} catch (ReplyException e) {
@@ -96,7 +96,7 @@ public class TXFailoverCommand extends BaseCommand {
// bug #42228 and bug #43504 - this cannot return until the current view
// has been installed by all members, so that dlocks are released and
// the same keys can be used in a new transaction by the same client thread
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
try {
WaitForViewInstallation.send((DistributionManager) cache.getDistributionManager());
} catch (InterruptedException e) {
@@ -110,9 +110,9 @@ public class TXFailoverCommand extends BaseCommand {
}
mgr.saveTXCommitMessageForClientFailover(txId, processor.getTxCommitMessage());
} else {
- writeException(msg, new TransactionDataNodeHasDepartedException(
- "Could not find transaction host for " + txId), false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, new TransactionDataNodeHasDepartedException(
+ "Could not find transaction host for " + txId), false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
mgr.removeHostedTXState(txId);
return;
}
@@ -121,8 +121,8 @@ public class TXFailoverCommand extends BaseCommand {
if (!wasInProgress) {
mgr.setInProgress(false);
}
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
index 8cedd2c..03270d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java
@@ -15,7 +15,6 @@
package org.apache.geode.internal.cache.tier.sockets.command;
-import org.apache.geode.cache.SynchronizationCommitConflictException;
import org.apache.geode.cache.client.internal.TXSynchronizationOp.CompletionType;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ReplyException;
@@ -54,7 +53,8 @@ public class TXSynchronizationCommand extends BaseCommand {
* org.apache.geode.internal.cache.tier.sockets.ServerConnection)
*/
@Override
- protected boolean shouldMasqueradeForTx(Message msg, ServerConnection servConn) {
+ protected boolean shouldMasqueradeForTx(Message clientMessage,
+ ServerConnection serverConnection) {
// masquerading is done in the waiting thread pool
return false;
}
@@ -68,26 +68,28 @@ public class TXSynchronizationCommand extends BaseCommand {
* long)
*/
@Override
- public void cmdExecute(final Message msg, final ServerConnection servConn, long start)
- throws IOException, ClassNotFoundException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ long start) throws IOException, ClassNotFoundException, InterruptedException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
- CompletionType type = CompletionType.values()[msg.getPart(0).getInt()];
- /* int txIdInt = */ msg.getPart(1).getInt(); // [bruce] not sure if we need to transmit this
+ CompletionType type = CompletionType.values()[clientMessage.getPart(0).getInt()];
+ /* int txIdInt = */ clientMessage.getPart(1).getInt(); // [bruce] not sure if we need to
+ // transmit this
final Part statusPart;
if (type == CompletionType.AFTER_COMPLETION) {
- statusPart = msg.getPart(2);
+ statusPart = clientMessage.getPart(2);
} else {
statusPart = null;
}
- final TXManagerImpl txMgr = (TXManagerImpl) servConn.getCache().getCacheTransactionManager();
+ final TXManagerImpl txMgr =
+ (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager();
final InternalDistributedMember member =
- (InternalDistributedMember) servConn.getProxyID().getDistributedMember();
+ (InternalDistributedMember) serverConnection.getProxyID().getDistributedMember();
// get the tx state without associating it with this thread. That's done later
- final TXStateProxy txProxy = txMgr.masqueradeAs(msg, member, true);
+ final TXStateProxy txProxy = txMgr.masqueradeAs(clientMessage, member, true);
// we have to run beforeCompletion and afterCompletion in the same thread
// because beforeCompletion obtains locks for the thread and afterCompletion
@@ -102,21 +104,21 @@ public class TXSynchronizationCommand extends BaseCommand {
TXStateProxy txState = null;
Throwable failureException = null;
try {
- txState = txMgr.masqueradeAs(msg, member, false);
+ txState = txMgr.masqueradeAs(clientMessage, member, false);
if (isDebugEnabled) {
logger.debug("Executing beforeCompletion() notification for transaction {}",
- msg.getTransactionId());
+ clientMessage.getTransactionId());
}
txState.setIsJTA(true);
txState.beforeCompletion();
try {
- writeReply(msg, servConn);
+ writeReply(clientMessage, serverConnection);
} catch (IOException e) {
if (isDebugEnabled) {
logger.debug("Problem writing reply to client", e);
}
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
} catch (ReplyException e) {
failureException = e.getCause();
} catch (InterruptedException e) {
@@ -128,13 +130,13 @@ public class TXSynchronizationCommand extends BaseCommand {
}
if (failureException != null) {
try {
- writeException(msg, failureException, false, servConn);
+ writeException(clientMessage, failureException, false, serverConnection);
} catch (IOException ioe) {
if (isDebugEnabled) {
logger.debug("Problem writing reply to client", ioe);
}
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
}
};
@@ -150,11 +152,11 @@ public class TXSynchronizationCommand extends BaseCommand {
public void run() {
TXStateProxy txState = null;
try {
- txState = txMgr.masqueradeAs(msg, member, false);
+ txState = txMgr.masqueradeAs(clientMessage, member, false);
int status = statusPart.getInt();
if (isDebugEnabled) {
logger.debug("Executing afterCompletion({}) notification for transaction {}",
- status, msg.getTransactionId());
+ status, clientMessage.getTransactionId());
}
txState.setIsJTA(true);
txState.afterCompletion(status);
@@ -162,7 +164,7 @@ public class TXSynchronizationCommand extends BaseCommand {
// where it can be applied to the local cache
TXCommitMessage cmsg = txState.getCommitMessage();
try {
- CommitCommand.writeCommitResponse(cmsg, msg, servConn);
+ CommitCommand.writeCommitResponse(cmsg, clientMessage, serverConnection);
txMgr.removeHostedTXState(txState.getTxId());
} catch (IOException e) {
// not much can be done here
@@ -170,16 +172,16 @@ public class TXSynchronizationCommand extends BaseCommand {
logger.warn("Problem writing reply to client", e);
}
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
} catch (RuntimeException e) {
try {
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
} catch (IOException ioe) {
if (isDebugEnabled) {
logger.debug("Problem writing reply to client", ioe);
}
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} finally {
@@ -195,12 +197,12 @@ public class TXSynchronizationCommand extends BaseCommand {
sync.runSecondRunnable(afterCompletion);
} else {
if (statusPart.getInt() == Status.STATUS_COMMITTED) {
- TXStateProxy txState = txMgr.masqueradeAs(msg, member, false);
+ TXStateProxy txState = txMgr.masqueradeAs(clientMessage, member, false);
try {
if (isDebugEnabled) {
logger.debug(
"Executing beforeCompletion() notification for transaction {} after failover",
- msg.getTransactionId());
+ clientMessage.getTransactionId());
}
txState.setIsJTA(true);
txState.beforeCompletion();
@@ -212,8 +214,8 @@ public class TXSynchronizationCommand extends BaseCommand {
}
}
} catch (Exception e) {
- writeException(msg, MessageType.EXCEPTION, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, MessageType.EXCEPTION, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
if (isDebugEnabled) {
logger.debug("Sent tx synchronization response");
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
index 7dbb78f..199ac18 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java
@@ -45,43 +45,44 @@ public class UnregisterInterest extends BaseCommand {
UnregisterInterest() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws ClassNotFoundException, IOException {
Part regionNamePart = null, keyPart = null;
String regionName = null;
Object key = null;
int interestType = 0;
StringId errMessage = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
- regionNamePart = msg.getPart(0);
- interestType = msg.getPart(1).getInt();
- keyPart = msg.getPart(2);
- Part isClosingPart = msg.getPart(3);
+ regionNamePart = clientMessage.getPart(0);
+ interestType = clientMessage.getPart(1).getInt();
+ keyPart = clientMessage.getPart(2);
+ Part isClosingPart = clientMessage.getPart(3);
byte[] isClosingPartBytes = (byte[]) isClosingPart.getObject();
boolean isClosing = isClosingPartBytes[0] == 0x01;
regionName = regionNamePart.getString();
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean keepalive = false;
try {
- Part keepalivePart = msg.getPart(4);
+ Part keepalivePart = clientMessage.getPart(4);
byte[] keepaliveBytes = (byte[]) keepalivePart.getObject();
keepalive = keepaliveBytes[0] != 0x00;
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Received unregister interest request ({} bytes) from {} for region {} key {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName, key);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key);
}
// Process the unregister interest request
@@ -95,9 +96,10 @@ public class UnregisterInterest extends BaseCommand {
errMessage =
LocalizedStrings.UnRegisterInterest_THE_INPUT_REGION_NAME_FOR_THE_UNREGISTER_INTEREST_REQUEST_IS_NULL;
String s = errMessage.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), s);
- writeErrorResponse(msg, MessageType.UNREGISTER_INTEREST_DATA_ERROR, s, servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), s);
+ writeErrorResponse(clientMessage, MessageType.UNREGISTER_INTEREST_DATA_ERROR, s,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -108,12 +110,12 @@ public class UnregisterInterest extends BaseCommand {
this.securityService.authorizeRegionRead(regionName, key.toString());
}
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
try {
@@ -121,8 +123,8 @@ public class UnregisterInterest extends BaseCommand {
authzRequest.unregisterInterestAuthorize(regionName, key, interestType);
key = unregisterContext.getKey();
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -141,18 +143,18 @@ public class UnregisterInterest extends BaseCommand {
*/
// Unregister interest irrelevent of whether the region is present it or
// not
- servConn.getAcceptor().getCacheClientNotifier().unregisterClientInterest(regionName, key,
- interestType, isClosing, servConn.getProxyID(), keepalive);
+ serverConnection.getAcceptor().getCacheClientNotifier().unregisterClientInterest(regionName,
+ key, interestType, isClosing, serverConnection.getProxyID(), keepalive);
// Update the statistics and write the reply
// bserverStats.incLong(processDestroyTimeId,
// DistributionStats.getStatTime() - start);
// start = DistributionStats.getStatTime();
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent unregister interest response for region {} key {}", servConn.getName(),
- regionName, key);
+ logger.debug("{}: Sent unregister interest response for region {} key {}",
+ serverConnection.getName(), regionName, key);
}
// bserverStats.incLong(writeDestroyResponseTimeId,
// DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
index 7369587..1968bff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
@@ -46,48 +46,48 @@ public class UnregisterInterestList extends BaseCommand {
private UnregisterInterestList() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
Part regionNamePart = null, keyPart = null, numberOfKeysPart = null;
String regionName = null;
Object key = null;
List keys = null;
int numberOfKeys = 0, partNumber = 0;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
// bserverStats.incLong(readDestroyRequestTimeId,
// DistributionStats.getStatTime() - start);
// bserverStats.incInt(destroyRequestsId, 1);
// start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
- Part isClosingListPart = msg.getPart(1);
+ Part isClosingListPart = clientMessage.getPart(1);
byte[] isClosingListPartBytes = (byte[]) isClosingListPart.getObject();
boolean isClosingList = isClosingListPartBytes[0] == 0x01;
boolean keepalive = false;
try {
- Part keepalivePart = msg.getPart(2);
+ Part keepalivePart = clientMessage.getPart(2);
byte[] keepalivePartBytes = (byte[]) keepalivePart.getObject();
keepalive = keepalivePartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- numberOfKeysPart = msg.getPart(3);
+ numberOfKeysPart = clientMessage.getPart(3);
numberOfKeys = numberOfKeysPart.getInt();
partNumber = 4;
keys = new ArrayList();
for (int i = 0; i < numberOfKeys; i++) {
- keyPart = msg.getPart(partNumber + i);
+ keyPart = clientMessage.getPart(partNumber + i);
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
keys.add(key);
@@ -95,8 +95,8 @@ public class UnregisterInterestList extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Received unregister interest request ({} bytes) from {} for the following {} keys in region {}: {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), numberOfKeys,
- regionName, keys);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), numberOfKeys, regionName, keys);
}
// Process the unregister interest request
@@ -113,22 +113,23 @@ public class UnregisterInterestList extends BaseCommand {
LocalizedStrings.UnRegisterInterest_THE_INPUT_REGION_NAME_FOR_THE_UNREGISTER_INTEREST_REQUEST_IS_NULL;
}
String s = errMessage.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), s);
- writeErrorResponse(msg, MessageType.UNREGISTER_INTEREST_DATA_ERROR, s, servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), s);
+ writeErrorResponse(clientMessage, MessageType.UNREGISTER_INTEREST_DATA_ERROR, s,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
try {
this.securityService.authorizeRegionRead(regionName);
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
try {
@@ -136,8 +137,8 @@ public class UnregisterInterestList extends BaseCommand {
authzRequest.unregisterInterestListAuthorize(regionName, keys);
keys = (List) unregisterContext.getKey();
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -155,20 +156,20 @@ public class UnregisterInterestList extends BaseCommand {
* responded = true; } else {
*/
// Register interest
- servConn.getAcceptor().getCacheClientNotifier().unregisterClientInterest(regionName, keys,
- isClosingList, servConn.getProxyID(), keepalive);
+ serverConnection.getAcceptor().getCacheClientNotifier().unregisterClientInterest(regionName,
+ keys, isClosingList, serverConnection.getProxyID(), keepalive);
// Update the statistics and write the reply
// bserverStats.incLong(processDestroyTimeId,
// DistributionStats.getStatTime() - start);
// start = DistributionStats.getStatTime(); WHY ARE GETTING START AND NOT
// USING IT?
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Sent unregister interest response for the following {} keys in region {}: {}",
- servConn.getName(), numberOfKeys, regionName, keys);
+ serverConnection.getName(), numberOfKeys, regionName, keys);
}
// bserverStats.incLong(writeDestroyResponseTimeId,
// DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
index 57aca22..2f434fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java
@@ -35,8 +35,9 @@ public class UpdateClientNotification extends BaseCommand {
private UpdateClientNotification() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- CacheServerStats stats = servConn.getCacheServerStats();
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ CacheServerStats stats = serverConnection.getCacheServerStats();
{
long oldStart = start;
start = DistributionStats.getStatTime();
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 4e450c7..1afe6ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -2149,7 +2149,7 @@ public class Connection implements Runnable {
logger.fatal(LocalizedMessage
.create(LocalizedStrings.Connection_FAILED_HANDLING_CHUNK_MESSAGE), ex);
}
- } else /* (msgType == END_CHUNKED_MSG_TYPE) */ {
+ } else /* (messageType == END_CHUNKED_MSG_TYPE) */ {
MsgDestreamer md = obtainMsgDestreamer(msgId, remoteVersion);
this.owner.getConduit().stats.incMessagesBeingReceived(md.size() == 0, len);
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
index 031f827..80b16fc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
@@ -30,8 +30,7 @@ import java.io.ObjectStreamClass;
/**
* Reusable Input/Output operation utility methods.
- * <p/>
- *
+ *
* @since GemFire 6.6
*/
@SuppressWarnings("unused")
@@ -44,8 +43,7 @@ public abstract class IOUtils {
* File.separator character. If the pathname is unspecified (null, empty or blank) then path
* elements are considered relative to file system root, beginning with File.separator. If array
* of path elements are null, then the pathname is returned as is.
- * </p>
- *
+ *
* @param pathname a String value indicating the base pathname.
* @param pathElements the path elements to append to pathname.
* @return the path elements appended to the pathname.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherUtils.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherUtils.java
new file mode 100644
index 0000000..017e0f5
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherUtils.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.distributed;
+
+import org.apache.geode.cache.Cache;
+
+/**
+ * Provides tests a way to access non-public state in ServerLauncher
+ */
+public class ServerLauncherUtils {
+
+ /**
+ * Returns the Cache from an online in-process ServerLauncher instance
+ */
+ public static Cache getCache(final ServerLauncher serverLauncher) {
+ return serverLauncher.getCache();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
index 39aa1e6..b529f0c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
@@ -14,166 +14,141 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
-import java.io.IOException;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.awaitility.Awaitility;
-
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.CacheException;
import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test runs all tests of HARegionQueueJUnitTest using BlockingHARegionQueue instead of
* HARegionQueue.
- *
- *
*/
@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class BlockingHARegionQueueJUnitTest extends HARegionQueueJUnitTest {
- /**
- * Creates Blocking HA region-queue object
- *
- * @return Blocking HA region-queue object
- * @throws IOException
- * @throws ClassNotFoundException
- * @throws CacheException
- * @throws InterruptedException
- */
- protected HARegionQueue createHARegionQueue(String name)
- throws IOException, ClassNotFoundException, CacheException, InterruptedException {
- HARegionQueue regionqueue =
- HARegionQueue.getHARegionQueueInstance(name, cache, HARegionQueue.BLOCKING_HA_QUEUE, false);
- return regionqueue;
- }
-
- /**
- * Creates Blocking HA region-queue object
- *
- * @return Blocking HA region-queue object
- * @throws IOException
- * @throws ClassNotFoundException
- * @throws CacheException
- * @throws InterruptedException
- */
- protected HARegionQueue createHARegionQueue(String name, HARegionQueueAttributes attrs)
- throws IOException, ClassNotFoundException, CacheException, InterruptedException {
- HARegionQueue regionqueue = HARegionQueue.getHARegionQueueInstance(name, cache, attrs,
- HARegionQueue.BLOCKING_HA_QUEUE, false);
- return regionqueue;
+ @Override
+ protected int queueType() {
+ return HARegionQueue.BLOCKING_HA_QUEUE;
}
/**
* Tests the effect of a put which is blocked because of capacity constraint & subsequent passage
* because of take operation
- *
*/
@Test
- public void testBlockingPutAndTake()
- throws InterruptedException, IOException, ClassNotFoundException {
+ public void testBlockingPutAndTake() throws Exception {
HARegionQueueAttributes hrqa = new HARegionQueueAttributes();
hrqa.setBlockingQueueCapacity(1);
- final HARegionQueue hrq = this.createHARegionQueue("testBlockingPutAndTake", hrqa);
- hrq.setPrimary(true);// fix for 40314 - capacity constraint is checked for primary only.
+
+ HARegionQueue hrq = createHARegionQueue(this.testName.getMethodName(), hrqa);
+ hrq.setPrimary(true); // fix for 40314 - capacity constraint is checked for primary only.
+
EventID id1 = new EventID(new byte[] {1}, 1, 1);
hrq.put(new ConflatableObject("key1", "val1", id1, false, "testing"));
- Thread t1 = new Thread(new Runnable() {
- public void run() {
- try {
- EventID id2 = new EventID(new byte[] {1}, 1, 2);
- hrq.put(new ConflatableObject("key1", "val2", id2, false, "testing"));
- } catch (Exception e) {
- encounteredException = true;
- }
+
+ AtomicBoolean threadStarted = new AtomicBoolean(false);
+
+ Thread thread = new Thread(() -> {
+ try {
+ threadStarted.set(true);
+ EventID id2 = new EventID(new byte[] {1}, 1, 2);
+ hrq.put(new ConflatableObject("key1", "val2", id2, false, "testing"));
+ } catch (InterruptedException e) {
+ errorCollector.addError(e);
}
});
- t1.start();
- Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> t1.isAlive());
+ thread.start();
+
+ Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> threadStarted.get());
+
Conflatable conf = (Conflatable) hrq.take();
- assertNotNull(conf);
- Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> !t1.isAlive());
+ assertThat(conf, notNullValue());
+
+ Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> !thread.isAlive());
}
/**
* Test Scenario : BlockingQueue capacity is 1. The first put should be successful. The second put
* should block till a peek/remove happens.
- *
*/
@Test
- public void testBlockingPutAndPeekRemove()
- throws InterruptedException, IOException, ClassNotFoundException {
+ public void testBlockingPutAndPeekRemove() throws Exception {
HARegionQueueAttributes hrqa = new HARegionQueueAttributes();
hrqa.setBlockingQueueCapacity(1);
- final HARegionQueue hrq = this.createHARegionQueue("testBlockingPutAndPeekRemove", hrqa);
+
+ HARegionQueue hrq = createHARegionQueue(this.testName.getMethodName(), hrqa);
hrq.setPrimary(true);// fix for 40314 - capacity constraint is checked for primary only.
+
EventID id1 = new EventID(new byte[] {1}, 1, 1);
hrq.put(new ConflatableObject("key1", "val1", id1, false, "testing"));
- Thread t1 = new Thread(new Runnable() {
- public void run() {
- try {
- EventID id2 = new EventID(new byte[] {1}, 1, 2);
- hrq.put(new ConflatableObject("key1", "val2", id2, false, "testing"));
- } catch (Exception e) {
- encounteredException = true;
- }
+
+ AtomicBoolean threadStarted = new AtomicBoolean(false);
+
+ Thread thread = new Thread(() -> {
+ try {
+ threadStarted.set(true);
+ EventID id2 = new EventID(new byte[] {1}, 1, 2);
+ hrq.put(new ConflatableObject("key1", "val2", id2, false, "testing"));
+ } catch (Exception e) {
+ errorCollector.addError(e);
}
});
- t1.start();
- Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> t1.isAlive());
+ thread.start();
+
+ Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> threadStarted.get());
+
Conflatable conf = (Conflatable) hrq.peek();
- assertNotNull(conf);
+ assertThat(conf, notNullValue());
+
hrq.remove();
- Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> !t1.isAlive());
- assertFalse("Exception occurred in put-thread", encounteredException);
+ Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> !thread.isAlive());
}
/**
* Test Scenario :Blocking Queue capacity is 1. The first put should be successful.The second put
* should block till the first put expires.
- *
+ * <p>
+ * fix for 40314 - capacity constraint is checked for primary only and expiry is not applicable on
+ * primary so marking this test as invalid.
*/
- // fix for 40314 - capacity constraint is checked for primary only and
- // expiry is not applicable on primary so marking this test as invalid.
- @Ignore
@Test
- public void testBlockingPutAndExpiry()
- throws InterruptedException, IOException, ClassNotFoundException {
+ public void testBlockingPutAndExpiry() throws Exception {
HARegionQueueAttributes hrqa = new HARegionQueueAttributes();
hrqa.setBlockingQueueCapacity(1);
hrqa.setExpiryTime(1);
- final HARegionQueue hrq = this.createHARegionQueue("testBlockingPutAndExpiry", hrqa);
+
+ HARegionQueue hrq = this.createHARegionQueue(this.testName.getMethodName(), hrqa);
EventID id1 = new EventID(new byte[] {1}, 1, 1);
- long start = System.currentTimeMillis();
+
hrq.put(new ConflatableObject("key1", "val1", id1, false, "testing"));
- Thread t1 = new Thread(new Runnable() {
- public void run() {
- try {
- EventID id2 = new EventID(new byte[] {1}, 1, 2);
- hrq.put(new ConflatableObject("key1", "val2", id2, false, "testing"));
- } catch (Exception e) {
- encounteredException = true;
- }
+
+ AtomicBoolean threadStarted = new AtomicBoolean(false);
+
+ Thread thread = new Thread(() -> {
+ try {
+ threadStarted.set(true);
+ EventID id2 = new EventID(new byte[] {1}, 1, 2);
+ hrq.put(new ConflatableObject("key1", "val2", id2, false, "testing"));
+ } catch (Exception e) {
+ errorCollector.addError(e);
}
});
- t1.start();
- Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> t1.isAlive());
- waitAtLeast(1000, start, () -> {
- assertFalse("Put-thread blocked unexpectedly", t1.isAlive());
- });
- assertFalse("Exception occurred in put-thread", encounteredException);
+ thread.start();
+
+ Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> threadStarted.get());
+
+ Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> !thread.isAlive());
}
}
[35/35] geode git commit: milestone
Posted by kl...@apache.org.
milestone
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d5dc97c8
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d5dc97c8
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d5dc97c8
Branch: refs/heads/feature/GEODE-2632-19
Commit: d5dc97c81ab755cb4dd99951d7320e073c4bdd76
Parents: d1ec508
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 31 16:13:20 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 31 16:14:43 2017 -0700
----------------------------------------------------------------------
.../membership/gms/auth/GMSAuthenticator.java | 69 ++-
.../geode/internal/cache/CacheServerImpl.java | 4 +
.../geode/internal/cache/GemFireCacheImpl.java | 14 +-
.../geode/internal/cache/InternalCache.java | 3 +
.../geode/internal/cache/tier/Command.java | 3 +-
.../internal/cache/tier/CommandContext.java | 33 ++
.../cache/tier/sockets/AcceptorImpl.java | 5 +-
.../cache/tier/sockets/BaseCommand.java | 11 +-
.../cache/tier/sockets/CacheClientProxy.java | 6 +-
.../cache/tier/sockets/CommandContextImpl.java | 63 +++
.../internal/cache/tier/sockets/HandShake.java | 16 +-
.../cache/tier/sockets/ServerConnection.java | 41 +-
.../tier/sockets/ServerHandShakeProcessor.java | 9 +-
.../cache/tier/sockets/command/AddPdxEnum.java | 3 +-
.../cache/tier/sockets/command/AddPdxType.java | 3 +-
.../cache/tier/sockets/command/ClearRegion.java | 3 +-
.../cache/tier/sockets/command/ClientReady.java | 3 +-
.../tier/sockets/command/CloseConnection.java | 3 +-
.../tier/sockets/command/CommitCommand.java | 6 +-
.../cache/tier/sockets/command/ContainsKey.java | 5 +-
.../tier/sockets/command/ContainsKey66.java | 3 +-
.../tier/sockets/command/CreateRegion.java | 3 +-
.../cache/tier/sockets/command/Default.java | 3 +-
.../cache/tier/sockets/command/Destroy.java | 3 +-
.../cache/tier/sockets/command/Destroy65.java | 3 +-
.../tier/sockets/command/DestroyRegion.java | 3 +-
.../tier/sockets/command/ExecuteFunction.java | 3 +-
.../tier/sockets/command/ExecuteFunction65.java | 3 +-
.../tier/sockets/command/ExecuteFunction66.java | 3 +-
.../tier/sockets/command/ExecuteFunction70.java | 5 +-
.../sockets/command/ExecuteRegionFunction.java | 3 +-
.../command/ExecuteRegionFunction61.java | 4 +-
.../command/ExecuteRegionFunction65.java | 3 +-
.../command/ExecuteRegionFunction66.java | 3 +-
.../command/ExecuteRegionFunctionSingleHop.java | 3 +-
.../sockets/command/GatewayReceiverCommand.java | 4 +-
.../cache/tier/sockets/command/Get70.java | 3 +-
.../cache/tier/sockets/command/GetAll.java | 3 +-
.../cache/tier/sockets/command/GetAll651.java | 3 +-
.../cache/tier/sockets/command/GetAll70.java | 3 +-
.../sockets/command/GetAllWithCallback.java | 3 +-
.../command/GetClientPRMetadataCommand.java | 3 +-
.../command/GetClientPRMetadataCommand66.java | 3 +-
.../GetClientPartitionAttributesCommand.java | 3 +-
.../GetClientPartitionAttributesCommand66.java | 3 +-
.../sockets/command/GetFunctionAttribute.java | 3 +-
.../tier/sockets/command/GetPDXEnumById.java | 3 +-
.../tier/sockets/command/GetPDXIdForEnum.java | 3 +-
.../tier/sockets/command/GetPDXIdForType.java | 3 +-
.../tier/sockets/command/GetPDXTypeById.java | 3 +-
.../tier/sockets/command/GetPdxEnums70.java | 3 +-
.../tier/sockets/command/GetPdxTypes70.java | 3 +-
.../cache/tier/sockets/command/Invalid.java | 3 +-
.../cache/tier/sockets/command/Invalidate.java | 3 +-
.../cache/tier/sockets/command/KeySet.java | 3 +-
.../cache/tier/sockets/command/MakePrimary.java | 4 +-
.../tier/sockets/command/ManagementCommand.java | 3 +-
.../cache/tier/sockets/command/PeriodicAck.java | 4 +-
.../cache/tier/sockets/command/Ping.java | 6 +-
.../cache/tier/sockets/command/Put.java | 3 +-
.../cache/tier/sockets/command/Put61.java | 3 +-
.../cache/tier/sockets/command/Put65.java | 3 +-
.../cache/tier/sockets/command/PutAll.java | 3 +-
.../cache/tier/sockets/command/PutAll70.java | 3 +-
.../cache/tier/sockets/command/PutAll80.java | 3 +-
.../sockets/command/PutUserCredentials.java | 3 +-
.../cache/tier/sockets/command/Query.java | 3 +-
.../cache/tier/sockets/command/Query651.java | 3 +-
.../command/RegisterDataSerializers.java | 4 +-
.../sockets/command/RegisterInstantiators.java | 4 +-
.../tier/sockets/command/RegisterInterest.java | 3 +-
.../sockets/command/RegisterInterest61.java | 3 +-
.../sockets/command/RegisterInterestList.java | 3 +-
.../sockets/command/RegisterInterestList61.java | 3 +-
.../sockets/command/RegisterInterestList66.java | 3 +-
.../cache/tier/sockets/command/RemoveAll.java | 3 +-
.../tier/sockets/command/RemoveUserAuth.java | 3 +-
.../cache/tier/sockets/command/Request.java | 3 +-
.../tier/sockets/command/RequestEventValue.java | 3 +-
.../tier/sockets/command/RollbackCommand.java | 3 +-
.../cache/tier/sockets/command/Size.java | 3 +-
.../tier/sockets/command/TXFailoverCommand.java | 3 +-
.../command/TXSynchronizationCommand.java | 4 +-
.../sockets/command/UnregisterInterest.java | 3 +-
.../sockets/command/UnregisterInterestList.java | 3 +-
.../command/UpdateClientNotification.java | 3 +-
.../apache/geode/internal/lang/Initializer.java | 2 +-
.../security/CustomSecurityService.java | 205 +++++++++
.../security/DisabledSecurityService.java | 208 +++++++++
.../security/EnabledSecurityService.java | 418 +++++++++++++++++++
.../security/LegacySecurityService.java | 218 ++++++++++
.../internal/security/SecurityService.java | 39 +-
.../security/SecurityServiceFactory.java | 136 ++++++
.../internal/security/SecurityServiceType.java | 28 ++
.../security/shiro/ConfigInitialization.java | 46 ++
.../security/shiro/JMXShiroAuthenticator.java | 18 +-
.../geode/management/cli/CommandService.java | 3 +-
.../management/internal/ManagementAgent.java | 11 +-
.../internal/SystemManagementService.java | 2 +-
.../cli/commands/AbstractCommandsSupport.java | 1 -
.../CreateAlterDestroyRegionCommands.java | 2 -
.../internal/cli/commands/DataCommands.java | 23 +-
.../internal/cli/commands/IndexCommands.java | 10 +-
.../cli/functions/DataCommandFunction.java | 110 +----
.../internal/cli/functions/SelectExecStep.java | 139 ++++++
.../internal/cli/remote/CommandProcessor.java | 8 +-
.../cli/remote/MemberCommandService.java | 5 +-
.../internal/security/AccessControlMBean.java | 6 +-
.../internal/security/MBeanServerWrapper.java | 20 +-
.../controllers/AbstractCommandsController.java | 8 +-
.../support/LoginHandlerInterceptor.java | 30 +-
.../apache/geode/security/PostProcessor.java | 2 +-
.../cache/ha/BlockingHARegionJUnitTest.java | 9 +-
.../tier/sockets/command/ContainsKey66Test.java | 10 +-
.../tier/sockets/command/ContainsKeyTest.java | 10 +-
.../tier/sockets/command/CreateRegionTest.java | 10 +-
.../tier/sockets/command/Destroy65Test.java | 10 +-
.../tier/sockets/command/DestroyRegionTest.java | 10 +-
.../cache/tier/sockets/command/DestroyTest.java | 10 +-
.../sockets/command/ExecuteFunction65Test.java | 11 +-
.../sockets/command/ExecuteFunction66Test.java | 10 +-
.../sockets/command/ExecuteFunctionTest.java | 11 +-
.../cache/tier/sockets/command/Get70Test.java | 10 +-
.../tier/sockets/command/GetAll651Test.java | 10 +-
.../tier/sockets/command/GetAll70Test.java | 10 +-
.../cache/tier/sockets/command/GetAllTest.java | 10 +-
.../sockets/command/GetAllWithCallbackTest.java | 10 +-
...tClientPartitionAttributesCommand66Test.java | 2 +-
...GetClientPartitionAttributesCommandTest.java | 4 +-
.../tier/sockets/command/InvalidateTest.java | 10 +-
.../cache/tier/sockets/command/KeySetTest.java | 10 +-
.../cache/tier/sockets/command/Put61Test.java | 10 +-
.../cache/tier/sockets/command/Put65Test.java | 10 +-
.../cache/tier/sockets/command/PutTest.java | 10 +-
.../sockets/command/RegisterInterest61Test.java | 10 +-
.../command/RegisterInterestList61Test.java | 10 +-
.../command/RegisterInterestList66Test.java | 10 +-
.../command/RegisterInterestListTest.java | 10 +-
.../sockets/command/RegisterInterestTest.java | 10 +-
.../tier/sockets/command/RemoveAllTest.java | 10 +-
.../cache/tier/sockets/command/RequestTest.java | 10 +-
.../sockets/command/UnregisterInterestTest.java | 10 +-
.../internal/lang/InitializerJUnitTest.java | 2 +-
.../internal/security/FakePostProcessor.java | 101 +++++
.../internal/security/FakeSecurityManager.java | 104 +++++
.../security/SecurityServiceFactoryTest.java | 226 ++++++++++
.../cache/tier/sockets/command/CloseCQ.java | 3 +-
.../cache/tier/sockets/command/ExecuteCQ.java | 3 +-
.../cache/tier/sockets/command/ExecuteCQ61.java | 3 +-
.../cache/tier/sockets/command/GetCQStats.java | 3 +-
.../tier/sockets/command/GetDurableCQs.java | 3 +-
.../cache/tier/sockets/command/MonitorCQ.java | 3 +-
.../cache/tier/sockets/command/StopCQ.java | 3 +-
.../internal/cli/LuceneIndexCommands.java | 8 +-
.../apache/geode/tools/pulse/tests/Server.java | 3 +-
.../apache/geode/cache/util/AutoBalancer.java | 2 +-
.../security/GeodeAuthenticationProvider.java | 24 +-
.../web/security/RestSecurityConfiguration.java | 4 +-
.../web/security/SecurityServiceProvider.java | 20 +
...andlerInterceptorRequestHeaderJUnitTest.java | 3 +-
160 files changed, 2507 insertions(+), 509 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
index ab0ca6b..c4d0e79 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
@@ -14,33 +14,40 @@
*/
package org.apache.geode.distributed.internal.membership.gms.auth;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.i18n.LocalizedStrings.*;
-
-import java.security.Principal;
-import java.util.Properties;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTH_INIT;
+import static org.apache.geode.internal.i18n.LocalizedStrings.AUTH_PEER_AUTHENTICATION_FAILED;
+import static org.apache.geode.internal.i18n.LocalizedStrings.AUTH_PEER_AUTHENTICATION_FAILED_WITH_EXCEPTION;
+import static org.apache.geode.internal.i18n.LocalizedStrings.AUTH_PEER_AUTHENTICATION_MISSING_CREDENTIALS;
+import static org.apache.geode.internal.i18n.LocalizedStrings.HandShake_FAILED_TO_ACQUIRE_AUTHENTICATOR_OBJECT;
import org.apache.commons.lang.StringUtils;
-
import org.apache.geode.LogWriter;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.distributed.internal.membership.gms.interfaces.Authenticator;
+import org.apache.geode.internal.cache.CacheConfig;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.HandShake;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.internal.security.IntegratedSecurityService;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.GemFireSecurityException;
+import java.security.Principal;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicReference;
+
public class GMSAuthenticator implements Authenticator {
private Services services;
private Properties securityProps;
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
@Override
public void init(Services s) {
@@ -98,6 +105,8 @@ public class GMSAuthenticator implements Authenticator {
*/
String authenticate(DistributedMember member, Properties credentials, Properties secProps)
throws AuthenticationFailedException {
+ SecurityService securityService = getSecurityService();
+
// For older systems, locator might be started without cache, so secureService may not be
// initialized here. We need to check
// if the passed in secProps has peer authenticator or not
@@ -116,9 +125,9 @@ public class GMSAuthenticator implements Authenticator {
String failMsg = null;
try {
- if (this.securityService.isIntegratedSecurity()) {
- this.securityService.login(credentials);
- this.securityService.authorizeClusterManage();
+ if (securityService.isIntegratedSecurity()) {
+ securityService.login(credentials);
+ securityService.authorizeClusterManage();
} else {
invokeAuthenticator(secProps, member, credentials);
}
@@ -145,10 +154,9 @@ public class GMSAuthenticator implements Authenticator {
LogWriter logWriter = this.services.getLogWriter();
LogWriter securityLogWriter = this.services.getSecurityLogWriter();
- auth.init(this.securityProps, logWriter, securityLogWriter); // this.securityProps contains
- // security-ldap-basedn but
- // security-ldap-baseDomainName
- // is expected
+
+ // this.securityProps contains security-ldap-basedn but security-ldap-baseDomainName is expected
+ auth.init(this.securityProps, logWriter, securityLogWriter);
return auth.authenticate(credentials, member);
} catch (GemFireSecurityException gse) {
@@ -202,4 +210,35 @@ public class GMSAuthenticator implements Authenticator {
@Override
public void emergencyClose() {}
+
+ private final AtomicReference<SecurityService> securityServiceRef = new AtomicReference<>();
+
+ /**
+ * Terrible mess. It would be nice if we could create SecurityService BEFORE this class.
+ */
+ private SecurityService getSecurityService() {
+ SecurityService securityService = this.securityServiceRef.get();
+ if (securityService == null) {
+ synchronized (this.securityServiceRef) {
+ securityService = this.securityServiceRef.get();
+ if (securityService == null) {
+ InternalCache cache = GemFireCacheImpl.getInstance();
+ if (cache != null) {
+ securityService = cache.getSecurityService();
+ }
+ }
+ if (securityService == null) {
+ InternalDistributedSystem system = InternalDistributedSystem.getConnectedInstance();
+ if (system != null) {
+ securityService = SecurityServiceFactory.create(new CacheConfig(), system.getConfig());
+ } else {
+ securityService = SecurityServiceFactory.create(null, null);
+ }
+ }
+ this.securityServiceRef.set(securityService);
+ }
+ }
+ return securityService;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
index 670c697..7d4b6d4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
@@ -72,6 +72,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.membership.ClientMembership;
import org.apache.geode.management.membership.ClientMembershipListener;
@@ -88,6 +89,8 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
private static final int FORCE_LOAD_UPDATE_FREQUENCY = getInteger(
DistributionConfig.GEMFIRE_PREFIX + "BridgeServer.FORCE_LOAD_UPDATE_FREQUENCY", 10);
+ private final SecurityService securityService;
+
/** The acceptor that does the actual serving */
private volatile AcceptorImpl acceptor;
@@ -135,6 +138,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
public CacheServerImpl(InternalCache cache, boolean isGatewayReceiver) {
super(cache);
this.isGatewayReceiver = isGatewayReceiver;
+ this.securityService = cache.getSecurityService();
}
// //////////////////// Instance Methods ///////////////////
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index c813a80..c886c36 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -213,6 +213,7 @@ import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.offheap.MemoryAllocator;
import org.apache.geode.internal.process.ClusterConfigurationNotAvailableException;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.security.SecurityServiceFactory;
import org.apache.geode.internal.sequencelog.SequenceLoggerImpl;
import org.apache.geode.internal.tcp.ConnectionTable;
import org.apache.geode.internal.util.concurrent.FutureResult;
@@ -583,7 +584,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
private final Map<Class<? extends CacheService>, CacheService> services = new HashMap<>();
- private final SecurityService securityService = SecurityService.getSecurityService();
+ private final SecurityService securityService;
static {
// this works around jdk bug 6427854, reported in ticket #44434
@@ -753,6 +754,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
synchronized (GemFireCacheImpl.class) {
GemFireCacheImpl instance = checkExistingCache(existingOk, cacheConfig);
if (instance == null) {
+ // TODO:KIRK: create SecurityService
instance = new GemFireCacheImpl(isClient, pf, system, cacheConfig, asyncEventListeners,
typeRegistry);
instance.initialize();
@@ -809,6 +811,9 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
JNDIInvoker.mapTransactions(system);
this.system = (InternalDistributedSystem) system;
this.dm = this.system.getDistributionManager();
+
+ this.securityService = SecurityServiceFactory.create(this.cacheConfig, this.system.getConfig());
+
if (!this.isClient && PoolManager.getAll().isEmpty()) {
// We only support management on members of a distributed system
// Should do this: if (!getSystem().isLoner()) {
@@ -928,6 +933,11 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
}
@Override
+ public SecurityService getSecurityService() {
+ return this.securityService;
+ }
+
+ @Override
public boolean isRESTServiceRunning() {
return this.isRESTServiceRunning;
}
@@ -3785,7 +3795,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
}
this.stopper.checkCancelInProgress(null);
- CacheServerImpl cacheServer = new CacheServerImpl(this, isGatewayReceiver);
+ CacheServerImpl cacheServer = new CacheServerImpl(this, isGatewayReceiver); // TODO:KIRK
this.allCacheServers.add(cacheServer);
sendAddCacheServerProfileMessage();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
index 5533ed1..25684e2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
@@ -60,6 +60,7 @@ import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.offheap.MemoryAllocator;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.JmxManagerAdvisor;
import org.apache.geode.management.internal.RestAgent;
import org.apache.geode.pdx.PdxInstanceFactory;
@@ -307,4 +308,6 @@ public interface InternalCache extends Cache, Extensible<Cache>, CacheTime {
PdxInstanceFactory createPdxInstanceFactory(String className, boolean expectDomainClass);
void waitForRegisterInterestsInProgress();
+
+ SecurityService getSecurityService();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java
index d7f7c7b..136a11f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java
@@ -16,9 +16,10 @@ package org.apache.geode.internal.cache.tier;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
public interface Command {
- void execute(Message message, ServerConnection serverConnection);
+ void execute(Message clientMessage, ServerConnection serverConnection, SecurityService securityService);
int RESPONDED = 1;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CommandContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CommandContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CommandContext.java
new file mode 100644
index 0000000..cd5d29c
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CommandContext.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.cache.tier;
+
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
+
+public interface CommandContext {
+
+ Message getMessage();
+
+ ServerConnection getServerConnection();
+
+ SecurityService getSecurityService();
+
+ long getStatTimeStart();
+
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
index 9658f98..d46e88f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
@@ -272,7 +272,7 @@ public class AcceptorImpl extends Acceptor implements Runnable {
private List<GatewayTransportFilter> gatewayTransportFilters;
private final SocketCreator socketCreator;
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
+ private final SecurityService securityService;
/**
* Initializes this acceptor thread to listen for connections on the given port.
@@ -297,6 +297,7 @@ public class AcceptorImpl extends Acceptor implements Runnable {
int maxConnections, int maxThreads, int maximumMessageCount, int messageTimeToLive,
ConnectionListener listener, List overflowAttributesList, boolean isGatewayReceiver,
List<GatewayTransportFilter> transportFilter, boolean tcpNoDelay) throws IOException {
+ this.securityService = internalCache.getSecurityService();
this.bindHostName = calcBindHostName(internalCache, bindHostName);
this.connectionListener = listener == null ? new ConnectionListenerAdapter() : listener;
this.notifyBySubscription = notifyBySubscription;
@@ -1470,7 +1471,7 @@ public class AcceptorImpl extends Acceptor implements Runnable {
}
ServerConnection serverConn = new ServerConnection(s, this.cache, this.crHelper, this.stats,
AcceptorImpl.handShakeTimeout, this.socketBufferSize, communicationModeStr,
- communicationMode, this);
+ communicationMode, this, this.securityService);
synchronized (this.allSCsLock) {
this.allSCs.add(serverConn);
ServerConnection snap[] = this.allSCList; // avoid volatile read
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
index 1fb8c8c..446da77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
@@ -115,8 +115,6 @@ public abstract class BaseCommand implements Command {
private static final Semaphore INCOMING_MSG_LIMITER;
- protected SecurityService securityService = IntegratedSecurityService.getSecurityService();
-
static {
Semaphore semaphore;
if (MAX_INCOMING_DATA > 0) {
@@ -140,7 +138,7 @@ public abstract class BaseCommand implements Command {
}
@Override
- public void execute(Message clientMessage, ServerConnection serverConnection) {
+ public void execute(Message clientMessage, ServerConnection serverConnection, SecurityService securityService) {
// Read the request and update the statistics
long start = DistributionStats.getStatTime();
if (EntryLogger.isEnabled() && serverConnection != null) {
@@ -156,13 +154,13 @@ public abstract class BaseCommand implements Command {
TXStateProxy tx = null;
try {
tx = txMgr.masqueradeAs(clientMessage, member, false);
- cmdExecute(clientMessage, serverConnection, start);
+ cmdExecute(clientMessage, serverConnection, securityService, start);
tx.updateProxyServer(txMgr.getMemberId());
} finally {
txMgr.unmasquerade(tx);
}
} else {
- cmdExecute(clientMessage, serverConnection, start);
+ cmdExecute(clientMessage, serverConnection, securityService, start);
}
} catch (TransactionException | CopyException | SerializationException | CacheWriterException
@@ -265,8 +263,7 @@ public abstract class BaseCommand implements Command {
return tag;
}
- public abstract void cmdExecute(Message clientMessage, ServerConnection serverConnection,
- long start) throws IOException, ClassNotFoundException, InterruptedException;
+ public abstract void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, final long start) throws IOException, ClassNotFoundException, InterruptedException;
protected void writeReply(Message origMsg, ServerConnection serverConnection) throws IOException {
Message replyMsg = serverConnection.getReplyMessage();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 8450db9..79a54a4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -327,7 +327,7 @@ public class CacheClientProxy implements ClientSession {
private int numDrainsInProgress = 0;
private final Object drainsInProgressLock = new Object();
- private SecurityService securityService = SecurityService.getSecurityService();
+ private final SecurityService securityService;
/**
* Constructor.
@@ -340,10 +340,12 @@ public class CacheClientProxy implements ClientSession {
*/
protected CacheClientProxy(CacheClientNotifier ccn, Socket socket,
ClientProxyMembershipID proxyID, boolean isPrimary, byte clientConflation,
- Version clientVersion, long acceptorId, boolean notifyBySubscription) throws CacheException {
+ Version clientVersion, long acceptorId, boolean notifyBySubscription, SecurityService securityService) throws CacheException {
+
initializeTransientFields(socket, proxyID, isPrimary, clientConflation, clientVersion);
this._cacheClientNotifier = ccn;
this._cache = ccn.getCache();
+ this.securityService = securityService;
this._maximumMessageCount = ccn.getMaximumMessageCount();
this._messageTimeToLive = ccn.getMessageTimeToLive();
this._acceptorId = acceptorId;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandContextImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandContextImpl.java
new file mode 100644
index 0000000..d4cf4ae
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandContextImpl.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.cache.tier.sockets;
+
+import org.apache.geode.internal.cache.tier.CommandContext;
+import org.apache.geode.internal.security.SecurityService;
+
+public class CommandContextImpl implements CommandContext {
+
+ private final Message clientMessage;
+ private final ServerConnection serverConnection;
+ private final SecurityService securityService;
+ private final long statTimeStart;
+
+ public CommandContextImpl(Message clientMessage, ServerConnection serverConnection, SecurityService securityService) {
+ this(clientMessage, serverConnection, securityService, 0);
+ }
+
+ public CommandContextImpl(CommandContext commandContext, long statTimeStart) {
+ this(commandContext.getMessage(), commandContext.getServerConnection(), commandContext.getSecurityService(), statTimeStart);
+ }
+
+ public CommandContextImpl(Message clientMessage, ServerConnection serverConnection, SecurityService securityService, long statTimeStart) {
+ this.clientMessage = clientMessage;
+ this.serverConnection = serverConnection;
+ this.securityService = securityService;
+ this.statTimeStart = statTimeStart;
+ }
+
+ @Override
+ public Message getMessage() {
+ return this.clientMessage;
+ }
+
+ @Override
+ public ServerConnection getServerConnection() {
+ return this.serverConnection;
+ }
+
+ @Override
+ public SecurityService getSecurityService() {
+ return this.securityService;
+ }
+
+ @Override
+ public long getStatTimeStart() {
+ return this.statTimeStart;
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index 388f838..54dd8ea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -48,6 +48,7 @@ import org.apache.geode.internal.cache.tier.ConnectionProxy;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.security.DisabledSecurityService;
import org.apache.geode.internal.security.IntegratedSecurityService;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
@@ -120,7 +121,7 @@ public class HandShake implements ClientHandShake {
public static final byte REPLY_SERVER_IS_LOCATOR = (byte) 67;
- private static SecurityService securityService = IntegratedSecurityService.getSecurityService();
+ private final SecurityService securityService;
private byte code;
private int clientReadTimeout = PoolFactory.DEFAULT_READ_TIMEOUT;
@@ -248,19 +249,20 @@ public class HandShake implements ClientHandShake {
protected HandShake() {
system = null;
id = null;
+ this.securityService = new DisabledSecurityService();
}
/**
* HandShake Constructor used by server side connection
*/
public HandShake(Socket sock, int timeout, DistributedSystem sys, Version clientVersion,
- byte communicationMode) throws IOException, AuthenticationRequiredException {
+ byte communicationMode, SecurityService securityService) throws IOException, AuthenticationRequiredException {
+
this.clientVersion = clientVersion;
this.system = sys;
- // SocketChannel sc = sock.getChannel();
- /*
- * if (sc != null) { } else
- */ {
+ this.securityService = securityService;
+
+ {
int soTimeout = -1;
try {
soTimeout = sock.getSoTimeout();
@@ -335,6 +337,7 @@ public class HandShake implements ClientHandShake {
this.system = sys;
setOverrides();
this.credentials = null;
+ this.securityService = new DisabledSecurityService();
}
public void updateProxyID(InternalDistributedMember idm) {
@@ -358,6 +361,7 @@ public class HandShake implements ClientHandShake {
this.overrides = handShake.overrides;
this.system = handShake.system;
this.id = handShake.id;
+ this.securityService = handShake.securityService;
// create new one
this._decrypt = null;
this._encrypt = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 485ccae..1b08540 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -39,7 +39,6 @@ import org.apache.shiro.util.ThreadState;
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.client.internal.AbstractOp;
import org.apache.geode.cache.client.internal.Connection;
import org.apache.geode.distributed.DistributedSystem;
@@ -62,7 +61,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
-import org.apache.geode.internal.security.IntegratedSecurityService;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.util.Breadcrumbs;
import org.apache.geode.security.AuthenticationFailedException;
@@ -88,7 +86,7 @@ public class ServerConnection implements Runnable {
private Map commands;
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
+ private final SecurityService securityService;
final protected CacheServerStats stats;
@@ -250,25 +248,26 @@ public class ServerConnection implements Runnable {
* Creates a new <code>ServerConnection</code> that processes messages received from an edge
* client over a given <code>Socket</code>.
*/
- public ServerConnection(Socket s, Cache c, CachedRegionHelper helper, CacheServerStats stats,
- int hsTimeout, int socketBufferSize, String communicationModeStr, byte communicationMode,
- Acceptor acceptor) {
- StringBuffer buffer = new StringBuffer(100);
+ public ServerConnection(Socket socket, InternalCache internalCache, CachedRegionHelper helper, CacheServerStats stats,
+ int hsTimeout, int socketBufferSize, String communicationModeStr, byte communicationMode,
+ Acceptor acceptor, SecurityService securityService) {
+
+ StringBuilder buffer = new StringBuilder(100);
if (((AcceptorImpl) acceptor).isGatewayReceiver()) {
buffer.append("GatewayReceiver connection from [");
} else {
buffer.append("Server connection from [");
}
buffer.append(communicationModeStr).append(" host address=")
- .append(s.getInetAddress().getHostAddress()).append("; ").append(communicationModeStr)
- .append(" port=").append(s.getPort()).append("]");
+ .append(socket.getInetAddress().getHostAddress()).append("; ").append(communicationModeStr)
+ .append(" port=").append(socket.getPort()).append("]");
this.name = buffer.toString();
this.stats = stats;
this.acceptor = (AcceptorImpl) acceptor;
this.crHelper = helper;
- this.logWriter = (InternalLogWriter) c.getLoggerI18n();
- this.securityLogWriter = (InternalLogWriter) c.getSecurityLoggerI18n();
+ this.logWriter = (InternalLogWriter) internalCache.getLoggerI18n();
+ this.securityLogWriter = (InternalLogWriter) internalCache.getSecurityLoggerI18n();
this.communicationModeStr = communicationModeStr;
this.communicationMode = communicationMode;
this.principal = null;
@@ -276,20 +275,18 @@ public class ServerConnection implements Runnable {
this.postAuthzRequest = null;
this.randomConnectionIdGen = new Random(this.hashCode());
+ this.securityService = securityService;
+
final boolean isDebugEnabled = logger.isDebugEnabled();
try {
- // requestMsg.setUseDataStream(useDataStream);
- // replyMsg.setUseDataStream(useDataStream);
- // responseMsg.setUseDataStream(useDataStream);
- // errorMsg.setUseDataStream(useDataStream);
- initStreams(s, socketBufferSize, stats);
+ initStreams(socket, socketBufferSize, stats);
if (isDebugEnabled) {
logger.debug(
"{}: Accepted client connection from {}[client host name={}; client host address={}; client port={}]",
- getName(), s.getInetAddress().getCanonicalHostName(),
- s.getInetAddress().getHostAddress(), s.getPort());
+ getName(), communicationModeStr, socket.getInetAddress().getCanonicalHostName(),
+ socket.getInetAddress().getHostAddress(), socket.getPort());
}
this.handShakeTimeout = hsTimeout;
} catch (Exception e) {
@@ -323,7 +320,7 @@ public class ServerConnection implements Runnable {
synchronized (this.handShakeMonitor) {
if (this.handshake == null) {
// synchronized (getCleanupTable()) {
- boolean readHandShake = ServerHandShakeProcessor.readHandShake(this);
+ boolean readHandShake = ServerHandShakeProcessor.readHandShake(this, getSecurityService());
if (readHandShake) {
if (this.handshake.isOK()) {
try {
@@ -441,6 +438,10 @@ public class ServerConnection implements Runnable {
return this.securityLogWriter;
}
+ private SecurityService getSecurityService() {
+ return this.securityService;
+ }
+
private boolean incedCleanupTableRef = false;
private boolean incedCleanupProxyIdTableRef = false;
@@ -777,7 +778,7 @@ public class ServerConnection implements Runnable {
}
}
- command.execute(msg, this);
+ command.execute(msg, this, this.securityService);
}
} finally {
// Keep track of the fact that a message is no longer being
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index 6534b68..884c2af 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -29,6 +29,7 @@ import java.net.SocketTimeoutException;
import java.security.Principal;
import java.util.Properties;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.logging.log4j.Logger;
import org.apache.shiro.subject.Subject;
@@ -77,7 +78,7 @@ public class ServerHandShakeProcessor {
currentServerVersion = Version.fromOrdinalOrCurrent(ver);
}
- public static boolean readHandShake(ServerConnection connection) {
+ public static boolean readHandShake(ServerConnection connection, SecurityService securityService) {
boolean validHandShake = false;
Version clientVersion = null;
try {
@@ -120,7 +121,7 @@ public class ServerHandShakeProcessor {
// Read the appropriate handshake
if (clientVersion.compareTo(Version.GFE_57) >= 0) {
- validHandShake = readGFEHandshake(connection, clientVersion);
+ validHandShake = readGFEHandshake(connection, clientVersion, securityService);
} else {
connection.refuseHandshake(
"Unsupported version " + clientVersion + "Server's current version " + Acceptor.VERSION,
@@ -196,7 +197,7 @@ public class ServerHandShakeProcessor {
hdos.close();
}
- private static boolean readGFEHandshake(ServerConnection connection, Version clientVersion) {
+ private static boolean readGFEHandshake(ServerConnection connection, Version clientVersion, SecurityService securityService) {
int handShakeTimeout = connection.getHandShakeTimeout();
InternalLogWriter securityLogWriter = connection.getSecurityLogWriter();
try {
@@ -204,7 +205,7 @@ public class ServerHandShakeProcessor {
DistributedSystem system = connection.getDistributedSystem();
// hitesh:it will set credentials and principals
HandShake handshake = new HandShake(socket, handShakeTimeout, system, clientVersion,
- connection.getCommunicationMode());
+ connection.getCommunicationMode(), securityService);
connection.setHandshake(handshake);
ClientProxyMembershipID proxyId = handshake.getMembership();
connection.setProxyId(proxyId);
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
index 2cb36cd..30db6b8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
@@ -24,6 +24,7 @@ import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.TypeRegistry;
@@ -39,7 +40,7 @@ public class AddPdxEnum extends BaseCommand {
private AddPdxEnum() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
index 3feba0d..52432ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
@@ -24,6 +24,7 @@ import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
@@ -39,7 +40,7 @@ public class AddPdxType extends BaseCommand {
private AddPdxType() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
index ab19954..b4f7282 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
@@ -35,6 +35,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class ClearRegion extends BaseCommand {
@@ -47,7 +48,7 @@ public class ClearRegion extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, callbackArgPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
index cf9c470..440722d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
@@ -20,6 +20,7 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.*;
import org.apache.geode.distributed.internal.DistributionStats;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
@@ -35,7 +36,7 @@ public class ClientReady extends BaseCommand {
private ClientReady() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
CacheServerStats stats = serverConnection.getCacheServerStats();
{
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
index 21f0cad..2a9a9a2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
@@ -27,6 +27,7 @@ import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
public class CloseConnection extends BaseCommand {
@@ -39,7 +40,7 @@ public class CloseConnection extends BaseCommand {
private CloseConnection() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
CacheServerStats stats = serverConnection.getCacheServerStats();
long oldStart = start;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
index 366d77c..49af0f4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
@@ -17,9 +17,7 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.TXCommitMessage;
import org.apache.geode.internal.cache.TXId;
@@ -30,7 +28,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
-import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
@@ -50,7 +48,7 @@ public class CommitCommand extends BaseCommand {
private CommitCommand() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
TXManagerImpl txMgr = (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
index 9cb2528..967caec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
import org.apache.geode.distributed.internal.DistributionStats;
-import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -30,6 +28,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
public class ContainsKey extends BaseCommand {
@@ -51,7 +50,7 @@ public class ContainsKey extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
Part regionNamePart = null;
Part keyPart = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
index b2ce055..e73fb5a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
@@ -33,6 +33,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
public class ContainsKey66 extends BaseCommand {
@@ -55,7 +56,7 @@ public class ContainsKey66 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
Part regionNamePart = null, keyPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
index 0dec596..de4f8e2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
@@ -30,6 +30,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
public class CreateRegion extends BaseCommand {
@@ -41,7 +42,7 @@ public class CreateRegion extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
Part regionNamePart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
index 3daaec5..8ea8634 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.*;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
@@ -37,7 +38,7 @@ public class Default extends BaseCommand {
private Default() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
// requiresResponse = true; NOT NEEDED... ALWAYS SEND ERROR RESPONSE
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
index 83ab394..bd3b427 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
@@ -37,6 +37,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.GemFireSecurityException;
public class Destroy extends BaseCommand {
@@ -48,7 +49,7 @@ public class Destroy extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startparam)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long startparam)
throws IOException, InterruptedException {
long start = startparam;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
index 3aebbb5..ddb6e0f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
@@ -42,6 +42,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.util.Breadcrumbs;
import org.apache.geode.security.GemFireSecurityException;
@@ -94,7 +95,7 @@ public class Destroy65 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart;
Part keyPart;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
index 886994e..0728e15 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
@@ -23,7 +23,6 @@ import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -45,7 +44,7 @@ public class DestroyRegion extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, callbackArgPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
index c146d27..9a8a43d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
@@ -47,6 +47,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
* This is the base command which read the parts for the MessageType.EXECUTE_FUNCTION.<br>
@@ -64,7 +65,7 @@ public class ExecuteFunction extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
Object function = null;
Object args = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
index 23d5b18..40b04c0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
@@ -48,6 +48,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
* @since GemFire 6.5
@@ -63,7 +64,7 @@ public class ExecuteFunction65 extends BaseCommand {
ExecuteFunction65() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
Object function = null;
Object args = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
index 46302bc..6d73498 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
@@ -60,6 +60,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
* @since GemFire 6.6
@@ -87,7 +88,7 @@ public class ExecuteFunction66 extends BaseCommand {
ExecuteFunction66() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
Object function = null;
Object args = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
index 09fe20e..4155846 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
@@ -36,6 +36,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.security.SecurityService;
/**
*
@@ -51,9 +52,9 @@ public class ExecuteFunction70 extends ExecuteFunction66 {
private ExecuteFunction70() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
- super.cmdExecute(clientMessage, serverConnection, start);
+ super.cmdExecute(clientMessage, serverConnection, securityService, start);
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
index 82a378d..ab3c121 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
@@ -43,6 +43,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
* This is the base command which reads the parts for the MessageType.EXECUTE_REGION_FUNCTION and
@@ -63,7 +64,7 @@ public class ExecuteRegionFunction extends BaseCommand {
private ExecuteRegionFunction() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
String regionName = null;
Object function = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
index 12919d0..a4e7741 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
@@ -16,7 +16,6 @@
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
-import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
@@ -46,6 +45,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
*
@@ -63,7 +63,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
private ExecuteRegionFunction61() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
String regionName = null;
Object function = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
index 3be907b..30d122f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
@@ -45,6 +45,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
* @since GemFire 6.5
@@ -60,7 +61,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
private ExecuteRegionFunction65() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
String regionName = null;
Object function = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
index 674082c..8a3f451 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
@@ -49,6 +49,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
* @since GemFire 6.6
@@ -64,7 +65,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
private ExecuteRegionFunction66() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
String regionName = null;
Object function = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
index cf96137..917c120 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
@@ -46,6 +46,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
* @since GemFire 6.5
@@ -62,7 +63,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
private ExecuteRegionFunctionSingleHop() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
index d489b88..956dd61 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
@@ -33,7 +33,6 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.EventIDHolder;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
@@ -49,6 +48,7 @@ import org.apache.geode.internal.cache.wan.GatewayReceiverStats;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.pdx.PdxConfigurationException;
import org.apache.geode.pdx.PdxRegistryMismatchException;
@@ -79,7 +79,7 @@ public class GatewayReceiverCommand extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
index 2ca8804..8cc0582 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
@@ -43,6 +43,7 @@ import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
public class Get70 extends BaseCommand {
@@ -54,7 +55,7 @@ public class Get70 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startparam)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long startparam)
throws IOException {
long start = startparam;
Part regionNamePart = null, keyPart = null, valuePart = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
index 01c5c9c..8ec3402 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
@@ -33,6 +33,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
public class GetAll extends BaseCommand {
@@ -44,7 +45,7 @@ public class GetAll extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null;
String regionName = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
index ad8ef49..8c0b0e9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
@@ -33,6 +33,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
public class GetAll651 extends BaseCommand {
@@ -44,7 +45,7 @@ public class GetAll651 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null;
String regionName = null;
[10/35] geode git commit: Upping read timeout in HAInterestTestCase
Posted by kl...@apache.org.
Upping read timeout in HAInterestTestCase
These tests seem to occasionally fail. Upping the timeout from 1 second
to get rid of spurious timing issues.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/76ff5061
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/76ff5061
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/76ff5061
Branch: refs/heads/feature/GEODE-2632-19
Commit: 76ff50613ad7703305c2d7dec0b4d1c8f5bb0873
Parents: 8067518
Author: Dan Smith <up...@apache.org>
Authored: Tue May 30 16:37:33 2017 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue May 30 16:37:33 2017 -0700
----------------------------------------------------------------------
.../geode/internal/cache/tier/sockets/HAInterestTestCase.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/76ff5061/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
index 858f603..5d3ae2d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
@@ -919,7 +919,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
try {
p = (PoolImpl) PoolManager.createFactory().addServer(host, PORT1).addServer(host, PORT2)
.addServer(host, PORT3).setSubscriptionEnabled(true).setSubscriptionRedundancy(-1)
- .setReadTimeout(1000).setPingInterval(1000)
+ .setReadTimeout(10000).setPingInterval(1000)
// retryInterval should be more so that only registerInterste thread
// will initiate failover
// .setRetryInterval(20000)
@@ -948,7 +948,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
PoolImpl p;
try {
p = (PoolImpl) PoolManager.createFactory().addServer(host, PORT1).addServer(host, PORT2)
- .setSubscriptionEnabled(true).setSubscriptionRedundancy(-1).setReadTimeout(1000)
+ .setSubscriptionEnabled(true).setSubscriptionRedundancy(-1).setReadTimeout(10000)
.setSocketBufferSize(32768).setMinConnections(6).setPingInterval(200)
// .setRetryInterval(200)
// retryAttempts 3
@@ -975,7 +975,7 @@ public class HAInterestTestCase extends JUnit4DistributedTestCase {
props.setProperty(LOCATORS, "");
new HAInterestTestCase().createCache(props);
PoolImpl p = (PoolImpl) PoolManager.createFactory().addServer(hostName, PORT1)
- .setSubscriptionEnabled(true).setSubscriptionRedundancy(-1).setReadTimeout(1000)
+ .setSubscriptionEnabled(true).setSubscriptionRedundancy(-1).setReadTimeout(10000)
// .setRetryInterval(20)
.create("HAInterestBaseTestPool");
AttributesFactory factory = new AttributesFactory();
[19/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerUtils.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerUtils.java
new file mode 100644
index 0000000..8cd7622
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerUtils.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.tier.sockets;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.internal.cache.CacheServerImpl;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Provides tests a way to access CacheServer, AcceptorImpl and ServerConnection
+ */
+public class CacheServerUtils {
+
+ /**
+ * Returns single CacheServer for the specified Cache instance
+ */
+ public static CacheServer getCacheServer(final Cache cache) {
+ List<CacheServer> cacheServers = cache.getCacheServers();
+ CacheServer cacheServer = cacheServers.get(0);
+ return cacheServer;
+ }
+
+ /**
+ * Returns AcceptorImpl for the specified CacheServer instance
+ */
+ public static AcceptorImpl getAcceptorImpl(final CacheServer cacheServer) {
+ AcceptorImpl acceptor = ((CacheServerImpl) cacheServer).getAcceptor();
+ return acceptor;
+ }
+
+ /**
+ * Returns single ServerConnection for the specified CacheServer instance
+ */
+ public static ServerConnection getServerConnection(final CacheServer cacheServer) {
+ AcceptorImpl acceptor = ((CacheServerImpl) cacheServer).getAcceptor();
+ Set<ServerConnection> serverConnections = acceptor.getAllServerConnections();
+ ServerConnection serverConnection = serverConnections.iterator().next(); // null
+ return serverConnection;
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
index 86fcbce..b2d903c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
@@ -32,53 +32,49 @@ import org.apache.geode.test.junit.categories.UnitTest;
public class MessageJUnitTest {
private Message message;
- private Socket mockSocket;
- private MessageStats mockStats;
- private ByteBuffer msgBuffer;
- private ServerConnection mockServerConnection;
@Before
public void setUp() throws Exception {
- mockSocket = mock(Socket.class);
- message = new Message(2, Version.CURRENT);
- assertEquals(2, message.getNumberOfParts());
- mockStats = mock(MessageStats.class);
- msgBuffer = ByteBuffer.allocate(1000);
- mockServerConnection = mock(ServerConnection.class);
- message.setComms(mockServerConnection, mockSocket, msgBuffer, mockStats);
+ Socket mockSocket = mock(Socket.class);
+ this.message = new Message(2, Version.CURRENT);
+ assertEquals(2, this.message.getNumberOfParts());
+ MessageStats mockStats = mock(MessageStats.class);
+ ByteBuffer msgBuffer = ByteBuffer.allocate(1000);
+ ServerConnection mockServerConnection = mock(ServerConnection.class);
+ this.message.setComms(mockServerConnection, mockSocket, msgBuffer, mockStats);
}
@Test
public void clearDoesNotThrowNPE() throws Exception {
// unsetComms clears the message's ByteBuffer, which was causing an NPE during shutdown
// when clear() was invoked
- message.unsetComms();
- message.clear();
+ this.message.unsetComms();
+ this.message.clear();
}
@Test
public void numberOfPartsIsAdjusted() {
- int numParts = message.getNumberOfParts();
- message.setNumberOfParts(2 * numParts + 1);
- assertEquals(2 * numParts + 1, message.getNumberOfParts());
- message.addBytesPart(new byte[1]);
- message.addIntPart(2);
- message.addLongPart(3);
- message.addObjPart("4");
- message.addStringPart("5");
- assertEquals(5, message.getNextPartNumber());
+ int numParts = this.message.getNumberOfParts();
+ this.message.setNumberOfParts(2 * numParts + 1);
+ assertEquals(2 * numParts + 1, this.message.getNumberOfParts());
+ this.message.addBytesPart(new byte[1]);
+ this.message.addIntPart(2);
+ this.message.addLongPart(3);
+ this.message.addObjPart("4");
+ this.message.addStringPart("5");
+ assertEquals(5, this.message.getNextPartNumber());
}
@Test
public void messageLongerThanMaxIntIsRejected() throws Exception {
- Part[] parts = new Part[2];
Part mockPart1 = mock(Part.class);
when(mockPart1.getLength()).thenReturn(Integer.MAX_VALUE / 2);
+ Part[] parts = new Part[2];
parts[0] = mockPart1;
parts[1] = mockPart1;
- message.setParts(parts);
+ this.message.setParts(parts);
try {
- message.send();
+ this.message.send();
fail("expected an exception but none was thrown");
} catch (MessageTooLargeException e) {
assertTrue(e.getMessage().contains("exceeds maximum integer value"));
@@ -87,14 +83,14 @@ public class MessageJUnitTest {
@Test
public void maxMessageSizeIsRespected() throws Exception {
- Part[] parts = new Part[2];
Part mockPart1 = mock(Part.class);
- when(mockPart1.getLength()).thenReturn(Message.MAX_MESSAGE_SIZE / 2);
+ when(mockPart1.getLength()).thenReturn(Message.DEFAULT_MAX_MESSAGE_SIZE / 2);
+ Part[] parts = new Part[2];
parts[0] = mockPart1;
parts[1] = mockPart1;
- message.setParts(parts);
+ this.message.setParts(parts);
try {
- message.send();
+ this.message.send();
fail("expected an exception but none was thrown");
} catch (MessageTooLargeException e) {
assertFalse(e.getMessage().contains("exceeds maximum integer value"));
@@ -103,21 +99,17 @@ public class MessageJUnitTest {
/**
* geode-1468: Message should clear the chunks in its Parts when performing cleanup.
- *
- * @throws Exception
*/
@Test
public void streamBuffersAreClearedDuringCleanup() throws Exception {
- Part[] parts = new Part[2];
Part mockPart1 = mock(Part.class);
when(mockPart1.getLength()).thenReturn(100);
+ Part[] parts = new Part[2];
parts[0] = mockPart1;
parts[1] = mockPart1;
- message.setParts(parts);
- message.clearParts();
+ this.message.setParts(parts);
+ this.message.clearParts();
verify(mockPart1, times(2)).clear();
}
- // TODO many more tests are needed
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
index 5a679bb..110d649 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -600,11 +600,11 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur
RegionTestCase.preSnapshotRegion = null;
SocketCreator.resetHostNameCache();
SocketCreator.resolve_dns = true;
- Message.MAX_MESSAGE_SIZE = Message.DEFAULT_MAX_MESSAGE_SIZE;
// clear system properties -- keep alphabetized
System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "log-level");
System.clearProperty("jgroups.resolve_dns");
+ System.clearProperty(Message.MAX_MESSAGE_SIZE_PROPERTY);
if (InternalDistributedSystem.systemAttemptingReconnect != null) {
InternalDistributedSystem.systemAttemptingReconnect.stopReconnecting();
[28/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
index 291db65..8915c55 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -94,9 +94,9 @@ import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.GemFireSecurityException;
/**
- * <code>CacheClientUpdater</code> is a thread that processes update messages from a cache server
- * and {@linkplain org.apache.geode.cache.Region#localInvalidate(Object) invalidates} the local
- * cache based on the contents of those messages.
+ * {@code CacheClientUpdater} is a thread that processes update messages from a cache server and
+ * {@linkplain org.apache.geode.cache.Region#localInvalidate(Object) invalidates} the local cache
+ * based on the contents of those messages.
*
* @since GemFire 3.5
*/
@@ -104,6 +104,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
private static final Logger logger = LogService.getLogger();
+ private static final int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
+
/**
* true if the constructor successfully created a connection. If false, the run method for this
* thread immediately exits.
@@ -129,6 +131,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* The input stream of the socket
*/
private final InputStream in;
+
/**
* Failed updater from the endpoint previously known as the primary
*/
@@ -139,12 +142,12 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
*/
private final ByteBuffer commBuffer;
- private boolean commBufferReleased;
+ private boolean commBufferReleased; // TODO: fix synchronization
private final CCUStats stats;
/**
- * Cache for which we provide service
+ * Cache for which we provide service TODO: lifecycle and synchronization need work
*/
private /* final */ InternalCache cache;
@@ -175,18 +178,18 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
*/
private boolean isOpCompleted;
- public final static String CLIENT_UPDATER_THREAD_NAME = "Cache Client Updater Thread ";
+ public static final String CLIENT_UPDATER_THREAD_NAME = "Cache Client Updater Thread ";
/**
- * to enable test flag
+ * to enable test flag TODO: eliminate isUsedByTest
*/
public static boolean isUsedByTest;
/**
* Indicates if full value was requested from server as a result of failure in applying delta
- * bytes.
+ * bytes. TODO: only used for test assertion
*/
- public static boolean fullValueRequested = false;
+ static boolean fullValueRequested = false;
private final ServerLocation location;
@@ -195,8 +198,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
private EndpointManager eManager = null;
private Endpoint endpoint = null;
- static private final long MAX_CACHE_WAIT = Long
- .getLong(DistributionConfig.GEMFIRE_PREFIX + "CacheClientUpdater.MAX_WAIT", 120).longValue(); // seconds
+ private static final long MAX_CACHE_WAIT =
+ Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "CacheClientUpdater.MAX_WAIT", 120); // seconds
/**
* Return true if cache appears
@@ -231,7 +234,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
boolean interrupted = Thread.interrupted();
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {
+ } catch (InterruptedException ignore) {
interrupted = true;
} finally {
if (interrupted) {
@@ -245,12 +248,12 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
/**
- * Creates a new <code>CacheClientUpdater</code> with a given name that waits for a server to
- * connect on a given port.
+ * Creates a new {@code CacheClientUpdater} with a given name that waits for a server to connect
+ * on a given port.
*
* @param name descriptive name, used for our ThreadGroup
* @param location the endpoint we represent
- * @param primary true if our endpoint is primary TODO ask the ep for this?
+ * @param primary true if our endpoint is primary
* @param ids the system we are distributing messages through
*
* @throws AuthenticationRequiredException when client is not configured to send credentials using
@@ -265,6 +268,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
Endpoint endpoint, int handshakeTimeout, SocketCreator socketCreator)
throws AuthenticationRequiredException, AuthenticationFailedException,
ServerRefusedConnectionException {
+
super(LoggingThreadGroup.createThreadGroup("Client update thread"), name);
this.setDaemon(true);
this.system = (InternalDistributedSystem) ids;
@@ -276,6 +280,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
this.eManager = eManager;
this.endpoint = endpoint;
this.stats = new CCUStats(this.system, this.location);
+
// Create the connection...
final boolean isDebugEnabled = logger.isDebugEnabled();
if (isDebugEnabled) {
@@ -291,7 +296,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
try {
// Size of the server-to-client communication socket buffers
int socketBufferSize =
- Integer.getInteger("BridgeServer.SOCKET_BUFFER_SIZE", 32768).intValue();
+ Integer.getInteger("BridgeServer.SOCKET_BUFFER_SIZE", DEFAULT_SOCKET_BUFFER_SIZE);
mySock = socketCreator.connectForClient(location.getHostName(), location.getPort(),
handshakeTimeout, socketBufferSize);
@@ -327,31 +332,27 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
}
- {
- int bufSize = 1024;
- try {
- bufSize = mySock.getSendBufferSize();
- if (bufSize < 1024) {
- bufSize = 1024;
- }
- } catch (SocketException ignore) {
+ int bufSize = 1024;
+ try {
+ bufSize = mySock.getSendBufferSize();
+ if (bufSize < 1024) {
+ bufSize = 1024;
}
- cb = ServerConnection.allocateCommBuffer(bufSize, mySock);
- }
- {
- // create a "server" memberId we currently don't know much about the
- // server.
- // Would be nice for it to send us its member id
- // TODO: change the serverId to use the endpoint's getMemberId() which
- // returns a
- // DistributedMember (once gfecq branch is merged to trunk).
- MemberAttributes ma =
- new MemberAttributes(0, -1, DistributionManager.NORMAL_DM_TYPE, -1, null, null, null);
- sid = new InternalDistributedMember(mySock.getInetAddress(), mySock.getPort(), false, true,
- ma);
+ } catch (SocketException ignore) {
}
+ cb = ServerConnection.allocateCommBuffer(bufSize, mySock);
+
+ // create a "server" memberId we currently don't know much about the server.
+ // Would be nice for it to send us its member id
+ // TODO: change the serverId to use the endpoint's getMemberId() which returns a
+ // DistributedMember (once gfecq branch is merged to trunk).
+ MemberAttributes ma =
+ new MemberAttributes(0, -1, DistributionManager.NORMAL_DM_TYPE, -1, null, null, null);
+ sid =
+ new InternalDistributedMember(mySock.getInetAddress(), mySock.getPort(), false, true, ma);
+
success = true;
- } catch (ConnectException e) {
+ } catch (ConnectException ignore) {
if (!quitting()) {
logger.warn(LocalizedMessage
.create(LocalizedStrings.CacheClientUpdater_0_CONNECTION_WAS_REFUSED, this));
@@ -385,20 +386,22 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
e.getMessage()));
}
} finally {
- connected = success;
+ this.connected = success;
if (mySock != null) {
try {
mySock.setSoTimeout(0);
- } catch (SocketException e) {
+ } catch (SocketException ignore) {
// ignore: nothing we can do about this
}
}
- if (connected) {
- socket = mySock;
- out = tmpOut;
- in = tmpIn;
- serverId = sid;
- commBuffer = cb;
+
+ if (this.connected) {
+ this.socket = mySock;
+ this.out = tmpOut;
+ this.in = tmpIn;
+ this.serverId = sid;
+ this.commBuffer = cb;
+
// Don't want the timeout after handshake
if (mySock != null) {
try {
@@ -406,12 +409,13 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
} catch (SocketException ignore) {
}
}
+
} else {
- socket = null;
- serverId = null;
- commBuffer = null;
- out = null;
- in = null;
+ this.socket = null;
+ this.serverId = null;
+ this.commBuffer = null;
+ this.out = null;
+ this.in = null;
if (mySock != null) {
try {
@@ -439,29 +443,31 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
public boolean isConnected() {
- return connected;
+ return this.connected;
}
+ @Override
public boolean isPrimary() {
- return isPrimary;
+ return this.isPrimary;
}
public InternalLogWriter getSecurityLogger() {
return this.qManager.getSecurityLogger();
}
+ @Override
public void setFailedUpdater(ClientUpdater failedUpdater) {
this.failedUpdater = failedUpdater;
}
/**
- * Performs the work of the client update thread. Creates a <code>ServerSocket</code> and waits
- * for the server to connect to it.
+ * Performs the work of the client update thread. Creates a {@code ServerSocket} and waits for the
+ * server to connect to it.
*/
@Override
public void run() {
+ EntryLogger.setSource(this.serverId, "RI");
boolean addedListener = false;
- EntryLogger.setSource(serverId, "RI");
try {
this.system.addDisconnectListener(this);
addedListener = true;
@@ -472,8 +478,10 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
return;
}
processMessages();
- } catch (CancelException e) {
- return; // just bail
+
+ } catch (CancelException ignore) {
+ // just bail
+
} finally {
if (addedListener) {
this.system.removeDisconnectListener(this);
@@ -486,8 +494,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Notifies this thread to stop processing
*/
- protected void stopProcessing() {
- continueProcessing.set(false);// = false;
+ private void stopProcessing() {
+ this.continueProcessing.set(false);
}
/**
@@ -495,39 +503,27 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* duplicates. Note: this method is not named stop because this is a Thread which has a deprecated
* stop method.
*/
- public void stopUpdater() {
+ private void stopUpdater() {
boolean isSelfDestroying = Thread.currentThread() == this;
-
stopProcessing();
+
// need to also close the socket for this interrupt to wakeup
// the thread. This fixes bug 35691.
- // this.close(); // this should not be done here.
if (this.isAlive()) {
if (logger.isDebugEnabled()) {
logger.debug("{}: Stopping {}", this.location, this);
}
+
if (!isSelfDestroying) {
interrupt();
try {
- if (socket != null) {
- socket.close();
+ if (this.socket != null) {
+ this.socket.close();
}
- } catch (VirtualMachineError err) {
- SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
- // now, so don't let this thread continue.
- throw err;
- } catch (Throwable t) {
- // Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
- // _still_ a possibility that you are dealing with a cascading
- // error condition, so you also need to check to see if the JVM
- // is still usable:
- SystemFailure.checkFailure();
- // dont care...
+ } catch (IOException e) {
if (logger.isDebugEnabled()) {
- logger.debug(t.getMessage(), t);
+ logger.debug(e.getMessage(), e);
}
}
} // !isSelfDestroying
@@ -537,32 +533,24 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Signals the run thread to stop, closes underlying resources.
*/
+ @Override
public void close() {
- this.continueProcessing.set(false);// = false; // signals we are done.
+ this.continueProcessing.set(false); // signals we are done.
- // Close the socket
- // This will also cause the underlying streams to fail.
+ // Close the socket. This will also cause the underlying streams to fail.
try {
- if (socket != null) {
- socket.close();
+ if (this.socket != null) {
+ this.socket.close();
}
- } catch (Exception e) {
+ } catch (IOException ignore) {
// ignore
}
- try {
- this.stats.close();
- } catch (Exception e) {
- // ignore
- }
+ this.stats.close();
// close the helper
- try {
- if (cacheHelper != null) {
- cacheHelper.close();
- }
- } catch (Exception e) {
- // ignore
+ if (this.cacheHelper != null) {
+ this.cacheHelper.close();
}
releaseCommBuffer();
}
@@ -572,41 +560,32 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* the server.
*/
private Message initializeMessage() {
- Message _message = new Message(2, Version.CURRENT);
- try {
- _message.setComms(socket, in, out, commBuffer, this.stats);
- } catch (IOException e) {
- if (!quitting()) {
- if (logger.isDebugEnabled()) {
- logger.debug(
- "{}: Caught following exception while attempting to initialize a server-to-client communication socket and will exit",
- this, e);
- }
- stopProcessing();
- }
- }
- return _message;
+ Message message = new Message(2, Version.CURRENT);
+ message.setComms(this.socket, this.in, this.out, this.commBuffer, this.stats);
+ return message;
}
/* refinement of method inherited from Thread */
@Override
public String toString() {
- return this.getName() + " (" + this.location.getHostName() + ":" + this.location.getPort()
- + ")";
+ return getName() + " (" + this.location.getHostName() + ':' + this.location.getPort() + ')';
}
/**
* Handle a marker message
*
- * @param m message containing the data
+ * @param clientMessage message containing the data
*/
- private void handleMarker(Message m) {
+ private void handleMarker(Message clientMessage) {
try {
final boolean isDebugEnabled = logger.isDebugEnabled();
if (isDebugEnabled) {
- logger.debug("Received marker message of length ({} bytes)", m.getPayloadLength());
+ logger.debug("Received marker message of length ({} bytes)",
+ clientMessage.getPayloadLength());
}
+
this.qManager.getState().processMarker();
+
if (isDebugEnabled) {
logger.debug("Processed marker message");
}
@@ -621,41 +600,40 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Create or update an entry
*
- * @param m message containing the data
+ * @param clientMessage message containing the data
*/
- private void handleUpdate(Message m) {
+ private void handleUpdate(Message clientMessage) {
String regionName = null;
Object key = null;
Part valuePart = null;
- Object newValue = null;
- byte[] deltaBytes = null;
- Object fullValue = null;
- boolean isValueObject = false;
- int partCnt = 0;
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
this.isOpCompleted = false;
+
// Retrieve the data from the put message parts
if (isDebugEnabled) {
- logger.debug("Received put message of length ({} bytes)", m.getPayloadLength());
+ logger.debug("Received put message of length ({} bytes)", clientMessage.getPayloadLength());
}
- Part regionNamePart = m.getPart(partCnt++);
- Part keyPart = m.getPart(partCnt++);
- boolean isDeltaSent = ((Boolean) m.getPart(partCnt++).getObject()).booleanValue();
- valuePart = m.getPart(partCnt++);
- Part callbackArgumentPart = m.getPart(partCnt++);
- VersionTag versionTag = (VersionTag) m.getPart(partCnt++).getObject();
+ int partCnt = 0;
+ Part regionNamePart = clientMessage.getPart(partCnt++);
+ Part keyPart = clientMessage.getPart(partCnt++);
+ boolean isDeltaSent = (Boolean) clientMessage.getPart(partCnt++).getObject();
+ valuePart = clientMessage.getPart(partCnt++);
+ Part callbackArgumentPart = clientMessage.getPart(partCnt++);
+ VersionTag versionTag = (VersionTag) clientMessage.getPart(partCnt++).getObject();
if (versionTag != null) {
versionTag.replaceNullIDs((InternalDistributedMember) this.endpoint.getMemberId());
}
- Part isInterestListPassedPart = m.getPart(partCnt++);
- Part hasCqsPart = m.getPart(partCnt++);
+ Part isInterestListPassedPart = clientMessage.getPart(partCnt++);
+ Part hasCqsPart = clientMessage.getPart(partCnt++);
- EventID eventId = (EventID) m.getPart(m.getNumberOfParts() - 1).getObject();
+ EventID eventId =
+ (EventID) clientMessage.getPart(clientMessage.getNumberOfParts() - 1).getObject();
- boolean withInterest = ((Boolean) isInterestListPassedPart.getObject()).booleanValue();
- boolean withCQs = ((Boolean) hasCqsPart.getObject()).booleanValue();
+ boolean withInterest = (Boolean) isInterestListPassedPart.getObject();
+ boolean withCQs = (Boolean) hasCqsPart.getObject();
regionName = regionNamePart.getString();
key = keyPart.getStringOrObject();
@@ -666,30 +644,39 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// object, it will be stored as a CachedDeserializable and
// deserialized only when requested.
- boolean isCreate = (m.getMessageType() == MessageType.LOCAL_CREATE);
+ boolean isCreate = clientMessage.getMessageType() == MessageType.LOCAL_CREATE;
+
if (isDebugEnabled) {
- logger
- .debug(
- "Putting entry for region: {} key: {} create: {}{} callbackArgument: {} withInterest={} withCQs={} eventID={} version={}",
- regionName, key, isCreate,
- (valuePart.isObject() ? new StringBuilder(" value: ")
- .append(deserialize(valuePart.getSerializedForm())) : ""),
- callbackArgument, withInterest, withCQs, eventId, versionTag);
+ logger.debug(
+ "Putting entry for region: {} key: {} create: {}{} callbackArgument: {} withInterest={} withCQs={} eventID={} version={}",
+ regionName, key, isCreate,
+ valuePart.isObject()
+ ? new StringBuilder(" value: ").append(deserialize(valuePart.getSerializedForm()))
+ : "",
+ callbackArgument, withInterest, withCQs, eventId, versionTag);
}
- LocalRegion region = (LocalRegion) cacheHelper.getRegion(regionName);
+ LocalRegion region = (LocalRegion) this.cacheHelper.getRegion(regionName);
+
+ Object newValue = null;
+ byte[] deltaBytes = null;
+ Object fullValue = null;
+ boolean isValueObject;
if (!isDeltaSent) {
// bug #42162 - must check for a serialized null here
byte[] serializedForm = valuePart.getSerializedForm();
+
if (isCreate && InternalDataSerializer.isSerializedNull(serializedForm)) {
// newValue = null; newValue is already null
} else {
newValue = valuePart.getSerializedForm();
}
+
if (withCQs) {
fullValue = valuePart.getObject();
}
+
isValueObject = valuePart.isObject();
} else {
deltaBytes = valuePart.getSerializedForm();
@@ -700,40 +687,49 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
if (isDebugEnabled && !quitting()) {
logger.debug("{}: Region named {} does not exist", this, regionName);
}
+
} else if (region.hasServerProxy() && ServerResponseMatrix
- .checkForValidStateAfterNotification(region, key, m.getMessageType())
+ .checkForValidStateAfterNotification(region, key, clientMessage.getMessageType())
&& (withInterest || !withCQs)) {
@Released
EntryEventImpl newEvent = null;
+
try {
// Create an event and put the entry
newEvent = EntryEventImpl.create(region,
- ((m.getMessageType() == MessageType.LOCAL_CREATE) ? Operation.CREATE
- : Operation.UPDATE),
+ clientMessage.getMessageType() == MessageType.LOCAL_CREATE ? Operation.CREATE
+ : Operation.UPDATE,
key, null /* newValue */, callbackArgument /* callbackArg */, true /* originRemote */,
eventId.getDistributedMember());
+
newEvent.setVersionTag(versionTag);
newEvent.setFromServer(true);
+
region.basicBridgeClientUpdate(eventId.getDistributedMember(), key, newValue, deltaBytes,
- isValueObject, callbackArgument, m.getMessageType() == MessageType.LOCAL_CREATE,
- qManager.getState().getProcessedMarker() || !this.isDurableClient, newEvent, eventId);
+ isValueObject, callbackArgument,
+ clientMessage.getMessageType() == MessageType.LOCAL_CREATE,
+ this.qManager.getState().getProcessedMarker() || !this.isDurableClient, newEvent,
+ eventId);
+
this.isOpCompleted = true;
+
// bug 45520 - ConcurrentCacheModificationException is not thrown and we must check this
// flag
- // if (newEvent.isConcurrencyConflict()) {
- // return; // this is logged elsewhere at fine level
- // }
if (withCQs && isDeltaSent) {
fullValue = newEvent.getNewValue();
}
- } catch (InvalidDeltaException ide) {
+ } catch (InvalidDeltaException ignore) {
Part fullValuePart = requestFullValue(eventId, "Caught InvalidDeltaException.");
region.getCachePerfStats().incDeltaFullValuesRequested();
- fullValue = newValue = fullValuePart.getObject();
- isValueObject = Boolean.valueOf(fullValuePart.isObject());
+ fullValue = newValue = fullValuePart.getObject(); // TODO: fix this line
+ isValueObject = fullValuePart.isObject();
+
region.basicBridgeClientUpdate(eventId.getDistributedMember(), key, newValue, null,
- isValueObject, callbackArgument, m.getMessageType() == MessageType.LOCAL_CREATE,
- qManager.getState().getProcessedMarker() || !this.isDurableClient, newEvent, eventId);
+ isValueObject, callbackArgument,
+ clientMessage.getMessageType() == MessageType.LOCAL_CREATE,
+ this.qManager.getState().getProcessedMarker() || !this.isDurableClient, newEvent,
+ eventId);
+
this.isOpCompleted = true;
} finally {
if (newEvent != null)
@@ -748,20 +744,19 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// Update CQs. CQs can exist without client region.
if (withCQs) {
- Part numCqsPart = m.getPart(partCnt++);
+ Part numCqsPart = clientMessage.getPart(partCnt++);
if (isDebugEnabled) {
logger.debug("Received message has CQ Event. Number of cqs interested in the event : {}",
numCqsPart.getInt() / 2);
}
- partCnt = processCqs(m, partCnt, numCqsPart.getInt(), m.getMessageType(), key, fullValue,
- deltaBytes, eventId);
+ partCnt = processCqs(clientMessage, partCnt, numCqsPart.getInt(),
+ clientMessage.getMessageType(), key, fullValue, deltaBytes, eventId);
this.isOpCompleted = true;
}
} catch (Exception e) {
String message =
LocalizedStrings.CacheClientUpdater_THE_FOLLOWING_EXCEPTION_OCCURRED_WHILE_ATTEMPTING_TO_PUT_ENTRY_REGION_0_KEY_1_VALUE_2
- .toLocalizedString(
- new Object[] {regionName, key, deserialize(valuePart.getSerializedForm())});
+ .toLocalizedString(regionName, key, deserialize(valuePart.getSerializedForm()));
handleException(message, e);
}
}
@@ -774,12 +769,14 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
if (isDebugEnabled) {
logger.debug("{} Requesting full value...", reason);
}
- Part result = (Part) GetEventValueOp.executeOnPrimary(qManager.getPool(), eventId, null);
+ Part result = (Part) GetEventValueOp.executeOnPrimary(this.qManager.getPool(), eventId, null);
if (result == null) {
// Just log a warning. Do not stop CCU thread.
+ // TODO: throw a subclass of Exception
throw new Exception("Could not retrieve full value for " + eventId);
}
+
if (isDebugEnabled) {
logger.debug("Full value received.");
}
@@ -789,39 +786,41 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Invalidate an entry
*
- * @param m message describing the entry
+ * @param clientMessage message describing the entry
*/
- private void handleInvalidate(Message m) {
+ private void handleInvalidate(Message clientMessage) {
String regionName = null;
Object key = null;
- int partCnt = 0;
-
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
this.isOpCompleted = false;
+
// Retrieve the data from the local-invalidate message parts
if (isDebugEnabled) {
- logger.debug("Received invalidate message of length ({} bytes)", m.getPayloadLength());
+ logger.debug("Received invalidate message of length ({} bytes)",
+ clientMessage.getPayloadLength());
}
- Part regionNamePart = m.getPart(partCnt++);
- Part keyPart = m.getPart(partCnt++);
- Part callbackArgumentPart = m.getPart(partCnt++);
+ int partCnt = 0;
+ Part regionNamePart = clientMessage.getPart(partCnt++);
+ Part keyPart = clientMessage.getPart(partCnt++);
+ Part callbackArgumentPart = clientMessage.getPart(partCnt++);
- VersionTag versionTag = (VersionTag) m.getPart(partCnt++).getObject();
+ VersionTag versionTag = (VersionTag) clientMessage.getPart(partCnt++).getObject();
if (versionTag != null) {
versionTag.replaceNullIDs((InternalDistributedMember) this.endpoint.getMemberId());
}
- Part isInterestListPassedPart = m.getPart(partCnt++);
- Part hasCqsPart = m.getPart(partCnt++);
+ Part isInterestListPassedPart = clientMessage.getPart(partCnt++);
+ Part hasCqsPart = clientMessage.getPart(partCnt++);
regionName = regionNamePart.getString();
key = keyPart.getStringOrObject();
Object callbackArgument = callbackArgumentPart.getObject();
- boolean withInterest = ((Boolean) isInterestListPassedPart.getObject()).booleanValue();
- boolean withCQs = ((Boolean) hasCqsPart.getObject()).booleanValue();
+ boolean withInterest = (Boolean) isInterestListPassedPart.getObject();
+ boolean withCQs = (Boolean) hasCqsPart.getObject();
if (isDebugEnabled) {
logger.debug(
@@ -829,34 +828,36 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
regionName, key, callbackArgument, withInterest, withCQs, versionTag);
}
- LocalRegion region = (LocalRegion) cacheHelper.getRegion(regionName);
+ LocalRegion region = (LocalRegion) this.cacheHelper.getRegion(regionName);
if (region == null) {
if (isDebugEnabled && !quitting()) {
logger.debug("Region named {} does not exist", regionName);
}
+
} else {
if (region.hasServerProxy() && (withInterest || !withCQs)) {
try {
- Part eid = m.getPart(m.getNumberOfParts() - 1);
+ Part eid = clientMessage.getPart(clientMessage.getNumberOfParts() - 1);
EventID eventId = (EventID) eid.getObject();
+
try {
region.basicBridgeClientInvalidate(eventId.getDistributedMember(), key,
callbackArgument,
- qManager.getState().getProcessedMarker() || !this.isDurableClient, eventId,
+ this.qManager.getState().getProcessedMarker() || !this.isDurableClient, eventId,
versionTag);
- } catch (ConcurrentCacheModificationException e) {
- // return; allow CQs to be processed
+ } catch (ConcurrentCacheModificationException ignore) {
+ // allow CQs to be processed
}
+
this.isOpCompleted = true;
// fix for 36615
- qManager.getState().incrementInvalidatedStats();
+ this.qManager.getState().incrementInvalidatedStats();
if (isDebugEnabled) {
logger.debug("Invalidated entry for region: {} key: {} callbackArgument: {}",
regionName, key, callbackArgument);
}
- } catch (EntryNotFoundException e) {
- /* ignore */
+ } catch (EntryNotFoundException ignore) {
if (isDebugEnabled && !quitting()) {
logger.debug("Already invalidated entry for region: {} key: {} callbackArgument: {}",
regionName, key, callbackArgument);
@@ -869,19 +870,20 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
if (withCQs) {
// The client may have been registered to receive invalidates for
// create and updates operations. Get the actual region operation.
- Part regionOpType = m.getPart(partCnt++);
- Part numCqsPart = m.getPart(partCnt++);
+ Part regionOpType = clientMessage.getPart(partCnt++);
+ Part numCqsPart = clientMessage.getPart(partCnt++);
if (isDebugEnabled) {
logger.debug("Received message has CQ Event. Number of cqs interested in the event : {}",
numCqsPart.getInt() / 2);
}
- partCnt = processCqs(m, partCnt, numCqsPart.getInt(), regionOpType.getInt(), key, null);
+ partCnt = processCqs(clientMessage, partCnt, numCqsPart.getInt(), regionOpType.getInt(),
+ key, null);
this.isOpCompleted = true;
}
} catch (Exception e) {
final String message =
LocalizedStrings.CacheClientUpdater_THE_FOLLOWING_EXCEPTION_OCCURRED_WHILE_ATTEMPTING_TO_INVALIDATE_ENTRY_REGION_0_KEY_1
- .toLocalizedString(new Object[] {regionName, key});
+ .toLocalizedString(regionName, key);
handleException(message, e);
}
}
@@ -889,26 +891,27 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* locally destroy an entry
*
- * @param m message describing the entry
+ * @param clientMessage message describing the entry
*/
- private void handleDestroy(Message m) {
+ private void handleDestroy(Message clientMessage) {
String regionName = null;
Object key = null;
- int partCnt = 0;
-
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
this.isOpCompleted = false;
// Retrieve the data from the local-destroy message parts
if (isDebugEnabled) {
- logger.debug("Received destroy message of length ({} bytes)", m.getPayloadLength());
+ logger.debug("Received destroy message of length ({} bytes)",
+ clientMessage.getPayloadLength());
}
- Part regionNamePart = m.getPart(partCnt++);
- Part keyPart = m.getPart(partCnt++);
- Part callbackArgumentPart = m.getPart(partCnt++);
+ int partCnt = 0;
+ Part regionNamePart = clientMessage.getPart(partCnt++);
+ Part keyPart = clientMessage.getPart(partCnt++);
+ Part callbackArgumentPart = clientMessage.getPart(partCnt++);
- VersionTag versionTag = (VersionTag) m.getPart(partCnt++).getObject();
+ VersionTag versionTag = (VersionTag) clientMessage.getPart(partCnt++).getObject();
if (versionTag != null) {
versionTag.replaceNullIDs((InternalDistributedMember) this.endpoint.getMemberId());
}
@@ -916,8 +919,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
regionName = regionNamePart.getString();
key = keyPart.getStringOrObject();
- Part isInterestListPassedPart = m.getPart(partCnt++);
- Part hasCqsPart = m.getPart(partCnt++);
+ Part isInterestListPassedPart = clientMessage.getPart(partCnt++);
+ Part hasCqsPart = clientMessage.getPart(partCnt++);
boolean withInterest = ((Boolean) isInterestListPassedPart.getObject()).booleanValue();
boolean withCQs = ((Boolean) hasCqsPart.getObject()).booleanValue();
@@ -929,30 +932,32 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
regionName, key, callbackArgument, withInterest, withCQs, versionTag);
}
- LocalRegion region = (LocalRegion) cacheHelper.getRegion(regionName);
- EventID eventId = null;
+ LocalRegion region = (LocalRegion) this.cacheHelper.getRegion(regionName);
if (region == null) {
if (isDebugEnabled && !quitting()) {
logger.debug("Region named {} does not exist", regionName);
}
+
} else if (region.hasServerProxy() && (withInterest || !withCQs)) {
+ EventID eventId = null;
try {
- Part eid = m.getPart(m.getNumberOfParts() - 1);
+ Part eid = clientMessage.getPart(clientMessage.getNumberOfParts() - 1);
eventId = (EventID) eid.getObject();
+
try {
region.basicBridgeClientDestroy(eventId.getDistributedMember(), key, callbackArgument,
- qManager.getState().getProcessedMarker() || !this.isDurableClient, eventId,
+ this.qManager.getState().getProcessedMarker() || !this.isDurableClient, eventId,
versionTag);
- } catch (ConcurrentCacheModificationException e) {
- // return; allow CQs to be processed
+ } catch (ConcurrentCacheModificationException ignore) {
+ // allow CQs to be processed
}
+
this.isOpCompleted = true;
if (isDebugEnabled) {
logger.debug("Destroyed entry for region: {} key: {} callbackArgument: {}", regionName,
key, callbackArgument);
}
- } catch (EntryNotFoundException e) {
- /* ignore */
+ } catch (EntryNotFoundException ignore) {
if (isDebugEnabled && !quitting()) {
logger.debug(
"Already destroyed entry for region: {} key: {} callbackArgument: {} eventId={}",
@@ -963,18 +968,19 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
if (withCQs) {
- Part numCqsPart = m.getPart(partCnt++);
+ Part numCqsPart = clientMessage.getPart(partCnt++);
if (isDebugEnabled) {
logger.debug("Received message has CQ Event. Number of cqs interested in the event : {}",
numCqsPart.getInt() / 2);
}
- partCnt = processCqs(m, partCnt, numCqsPart.getInt(), m.getMessageType(), key, null);
+ partCnt = processCqs(clientMessage, partCnt, numCqsPart.getInt(),
+ clientMessage.getMessageType(), key, null);
this.isOpCompleted = true;
}
} catch (Exception e) {
String message =
LocalizedStrings.CacheClientUpdater_THE_FOLLOWING_EXCEPTION_OCCURRED_WHILE_ATTEMPTING_TO_DESTROY_ENTRY_REGION_0_KEY_1
- .toLocalizedString(new Object[] {regionName, key});
+ .toLocalizedString(regionName, key);
handleException(message, e);
}
}
@@ -982,44 +988,44 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Locally destroy a region
*
- * @param m message describing the region
+ * @param clientMessage message describing the region
*/
- private void handleDestroyRegion(Message m) {
- Part regionNamePart = null, callbackArgumentPart = null;
+ private void handleDestroyRegion(Message clientMessage) {
String regionName = null;
- Object callbackArgument = null;
- LocalRegion region = null;
- int partCnt = 0;
-
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
// Retrieve the data from the local-destroy-region message parts
if (isDebugEnabled) {
- logger.debug("Received destroy region message of length ({} bytes)", m.getPayloadLength());
+ logger.debug("Received destroy region message of length ({} bytes)",
+ clientMessage.getPayloadLength());
}
- regionNamePart = m.getPart(partCnt++);
- callbackArgumentPart = m.getPart(partCnt++);
+ int partCnt = 0;
+ Part regionNamePart = clientMessage.getPart(partCnt++);
+ Part callbackArgumentPart = clientMessage.getPart(partCnt++);
regionName = regionNamePart.getString();
- callbackArgument = callbackArgumentPart.getObject();
+ Object callbackArgument = callbackArgumentPart.getObject();
- Part hasCqsPart = m.getPart(partCnt++);
+ Part hasCqsPart = clientMessage.getPart(partCnt++);
if (isDebugEnabled) {
logger.debug("Destroying region: {} callbackArgument: {}", regionName, callbackArgument);
}
// Handle CQs if any on this region.
- if (((Boolean) hasCqsPart.getObject()).booleanValue()) {
- Part numCqsPart = m.getPart(partCnt++);
+ if ((Boolean) hasCqsPart.getObject()) {
+ Part numCqsPart = clientMessage.getPart(partCnt++);
if (isDebugEnabled) {
logger.debug("Received message has CQ Event. Number of cqs interested in the event : {}",
numCqsPart.getInt() / 2);
}
- partCnt = processCqs(m, partCnt, numCqsPart.getInt(), m.getMessageType(), null, null);
+ // TODO: partCnt is unused -- does processCqs have side effects
+ partCnt = processCqs(clientMessage, partCnt, numCqsPart.getInt(),
+ clientMessage.getMessageType(), null, null);
}
// Confirm that the region exists
- region = (LocalRegion) cacheHelper.getRegion(regionName);
+ LocalRegion region = (LocalRegion) this.cacheHelper.getRegion(regionName);
if (region == null) {
if (isDebugEnabled && !quitting()) {
logger.debug("Region named {} does not exist", regionName);
@@ -1036,7 +1042,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
logger.debug("Destroyed region: {} callbackArgument: {}", regionName, callbackArgument);
}
}
- } catch (RegionDestroyedException e) { // already destroyed
+ } catch (RegionDestroyedException ignore) { // already destroyed
if (isDebugEnabled) {
logger.debug("region already destroyed: {}", regionName);
}
@@ -1051,24 +1057,24 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Locally clear a region
*
- * @param m message describing the region to clear
+ * @param clientMessage message describing the region to clear
*/
- private void handleClearRegion(Message m) {
+ private void handleClearRegion(Message clientMessage) {
String regionName = null;
- int partCnt = 0;
-
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
// Retrieve the data from the clear-region message parts
if (isDebugEnabled) {
logger.debug("{}: Received clear region message of length ({} bytes)", this,
- m.getPayloadLength());
+ clientMessage.getPayloadLength());
}
- Part regionNamePart = m.getPart(partCnt++);
- Part callbackArgumentPart = m.getPart(partCnt++);
+ int partCnt = 0;
+ Part regionNamePart = clientMessage.getPart(partCnt++);
+ Part callbackArgumentPart = clientMessage.getPart(partCnt++);
- Part hasCqsPart = m.getPart(partCnt++);
+ Part hasCqsPart = clientMessage.getPart(partCnt++);
regionName = regionNamePart.getString();
Object callbackArgument = callbackArgumentPart.getObject();
@@ -1076,17 +1082,18 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
logger.debug("Clearing region: {} callbackArgument: {}", regionName, callbackArgument);
}
- if (((Boolean) hasCqsPart.getObject()).booleanValue()) {
- Part numCqsPart = m.getPart(partCnt++);
+ if ((Boolean) hasCqsPart.getObject()) {
+ Part numCqsPart = clientMessage.getPart(partCnt++);
if (isDebugEnabled) {
logger.debug("Received message has CQ Event. Number of cqs interested in the event : {}",
numCqsPart.getInt() / 2);
}
- partCnt = processCqs(m, partCnt, numCqsPart.getInt(), m.getMessageType(), null, null);
+ partCnt = processCqs(clientMessage, partCnt, numCqsPart.getInt(),
+ clientMessage.getMessageType(), null, null);
}
// Confirm that the region exists
- LocalRegion region = (LocalRegion) cacheHelper.getRegion(regionName);
+ LocalRegion region = (LocalRegion) this.cacheHelper.getRegion(regionName);
if (region == null) {
if (isDebugEnabled && !quitting()) {
logger.debug("Region named {} does not exist", regionName);
@@ -1099,7 +1106,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
if (region.hasServerProxy()) {
// Locally clear the region
region.basicBridgeClientClear(callbackArgument,
- qManager.getState().getProcessedMarker() || !this.isDurableClient);
+ this.qManager.getState().getProcessedMarker() || !this.isDurableClient);
if (isDebugEnabled) {
logger.debug("Cleared region: {} callbackArgument: {}", regionName, callbackArgument);
@@ -1117,50 +1124,44 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* Locally invalidate a region NOTE: Added as part of bug#38048. The code only takes care of CQ
* processing. Support needs to be added for local region invalidate.
*
- * @param m message describing the region to clear
+ * @param clientMessage message describing the region to clear
*/
- private void handleInvalidateRegion(Message m) {
+ private void handleInvalidateRegion(Message clientMessage) {
String regionName = null;
- int partCnt = 0;
-
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
// Retrieve the data from the invalidate-region message parts
if (isDebugEnabled) {
logger.debug("{}: Received invalidate region message of length ({} bytes)", this,
- m.getPayloadLength());
+ clientMessage.getPayloadLength());
}
- Part regionNamePart = m.getPart(partCnt++);
+ int partCnt = 0;
+ Part regionNamePart = clientMessage.getPart(partCnt++);
partCnt++; // Part callbackArgumentPart = m.getPart(partCnt++);
- Part hasCqsPart = m.getPart(partCnt++);
+ Part hasCqsPart = clientMessage.getPart(partCnt++);
regionName = regionNamePart.getString();
- // Object callbackArgument = callbackArgumentPart.getObject();
- if (((Boolean) hasCqsPart.getObject()).booleanValue()) {
- Part numCqsPart = m.getPart(partCnt++);
+ if ((Boolean) hasCqsPart.getObject()) {
+ Part numCqsPart = clientMessage.getPart(partCnt++);
if (isDebugEnabled) {
logger.debug("Received message has CQ Event. Number of cqs interested in the event : {}",
numCqsPart.getInt() / 2);
}
- partCnt = processCqs(m, partCnt, numCqsPart.getInt(), m.getMessageType(), null, null);
+ // TODO: partCnt is unused
+ partCnt = processCqs(clientMessage, partCnt, numCqsPart.getInt(),
+ clientMessage.getMessageType(), null, null);
}
// Confirm that the region exists
- LocalRegion region = (LocalRegion) cacheHelper.getRegion(regionName);
+ LocalRegion region = (LocalRegion) this.cacheHelper.getRegion(regionName);
if (region == null) {
if (isDebugEnabled && !quitting()) {
logger.debug("Region named {} does not exist", regionName);
}
- return;
- }
-
- // Verify that the region in question should respond to this
- // message
- if (region.hasServerProxy()) {
- return;
}
} catch (Exception e) {
@@ -1174,40 +1175,39 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Register instantiators locally
*
- * @param msg message describing the new instantiators
+ * @param clientMessage message describing the new instantiators
* @param eventId eventId of the instantiators
*/
- private void handleRegisterInstantiator(Message msg, EventID eventId) {
+ private void handleRegisterInstantiator(Message clientMessage, EventID eventId) {
String instantiatorClassName = null;
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
- int noOfParts = msg.getNumberOfParts();
+ int noOfParts = clientMessage.getNumberOfParts();
if (isDebugEnabled) {
logger.debug("{}: Received register instantiators message of parts {}", getName(),
noOfParts);
}
+
Assert.assertTrue((noOfParts - 1) % 3 == 0);
- for (int i = 0; i < noOfParts - 1; i = i + 3) {
+ for (int i = 0; i < noOfParts - 1; i += 3) {
instantiatorClassName =
- (String) CacheServerHelper.deserialize(msg.getPart(i).getSerializedForm());
- String instantiatedClassName =
- (String) CacheServerHelper.deserialize(msg.getPart(i + 1).getSerializedForm());
- int id = msg.getPart(i + 2).getInt();
+ (String) CacheServerHelper.deserialize(clientMessage.getPart(i).getSerializedForm());
+ String instantiatedClassName = (String) CacheServerHelper
+ .deserialize(clientMessage.getPart(i + 1).getSerializedForm());
+ int id = clientMessage.getPart(i + 2).getInt();
InternalInstantiator.register(instantiatorClassName, instantiatedClassName, id, false,
- eventId, null/* context */);
- // distribute is false because we don't want to propagate this to
- // servers recursively
+ eventId, null);
+ // distribute is false because we don't want to propagate this to servers recursively
}
// CALLBACK TESTING PURPOSE ONLY
if (PoolImpl.IS_INSTANTIATOR_CALLBACK) {
- ClientServerObserver bo = ClientServerObserverHolder.getInstance();
- bo.afterReceivingFromServer(eventId);
+ ClientServerObserver clientServerObserver = ClientServerObserverHolder.getInstance();
+ clientServerObserver.afterReceivingFromServer(eventId);
}
- }
- // TODO bug: can the following catch be more specific?
- catch (Exception e) {
+ } catch (Exception e) {
if (isDebugEnabled) {
logger.debug("{}: Caught following exception while attempting to read Instantiator : {}",
this, instantiatorClassName, e);
@@ -1218,6 +1218,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
private void handleRegisterDataSerializer(Message msg, EventID eventId) {
Class dataSerializerClass = null;
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
int noOfParts = msg.getNumberOfParts();
if (isDebugEnabled) {
@@ -1231,8 +1232,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
(String) CacheServerHelper.deserialize(msg.getPart(i).getSerializedForm());
int id = msg.getPart(i + 1).getInt();
InternalDataSerializer.register(dataSerializerClassName, false, eventId, null, id);
- // distribute is false because we don't want to propagate this to
- // servers recursively
+ // distribute is false because we don't want to propagate this to servers recursively
int numOfClasses = msg.getPart(i + 2).getInt();
int j = 0;
@@ -1241,7 +1241,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
(String) CacheServerHelper.deserialize(msg.getPart(i + 3 + j).getSerializedForm());
InternalDataSerializer.updateSupportedClassesMap(dataSerializerClassName, className);
}
- i = i + 3 + j;
+
+ i += 3 + j;
} catch (ClassNotFoundException e) {
if (isDebugEnabled) {
logger.debug(
@@ -1257,9 +1258,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
bo.afterReceivingFromServer(eventId);
}
- }
- // TODO bug: can the following catch be more specific?
- catch (Exception e) {
+ } catch (Exception e) {
if (isDebugEnabled) {
logger.debug("{}: Caught following exception while attempting to read DataSerializer : {}",
this, dataSerializerClass, e);
@@ -1270,93 +1269,87 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Processes message to invoke CQ listeners.
*/
- private int processCqs(Message m, int startMessagePart, int numCqParts, int messageType,
- Object key, Object value) {
- return processCqs(m, startMessagePart, numCqParts, messageType, key, value, null,
- null/* eventId */);
+ private int processCqs(Message clientMessage, int startMessagePart, int numCqParts,
+ int messageType, Object key, Object value) {
+ return processCqs(clientMessage, startMessagePart, numCqParts, messageType, key, value, null,
+ null);
}
- private int processCqs(Message m, int startMessagePart, int numCqParts, int messageType,
- Object key, Object value, byte[] delta, EventID eventId) {
+ private int processCqs(Message clientMessage, int startMessagePart, int numCqParts,
+ int messageType, Object key, Object value, byte[] delta, EventID eventId) {
HashMap cqs = new HashMap();
final boolean isDebugEnabled = logger.isDebugEnabled();
for (int cqCnt = 0; cqCnt < numCqParts;) {
- StringBuilder str = null;
+ StringBuilder sb = null;
if (isDebugEnabled) {
- str = new StringBuilder(100);
- str.append("found these queries: ");
+ sb = new StringBuilder(100);
+ sb.append("found these queries: ");
}
try {
// Get CQ Name.
- Part cqNamePart = m.getPart(startMessagePart + (cqCnt++));
+ Part cqNamePart = clientMessage.getPart(startMessagePart + cqCnt++);
// Get CQ Op.
- Part cqOpPart = m.getPart(startMessagePart + (cqCnt++));
- cqs.put(cqNamePart.getString(), Integer.valueOf(cqOpPart.getInt()));
+ Part cqOpPart = clientMessage.getPart(startMessagePart + cqCnt++);
+ cqs.put(cqNamePart.getString(), cqOpPart.getInt());
- if (str != null) {
- str.append(cqNamePart.getString()).append(" op=").append(cqOpPart.getInt()).append(" ");
+ if (sb != null) {
+ sb.append(cqNamePart.getString()).append(" op=").append(cqOpPart.getInt()).append(" ");
}
- } catch (Exception ex) {
+ } catch (Exception ignore) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.CacheClientUpdater_ERROR_WHILE_PROCESSING_THE_CQ_MESSAGE_PROBLEM_WITH_READING_MESSAGE_FOR_CQ_0,
cqCnt));
}
- if (isDebugEnabled && str != null) {
- logger.debug(str);
+ if (isDebugEnabled) {
+ logger.debug(sb);
}
}
- {
- CqService cqService = this.cache.getCqService();
- try {
- cqService.dispatchCqListeners(cqs, messageType, key, value, delta, qManager, eventId);
- } catch (Exception ex) {
- logger.warn(LocalizedMessage.create(
- LocalizedStrings.CacheClientUpdater_FAILED_TO_INVOKE_CQ_DISPATCHER_ERROR___0,
- ex.getMessage()));
- if (isDebugEnabled) {
- logger.debug("Failed to invoke CQ Dispatcher.", ex);
- }
+ CqService cqService = this.cache.getCqService();
+ try {
+ cqService.dispatchCqListeners(cqs, messageType, key, value, delta, this.qManager, eventId);
+ } catch (Exception ex) {
+ logger.warn(LocalizedMessage.create(
+ LocalizedStrings.CacheClientUpdater_FAILED_TO_INVOKE_CQ_DISPATCHER_ERROR___0,
+ ex.getMessage()));
+ if (isDebugEnabled) {
+ logger.debug("Failed to invoke CQ Dispatcher.", ex);
}
}
- return (startMessagePart + numCqParts);
+ return startMessagePart + numCqParts;
}
- private void handleRegisterInterest(Message m) {
+ private void handleRegisterInterest(Message clientMessage) {
String regionName = null;
Object key = null;
- int interestType;
- byte interestResultPolicy;
- boolean isDurable;
- boolean receiveUpdatesAsInvalidates;
- int partCnt = 0;
-
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
// Retrieve the data from the add interest message parts
if (isDebugEnabled) {
logger.debug("{}: Received add interest message of length ({} bytes)", this,
- m.getPayloadLength());
+ clientMessage.getPayloadLength());
}
- Part regionNamePart = m.getPart(partCnt++);
- Part keyPart = m.getPart(partCnt++);
- Part interestTypePart = m.getPart(partCnt++);
- Part interestResultPolicyPart = m.getPart(partCnt++);
- Part isDurablePart = m.getPart(partCnt++);
- Part receiveUpdatesAsInvalidatesPart = m.getPart(partCnt++);
+
+ int partCnt = 0;
+ Part regionNamePart = clientMessage.getPart(partCnt++);
+ Part keyPart = clientMessage.getPart(partCnt++);
+ Part interestTypePart = clientMessage.getPart(partCnt++);
+ Part interestResultPolicyPart = clientMessage.getPart(partCnt++);
+ Part isDurablePart = clientMessage.getPart(partCnt++);
+ Part receiveUpdatesAsInvalidatesPart = clientMessage.getPart(partCnt++);
regionName = regionNamePart.getString();
key = keyPart.getStringOrObject();
- interestType = ((Integer) interestTypePart.getObject()).intValue();
- interestResultPolicy = ((Byte) interestResultPolicyPart.getObject()).byteValue();
- isDurable = ((Boolean) isDurablePart.getObject()).booleanValue();
- receiveUpdatesAsInvalidates =
- ((Boolean) receiveUpdatesAsInvalidatesPart.getObject()).booleanValue();
+ int interestType = (Integer) interestTypePart.getObject();
+ byte interestResultPolicy = (Byte) interestResultPolicyPart.getObject();
+ boolean isDurable = (Boolean) isDurablePart.getObject();
+ boolean receiveUpdatesAsInvalidates = (Boolean) receiveUpdatesAsInvalidatesPart.getObject();
// Confirm that region exists
- LocalRegion region = (LocalRegion) cacheHelper.getRegion(regionName);
+ LocalRegion region = (LocalRegion) this.cacheHelper.getRegion(regionName);
if (region == null) {
if (isDebugEnabled && !quitting()) {
logger.debug("{}: Region named {} does not exist", this, regionName);
@@ -1386,38 +1379,34 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
}
- private void handleUnregisterInterest(Message m) {
+ private void handleUnregisterInterest(Message clientMessage) {
String regionName = null;
Object key = null;
- int interestType;
- boolean isDurable;
- boolean receiveUpdatesAsInvalidates;
- int partCnt = 0;
-
final boolean isDebugEnabled = logger.isDebugEnabled();
+
try {
// Retrieve the data from the remove interest message parts
if (isDebugEnabled) {
logger.debug("{}: Received remove interest message of length ({} bytes)", this,
- m.getPayloadLength());
+ clientMessage.getPayloadLength());
}
- Part regionNamePart = m.getPart(partCnt++);
- Part keyPart = m.getPart(partCnt++);
- Part interestTypePart = m.getPart(partCnt++);
- Part isDurablePart = m.getPart(partCnt++);
- Part receiveUpdatesAsInvalidatesPart = m.getPart(partCnt++);
+ int partCnt = 0;
+ Part regionNamePart = clientMessage.getPart(partCnt++);
+ Part keyPart = clientMessage.getPart(partCnt++);
+ Part interestTypePart = clientMessage.getPart(partCnt++);
+ Part isDurablePart = clientMessage.getPart(partCnt++);
+ Part receiveUpdatesAsInvalidatesPart = clientMessage.getPart(partCnt++);
// Not reading the eventId part
regionName = regionNamePart.getString();
key = keyPart.getStringOrObject();
- interestType = ((Integer) interestTypePart.getObject()).intValue();
- isDurable = ((Boolean) isDurablePart.getObject()).booleanValue();
- receiveUpdatesAsInvalidates =
- ((Boolean) receiveUpdatesAsInvalidatesPart.getObject()).booleanValue();
+ int interestType = (Integer) interestTypePart.getObject();
+ boolean isDurable = (Boolean) isDurablePart.getObject();
+ boolean receiveUpdatesAsInvalidates = (Boolean) receiveUpdatesAsInvalidatesPart.getObject();
// Confirm that region exists
- LocalRegion region = (LocalRegion) cacheHelper.getRegion(regionName);
+ LocalRegion region = (LocalRegion) this.cacheHelper.getRegion(regionName);
if (region == null) {
if (isDebugEnabled) {
logger.debug("{}: Region named {} does not exist", this, regionName);
@@ -1445,14 +1434,17 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
}
- private void handleTombstoneOperation(Message msg) {
+ private void handleTombstoneOperation(Message clientMessage) {
String regionName = "unknown";
+
try { // not sure why this isn't done by the caller
int partIdx = 0;
+
// see ClientTombstoneMessage.getGFE70Message
- regionName = msg.getPart(partIdx++).getString();
- int op = msg.getPart(partIdx++).getInt();
- LocalRegion region = (LocalRegion) cacheHelper.getRegion(regionName);
+ regionName = clientMessage.getPart(partIdx++).getString();
+ int op = clientMessage.getPart(partIdx++).getInt();
+ LocalRegion region = (LocalRegion) this.cacheHelper.getRegion(regionName);
+
if (region == null) {
if (!quitting()) {
if (logger.isDebugEnabled()) {
@@ -1461,24 +1453,29 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
return;
}
+
if (logger.isDebugEnabled()) {
logger.debug("{}: Received tombstone operation for region {} with operation={}", this,
region, op);
}
+
if (!region.getConcurrencyChecksEnabled()) {
return;
}
+
switch (op) {
case 0:
Map<VersionSource, Long> regionGCVersions =
- (Map<VersionSource, Long>) msg.getPart(partIdx++).getObject();
- EventID eventID = (EventID) msg.getPart(partIdx++).getObject();
+ (Map<VersionSource, Long>) clientMessage.getPart(partIdx++).getObject();
+ EventID eventID = (EventID) clientMessage.getPart(partIdx++).getObject();
region.expireTombstones(regionGCVersions, eventID, null);
break;
+
case 1:
- Set<Object> removedKeys = (Set<Object>) msg.getPart(partIdx++).getObject();
+ Set<Object> removedKeys = (Set<Object>) clientMessage.getPart(partIdx++).getObject();
region.expireTombstoneKeys(removedKeys);
break;
+
default:
throw new IllegalArgumentException("unknown operation type " + op);
}
@@ -1494,22 +1491,21 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
*/
private boolean quitting() {
if (isInterrupted()) {
- // Any time an interrupt is thrown at this thread, regard it as a
- // request to terminate
+ // Any time an interrupt is thrown at this thread, regard it as a request to terminate
return true;
}
- if (!continueProcessing.get()) {
+ if (!this.continueProcessing.get()) {
// de facto flag indicating we are to stop
return true;
}
- if (cache != null && cache.getCancelCriterion().isCancelInProgress()) {
+ if (this.cache != null && this.cache.getCancelCriterion().isCancelInProgress()) {
// System is cancelling
return true;
}
// The pool stuff is really sick, so it's possible for us to have a distributed
// system that is not the same as our cache. Check it just in case...
- if (system.getCancelCriterion().isCancelInProgress()) {
+ if (this.system.getCancelCriterion().isCancelInProgress()) {
return true;
}
@@ -1531,15 +1527,15 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
this.failedUpdater.join(5000);
}
}
- } catch (InterruptedException ie) {
+ } catch (InterruptedException ignore) {
gotInterrupted = true;
- return; // just bail, because I have not done anything yet
+ // just bail, because I have not done anything yet
} finally {
if (!gotInterrupted && this.failedUpdater != null) {
logger.info(LocalizedMessage.create(
LocalizedStrings.CacheClientUpdater_0_HAS_COMPLETED_WAITING_FOR_1,
new Object[] {this, this.failedUpdater}));
- failedUpdater = null;
+ this.failedUpdater = null;
}
}
}
@@ -1548,6 +1544,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* Processes messages received from the server.
*
* Only certain types of messages are handled.
+ *
+ * TODO: Method 'processMessages' is too complex to analyze by data flow algorithm
*
* @see MessageType#CLIENT_MARKER
* @see MessageType#LOCAL_CREATE
@@ -1558,11 +1556,11 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* @see MessageType#CLEAR_REGION
* @see ClientUpdateMessage
*/
- protected void processMessages() {
+ private void processMessages() {
final boolean isDebugEnabled = logger.isDebugEnabled();
try {
- Part eid = null;
- Message _message = initializeMessage();
+ Message clientMessage = initializeMessage();
+
if (quitting()) {
if (isDebugEnabled) {
logger.debug("processMessages quitting early because we have stopped");
@@ -1570,11 +1568,11 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// our caller calls close which will notify all waiters for our init
return;
}
+
logger.info(LocalizedMessage
.create(LocalizedStrings.CacheClientUpdater_0_READY_TO_PROCESS_MESSAGES, this));
- while (continueProcessing.get()) {
- // SystemFailure.checkFailure(); dm will check this
+ while (this.continueProcessing.get()) {
if (quitting()) {
if (isDebugEnabled) {
logger.debug("termination detected");
@@ -1594,12 +1592,12 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
try {
// Read the message
- _message.recv();
+ clientMessage.recv();
// Wait for the previously failed cache client updater
// to finish. This will avoid out of order messages.
waitForFailedUpdater();
- cache.waitForRegisterInterestsInProgress();
+ this.cache.waitForRegisterInterestsInProgress();
if (quitting()) {
if (isDebugEnabled) {
logger.debug("processMessages quitting before processing message");
@@ -1608,7 +1606,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
// If the message is a ping, ignore it
- if (_message.getMessageType() == MessageType.SERVER_TO_CLIENT_PING) {
+ if (clientMessage.getMessageType() == MessageType.SERVER_TO_CLIENT_PING) {
if (isDebugEnabled) {
logger.debug("{}: Received ping", this);
}
@@ -1616,76 +1614,80 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
boolean isDeltaSent = false;
- boolean isCreateOrUpdate = _message.getMessageType() == MessageType.LOCAL_CREATE
- || _message.getMessageType() == MessageType.LOCAL_UPDATE;
+ boolean isCreateOrUpdate = clientMessage.getMessageType() == MessageType.LOCAL_CREATE
+ || clientMessage.getMessageType() == MessageType.LOCAL_UPDATE;
if (isCreateOrUpdate) {
- isDeltaSent = ((Boolean) _message.getPart(2).getObject()).booleanValue();
+ isDeltaSent = (Boolean) clientMessage.getPart(2).getObject();
}
// extract the eventId and verify if it is a duplicate event
// if it is a duplicate event, ignore
// @since GemFire 5.1
- int numberOfParts = _message.getNumberOfParts();
- eid = _message.getPart(numberOfParts - 1);
+ int numberOfParts = clientMessage.getNumberOfParts();
+ Part eid = clientMessage.getPart(numberOfParts - 1);
+
// TODO the message handling methods also deserialized the eventID - inefficient
EventID eventId = (EventID) eid.getObject();
// no need to verify if the instantiator msg is duplicate or not
- if (_message.getMessageType() != MessageType.REGISTER_INSTANTIATORS
- && _message.getMessageType() != MessageType.REGISTER_DATASERIALIZERS) {
+ if (clientMessage.getMessageType() != MessageType.REGISTER_INSTANTIATORS
+ && clientMessage.getMessageType() != MessageType.REGISTER_DATASERIALIZERS) {
if (this.qManager.getState().verifyIfDuplicate(eventId,
!(this.isDurableClient || isDeltaSent))) {
continue;
}
}
+
if (logger.isTraceEnabled(LogMarker.BRIDGE_SERVER)) {
- logger.trace(LogMarker.BRIDGE_SERVER,
- "Processing event with id {}" + eventId.expensiveToString());
+ logger.trace(LogMarker.BRIDGE_SERVER, "Processing event with id {}",
+ eventId.expensiveToString());
}
+
this.isOpCompleted = true;
+
// Process the message
- switch (_message.getMessageType()) {
+ switch (clientMessage.getMessageType()) {
case MessageType.LOCAL_CREATE:
case MessageType.LOCAL_UPDATE:
- handleUpdate(_message);
+ handleUpdate(clientMessage);
break;
case MessageType.LOCAL_INVALIDATE:
- handleInvalidate(_message);
+ handleInvalidate(clientMessage);
break;
case MessageType.LOCAL_DESTROY:
- handleDestroy(_message);
+ handleDestroy(clientMessage);
break;
case MessageType.LOCAL_DESTROY_REGION:
- handleDestroyRegion(_message);
+ handleDestroyRegion(clientMessage);
break;
case MessageType.CLEAR_REGION:
- handleClearRegion(_message);
+ handleClearRegion(clientMessage);
break;
case MessageType.REGISTER_INSTANTIATORS:
- handleRegisterInstantiator(_message, eventId);
+ handleRegisterInstantiator(clientMessage, eventId);
break;
case MessageType.REGISTER_DATASERIALIZERS:
- handleRegisterDataSerializer(_message, eventId);
+ handleRegisterDataSerializer(clientMessage, eventId);
break;
case MessageType.CLIENT_MARKER:
- handleMarker(_message);
+ handleMarker(clientMessage);
break;
case MessageType.INVALIDATE_REGION:
- handleInvalidateRegion(_message);
+ handleInvalidateRegion(clientMessage);
break;
case MessageType.CLIENT_REGISTER_INTEREST:
- handleRegisterInterest(_message);
+ handleRegisterInterest(clientMessage);
break;
case MessageType.CLIENT_UNREGISTER_INTEREST:
- handleUnregisterInterest(_message);
+ handleUnregisterInterest(clientMessage);
break;
case MessageType.TOMBSTONE_OPERATION:
- handleTombstoneOperation(_message);
+ handleTombstoneOperation(clientMessage);
break;
default:
logger.warn(LocalizedMessage.create(
LocalizedStrings.CacheClientUpdater_0_RECEIVED_AN_UNSUPPORTED_MESSAGE_TYPE_1,
- new Object[] {this, MessageType.getString(_message.getMessageType())}));
+ new Object[] {this, MessageType.getString(clientMessage.getMessageType())}));
break;
}
@@ -1700,7 +1702,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// likely to send pings...
// and the ClientHealthMonitor will cause a disconnect
- } catch (InterruptedIOException e) {
+ } catch (InterruptedIOException ignore) {
// Per Sun's support web site, this exception seems to be peculiar
// to Solaris, and may eventually not even be generated there.
//
@@ -1708,62 +1710,59 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// isInterrupted() is false. (How very odd!)
//
// We regard it the same as an InterruptedException
- this.endPointDied = true;
- continueProcessing.set(false);// = false;
+ this.continueProcessing.set(false);
if (isDebugEnabled) {
logger.debug("InterruptedIOException");
}
+
} catch (IOException e) {
- this.endPointDied = true;
// Either the server went away, or we caught a closing condition.
if (!quitting()) {
// Server departed; print a message.
- String message = ": Caught the following exception and will exit: ";
- String errMessage = e.getMessage();
- if (errMessage == null) {
- errMessage = "";
- }
- ClientServerObserver bo = ClientServerObserverHolder.getInstance();
- bo.beforeFailoverByCacheClientUpdater(this.location);
- eManager.serverCrashed(this.endpoint);
+ ClientServerObserver clientServerObserver = ClientServerObserverHolder.getInstance();
+ clientServerObserver.beforeFailoverByCacheClientUpdater(this.location);
+ this.eManager.serverCrashed(this.endpoint);
if (isDebugEnabled) {
- logger.debug("" + message + e);
+ logger.debug("Caught the following exception and will exit", e);
}
} // !quitting
// In any event, terminate this thread.
- continueProcessing.set(false);// = false;
+ this.continueProcessing.set(false);
if (isDebugEnabled) {
logger.debug("terminated due to IOException");
}
+
} catch (Exception e) {
if (!quitting()) {
- this.endPointDied = true;
- ClientServerObserver bo = ClientServerObserverHolder.getInstance();
- bo.beforeFailoverByCacheClientUpdater(this.location);
- eManager.serverCrashed(this.endpoint);
+ ClientServerObserver clientServerObserver = ClientServerObserverHolder.getInstance();
+ clientServerObserver.beforeFailoverByCacheClientUpdater(this.location);
+ this.eManager.serverCrashed(this.endpoint);
String message = ": Caught the following exception and will exit: ";
handleException(message, e);
}
+
// In any event, terminate this thread.
- continueProcessing.set(false);// = false; // force termination
+ this.continueProcessing.set(false);// = false; // force termination
if (isDebugEnabled) {
logger.debug("CCU terminated due to Exception");
}
+
} finally {
- _message.clear();
+ clientMessage.clear();
}
} // while
+
} finally {
if (isDebugEnabled) {
logger.debug("has stopped and cleaning the helper ..");
}
- this.close(); // added to fixes some race conditions associated with 38382
+ close(); // added to fix some race conditions associated with 38382
// this will make sure that if this thread dies without starting QueueMgr then it will start..
// 1. above we ignore InterruptedIOException and this thread dies without informing QueueMgr
- // 2. if there is some other race codition with continueProcessing flag
- this.qManager.checkEndpoint(this, endpoint);
+ // 2. if there is some other race condition with continueProcessing flag
+ this.qManager.checkEndpoint(this, this.endpoint);
}
}
@@ -1796,12 +1795,11 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
*/
private Object deserialize(byte[] serializedBytes) {
Object deserializedObject = serializedBytes;
- // This is a debugging method so ignore all exceptions like
- // ClassNotFoundException
+ // This is a debugging method so ignore all exceptions like ClassNotFoundException
try {
DataInputStream dis = new DataInputStream(new ByteArrayInputStream(serializedBytes));
deserializedObject = DataSerializer.readObject(dis);
- } catch (Exception e) {
+ } catch (ClassNotFoundException | IOException ignore) {
}
return deserializedObject;
}
@@ -1810,18 +1808,14 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* @return the local port of our {@link #socket}
*/
protected int getLocalPort() {
- return socket.getLocalPort();
+ return this.socket.getLocalPort();
}
+ @Override
public void onDisconnect(InternalDistributedSystem sys) {
stopUpdater();
}
- /**
- * true if the EndPoint represented by this updater thread has died.
- */
- private volatile boolean endPointDied = false;
-
private void verifySocketBufferSize(int requestedBufferSize, int actualBufferSize, String type) {
if (actualBufferSize < requestedBufferSize) {
logger.info(LocalizedMessage.create(
@@ -1837,11 +1831,11 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* @since GemFire 5.7
*/
public static class CCUStats implements MessageStats {
- // static fields
+
private static final StatisticsType type;
- private final static int messagesBeingReceivedId;
- private final static int messageBytesBeingReceivedId;
- private final static int receivedBytesId;
+ private static final int messagesBeingReceivedId;
+ private static final int messageBytesBeingReceivedId;
+ private static final int receivedBytesId;
static {
StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
@@ -1863,7 +1857,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// instance fields
private final Statistics stats;
- public CCUStats(DistributedSystem ids, ServerLocation location) {
+ CCUStats(DistributedSystem ids, ServerLocation location) {
// no need for atomic since only a single thread will be writing these
this.stats = ids.createStatistics(type, "CacheClientUpdater-" + location);
}
@@ -1872,25 +1866,29 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
this.stats.close();
}
+ @Override
public void incReceivedBytes(long v) {
this.stats.incLong(receivedBytesId, v);
}
+ @Override
public void incSentBytes(long v) {
// noop since we never send messages
}
+ @Override
public void incMessagesBeingReceived(int bytes) {
- stats.incInt(messagesBeingReceivedId, 1);
+ this.stats.incInt(messagesBeingReceivedId, 1);
if (bytes > 0) {
- stats.incLong(messageBytesBeingReceivedId, bytes);
+ this.stats.incLong(messageBytesBeingReceivedId, bytes);
}
}
+ @Override
public void decMessagesBeingReceived(int bytes) {
- stats.incInt(messagesBeingReceivedId, -1);
+ this.stats.incInt(messagesBeingReceivedId, -1);
if (bytes > 0) {
- stats.incLong(messageBytesBeingReceivedId, -bytes);
+ this.stats.incLong(messageBytesBeingReceivedId, -bytes);
}
}
@@ -1904,7 +1902,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
}
+ @Override
public boolean isProcessing() {
- return continueProcessing.get();
+ return this.continueProcessing.get();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
index 2a5a3d7..39c2f3a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
@@ -22,7 +22,6 @@ import org.apache.geode.internal.logging.LogService;
import java.io.EOFException;
import java.io.IOException;
-import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import org.apache.logging.log4j.Logger;
@@ -36,7 +35,7 @@ import org.apache.logging.log4j.Logger;
*
* <PRE>
*
- * msgType - int - 4 bytes type of message, types enumerated below
+ * messageType - int - 4 bytes type of message, types enumerated below
*
* numberOfParts - int - 4 bytes number of elements (LEN-BYTE* pairs) contained
* in the payload. Message can be a multi-part message
@@ -153,7 +152,8 @@ public class ChunkedMessage extends Message {
public void setLastChunkAndNumParts(boolean lastChunk, int numParts) {
setLastChunk(lastChunk);
- if (this.sc != null && this.sc.getClientVersion().compareTo(Version.GFE_65) >= 0) {
+ if (this.serverConnection != null
+ && this.serverConnection.getClientVersion().compareTo(Version.GFE_65) >= 0) {
// we us e three bits for number of parts in last chunk byte
// we us e three bits for number of parts in last chunk byte
byte localLastChunk = (byte) (numParts << 5);
@@ -162,7 +162,7 @@ public class ChunkedMessage extends Message {
}
public void setServerConnection(ServerConnection servConn) {
- if (this.sc != servConn)
+ if (this.serverConnection != servConn)
throw new IllegalStateException("this.sc was not correctly set");
}
@@ -209,7 +209,7 @@ public class ChunkedMessage extends Message {
// Set the header and payload fields only after receiving all the
// socket data, providing better message consistency in the face
// of exceptional conditions (e.g. IO problems, timeouts etc.)
- this.msgType = type;
+ this.messageType = type;
this.numberOfParts = numParts; // Already set in setPayloadFields via setNumberOfParts
this.transactionId = txid;
}
@@ -241,14 +241,15 @@ public class ChunkedMessage extends Message {
int totalBytesRead = 0;
do {
int bytesRead = 0;
- bytesRead = is.read(cb.array(), totalBytesRead, CHUNK_HEADER_LENGTH - totalBytesRead);
+ bytesRead =
+ inputStream.read(cb.array(), totalBytesRead, CHUNK_HEADER_LENGTH - totalBytesRead);
if (bytesRead == -1) {
throw new EOFException(
LocalizedStrings.ChunkedMessage_CHUNK_READ_ERROR_CONNECTION_RESET.toLocalizedString());
}
totalBytesRead += bytesRead;
- if (this.msgStats != null) {
- this.msgStats.incReceivedBytes(bytesRead);
+ if (this.messageStats != null) {
+ this.messageStats.incReceivedBytes(bytesRead);
}
} while (totalBytesRead < CHUNK_HEADER_LENGTH);
@@ -315,7 +316,7 @@ public class ChunkedMessage extends Message {
* Sends a chunk of this message.
*/
public void sendChunk(ServerConnection servConn) throws IOException {
- if (this.sc != servConn)
+ if (this.serverConnection != servConn)
throw new IllegalStateException("this.sc was not correctly set");
sendChunk();
}
@@ -355,7 +356,7 @@ public class ChunkedMessage extends Message {
protected void getHeaderBytesForWrite() {
final ByteBuffer cb = getCommBuffer();
cb.clear();
- cb.putInt(this.msgType);
+ cb.putInt(this.messageType);
cb.putInt(this.numberOfParts);
cb.putInt(this.transactionId);
[08/35] geode git commit: GEODE-2420: Warn a user if they try to export too much data - document —file-size-limit gfsh option
Posted by kl...@apache.org.
GEODE-2420: Warn a user if they try to export too much data - document —file-size-limit gfsh option
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/31971403
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/31971403
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/31971403
Branch: refs/heads/feature/GEODE-2632-19
Commit: 31971403c2b6442bc27f03ce4a5bcaf49cb105f7
Parents: 2fb7381
Author: Dave Barnes <db...@pivotal.io>
Authored: Tue May 30 15:23:09 2017 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Tue May 30 15:23:59 2017 -0700
----------------------------------------------------------------------
geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/31971403/geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb
index ccf95cc..f0c6d54 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb
@@ -170,7 +170,8 @@ The `--dir` parameter specifies a local directory to which log files will be wri
``` pre
export logs [--dir=value] [--group=value(,value)*] [--member=value(,value)*]
[--log-level=value] [--only-log-level=value] [--merge-log=value]
-[--start-time=value] [--end-time=value] [logs-only(=value)?] [--stats-only(=value)?]
+[--start-time=value] [--end-time=value] [logs-only(=value)?]
+[--stats-only(=value)?] [--file-size-limit(=value)?]
```
| Name | Description | Default Value |
@@ -185,6 +186,7 @@ export logs [--dir=value] [--group=value(,value)*] [--member=value(,value)*]
| <span class="keyword parmname">\\-\\-end-time</span> | Log entries that occurred before this time will be exported. Format: yyyy/MM/dd/HH/mm/ss/SSS/z OR yyyy/MM/dd | no limit |
| <span class="keyword parmname">\\-\\-logs-only</span> | Whether to export only logs (not statistics) | If parameter not specified: false. If parameter specified without a value: true |
| <span class="keyword parmname">\\-\\-stats-only</span> | Whether to export only statistics (not logs) | If parameter not specified: false. If parameter specified without a value: true |
+| <span class="keyword parmname">\\-\\-file-size-limit</span> | Limits size of the file that can be exported. Specify 0 (zero) for no limit. Value is in megabytes by default or [k,m,g,t] may be specified. | If parameter not specified: 100m. If parameter specified without a value: 0 |
<span class="tablecap">Table 4. Export Logs Parameters</span>
[07/35] geode git commit: GEODE-2974: Remove GemFire product name
from message string
Posted by kl...@apache.org.
GEODE-2974: Remove GemFire product name from message string
The error message now reports "Could not process command due to error."
followed by the decription of the error.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/2fb73815
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/2fb73815
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/2fb73815
Branch: refs/heads/feature/GEODE-2632-19
Commit: 2fb738157ac8b5c8e2e2fab03e3e87874f8e5bc3
Parents: c08d70d
Author: Ken Howe <kh...@pivotal.io>
Authored: Wed May 24 13:34:37 2017 -0700
Committer: Ken Howe <kh...@pivotal.io>
Committed: Tue May 30 15:15:40 2017 -0700
----------------------------------------------------------------------
.../internal/cli/result/ResultBuilder.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/2fb73815/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
index 6332540..94dbca0 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
@@ -22,9 +22,7 @@ import java.util.Collection;
import java.util.List;
/**
- *
- *
- * @since GemFire 7.0
+ * Provides methods for creating {@link Result} objects to return from Gfsh command functions
*/
public class ResultBuilder {
public static final int CODE_SHELLCLIENT_ABORT_OP = 110;
@@ -38,7 +36,7 @@ public class ResultBuilder {
// errors on member
public static final int ERRORCODE_PARSING_ERROR = 501;
- public static final int ERRORCODE_GEMFIRE_ERROR = 505;
+ public static final int ERRORCODE_GEODE_ERROR = 505;
public static final int ERRORCODE_BADRESPONSE_ERROR = 510;
public static final int ERRORCODE_BADCONFIG_ERROR = 515;
public static final int ERRORCODE_USER_ERROR = 520;
@@ -88,17 +86,17 @@ public class ResultBuilder {
}
/**
- * Method for convenience to create error result for error in GemFire while executing command.
+ * Method for convenience to create error result for error in Geode while executing command.
* <p/>
* Note: To build your own error result, use {@link #createErrorResultData()} to build
* {@link ErrorResultData} & then use {@link #buildResult(ResultData)}
*
* @param message Message to be shown to the user
- * @return Result for error in GemFire while executing command.
+ * @return Result for error in Geode while executing command.
*/
public static Result createGemFireErrorResult(String message) {
- return createErrorResult(ERRORCODE_GEMFIRE_ERROR,
- "Could not process command due to GemFire error. " + message);
+ return createErrorResult(ERRORCODE_GEODE_ERROR,
+ "Could not process command due to error. " + message);
}
public static Result createGemFireUnAuthorizedErrorResult(String message) {
@@ -268,7 +266,7 @@ public class ResultBuilder {
while (result.hasNextLine()) {
builder.append(result.nextLine());
}
- // TODO - Abhishek - what to do with incoming files??
+ // TODO - what to do with incoming files??
}
return builder.toString();
[24/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
index 2fb860d..db97d53 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java
@@ -22,7 +22,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.cache.operations.internal.GetOperationContextImpl;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -57,44 +56,44 @@ public class GetAllWithCallback extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null, callbackPart = null;
String regionName = null;
Object[] keys = null;
Object callback = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
int partIdx = 0;
// Retrieve the region name from the message parts
- regionNamePart = msg.getPart(partIdx++);
+ regionNamePart = clientMessage.getPart(partIdx++);
regionName = regionNamePart.getString();
// Retrieve the keys array from the message parts
- keysPart = msg.getPart(partIdx++);
+ keysPart = clientMessage.getPart(partIdx++);
try {
keys = (Object[]) keysPart.getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- callbackPart = msg.getPart(partIdx++);
+ callbackPart = clientMessage.getPart(partIdx++);
try {
callback = callbackPart.getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
StringBuffer buffer = new StringBuffer();
- buffer.append(servConn.getName()).append(": Received getAll request (")
- .append(msg.getPayloadLength()).append(" bytes) from ").append(servConn.getSocketString())
- .append(" for region ").append(regionName).append(" with callback ").append(callback)
- .append(" keys ");
+ buffer.append(serverConnection.getName()).append(": Received getAll request (")
+ .append(clientMessage.getPayloadLength()).append(" bytes) from ")
+ .append(serverConnection.getSocketString()).append(" for region ").append(regionName)
+ .append(" with callback ").append(callback).append(" keys ");
if (keys != null) {
for (int i = 0; i < keys.length; i++) {
buffer.append(keys[i]).append(" ");
@@ -114,35 +113,36 @@ public class GetAllWithCallback extends BaseCommand {
.toLocalizedString();
}
logger.warn(LocalizedMessage.create(LocalizedStrings.TWO_ARG_COLON,
- new Object[] {servConn.getName(), message}));
- writeChunkedErrorResponse(msg, MessageType.GET_ALL_DATA_ERROR, message, servConn);
- servConn.setAsTrue(RESPONDED);
+ new Object[] {serverConnection.getName(), message}));
+ writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = " was not found during getAll request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// Send header
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, servConn, callback);
- servConn.setAsTrue(RESPONDED);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, callback);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -154,7 +154,7 @@ public class GetAllWithCallback extends BaseCommand {
assert keys != null;
int numKeys = keys.length;
- VersionedObjectList values = new VersionedObjectList(maximumChunkSize, false,
+ VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, false,
region.getAttributes().getConcurrencyChecksEnabled(), false);
try {
AuthorizeRequest authzRequest = servConn.getAuthzRequest();
@@ -162,7 +162,7 @@ public class GetAllWithCallback extends BaseCommand {
Get70 request = (Get70) Get70.getCommand();
for (int i = 0; i < numKeys; i++) {
// Send the intermediate chunk if necessary
- if (values.size() == maximumChunkSize) {
+ if (values.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
sendGetAllResponseChunk(region, values, false, servConn);
values.clear();
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
index a3e565d..201b5c0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
@@ -49,20 +49,20 @@ public class GetClientPRMetadataCommand extends BaseCommand {
private GetClientPRMetadataCommand() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- regionFullPath = msg.getPart(0).getString();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ regionFullPath = clientMessage.getPart(0).getString();
String errMessage = "";
if (regionFullPath == null) {
logger.warn(LocalizedMessage
.create(LocalizedStrings.GetClientPRMetadata_THE_INPUT_REGION_PATH_IS_NULL));
errMessage =
LocalizedStrings.GetClientPRMetadata_THE_INPUT_REGION_PATH_IS_NULL.toLocalizedString();
- writeErrorResponse(msg, MessageType.GET_CLIENT_PR_METADATA_ERROR, errMessage.toString(),
- servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} else {
Region region = crHelper.getRegion(regionFullPath);
if (region == null) {
@@ -71,13 +71,13 @@ public class GetClientPRMetadataCommand extends BaseCommand {
regionFullPath));
errMessage = LocalizedStrings.GetClientPRMetadata_REGION_NOT_FOUND.toLocalizedString()
+ regionFullPath;
- writeErrorResponse(msg, MessageType.GET_CLIENT_PR_METADATA_ERROR, errMessage.toString(),
- servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} else {
try {
- Message responseMsg = servConn.getResponseMessage();
- responseMsg.setTransactionId(msg.getTransactionId());
+ Message responseMsg = serverConnection.getResponseMessage();
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.setMessageType(MessageType.RESPONSE_CLIENT_PR_METADATA);
PartitionedRegion prRgion = (PartitionedRegion) region;
@@ -93,11 +93,11 @@ public class GetClientPRMetadataCommand extends BaseCommand {
}
}
responseMsg.send();
- msg.clearParts();
+ clientMessage.clearParts();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
} finally {
- servConn.setAsTrue(Command.RESPONDED);
+ serverConnection.setAsTrue(Command.RESPONDED);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
index 3961b19..7b370fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
@@ -47,20 +47,20 @@ public class GetClientPRMetadataCommand66 extends BaseCommand {
private GetClientPRMetadataCommand66() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- regionFullPath = msg.getPart(0).getString();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ regionFullPath = clientMessage.getPart(0).getString();
String errMessage = "";
if (regionFullPath == null) {
logger.warn(LocalizedMessage
.create(LocalizedStrings.GetClientPRMetadata_THE_INPUT_REGION_PATH_IS_NULL));
errMessage =
LocalizedStrings.GetClientPRMetadata_THE_INPUT_REGION_PATH_IS_NULL.toLocalizedString();
- writeErrorResponse(msg, MessageType.GET_CLIENT_PR_METADATA_ERROR, errMessage.toString(),
- servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} else {
Region region = crHelper.getRegion(regionFullPath);
if (region == null) {
@@ -69,13 +69,13 @@ public class GetClientPRMetadataCommand66 extends BaseCommand {
regionFullPath));
errMessage = LocalizedStrings.GetClientPRMetadata_REGION_NOT_FOUND.toLocalizedString()
+ regionFullPath;
- writeErrorResponse(msg, MessageType.GET_CLIENT_PR_METADATA_ERROR, errMessage.toString(),
- servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PR_METADATA_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} else {
try {
- Message responseMsg = servConn.getResponseMessage();
- responseMsg.setTransactionId(msg.getTransactionId());
+ Message responseMsg = serverConnection.getResponseMessage();
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.setMessageType(MessageType.RESPONSE_CLIENT_PR_METADATA);
PartitionedRegion prRgion = (PartitionedRegion) region;
@@ -86,11 +86,11 @@ public class GetClientPRMetadataCommand66 extends BaseCommand {
responseMsg.addObjPart(serverLocations);
}
responseMsg.send();
- msg.clearParts();
+ clientMessage.clearParts();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
} finally {
- servConn.setAsTrue(Command.RESPONDED);
+ serverConnection.setAsTrue(Command.RESPONDED);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
index 7d5c251..6be9353 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
@@ -45,22 +45,22 @@ public class GetClientPartitionAttributesCommand extends BaseCommand {
@SuppressWarnings("unchecked")
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
- regionFullPath = msg.getPart(0).getString();
+ regionFullPath = clientMessage.getPart(0).getString();
String errMessage = "";
if (regionFullPath == null) {
logger.warn(LocalizedMessage
.create(LocalizedStrings.GetClientPartitionAttributes_THE_INPUT_REGION_PATH_IS_NULL));
errMessage = LocalizedStrings.GetClientPartitionAttributes_THE_INPUT_REGION_PATH_IS_NULL
.toLocalizedString();
- writeErrorResponse(msg, MessageType.GET_CLIENT_PARTITION_ATTRIBUTES_ERROR,
- errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PARTITION_ATTRIBUTES_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Region region = servConn.getCache().getRegion(regionFullPath);
+ Region region = serverConnection.getCache().getRegion(regionFullPath);
if (region == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.GetClientPartitionAttributes_REGION_NOT_FOUND_FOR_SPECIFIED_REGION_PATH,
@@ -68,15 +68,15 @@ public class GetClientPartitionAttributesCommand extends BaseCommand {
errMessage =
LocalizedStrings.GetClientPartitionAttributes_REGION_NOT_FOUND.toLocalizedString()
+ regionFullPath;
- writeErrorResponse(msg, MessageType.GET_CLIENT_PARTITION_ATTRIBUTES_ERROR,
- errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PARTITION_ATTRIBUTES_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
try {
- Message responseMsg = servConn.getResponseMessage();
- responseMsg.setTransactionId(msg.getTransactionId());
+ Message responseMsg = serverConnection.getResponseMessage();
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.setMessageType(MessageType.RESPONSE_CLIENT_PARTITION_ATTRIBUTES);
PartitionedRegion prRgion = (PartitionedRegion) region;
@@ -113,11 +113,11 @@ public class GetClientPartitionAttributesCommand extends BaseCommand {
}
responseMsg.addObjPart(leaderRegionPath);
responseMsg.send();
- msg.clearParts();
+ clientMessage.clearParts();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
} finally {
- servConn.setAsTrue(Command.RESPONDED);
+ serverConnection.setAsTrue(Command.RESPONDED);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
index 209c40c..251f4da 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
@@ -50,22 +50,22 @@ public class GetClientPartitionAttributesCommand66 extends BaseCommand {
@SuppressWarnings("unchecked")
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
- regionFullPath = msg.getPart(0).getString();
+ regionFullPath = clientMessage.getPart(0).getString();
String errMessage = "";
if (regionFullPath == null) {
logger.warn(LocalizedMessage
.create(LocalizedStrings.GetClientPartitionAttributes_THE_INPUT_REGION_PATH_IS_NULL));
errMessage = LocalizedStrings.GetClientPartitionAttributes_THE_INPUT_REGION_PATH_IS_NULL
.toLocalizedString();
- writeErrorResponse(msg, MessageType.GET_CLIENT_PARTITION_ATTRIBUTES_ERROR,
- errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PARTITION_ATTRIBUTES_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Region region = servConn.getCache().getRegion(regionFullPath);
+ Region region = serverConnection.getCache().getRegion(regionFullPath);
if (region == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.GetClientPartitionAttributes_REGION_NOT_FOUND_FOR_SPECIFIED_REGION_PATH,
@@ -73,15 +73,15 @@ public class GetClientPartitionAttributesCommand66 extends BaseCommand {
errMessage =
LocalizedStrings.GetClientPartitionAttributes_REGION_NOT_FOUND.toLocalizedString()
+ regionFullPath;
- writeErrorResponse(msg, MessageType.GET_CLIENT_PARTITION_ATTRIBUTES_ERROR,
- errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.GET_CLIENT_PARTITION_ATTRIBUTES_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
try {
- Message responseMsg = servConn.getResponseMessage();
- responseMsg.setTransactionId(msg.getTransactionId());
+ Message responseMsg = serverConnection.getResponseMessage();
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.setMessageType(MessageType.RESPONSE_CLIENT_PARTITION_ATTRIBUTES);
if (!(region instanceof PartitionedRegion)) {
@@ -138,11 +138,11 @@ public class GetClientPartitionAttributesCommand66 extends BaseCommand {
}
}
responseMsg.send();
- msg.clearParts();
+ clientMessage.clearParts();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
} finally {
- servConn.setAsTrue(Command.RESPONDED);
+ serverConnection.setAsTrue(Command.RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
index 8ec16ef..2c1f26c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
@@ -34,15 +34,16 @@ public class GetFunctionAttribute extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- String functionId = msg.getPart(0).getString();
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ String functionId = clientMessage.getPart(0).getString();
if (functionId == null) {
String message =
LocalizedStrings.GetFunctionAttribute_THE_INPUT_0_FOR_GET_FUNCTION_ATTRIBUTE_REQUEST_IS_NULL
.toLocalizedString("functionId");
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(msg, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(clientMessage, message, serverConnection);
return;
}
@@ -52,8 +53,8 @@ public class GetFunctionAttribute extends BaseCommand {
message =
LocalizedStrings.GetFunctionAttribute_THE_FUNCTION_IS_NOT_REGISTERED_FOR_FUNCTION_ID_0
.toLocalizedString(functionId);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(msg, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(clientMessage, message, serverConnection);
return;
}
@@ -61,7 +62,7 @@ public class GetFunctionAttribute extends BaseCommand {
functionAttributes[0] = (byte) (function.hasResult() ? 1 : 0);
functionAttributes[1] = (byte) (function.isHA() ? 1 : 0);
functionAttributes[2] = (byte) (function.optimizeForWrite() ? 1 : 0);
- writeResponseWithFunctionAttribute(functionAttributes, msg, servConn);
+ writeResponseWithFunctionAttribute(functionAttributes, clientMessage, serverConnection);
}
private void sendError(Message msg, String message, ServerConnection servConn)
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
index 54a21ed..15215de 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
@@ -36,32 +36,33 @@ public class GetPDXEnumById extends BaseCommand {
private GetPDXEnumById() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received get pdx enum by id request ({} parts) from {}", servConn.getName(),
- msg.getNumberOfParts(), servConn.getSocketString());
+ logger.debug("{}: Received get pdx enum by id request ({} parts) from {}",
+ serverConnection.getName(), clientMessage.getNumberOfParts(),
+ serverConnection.getSocketString());
}
- int enumId = msg.getPart(0).getInt();
+ int enumId = clientMessage.getPart(0).getInt();
EnumInfo result;
try {
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
TypeRegistry registry = cache.getPdxRegistry();
result = registry.getEnumInfoById(enumId);
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Message responseMsg = servConn.getResponseMessage();
+ Message responseMsg = serverConnection.getResponseMessage();
responseMsg.setMessageType(MessageType.RESPONSE);
responseMsg.setNumberOfParts(1);
- responseMsg.setTransactionId(msg.getTransactionId());
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.addObjPart(result);
- responseMsg.send(servConn);
- servConn.setAsTrue(RESPONDED);
+ responseMsg.send(serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
index 1b21383..40c62a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
@@ -36,33 +36,34 @@ public class GetPDXIdForEnum extends BaseCommand {
private GetPDXIdForEnum() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
logger.debug("{}: Received get pdx id for enum request ({} parts) from {}",
- servConn.getName(), msg.getNumberOfParts(), servConn.getSocketString());
+ serverConnection.getName(), clientMessage.getNumberOfParts(),
+ serverConnection.getSocketString());
}
- EnumInfo enumInfo = (EnumInfo) msg.getPart(0).getObject();
+ EnumInfo enumInfo = (EnumInfo) clientMessage.getPart(0).getObject();
int enumId;
try {
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
TypeRegistry registry = cache.getPdxRegistry();
enumId = registry.defineEnum(enumInfo);
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Message responseMsg = servConn.getResponseMessage();
+ Message responseMsg = serverConnection.getResponseMessage();
responseMsg.setMessageType(MessageType.RESPONSE);
responseMsg.setNumberOfParts(1);
- responseMsg.setTransactionId(msg.getTransactionId());
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.addIntPart(enumId);
- responseMsg.send(servConn);
- servConn.setAsTrue(RESPONDED);
+ responseMsg.send(serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
index 2054196..c1de0fc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
@@ -36,34 +36,35 @@ public class GetPDXIdForType extends BaseCommand {
private GetPDXIdForType() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
logger.debug("{}: Received get pdx id for type request ({} parts) from {}",
- servConn.getName(), msg.getNumberOfParts(), servConn.getSocketString());
+ serverConnection.getName(), clientMessage.getNumberOfParts(),
+ serverConnection.getSocketString());
}
- int noOfParts = msg.getNumberOfParts();
+ int noOfParts = clientMessage.getNumberOfParts();
- PdxType type = (PdxType) msg.getPart(0).getObject();
+ PdxType type = (PdxType) clientMessage.getPart(0).getObject();
int pdxId;
try {
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
TypeRegistry registry = cache.getPdxRegistry();
pdxId = registry.defineType(type);
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Message responseMsg = servConn.getResponseMessage();
+ Message responseMsg = serverConnection.getResponseMessage();
responseMsg.setMessageType(MessageType.RESPONSE);
responseMsg.setNumberOfParts(1);
- responseMsg.setTransactionId(msg.getTransactionId());
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.addIntPart(pdxId);
- responseMsg.send(servConn);
- servConn.setAsTrue(RESPONDED);
+ responseMsg.send(serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
index 2470893..16e9dd0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
@@ -36,32 +36,33 @@ public class GetPDXTypeById extends BaseCommand {
private GetPDXTypeById() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received get pdx type by id request ({} parts) from {}", servConn.getName(),
- msg.getNumberOfParts(), servConn.getSocketString());
+ logger.debug("{}: Received get pdx type by id request ({} parts) from {}",
+ serverConnection.getName(), clientMessage.getNumberOfParts(),
+ serverConnection.getSocketString());
}
- int pdxId = msg.getPart(0).getInt();
+ int pdxId = clientMessage.getPart(0).getInt();
PdxType type;
try {
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
TypeRegistry registry = cache.getPdxRegistry();
type = registry.getType(pdxId);
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Message responseMsg = servConn.getResponseMessage();
+ Message responseMsg = serverConnection.getResponseMessage();
responseMsg.setMessageType(MessageType.RESPONSE);
responseMsg.setNumberOfParts(1);
- responseMsg.setTransactionId(msg.getTransactionId());
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.addObjPart(type);
- responseMsg.send(servConn);
- servConn.setAsTrue(RESPONDED);
+ responseMsg.send(serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
index 19551c4..7753584 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
@@ -36,31 +36,31 @@ public class GetPdxEnums70 extends BaseCommand {
private GetPdxEnums70() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received get pdx enums from {}", servConn.getName(),
- servConn.getSocketString());
+ logger.debug("{}: Received get pdx enums from {}", serverConnection.getName(),
+ serverConnection.getSocketString());
}
Map<Integer, EnumInfo> enums;
try {
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
enums = cache.getPdxRegistry().enumMap();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Message responseMsg = servConn.getResponseMessage();
+ Message responseMsg = serverConnection.getResponseMessage();
responseMsg.setMessageType(MessageType.RESPONSE);
responseMsg.setNumberOfParts(1);
- responseMsg.setTransactionId(msg.getTransactionId());
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.addObjPart(enums);
- responseMsg.send(servConn);
- servConn.setAsTrue(RESPONDED);
+ responseMsg.send(serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
index cc96b8e..c31a375 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
@@ -36,30 +36,30 @@ public class GetPdxTypes70 extends BaseCommand {
private GetPdxTypes70() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received get pdx types from {}", servConn.getName(),
- servConn.getSocketString());
+ logger.debug("{}: Received get pdx types from {}", serverConnection.getName(),
+ serverConnection.getSocketString());
}
Map<Integer, PdxType> types;
try {
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
types = cache.getPdxRegistry().typeMap();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Message responseMsg = servConn.getResponseMessage();
+ Message responseMsg = serverConnection.getResponseMessage();
responseMsg.setMessageType(MessageType.RESPONSE);
responseMsg.setNumberOfParts(1);
- responseMsg.setTransactionId(msg.getTransactionId());
+ responseMsg.setTransactionId(clientMessage.getTransactionId());
responseMsg.addObjPart(types);
- responseMsg.send(servConn);
- servConn.setAsTrue(RESPONDED);
+ responseMsg.send(serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
index 24d623a..040e1c2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
@@ -36,12 +36,14 @@ public class Invalid extends BaseCommand {
private Invalid() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
logger.error(
LocalizedMessage.create(LocalizedStrings.Invalid_0_INVALID_MESSAGE_TYPE_WITH_TX_1_FROM_2,
- new Object[] {servConn.getName(), Integer.valueOf(msg.getTransactionId()),
- servConn.getSocketString()}));
- writeErrorResponse(msg, MessageType.INVALID, servConn);
+ new Object[] {serverConnection.getName(),
+ Integer.valueOf(clientMessage.getTransactionId()),
+ serverConnection.getSocketString()}));
+ writeErrorResponse(clientMessage, MessageType.INVALID, serverConnection);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
index 42b2497..801b3ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java
@@ -48,15 +48,15 @@ public class Invalidate extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, callbackArgPart = null;
String regionName = null;
Object callbackArg = null, key = null;
Part eventPart = null;
StringBuffer errMessage = new StringBuffer();
- CacheServerStats stats = servConn.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ CacheServerStats stats = serverConnection.getCacheServerStats();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
@@ -64,17 +64,17 @@ public class Invalidate extends BaseCommand {
stats.incReadInvalidateRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- keyPart = msg.getPart(1);
- eventPart = msg.getPart(2);
+ regionNamePart = clientMessage.getPart(0);
+ keyPart = clientMessage.getPart(1);
+ eventPart = clientMessage.getPart(2);
// callbackArgPart = null; (redundant assignment)
- if (msg.getNumberOfParts() > 3) {
- callbackArgPart = msg.getPart(3);
+ if (clientMessage.getNumberOfParts() > 3) {
+ callbackArgPart = clientMessage.getPart(3);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -82,14 +82,14 @@ public class Invalidate extends BaseCommand {
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
- logger.debug(servConn.getName() + ": Received invalidate request (" + msg.getPayloadLength()
- + " bytes) from " + servConn.getSocketString() + " for region " + regionName + " key "
- + key);
+ logger.debug(serverConnection.getName() + ": Received invalidate request ("
+ + clientMessage.getPayloadLength() + " bytes) from " + serverConnection.getSocketString()
+ + " for region " + regionName + " key " + key);
}
// Process the invalidate request
@@ -108,23 +108,25 @@ public class Invalidate extends BaseCommand {
.append(LocalizedStrings.BaseCommand__THE_INPUT_REGION_NAME_FOR_THE_0_REQUEST_IS_NULL
.toLocalizedString("invalidate"));
}
- writeErrorResponse(msg, MessageType.DESTROY_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.DESTROY_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = LocalizedStrings.BaseCommand__0_WAS_NOT_FOUND_DURING_1_REQUEST
.toLocalizedString(regionName, "invalidate");
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// Invalidate the entry
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
Breadcrumbs.setEventId(eventId);
@@ -134,7 +136,7 @@ public class Invalidate extends BaseCommand {
// for integrated security
this.securityService.authorizeRegionWrite(regionName, key.toString());
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
InvalidateOperationContext invalidateContext =
authzRequest.invalidateAuthorize(regionName, key, callbackArg);
@@ -143,7 +145,7 @@ public class Invalidate extends BaseCommand {
EventIDHolder clientEvent = new EventIDHolder(eventId);
// msg.isRetry might be set by v7.0 and later clients
- if (msg.isRetry()) {
+ if (clientMessage.isRetry()) {
// if (logger.isDebugEnabled()) {
// logger.debug("DEBUG: encountered isRetry in Invalidate");
// }
@@ -157,9 +159,10 @@ public class Invalidate extends BaseCommand {
}
}
- region.basicBridgeInvalidate(key, callbackArg, servConn.getProxyID(), true, clientEvent);
+ region.basicBridgeInvalidate(key, callbackArg, serverConnection.getProxyID(), true,
+ clientEvent);
tag = clientEvent.getVersionTag();
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
} catch (EntryNotFoundException e) {
// Don't send an exception back to the client if this
// exception happens. Just log it and continue.
@@ -167,25 +170,25 @@ public class Invalidate extends BaseCommand {
LocalizedStrings.BaseCommand_DURING_0_NO_ENTRY_WAS_FOUND_FOR_KEY_1,
new Object[] {"invalidate", key}));
} catch (RegionDestroyedException rde) {
- writeException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, rde, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// If an exception occurs during the destroy, preserve the connection
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (e instanceof GemFireSecurityException) {
// Fine logging for security exceptions since these are already
// logged by the security logger
if (logger.isDebugEnabled()) {
- logger.debug("{}: Unexpected Security exception", servConn.getName(), e);
+ logger.debug("{}: Unexpected Security exception", serverConnection.getName(), e);
}
} else {
logger.warn(LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), e);
+ serverConnection.getName()), e);
}
return;
}
@@ -199,17 +202,18 @@ public class Invalidate extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeReplyWithRefreshMetadata(msg, servConn, pr, pr.getNetworkHopType(), tag);
+ writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, pr.getNetworkHopType(),
+ tag);
pr.clearNetworkHopData();
} else {
- writeReply(msg, servConn, tag);
+ writeReply(clientMessage, serverConnection, tag);
}
} else {
- writeReply(msg, servConn, tag);
+ writeReply(clientMessage, serverConnection, tag);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent invalidate response for region {} key {}", servConn.getName(),
+ logger.debug("{}: Sent invalidate response for region {} key {}", serverConnection.getName(),
regionName, key);
}
stats.incWriteInvalidateResponseTime(DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
index 4ac5023..2531e1d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
@@ -60,7 +60,7 @@ public class Invalidate70 extends Invalidate {
pr.getPrStats().incPRMetaDataSentCount();
replyMsg.send(servConn);
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADAT tx: {}", servConn.getName(),
+ logger.trace("{}: rpl with REFRESH_METADATA tx: {}", servConn.getName(),
origMsg.getTransactionId());
}
}
@@ -90,7 +90,7 @@ public class Invalidate70 extends Invalidate {
logger.debug("response has no version tag");
}
}
- replyMsg.addBytesPart(OK_BYTES); // make old single-hop code happy by putting byte[]{0} here
+ replyMsg.addBytesPart(okBytes()); // make old single-hop code happy by putting byte[]{0} here
replyMsg.send(servConn);
if (logger.isTraceEnabled()) {
logger.trace("{}: rpl tx: {} parts={}", servConn.getName(), origMsg.getTransactionId(),
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
index 5f7388c..66de347 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
@@ -26,7 +26,6 @@ import java.util.Set;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.operations.KeySetOperationContext;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -49,21 +48,22 @@ public class KeySet extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null;
String regionName = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
// Retrieve the region name from the message parts
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
final boolean isDebugEnabled = logger.isDebugEnabled();
if (isDebugEnabled) {
logger.debug("{}: Received key set request ({} bytes) from {} for region {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName);
}
// Process the key set request
@@ -72,41 +72,42 @@ public class KeySet extends BaseCommand {
// if (regionName == null) (can only be null)
{
message = LocalizedStrings.KeySet_0_THE_INPUT_REGION_NAME_FOR_THE_KEY_SET_REQUEST_IS_NULL
- .toLocalizedString(servConn.getName());
+ .toLocalizedString(serverConnection.getName());
logger.warn(LocalizedMessage.create(
LocalizedStrings.KeySet_0_THE_INPUT_REGION_NAME_FOR_THE_KEY_SET_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
}
- writeKeySetErrorResponse(msg, MessageType.KEY_SET_DATA_ERROR, message, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeKeySetErrorResponse(clientMessage, MessageType.KEY_SET_DATA_ERROR, message,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = LocalizedStrings.KeySet__0_WAS_NOT_FOUND_DURING_KEY_SET_REQUEST
.toLocalizedString(regionName);
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
try {
this.securityService.authorizeRegionRead(regionName);
} catch (NotAuthorizedException ex) {
- writeChunkedException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, ex, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
KeySetOperationContext keySetContext = null;
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
try {
keySetContext = authzRequest.keySetAuthorize(regionName);
} catch (NotAuthorizedException ex) {
- writeChunkedException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, ex, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -117,20 +118,21 @@ public class KeySet extends BaseCommand {
// Send header
chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
- fillAndSendKeySetResponseChunks(region, regionName, keySetContext, servConn);
- servConn.setAsTrue(RESPONDED);
+ fillAndSendKeySetResponseChunks(region, regionName, keySetContext, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, e, false, servConn, servConn.getChunkedResponseMessage());
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection,
+ serverConnection.getChunkedResponseMessage());
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -138,7 +140,8 @@ public class KeySet extends BaseCommand {
// logger.fine(getName() + ": Sent chunk (1 of 1) of register interest
// response (" + chunkedResponseMsg.getBufferLength() + " bytes) for
// region " + regionName + " key " + key);
- logger.debug("{}: Sent key set response for the region {}", servConn.getName(), regionName);
+ logger.debug("{}: Sent key set response for the region {}", serverConnection.getName(),
+ regionName);
}
// bserverStats.incLong(writeDestroyResponseTimeId,
// DistributionStats.getStatTime() - start);
@@ -160,7 +163,7 @@ public class KeySet extends BaseCommand {
keySet = keySetContext.getKeySet();
}
- List keyList = new ArrayList(maximumChunkSize);
+ List keyList = new ArrayList(MAXIMUM_CHUNK_SIZE);
final boolean isTraceEnabled = logger.isTraceEnabled();
for (Iterator it = keySet.iterator(); it.hasNext();) {
Object entryKey = it.next();
@@ -169,7 +172,7 @@ public class KeySet extends BaseCommand {
logger.trace("{}: fillAndSendKeySetResponseKey <{}>; list size was {}; region: {}",
servConn.getName(), entryKey, keyList.size(), region.getFullPath());
}
- if (keyList.size() == maximumChunkSize) {
+ if (keyList.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
sendKeySetResponseChunk(region, keyList, false, servConn);
keyList.clear();
@@ -185,7 +188,7 @@ public class KeySet extends BaseCommand {
chunkedResponseMsg.setNumberOfParts(1);
chunkedResponseMsg.setLastChunk(lastChunk);
- chunkedResponseMsg.addObjPart(list, zipValues);
+ chunkedResponseMsg.addObjPart(list, false);
if (logger.isDebugEnabled()) {
logger.debug("{}: Sending {} key set response chunk for region={}{}", servConn.getName(),
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
index fc8fe44..ac9901c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
@@ -34,30 +34,31 @@ public class MakePrimary extends BaseCommand {
private MakePrimary() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- Part isClientReadyPart = msg.getPart(0);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ Part isClientReadyPart = clientMessage.getPart(0);
byte[] isClientReadyPartBytes = (byte[]) isClientReadyPart.getObject();
boolean isClientReady = isClientReadyPartBytes[0] == 0x01;
final boolean isDebugEnabled = logger.isDebugEnabled();
if (isDebugEnabled) {
logger.debug("{}: Received make primary request ({} bytes) isClientReady={}: from {}",
- servConn.getName(), msg.getPayloadLength(), isClientReady, servConn.getSocketString());
+ serverConnection.getName(), clientMessage.getPayloadLength(), isClientReady,
+ serverConnection.getSocketString());
}
try {
- servConn.getAcceptor().getCacheClientNotifier().makePrimary(servConn.getProxyID(),
- isClientReady);
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ serverConnection.getAcceptor().getCacheClientNotifier()
+ .makePrimary(serverConnection.getProxyID(), isClientReady);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (isDebugEnabled) {
- logger.debug("{}: Sent make primary response for {}", servConn.getName(),
- servConn.getSocketString());
+ logger.debug("{}: Sent make primary response for {}", serverConnection.getName(),
+ serverConnection.getSocketString());
}
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java
index b5e1ca3..9a79540 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
public class ManagementCommand extends BaseCommand {
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException, InterruptedException {
// TODO Auto-generated method stub
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
index d301909..121ec37 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
@@ -33,43 +33,44 @@ public class PeriodicAck extends BaseCommand {
private PeriodicAck() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received periodic ack request ({} bytes) from {}", servConn.getName(),
- msg.getPayloadLength(), servConn.getSocketString());
+ logger.debug("{}: Received periodic ack request ({} bytes) from {}",
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString());
}
try {
- int numEvents = msg.getNumberOfParts();
+ int numEvents = clientMessage.getNumberOfParts();
boolean success = false;
- CacheClientNotifier ccn = servConn.getAcceptor().getCacheClientNotifier();
- CacheClientProxy proxy = ccn.getClientProxy(servConn.getProxyID());
+ CacheClientNotifier ccn = serverConnection.getAcceptor().getCacheClientNotifier();
+ CacheClientProxy proxy = ccn.getClientProxy(serverConnection.getProxyID());
if (proxy != null) {
proxy.getHARegionQueue().createAckedEventsMap();
for (int i = 0; i < numEvents; i++) {
- Part eventIdPart = msg.getPart(i);
- eventIdPart.setVersion(servConn.getClientVersion());
+ Part eventIdPart = clientMessage.getPart(i);
+ eventIdPart.setVersion(serverConnection.getClientVersion());
EventID eid = (EventID) eventIdPart.getObject();
- success = ccn.processDispatchedMessage(servConn.getProxyID(), eid);
+ success = ccn.processDispatchedMessage(serverConnection.getProxyID(), eid);
if (!success)
break;
}
}
if (success) {
proxy.getHARegionQueue().setAckedEvents();
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent periodic ack response for {}", servConn.getName(),
- servConn.getSocketString());
+ logger.debug("{}: Sent periodic ack response for {}", serverConnection.getName(),
+ serverConnection.getSocketString());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
index 7a12ce1..adcfd14 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
@@ -39,35 +39,38 @@ public class Ping extends BaseCommand {
private Ping() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
final boolean isDebugEnabled = logger.isDebugEnabled();
if (isDebugEnabled) {
- logger.debug("{}: rcv tx: {} from {} rcvTime: {}", servConn.getName(), msg.getTransactionId(),
- servConn.getSocketString(), (DistributionStats.getStatTime() - start));
+ logger.debug("{}: rcv tx: {} from {} rcvTime: {}", serverConnection.getName(),
+ clientMessage.getTransactionId(), serverConnection.getSocketString(),
+ (DistributionStats.getStatTime() - start));
}
ClientHealthMonitor chm = ClientHealthMonitor.getInstance();
if (chm != null)
- chm.receivedPing(servConn.getProxyID());
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ chm.receivedPing(serverConnection.getProxyID());
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (isDebugEnabled) {
- logger.debug("{}: Sent ping reply to {}", servConn.getName(), servConn.getSocketString());
+ logger.debug("{}: Sent ping reply to {}", serverConnection.getName(),
+ serverConnection.getSocketString());
}
}
@Override
- protected void writeReply(Message origMsg, ServerConnection servConn) throws IOException {
- Message replyMsg = servConn.getReplyMessage();
- servConn.getCache().getCancelCriterion().checkCancelInProgress(null);
+ protected void writeReply(Message origMsg, ServerConnection serverConnection) throws IOException {
+ Message replyMsg = serverConnection.getReplyMessage();
+ serverConnection.getCache().getCancelCriterion().checkCancelInProgress(null);
replyMsg.setMessageType(MessageType.REPLY);
replyMsg.setNumberOfParts(1);
replyMsg.setTransactionId(origMsg.getTransactionId());
- replyMsg.addBytesPart(OK_BYTES);
- replyMsg.send(servConn);
+ replyMsg.addBytesPart(okBytes());
+ replyMsg.send(serverConnection);
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl tx: {}", servConn.getName(), origMsg.getTransactionId());
+ logger.trace("{}: rpl tx: {}", serverConnection.getName(), origMsg.getTransactionId());
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
index 2a235c0..76c8184 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java
@@ -49,36 +49,36 @@ public class Put extends BaseCommand {
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null;
String regionName = null;
Object callbackArg = null, key = null;
Part eventPart = null;
String errMessage = "";
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
// requiresResponse = true;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
start = DistributionStats.getStatTime();
stats.incReadPutRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- keyPart = msg.getPart(1);
- valuePart = msg.getPart(2);
- eventPart = msg.getPart(3);
+ regionNamePart = clientMessage.getPart(0);
+ keyPart = clientMessage.getPart(1);
+ valuePart = clientMessage.getPart(2);
+ eventPart = clientMessage.getPart(3);
// callbackArgPart = null; (redundant assignment)
- if (msg.getNumberOfParts() > 4) {
- callbackArgPart = msg.getPart(4);
+ if (clientMessage.getNumberOfParts() > 4) {
+ callbackArgPart = clientMessage.getPart(4);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -87,43 +87,45 @@ public class Put extends BaseCommand {
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isTraceEnabled()) {
logger.trace("{}: Received put request ({} bytes) from {} for region {} key {} value {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName, key,
- valuePart);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key, valuePart);
}
// Process the put request
if (key == null || regionName == null) {
if (key == null) {
logger.warn(LocalizedMessage.create(
- LocalizedStrings.Put_0_THE_INPUT_KEY_FOR_THE_PUT_REQUEST_IS_NULL, servConn.getName()));
+ LocalizedStrings.Put_0_THE_INPUT_KEY_FOR_THE_PUT_REQUEST_IS_NULL,
+ serverConnection.getName()));
errMessage =
LocalizedStrings.Put_THE_INPUT_KEY_FOR_THE_PUT_REQUEST_IS_NULL.toLocalizedString();
}
if (regionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.Put_0_THE_INPUT_REGION_NAME_FOR_THE_PUT_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage = LocalizedStrings.Put_THE_INPUT_REGION_NAME_FOR_THE_PUT_REQUEST_IS_NULL
.toLocalizedString();
}
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason =
LocalizedStrings.Put_REGION_WAS_NOT_FOUND_DURING_PUT_REQUEST.toLocalizedString();
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -131,18 +133,19 @@ public class Put extends BaseCommand {
// Invalid to 'put' a null value in an existing key
logger.info(LocalizedMessage.create(
LocalizedStrings.Put_0_ATTEMPTED_TO_PUT_A_NULL_VALUE_FOR_EXISTING_KEY_1,
- new Object[] {servConn.getName(), key}));
+ new Object[] {serverConnection.getName(), key}));
errMessage =
LocalizedStrings.Put_ATTEMPTED_TO_PUT_A_NULL_VALUE_FOR_EXISTING_KEY_0.toLocalizedString();
- writeErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
try {
byte[] value = valuePart.getSerializedForm();
@@ -150,7 +153,7 @@ public class Put extends BaseCommand {
this.securityService.authorizeRegionWrite(regionName, key.toString());
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
authzRequest.createRegionAuthorize((String) key);
@@ -173,46 +176,47 @@ public class Put extends BaseCommand {
// Create the null entry. Since the value is null, the value of the
// isObject
// the true after null doesn't matter and is not used.
- result = region.basicBridgeCreate(key, null, true, callbackArg, servConn.getProxyID(), true,
- new EventIDHolder(eventId), false);
+ result = region.basicBridgeCreate(key, null, true, callbackArg,
+ serverConnection.getProxyID(), true, new EventIDHolder(eventId), false);
} else {
// Put the entry
result = region.basicBridgePut(key, value, null, isObject, callbackArg,
- servConn.getProxyID(), true, new EventIDHolder(eventId));
+ serverConnection.getProxyID(), true, new EventIDHolder(eventId));
}
if (result) {
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
} else {
StringId message = LocalizedStrings.PUT_0_FAILED_TO_PUT_ENTRY_FOR_REGION_1_KEY_2_VALUE_3;
- Object[] messageArgs = new Object[] {servConn.getName(), regionName, key, valuePart};
+ Object[] messageArgs =
+ new Object[] {serverConnection.getName(), regionName, key, valuePart};
String s = message.toLocalizedString(messageArgs);
logger.info(s);
throw new Exception(s);
}
} catch (RegionDestroyedException rde) {
- writeException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, rde, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (ResourceException re) {
- writeException(msg, re, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, re, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (Exception ce) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ce);
+ checkForInterrupt(serverConnection, ce);
// If an exception occurs during the put, preserve the connection
- writeException(msg, ce, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ce, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (ce instanceof GemFireSecurityException) {
// Fine logging for security exceptions since these are already
// logged by the security logger
if (logger.isDebugEnabled()) {
- logger.debug("{}: Unexpected Security exception", servConn.getName(), ce);
+ logger.debug("{}: Unexpected Security exception", serverConnection.getName(), ce);
}
} else {
logger.warn(LocalizedMessage.create(LocalizedStrings.PUT_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), ce);
+ serverConnection.getName()), ce);
}
return;
} finally {
@@ -222,12 +226,13 @@ public class Put extends BaseCommand {
}
// Increment statistics and write the reply
- writeReply(msg, servConn);
+ writeReply(clientMessage, serverConnection);
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
logger.debug("{}: Sent put response back to {} for region {} key {} value {}",
- servConn.getName(), servConn.getSocketString(), regionName, key, valuePart);
+ serverConnection.getName(), serverConnection.getSocketString(), regionName, key,
+ valuePart);
}
stats.incWritePutResponseTime(DistributionStats.getStatTime() - start);
}
[27/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
index f102b2d..1f9ef91 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
@@ -34,7 +34,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
-import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
import java.util.Map;
@@ -47,7 +46,7 @@ import java.util.concurrent.TimeUnit;
* and serialize it out to the wire.
*
* <PRE>
- * msgType - int - 4 bytes type of message, types enumerated below
+ * messageType - int - 4 bytes type of message, types enumerated below
*
* msgLength - int - 4 bytes total length of variable length payload
*
@@ -55,10 +54,10 @@ import java.util.concurrent.TimeUnit;
* contained in the payload. Message can
* be a multi-part message
*
- * transId - int - 4 bytes filled in by the requestor, copied back into
+ * transId - int - 4 bytes filled in by the requester, copied back into
* the response
*
- * flags - byte- 1 byte filled in by the requestor
+ * flags - byte- 1 byte filled in by the requester
* len1
* part1
* .
@@ -76,18 +75,17 @@ import java.util.concurrent.TimeUnit;
*
* See also <a href="package-summary.html#messages">package description</a>.
*
- * @see org.apache.geode.internal.cache.tier.MessageType
- *
+ * @see MessageType
*/
public class Message {
- public static final int DEFAULT_MAX_MESSAGE_SIZE = 1073741824;
- /**
- * maximum size of an outgoing message. See GEODE-478
- */
- public static int MAX_MESSAGE_SIZE =
- Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "client.max-message-size",
- DEFAULT_MAX_MESSAGE_SIZE).intValue();
+ // Tentative workaround to avoid OOM stated in #46754.
+ public static final ThreadLocal<Integer> MESSAGE_TYPE = new ThreadLocal<>();
+
+ public static final String MAX_MESSAGE_SIZE_PROPERTY =
+ DistributionConfig.GEMFIRE_PREFIX + "client.max-message-size";
+
+ static final int DEFAULT_MAX_MESSAGE_SIZE = 1073741824;
private static final Logger logger = LogService.getLogger();
@@ -97,83 +95,89 @@ public class Message {
private static final ThreadLocal<ByteBuffer> tlCommBuffer = new ThreadLocal<>();
- private static final byte[] TRUE;
- private static final byte[] FALSE;
+ // These two statics are fields shoved into the flags byte for transmission.
+ // The MESSAGE_IS_RETRY bit is stripped out during deserialization but the other
+ // is left in place
+ private static final byte MESSAGE_HAS_SECURE_PART = (byte) 0x02;
+ private static final byte MESSAGE_IS_RETRY = (byte) 0x04;
+
+ private static final byte MESSAGE_IS_RETRY_MASK = (byte) 0xFB;
- static {
- try {
- HeapDataOutputStream hdos = new HeapDataOutputStream(10, null);
+ private static final int DEFAULT_CHUNK_SIZE = 1024;
+
+ private static final byte[] TRUE = defineTrue();
+ private static final byte[] FALSE = defineFalse();
+
+ private static byte[] defineTrue() {
+ try (HeapDataOutputStream hdos = new HeapDataOutputStream(10, null)) {
BlobHelper.serializeTo(Boolean.TRUE, hdos);
- TRUE = hdos.toByteArray();
- } catch (Exception e) {
+ return hdos.toByteArray();
+ } catch (IOException e) {
throw new IllegalStateException(e);
}
+ }
- try {
- HeapDataOutputStream hdos = new HeapDataOutputStream(10, null);
+ private static byte[] defineFalse() {
+ try (HeapDataOutputStream hdos = new HeapDataOutputStream(10, null)) {
BlobHelper.serializeTo(Boolean.FALSE, hdos);
- FALSE = hdos.toByteArray();
- } catch (Exception e) {
+ return hdos.toByteArray();
+ } catch (IOException e) {
throw new IllegalStateException(e);
}
}
- protected int msgType;
- protected int payloadLength = 0;
- protected int numberOfParts = 0;
+ /**
+ * maximum size of an outgoing message. See GEODE-478
+ */
+ private final int maxMessageSize;
+
+ protected int messageType;
+ private int payloadLength = 0;
+ int numberOfParts = 0;
protected int transactionId = TXManagerImpl.NOTX;
- protected int currentPart = 0;
- protected Part[] partsList = null;
- protected ByteBuffer cachedCommBuffer;
+ int currentPart = 0;
+ private Part[] partsList = null;
+ private ByteBuffer cachedCommBuffer;
protected Socket socket = null;
- protected SocketChannel sockCh = null;
- protected OutputStream os = null;
- protected InputStream is = null;
- protected boolean messageModified = true;
+ private SocketChannel socketChannel = null;
+ private OutputStream outputStream = null;
+ protected InputStream inputStream = null;
+ private boolean messageModified = true;
+
/** is this message a retry of a previously sent message? */
- protected boolean isRetry;
+ private boolean isRetry;
+
private byte flags = 0x00;
- protected MessageStats msgStats = null;
- protected ServerConnection sc = null;
+ MessageStats messageStats = null;
+ protected ServerConnection serverConnection = null;
private int maxIncomingMessageLength = -1;
private Semaphore dataLimiter = null;
- // private int MAX_MSGS = -1;
- private Semaphore msgLimiter = null;
- private boolean hdrRead = false;
- private int chunkSize = 1024;// Default Chunk Size.
+ private Semaphore messageLimiter = null;
+ private boolean readHeader = false;
+ private int chunkSize = DEFAULT_CHUNK_SIZE;
- protected Part securePart = null;
+ Part securePart = null;
private boolean isMetaRegion = false;
-
- // These two statics are fields shoved into the flags byte for transmission.
- // The MESSAGE_IS_RETRY bit is stripped out during deserialization but the other
- // is left in place
- public static final byte MESSAGE_HAS_SECURE_PART = (byte) 0x02;
- public static final byte MESSAGE_IS_RETRY = (byte) 0x04;
-
- public static final byte MESSAGE_IS_RETRY_MASK = (byte) 0xFB;
-
- // Tentative workaround to avoid OOM stated in #46754.
- public static final ThreadLocal<Integer> messageType = new ThreadLocal<Integer>();
-
- Version version;
+ private Version version;
/**
* Creates a new message with the given number of parts
*/
public Message(int numberOfParts, Version destVersion) {
+ this.maxMessageSize = Integer.getInteger(MAX_MESSAGE_SIZE_PROPERTY, DEFAULT_MAX_MESSAGE_SIZE);
this.version = destVersion;
Assert.assertTrue(destVersion != null, "Attempt to create an unversioned message");
- partsList = new Part[numberOfParts];
+ this.partsList = new Part[numberOfParts];
this.numberOfParts = numberOfParts;
- for (int i = 0; i < partsList.length; i++) {
- partsList[i] = new Part();
+ int partsListLength = this.partsList.length;
+ for (int i = 0; i < partsListLength; i++) {
+ this.partsList[i] = new Part();
}
}
public boolean isSecureMode() {
- return securePart != null;
+ return this.securePart != null;
}
public byte[] getSecureBytes() throws IOException, ClassNotFoundException {
@@ -186,7 +190,7 @@ public class Message {
throw new IllegalArgumentException(
LocalizedStrings.Message_INVALID_MESSAGETYPE.toLocalizedString());
}
- this.msgType = msgType;
+ this.messageType = msgType;
}
public void setVersion(Version clientVersion) {
@@ -194,17 +198,15 @@ public class Message {
}
public void setMessageHasSecurePartFlag() {
- this.flags = (byte) (this.flags | MESSAGE_HAS_SECURE_PART);
+ this.flags |= MESSAGE_HAS_SECURE_PART;
}
public void clearMessageHasSecurePartFlag() {
- this.flags = (byte) (this.flags & MESSAGE_HAS_SECURE_PART);
+ this.flags &= MESSAGE_HAS_SECURE_PART;
}
/**
* Sets and builds the {@link Part}s that are sent in the payload of the Message
- *
- * @param numberOfParts
*/
public void setNumberOfParts(int numberOfParts) {
// hitesh: need to add security header here from server
@@ -227,9 +229,7 @@ public class Message {
}
/**
- * For boundary testing we may need to inject mock parts
- *
- * @param parts
+ * For boundary testing we may need to inject mock parts. For testing only.
*/
void setParts(Part[] parts) {
this.partsList = parts;
@@ -260,7 +260,7 @@ public class Message {
/**
* When building a Message this will return the number of the next Part to be added to the message
*/
- public int getNextPartNumber() {
+ int getNextPartNumber() {
return this.currentPart;
}
@@ -268,33 +268,36 @@ public class Message {
addStringPart(str, false);
}
- private static final Map<String, byte[]> CACHED_STRINGS = new ConcurrentHashMap<String, byte[]>();
+ private static final Map<String, byte[]> CACHED_STRINGS = new ConcurrentHashMap<>();
public void addStringPart(String str, boolean enableCaching) {
if (str == null) {
- addRawPart((byte[]) null, false);
- } else {
- Part part = partsList[this.currentPart];
- if (enableCaching) {
- byte[] bytes = CACHED_STRINGS.get(str);
- if (bytes == null) {
- HeapDataOutputStream hdos = new HeapDataOutputStream(str);
+ addRawPart(null, false);
+ return;
+ }
+
+ Part part = this.partsList[this.currentPart];
+ if (enableCaching) {
+ byte[] bytes = CACHED_STRINGS.get(str);
+ if (bytes == null) {
+ try (HeapDataOutputStream hdos = new HeapDataOutputStream(str)) {
bytes = hdos.toByteArray();
CACHED_STRINGS.put(str, bytes);
}
- part.setPartState(bytes, false);
- } else {
- HeapDataOutputStream hdos = new HeapDataOutputStream(str);
- this.messageModified = true;
- part.setPartState(hdos, false);
}
- this.currentPart++;
+ part.setPartState(bytes, false);
+
+ } else {
+ // do NOT close the HeapDataOutputStream
+ this.messageModified = true;
+ part.setPartState(new HeapDataOutputStream(str), false);
}
+ this.currentPart++;
}
/*
- * Adds a new part to this message that contains a <code>byte</code> array (as opposed to a
- * serialized object).
+ * Adds a new part to this message that contains a {@code byte} array (as opposed to a serialized
+ * object).
*
* @see #addPart(byte[], boolean)
*/
@@ -312,13 +315,6 @@ public class Message {
}
}
- public void addDeltaPart(HeapDataOutputStream hdos) {
- this.messageModified = true;
- Part part = partsList[this.currentPart];
- part.setPartState(hdos, false);
- this.currentPart++;
- }
-
public void addObjPart(Object o) {
addObjPart(o, false);
}
@@ -345,6 +341,9 @@ public class Message {
}
}
+ /**
+ * Object o is always null
+ */
public void addPartInAnyForm(@Unretained Object o, boolean isObject) {
if (o == null) {
addRawPart((byte[]) o, false);
@@ -353,7 +352,7 @@ public class Message {
} else if (o instanceof StoredObject) {
// It is possible it is an off-heap StoredObject that contains a simple non-object byte[].
this.messageModified = true;
- Part part = partsList[this.currentPart];
+ Part part = this.partsList[this.currentPart];
part.setPartState((StoredObject) o, isObject);
this.currentPart++;
} else {
@@ -362,59 +361,58 @@ public class Message {
}
private void serializeAndAddPartNoCopying(Object o) {
- HeapDataOutputStream hdos;
- Version v = version;
- if (version.equals(Version.CURRENT)) {
+ Version v = this.version;
+ if (this.version.equals(Version.CURRENT)) {
v = null;
}
- // create the HDOS with a flag telling it that it can keep any byte[] or ByteBuffers/ByteSources
- // passed to it.
- hdos = new HeapDataOutputStream(chunkSize, v, true);
+
+ // Create the HDOS with a flag telling it that it can keep any byte[] or ByteBuffers/ByteSources
+ // passed to it. Do NOT close the HeapDataOutputStream!
+ HeapDataOutputStream hdos = new HeapDataOutputStream(this.chunkSize, v, true);
try {
BlobHelper.serializeTo(o, hdos);
} catch (IOException ex) {
throw new SerializationException("failed serializing object", ex);
}
this.messageModified = true;
- Part part = partsList[this.currentPart];
+ Part part = this.partsList[this.currentPart];
part.setPartState(hdos, true);
this.currentPart++;
-
}
private void serializeAndAddPart(Object o, boolean zipValues) {
if (zipValues) {
throw new UnsupportedOperationException("zipValues no longer supported");
+ }
- } else {
- HeapDataOutputStream hdos;
- Version v = version;
- if (version.equals(Version.CURRENT)) {
- v = null;
- }
- hdos = new HeapDataOutputStream(chunkSize, v);
- try {
- BlobHelper.serializeTo(o, hdos);
- } catch (IOException ex) {
- throw new SerializationException("failed serializing object", ex);
- }
- this.messageModified = true;
- Part part = partsList[this.currentPart];
- part.setPartState(hdos, true);
- this.currentPart++;
+ Version v = this.version;
+ if (this.version.equals(Version.CURRENT)) {
+ v = null;
}
+
+ // do NOT close the HeapDataOutputStream
+ HeapDataOutputStream hdos = new HeapDataOutputStream(this.chunkSize, v);
+ try {
+ BlobHelper.serializeTo(o, hdos);
+ } catch (IOException ex) {
+ throw new SerializationException("failed serializing object", ex);
+ }
+ this.messageModified = true;
+ Part part = this.partsList[this.currentPart];
+ part.setPartState(hdos, true);
+ this.currentPart++;
}
public void addIntPart(int v) {
this.messageModified = true;
- Part part = partsList[this.currentPart];
+ Part part = this.partsList[this.currentPart];
part.setInt(v);
this.currentPart++;
}
public void addLongPart(long v) {
this.messageModified = true;
- Part part = partsList[this.currentPart];
+ Part part = this.partsList[this.currentPart];
part.setLong(v);
this.currentPart++;
}
@@ -424,13 +422,13 @@ public class Message {
*/
public void addRawPart(byte[] newPart, boolean isObject) {
this.messageModified = true;
- Part part = partsList[this.currentPart];
+ Part part = this.partsList[this.currentPart];
part.setPartState(newPart, isObject);
this.currentPart++;
}
public int getMessageType() {
- return this.msgType;
+ return this.messageType;
}
public int getPayloadLength() {
@@ -451,7 +449,7 @@ public class Message {
public Part getPart(int index) {
if (index < this.numberOfParts) {
- Part p = partsList[index];
+ Part p = this.partsList[index];
if (this.version != null) {
p.setVersion(this.version);
}
@@ -480,9 +478,9 @@ public class Message {
if (len != 0) {
this.payloadLength = 0;
}
- if (this.hdrRead) {
- if (this.msgStats != null) {
- this.msgStats.decMessagesBeingReceived(len);
+ if (this.readHeader) {
+ if (this.messageStats != null) {
+ this.messageStats.decMessagesBeingReceived(len);
}
}
ByteBuffer buffer = getCommBuffer();
@@ -495,20 +493,19 @@ public class Message {
this.dataLimiter = null;
this.maxIncomingMessageLength = 0;
}
- if (this.hdrRead) {
- if (this.msgLimiter != null) {
- this.msgLimiter.release(1);
- this.msgLimiter = null;
+ if (this.readHeader) {
+ if (this.messageLimiter != null) {
+ this.messageLimiter.release(1);
+ this.messageLimiter = null;
}
- this.hdrRead = false;
+ this.readHeader = false;
}
this.flags = 0;
}
protected void packHeaderInfoForSending(int msgLen, boolean isSecurityHeader) {
- // hitesh: setting second bit of flags byte for client
- // this is not require but this makes all changes easily at client side right now
- // just see this bit and process security header
+ // setting second bit of flags byte for client this is not require but this makes all changes
+ // easily at client side right now just see this bit and process security header
byte flagsByte = this.flags;
if (isSecurityHeader) {
flagsByte |= MESSAGE_HAS_SECURE_PART;
@@ -516,14 +513,14 @@ public class Message {
if (this.isRetry) {
flagsByte |= MESSAGE_IS_RETRY;
}
- getCommBuffer().putInt(this.msgType).putInt(msgLen).putInt(this.numberOfParts)
+ getCommBuffer().putInt(this.messageType).putInt(msgLen).putInt(this.numberOfParts)
.putInt(this.transactionId).put(flagsByte);
}
protected Part getSecurityPart() {
- if (this.sc != null) {
+ if (this.serverConnection != null) {
// look types right put get etc
- return this.sc.updateAndGetSecurityPart();
+ return this.serverConnection.updateAndGetSecurityPart();
}
return null;
}
@@ -537,7 +534,7 @@ public class Message {
this.isMetaRegion = isMetaRegion;
}
- public boolean getAndResetIsMetaRegion() {
+ boolean getAndResetIsMetaRegion() {
boolean isMetaRegion = this.isMetaRegion;
this.isMetaRegion = false;
return isMetaRegion;
@@ -546,21 +543,20 @@ public class Message {
/**
* Sends this message out on its socket.
*/
- protected void sendBytes(boolean clearMessage) throws IOException {
- if (this.sc != null) {
+ void sendBytes(boolean clearMessage) throws IOException {
+ if (this.serverConnection != null) {
// Keep track of the fact that we are making progress.
- this.sc.updateProcessingMessage();
+ this.serverConnection.updateProcessingMessage();
}
if (this.socket == null) {
throw new IOException(LocalizedStrings.Message_DEAD_CONNECTION.toLocalizedString());
}
try {
- final ByteBuffer cb = getCommBuffer();
- if (cb == null) {
+ final ByteBuffer commBuffer = getCommBuffer();
+ if (commBuffer == null) {
throw new IOException("No buffer");
}
- int msgLen = 0;
- synchronized (cb) {
+ synchronized (commBuffer) {
long totalPartLen = 0;
long headerLen = 0;
int partsToTransmit = this.numberOfParts;
@@ -581,50 +577,50 @@ public class Message {
partsToTransmit++;
}
- if ((headerLen + totalPartLen) > Integer.MAX_VALUE) {
+ if (headerLen + totalPartLen > Integer.MAX_VALUE) {
throw new MessageTooLargeException(
"Message size (" + (headerLen + totalPartLen) + ") exceeds maximum integer value");
}
- msgLen = (int) (headerLen + totalPartLen);
+ int msgLen = (int) (headerLen + totalPartLen);
- if (msgLen > MAX_MESSAGE_SIZE) {
+ if (msgLen > this.maxMessageSize) {
throw new MessageTooLargeException("Message size (" + msgLen
- + ") exceeds gemfire.client.max-message-size setting (" + MAX_MESSAGE_SIZE + ")");
+ + ") exceeds gemfire.client.max-message-size setting (" + this.maxMessageSize + ")");
}
- cb.clear();
- packHeaderInfoForSending(msgLen, (securityPart != null));
+ commBuffer.clear();
+ packHeaderInfoForSending(msgLen, securityPart != null);
for (int i = 0; i < partsToTransmit; i++) {
- Part part = (i == this.numberOfParts) ? securityPart : partsList[i];
+ Part part = i == this.numberOfParts ? securityPart : this.partsList[i];
- if (cb.remaining() < PART_HEADER_SIZE) {
+ if (commBuffer.remaining() < PART_HEADER_SIZE) {
flushBuffer();
}
int partLen = part.getLength();
- cb.putInt(partLen);
- cb.put(part.getTypeCode());
- if (partLen <= cb.remaining()) {
- part.writeTo(cb);
+ commBuffer.putInt(partLen);
+ commBuffer.put(part.getTypeCode());
+ if (partLen <= commBuffer.remaining()) {
+ part.writeTo(commBuffer);
} else {
flushBuffer();
- if (this.sockCh != null) {
- part.writeTo(this.sockCh, cb);
+ if (this.socketChannel != null) {
+ part.writeTo(this.socketChannel, commBuffer);
} else {
- part.writeTo(this.os, cb);
+ part.writeTo(this.outputStream, commBuffer);
}
- if (this.msgStats != null) {
- this.msgStats.incSentBytes(partLen);
+ if (this.messageStats != null) {
+ this.messageStats.incSentBytes(partLen);
}
}
}
- if (cb.position() != 0) {
+ if (commBuffer.position() != 0) {
flushBuffer();
}
this.messageModified = false;
- if (this.sockCh == null) {
- this.os.flush();
+ if (this.socketChannel == null) {
+ this.outputStream.flush();
}
}
} finally {
@@ -634,69 +630,67 @@ public class Message {
}
}
- protected void flushBuffer() throws IOException {
+ void flushBuffer() throws IOException {
final ByteBuffer cb = getCommBuffer();
- if (this.sockCh != null) {
+ if (this.socketChannel != null) {
cb.flip();
do {
- this.sockCh.write(cb);
+ this.socketChannel.write(cb);
} while (cb.remaining() > 0);
} else {
- this.os.write(cb.array(), 0, cb.position());
+ this.outputStream.write(cb.array(), 0, cb.position());
}
- if (this.msgStats != null) {
- this.msgStats.incSentBytes(cb.position());
+ if (this.messageStats != null) {
+ this.messageStats.incSentBytes(cb.position());
}
cb.clear();
}
private void read() throws IOException {
clearParts();
- // TODO:Hitesh ??? for server changes make sure sc is not null as this class also used by client
- // :(
+ // TODO: for server changes make sure sc is not null as this class also used by client
readHeaderAndPayload();
}
/**
* Read the actual bytes of the header off the socket
*/
- protected void fetchHeader() throws IOException {
+ void fetchHeader() throws IOException {
final ByteBuffer cb = getCommBuffer();
cb.clear();
- // msgType is invalidated here and can be used as an indicator
- // of problems reading the message
- this.msgType = MessageType.INVALID;
- int hdr = 0;
+ // messageType is invalidated here and can be used as an indicator
+ // of problems reading the message
+ this.messageType = MessageType.INVALID;
final int headerLength = getHeaderLength();
- if (this.sockCh != null) {
+ if (this.socketChannel != null) {
cb.limit(headerLength);
do {
- int bytesRead = this.sockCh.read(cb);
- // System.out.println("DEBUG: fetchHeader read " + bytesRead + " bytes commBuffer=" + cb);
+ int bytesRead = this.socketChannel.read(cb);
if (bytesRead == -1) {
throw new EOFException(
LocalizedStrings.Message_THE_CONNECTION_HAS_BEEN_RESET_WHILE_READING_THE_HEADER
.toLocalizedString());
}
- if (this.msgStats != null) {
- this.msgStats.incReceivedBytes(bytesRead);
+ if (this.messageStats != null) {
+ this.messageStats.incReceivedBytes(bytesRead);
}
} while (cb.remaining() > 0);
cb.flip();
+
} else {
+ int hdr = 0;
do {
- int bytesRead = -1;
- bytesRead = this.is.read(cb.array(), hdr, headerLength - hdr);
+ int bytesRead = this.inputStream.read(cb.array(), hdr, headerLength - hdr);
if (bytesRead == -1) {
throw new EOFException(
LocalizedStrings.Message_THE_CONNECTION_HAS_BEEN_RESET_WHILE_READING_THE_HEADER
.toLocalizedString());
}
hdr += bytesRead;
- if (this.msgStats != null) {
- this.msgStats.incReceivedBytes(bytesRead);
+ if (this.messageStats != null) {
+ this.messageStats.incReceivedBytes(bytesRead);
}
} while (hdr < headerLength);
@@ -717,34 +711,36 @@ public class Message {
if (!MessageType.validate(type)) {
throw new IOException(LocalizedStrings.Message_INVALID_MESSAGE_TYPE_0_WHILE_READING_HEADER
- .toLocalizedString(Integer.valueOf(type)));
+ .toLocalizedString(type));
}
+
int timeToWait = 0;
- if (this.sc != null) {
+ if (this.serverConnection != null) {
// Keep track of the fact that a message is being processed.
- this.sc.setProcessingMessage();
- timeToWait = sc.getClientReadTimeout();
+ this.serverConnection.setProcessingMessage();
+ timeToWait = this.serverConnection.getClientReadTimeout();
}
- this.hdrRead = true;
- if (this.msgLimiter != null) {
+ this.readHeader = true;
+
+ if (this.messageLimiter != null) {
for (;;) {
- this.sc.getCachedRegionHelper().checkCancelInProgress(null);
+ this.serverConnection.getCachedRegionHelper().checkCancelInProgress(null);
boolean interrupted = Thread.interrupted();
try {
if (timeToWait == 0) {
- this.msgLimiter.acquire(1);
+ this.messageLimiter.acquire(1);
} else {
- if (!this.msgLimiter.tryAcquire(1, timeToWait, TimeUnit.MILLISECONDS)) {
- if (this.msgStats != null && this.msgStats instanceof CacheServerStats) {
- ((CacheServerStats) this.msgStats).incConnectionsTimedOut();
+ if (!this.messageLimiter.tryAcquire(1, timeToWait, TimeUnit.MILLISECONDS)) {
+ if (this.messageStats instanceof CacheServerStats) {
+ ((CacheServerStats) this.messageStats).incConnectionsTimedOut();
}
throw new IOException(
LocalizedStrings.Message_OPERATION_TIMED_OUT_ON_SERVER_WAITING_ON_CONCURRENT_MESSAGE_LIMITER_AFTER_WAITING_0_MILLISECONDS
- .toLocalizedString(Integer.valueOf(timeToWait)));
+ .toLocalizedString(timeToWait));
}
}
break;
- } catch (InterruptedException e) {
+ } catch (InterruptedException ignore) {
interrupted = true;
} finally {
if (interrupted) {
@@ -753,16 +749,17 @@ public class Message {
}
} // for
}
+
if (len > 0) {
if (this.maxIncomingMessageLength > 0 && len > this.maxIncomingMessageLength) {
throw new IOException(LocalizedStrings.Message_MESSAGE_SIZE_0_EXCEEDED_MAX_LIMIT_OF_1
- .toLocalizedString(new Object[] {Integer.valueOf(len),
- Integer.valueOf(this.maxIncomingMessageLength)}));
+ .toLocalizedString(new Object[] {len, this.maxIncomingMessageLength}));
}
+
if (this.dataLimiter != null) {
for (;;) {
- if (sc != null) {
- this.sc.getCachedRegionHelper().checkCancelInProgress(null);
+ if (this.serverConnection != null) {
+ this.serverConnection.getCachedRegionHelper().checkCancelInProgress(null);
}
boolean interrupted = Thread.interrupted();
try {
@@ -770,21 +767,21 @@ public class Message {
this.dataLimiter.acquire(len);
} else {
int newTimeToWait = timeToWait;
- if (this.msgLimiter != null) {
+ if (this.messageLimiter != null) {
// may have waited for msg limit so recalc time to wait
- newTimeToWait -= (int) sc.getCurrentMessageProcessingTime();
+ newTimeToWait -= (int) this.serverConnection.getCurrentMessageProcessingTime();
}
if (newTimeToWait <= 0
- || !this.msgLimiter.tryAcquire(1, newTimeToWait, TimeUnit.MILLISECONDS)) {
+ || !this.messageLimiter.tryAcquire(1, newTimeToWait, TimeUnit.MILLISECONDS)) {
throw new IOException(
LocalizedStrings.Message_OPERATION_TIMED_OUT_ON_SERVER_WAITING_ON_CONCURRENT_DATA_LIMITER_AFTER_WAITING_0_MILLISECONDS
.toLocalizedString(timeToWait));
}
}
- this.payloadLength = len; // makes sure payloadLength gets set now so we will release
- // the semaphore
+ // makes sure payloadLength gets set now so we will release the semaphore
+ this.payloadLength = len;
break; // success
- } catch (InterruptedException e) {
+ } catch (InterruptedException ignore) {
interrupted = true;
} finally {
if (interrupted) {
@@ -794,15 +791,15 @@ public class Message {
}
}
}
- if (this.msgStats != null) {
- this.msgStats.incMessagesBeingReceived(len);
+ if (this.messageStats != null) {
+ this.messageStats.incMessagesBeingReceived(len);
this.payloadLength = len; // makes sure payloadLength gets set now so we will dec on clear
}
this.isRetry = (bits & MESSAGE_IS_RETRY) != 0;
- bits = (byte) (bits & MESSAGE_IS_RETRY_MASK);
+ bits &= MESSAGE_IS_RETRY_MASK;
this.flags = bits;
- this.msgType = type;
+ this.messageType = type;
readPayloadFields(numParts, len);
@@ -813,32 +810,38 @@ public class Message {
// this.numberOfParts = numParts; Already set in setPayloadFields via setNumberOfParts
this.transactionId = txid;
this.flags = bits;
- if (this.sc != null) {
+ if (this.serverConnection != null) {
// Keep track of the fact that a message is being processed.
- this.sc.updateProcessingMessage();
+ this.serverConnection.updateProcessingMessage();
}
}
- protected void readPayloadFields(final int numParts, final int len) throws IOException {
+ /**
+ * TODO: refactor overly long method readPayloadFields
+ */
+ void readPayloadFields(final int numParts, final int len) throws IOException {
if (len > 0 && numParts <= 0 || len <= 0 && numParts > 0) {
throw new IOException(
LocalizedStrings.Message_PART_LENGTH_0_AND_NUMBER_OF_PARTS_1_INCONSISTENT
- .toLocalizedString(new Object[] {Integer.valueOf(len), Integer.valueOf(numParts)}));
+ .toLocalizedString(new Object[] {len, numParts}));
}
- Integer msgType = messageType.get();
+ Integer msgType = MESSAGE_TYPE.get();
if (msgType != null && msgType == MessageType.PING) {
- messageType.set(null); // set it to null right away.
- int pingParts = 10; // Some number which will not throw OOM but still be acceptable for a ping
- // operation.
+ // set it to null right away.
+ MESSAGE_TYPE.set(null);
+ // Some number which will not throw OOM but still be acceptable for a ping operation.
+ int pingParts = 10;
if (numParts > pingParts) {
throw new IOException("Part length ( " + numParts + " ) is inconsistent for "
+ MessageType.getString(msgType) + " operation.");
}
}
+
setNumberOfParts(numParts);
- if (numParts <= 0)
+ if (numParts <= 0) {
return;
+ }
if (len < 0) {
logger.info(LocalizedMessage.create(LocalizedStrings.Message_RPL_NEG_LEN__0, len));
@@ -849,12 +852,11 @@ public class Message {
cb.clear();
cb.flip();
- int readSecurePart = 0;
- readSecurePart = checkAndSetSecurityPart();
+ int readSecurePart = checkAndSetSecurityPart();
int bytesRemaining = len;
- for (int i = 0; ((i < numParts + readSecurePart)
- || ((readSecurePart == 1) && (cb.remaining() > 0))); i++) {
+ for (int i = 0; i < numParts + readSecurePart
+ || readSecurePart == 1 && cb.remaining() > 0; i++) {
int bytesReadThisTime = readPartChunk(bytesRemaining);
bytesRemaining -= bytesReadThisTime;
@@ -869,6 +871,7 @@ public class Message {
int partLen = cb.getInt();
byte partType = cb.get();
byte[] partBytes = null;
+
if (partLen > 0) {
partBytes = new byte[partLen];
int alreadyReadBytes = cb.remaining();
@@ -878,26 +881,27 @@ public class Message {
}
cb.get(partBytes, 0, alreadyReadBytes);
}
+
// now we need to read partLen - alreadyReadBytes off the wire
int off = alreadyReadBytes;
int remaining = partLen - off;
while (remaining > 0) {
- if (this.sockCh != null) {
+ if (this.socketChannel != null) {
int bytesThisTime = remaining;
cb.clear();
if (bytesThisTime > cb.capacity()) {
bytesThisTime = cb.capacity();
}
cb.limit(bytesThisTime);
- int res = this.sockCh.read(cb);
+ int res = this.socketChannel.read(cb);
if (res != -1) {
cb.flip();
bytesRemaining -= res;
remaining -= res;
cb.get(partBytes, off, res);
off += res;
- if (this.msgStats != null) {
- this.msgStats.incReceivedBytes(res);
+ if (this.messageStats != null) {
+ this.messageStats.incReceivedBytes(res);
}
} else {
throw new EOFException(
@@ -905,14 +909,13 @@ public class Message {
.toLocalizedString());
}
} else {
- int res = 0;
- res = this.is.read(partBytes, off, remaining);
+ int res = this.inputStream.read(partBytes, off, remaining);
if (res != -1) {
bytesRemaining -= res;
remaining -= res;
off += res;
- if (this.msgStats != null) {
- this.msgStats.incReceivedBytes(res);
+ if (this.messageStats != null) {
+ this.messageStats.incReceivedBytes(res);
}
} else {
throw new EOFException(
@@ -941,35 +944,38 @@ public class Message {
* @return the number of bytes read into commBuffer
*/
private int readPartChunk(int bytesRemaining) throws IOException {
- final ByteBuffer cb = getCommBuffer();
- if (cb.remaining() >= PART_HEADER_SIZE) {
+ final ByteBuffer commBuffer = getCommBuffer();
+ if (commBuffer.remaining() >= PART_HEADER_SIZE) {
// we already have the next part header in commBuffer so just return
return 0;
}
- if (cb.position() != 0) {
- cb.compact();
+
+ if (commBuffer.position() != 0) {
+ commBuffer.compact();
} else {
- cb.position(cb.limit());
- cb.limit(cb.capacity());
+ commBuffer.position(commBuffer.limit());
+ commBuffer.limit(commBuffer.capacity());
}
- int bytesRead = 0;
- if (this.sc != null) {
+
+ if (this.serverConnection != null) {
// Keep track of the fact that we are making progress
- this.sc.updateProcessingMessage();
+ this.serverConnection.updateProcessingMessage();
}
- if (this.sockCh != null) {
- int remaining = cb.remaining();
+ int bytesRead = 0;
+
+ if (this.socketChannel != null) {
+ int remaining = commBuffer.remaining();
if (remaining > bytesRemaining) {
remaining = bytesRemaining;
- cb.limit(cb.position() + bytesRemaining);
+ commBuffer.limit(commBuffer.position() + bytesRemaining);
}
while (remaining > 0) {
- int res = this.sockCh.read(cb);
+ int res = this.socketChannel.read(commBuffer);
if (res != -1) {
remaining -= res;
bytesRead += res;
- if (this.msgStats != null) {
- this.msgStats.incReceivedBytes(res);
+ if (this.messageStats != null) {
+ this.messageStats.incReceivedBytes(res);
}
} else {
throw new EOFException(
@@ -979,21 +985,20 @@ public class Message {
}
} else {
- int bufSpace = cb.capacity() - cb.position();
- int bytesToRead = bufSpace;
+ int bytesToRead = commBuffer.capacity() - commBuffer.position();
if (bytesRemaining < bytesToRead) {
bytesToRead = bytesRemaining;
}
- int pos = cb.position();
+ int pos = commBuffer.position();
+
while (bytesToRead > 0) {
- int res = 0;
- res = this.is.read(cb.array(), pos, bytesToRead);
+ int res = this.inputStream.read(commBuffer.array(), pos, bytesToRead);
if (res != -1) {
bytesToRead -= res;
pos += res;
bytesRead += res;
- if (this.msgStats != null) {
- this.msgStats.incReceivedBytes(res);
+ if (this.messageStats != null) {
+ this.messageStats.incReceivedBytes(res);
}
} else {
throw new EOFException(
@@ -1001,9 +1006,10 @@ public class Message {
.toLocalizedString());
}
}
- cb.position(pos);
+
+ commBuffer.position(pos);
}
- cb.flip();
+ commBuffer.flip();
return bytesRead;
}
@@ -1011,40 +1017,39 @@ public class Message {
* Gets rid of all the parts that have been added to this message.
*/
public void clearParts() {
- for (int i = 0; i < partsList.length; i++) {
- partsList[i].clear();
+ for (Part part : this.partsList) {
+ part.clear();
}
this.currentPart = 0;
}
@Override
public String toString() {
- StringBuffer sb = new StringBuffer();
- sb.append("type=").append(MessageType.getString(msgType));
- sb.append("; payloadLength=").append(payloadLength);
- sb.append("; numberOfParts=").append(numberOfParts);
- sb.append("; transactionId=").append(transactionId);
- sb.append("; currentPart=").append(currentPart);
- sb.append("; messageModified=").append(messageModified);
- sb.append("; flags=").append(Integer.toHexString(flags));
- for (int i = 0; i < numberOfParts; i++) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("type=").append(MessageType.getString(this.messageType));
+ sb.append("; payloadLength=").append(this.payloadLength);
+ sb.append("; numberOfParts=").append(this.numberOfParts);
+ sb.append("; transactionId=").append(this.transactionId);
+ sb.append("; currentPart=").append(this.currentPart);
+ sb.append("; messageModified=").append(this.messageModified);
+ sb.append("; flags=").append(Integer.toHexString(this.flags));
+ for (int i = 0; i < this.numberOfParts; i++) {
sb.append("; part[").append(i).append("]={");
- sb.append(this.partsList[i].toString());
+ sb.append(this.partsList[i]);
sb.append("}");
}
return sb.toString();
}
-
- public void setComms(ServerConnection sc, Socket socket, ByteBuffer bb, MessageStats msgStats)
+ void setComms(ServerConnection sc, Socket socket, ByteBuffer bb, MessageStats msgStats)
throws IOException {
- this.sc = sc;
+ this.serverConnection = sc;
setComms(socket, bb, msgStats);
}
- public void setComms(Socket socket, ByteBuffer bb, MessageStats msgStats) throws IOException {
- this.sockCh = socket.getChannel();
- if (this.sockCh == null) {
+ void setComms(Socket socket, ByteBuffer bb, MessageStats msgStats) throws IOException {
+ this.socketChannel = socket.getChannel();
+ if (this.socketChannel == null) {
setComms(socket, socket.getInputStream(), socket.getOutputStream(), bb, msgStats);
} else {
setComms(socket, null, null, bb, msgStats);
@@ -1052,14 +1057,14 @@ public class Message {
}
public void setComms(Socket socket, InputStream is, OutputStream os, ByteBuffer bb,
- MessageStats msgStats) throws IOException {
+ MessageStats msgStats) {
Assert.assertTrue(socket != null);
this.socket = socket;
- this.sockCh = socket.getChannel();
- this.is = is;
- this.os = os;
+ this.socketChannel = socket.getChannel();
+ this.inputStream = is;
+ this.outputStream = os;
this.cachedCommBuffer = bb;
- this.msgStats = msgStats;
+ this.messageStats = msgStats;
}
/**
@@ -1069,11 +1074,11 @@ public class Message {
*/
public void unsetComms() {
this.socket = null;
- this.sockCh = null;
- this.is = null;
- this.os = null;
+ this.socketChannel = null;
+ this.inputStream = null;
+ this.outputStream = null;
this.cachedCommBuffer = null;
- this.msgStats = null;
+ this.messageStats = null;
}
/**
@@ -1084,7 +1089,7 @@ public class Message {
}
public void send(ServerConnection servConn) throws IOException {
- if (this.sc != servConn)
+ if (this.serverConnection != servConn)
throw new IllegalStateException("this.sc was not correctly set");
send(true);
}
@@ -1097,7 +1102,7 @@ public class Message {
}
/**
- * Populates the stats of this <code>Message</code> with information received via its socket
+ * Populates the stats of this {@code Message} with information received via its socket
*/
public void recv() throws IOException {
if (this.socket != null) {
@@ -1111,10 +1116,10 @@ public class Message {
public void recv(ServerConnection sc, int maxMessageLength, Semaphore dataLimiter,
Semaphore msgLimiter) throws IOException {
- this.sc = sc;
+ this.serverConnection = sc;
this.maxIncomingMessageLength = maxMessageLength;
this.dataLimiter = dataLimiter;
- this.msgLimiter = msgLimiter;
+ this.messageLimiter = msgLimiter;
recv();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 83d0e9d..485ccae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -723,12 +723,10 @@ public class ServerConnection implements Runnable {
ThreadState threadState = null;
try {
if (msg != null) {
- // this.logger.fine("donormalMsg() msgType " + msg.getMessageType());
- // Since this thread is not interrupted when the cache server is
- // shutdown,
- // test again after a message has been read. This is a bit of a hack. I
- // think this thread should be interrupted, but currently AcceptorImpl
- // doesn't keep track of the threads that it launches.
+ // Since this thread is not interrupted when the cache server is shutdown, test again after
+ // a message has been read. This is a bit of a hack. I think this thread should be
+ // interrupted, but currently AcceptorImpl doesn't keep track of the threads that it
+ // launches.
if (!this.processMessages || (crHelper.isShutdown())) {
if (logger.isDebugEnabled()) {
logger.debug("{} ignoring message of type {} from client {} due to shutdown.",
@@ -1078,8 +1076,6 @@ public class ServerConnection implements Runnable {
*/
public Part updateAndGetSecurityPart() {
// need to take care all message types here
- // this.logger.fine("getSecurityPart() msgType = "
- // + this.requestMsg.msgType);
if (AcceptorImpl.isAuthenticationRequired()
&& this.handshake.getVersion().compareTo(Version.GFE_65) >= 0
&& (this.communicationMode != Acceptor.GATEWAY_TO_GATEWAY)
@@ -1090,40 +1086,40 @@ public class ServerConnection implements Runnable {
if (AcceptorImpl.isAuthenticationRequired() && logger.isDebugEnabled()) {
logger.debug(
"ServerConnection.updateAndGetSecurityPart() not adding security part for msg type {}",
- MessageType.getString(this.requestMsg.msgType));
+ MessageType.getString(this.requestMsg.messageType));
}
}
return null;
}
private boolean isInternalMessage() {
- return (this.requestMsg.msgType == MessageType.CLIENT_READY
- || this.requestMsg.msgType == MessageType.CLOSE_CONNECTION
- || this.requestMsg.msgType == MessageType.GETCQSTATS_MSG_TYPE
- || this.requestMsg.msgType == MessageType.GET_CLIENT_PARTITION_ATTRIBUTES
- || this.requestMsg.msgType == MessageType.GET_CLIENT_PR_METADATA
- || this.requestMsg.msgType == MessageType.INVALID
- || this.requestMsg.msgType == MessageType.MAKE_PRIMARY
- || this.requestMsg.msgType == MessageType.MONITORCQ_MSG_TYPE
- || this.requestMsg.msgType == MessageType.PERIODIC_ACK
- || this.requestMsg.msgType == MessageType.PING
- || this.requestMsg.msgType == MessageType.REGISTER_DATASERIALIZERS
- || this.requestMsg.msgType == MessageType.REGISTER_INSTANTIATORS
- || this.requestMsg.msgType == MessageType.REQUEST_EVENT_VALUE
- || this.requestMsg.msgType == MessageType.ADD_PDX_TYPE
- || this.requestMsg.msgType == MessageType.GET_PDX_ID_FOR_TYPE
- || this.requestMsg.msgType == MessageType.GET_PDX_TYPE_BY_ID
- || this.requestMsg.msgType == MessageType.SIZE
- || this.requestMsg.msgType == MessageType.TX_FAILOVER
- || this.requestMsg.msgType == MessageType.TX_SYNCHRONIZATION
- || this.requestMsg.msgType == MessageType.GET_FUNCTION_ATTRIBUTES
- || this.requestMsg.msgType == MessageType.ADD_PDX_ENUM
- || this.requestMsg.msgType == MessageType.GET_PDX_ID_FOR_ENUM
- || this.requestMsg.msgType == MessageType.GET_PDX_ENUM_BY_ID
- || this.requestMsg.msgType == MessageType.GET_PDX_TYPES
- || this.requestMsg.msgType == MessageType.GET_PDX_ENUMS
- || this.requestMsg.msgType == MessageType.COMMIT
- || this.requestMsg.msgType == MessageType.ROLLBACK);
+ return (this.requestMsg.messageType == MessageType.CLIENT_READY
+ || this.requestMsg.messageType == MessageType.CLOSE_CONNECTION
+ || this.requestMsg.messageType == MessageType.GETCQSTATS_MSG_TYPE
+ || this.requestMsg.messageType == MessageType.GET_CLIENT_PARTITION_ATTRIBUTES
+ || this.requestMsg.messageType == MessageType.GET_CLIENT_PR_METADATA
+ || this.requestMsg.messageType == MessageType.INVALID
+ || this.requestMsg.messageType == MessageType.MAKE_PRIMARY
+ || this.requestMsg.messageType == MessageType.MONITORCQ_MSG_TYPE
+ || this.requestMsg.messageType == MessageType.PERIODIC_ACK
+ || this.requestMsg.messageType == MessageType.PING
+ || this.requestMsg.messageType == MessageType.REGISTER_DATASERIALIZERS
+ || this.requestMsg.messageType == MessageType.REGISTER_INSTANTIATORS
+ || this.requestMsg.messageType == MessageType.REQUEST_EVENT_VALUE
+ || this.requestMsg.messageType == MessageType.ADD_PDX_TYPE
+ || this.requestMsg.messageType == MessageType.GET_PDX_ID_FOR_TYPE
+ || this.requestMsg.messageType == MessageType.GET_PDX_TYPE_BY_ID
+ || this.requestMsg.messageType == MessageType.SIZE
+ || this.requestMsg.messageType == MessageType.TX_FAILOVER
+ || this.requestMsg.messageType == MessageType.TX_SYNCHRONIZATION
+ || this.requestMsg.messageType == MessageType.GET_FUNCTION_ATTRIBUTES
+ || this.requestMsg.messageType == MessageType.ADD_PDX_ENUM
+ || this.requestMsg.messageType == MessageType.GET_PDX_ID_FOR_ENUM
+ || this.requestMsg.messageType == MessageType.GET_PDX_ENUM_BY_ID
+ || this.requestMsg.messageType == MessageType.GET_PDX_TYPES
+ || this.requestMsg.messageType == MessageType.GET_PDX_ENUMS
+ || this.requestMsg.messageType == MessageType.COMMIT
+ || this.requestMsg.messageType == MessageType.ROLLBACK);
}
public void run() {
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage.java
new file mode 100644
index 0000000..7118347
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.tier.sockets;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Set;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.internal.InternalDataSerializer;
+
+/**
+ * Send interest registration to another server. Since interest registration performs a state-flush
+ * operation this message must not transmitted on an ordered socket.
+ * <p>
+ * Extracted from CacheClientNotifier
+ */
+public class ServerInterestRegistrationMessage extends HighPriorityDistributionMessage
+ implements MessageWithReply {
+
+ private ClientProxyMembershipID clientId;
+ private ClientInterestMessageImpl clientMessage;
+ private int processorId;
+
+ ServerInterestRegistrationMessage(ClientProxyMembershipID clientId,
+ ClientInterestMessageImpl clientInterestMessage) {
+ this.clientId = clientId;
+ this.clientMessage = clientInterestMessage;
+ }
+
+ public ServerInterestRegistrationMessage() {
+ // deserializing in fromData
+ }
+
+ static void sendInterestChange(DM dm, ClientProxyMembershipID clientId,
+ ClientInterestMessageImpl clientInterestMessage) {
+ ServerInterestRegistrationMessage registrationMessage =
+ new ServerInterestRegistrationMessage(clientId, clientInterestMessage);
+
+ Set recipients = dm.getOtherDistributionManagerIds();
+ registrationMessage.setRecipients(recipients);
+
+ ReplyProcessor21 replyProcessor = new ReplyProcessor21(dm, recipients);
+ registrationMessage.processorId = replyProcessor.getProcessorId();
+
+ dm.putOutgoing(registrationMessage);
+
+ try {
+ replyProcessor.waitForReplies();
+ } catch (InterruptedException ignore) {
+ Thread.currentThread().interrupt();
+ }
+ }
+
+ @Override
+ protected void process(DistributionManager dm) {
+ // Get the proxy for the proxy id
+ try {
+ CacheClientNotifier clientNotifier = CacheClientNotifier.getInstance();
+ if (clientNotifier != null) {
+ CacheClientProxy proxy = clientNotifier.getClientProxy(this.clientId);
+ // If this VM contains a proxy for the requested proxy id, forward the
+ // message on to the proxy for processing
+ if (proxy != null) {
+ proxy.processInterestMessage(this.clientMessage);
+ }
+ }
+ } finally {
+ ReplyMessage reply = new ReplyMessage();
+ reply.setProcessorId(this.processorId);
+ reply.setRecipient(getSender());
+ try {
+ dm.putOutgoing(reply);
+ } catch (CancelException ignore) {
+ // can't send a reply, so ignore the exception
+ }
+ }
+ }
+
+ @Override
+ public int getDSFID() {
+ return SERVER_INTEREST_REGISTRATION_MESSAGE;
+ }
+
+ @Override
+ public void toData(DataOutput out) throws IOException {
+ super.toData(out);
+ out.writeInt(this.processorId);
+ InternalDataSerializer.invokeToData(this.clientId, out);
+ InternalDataSerializer.invokeToData(this.clientMessage, out);
+ }
+
+ @Override
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ super.fromData(in);
+ this.processorId = in.readInt();
+ this.clientId = new ClientProxyMembershipID();
+ InternalDataSerializer.invokeFromData(this.clientId, in);
+ this.clientMessage = new ClientInterestMessageImpl();
+ InternalDataSerializer.invokeFromData(this.clientMessage, in);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
index 1b599e9..2cb36cd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
@@ -39,29 +39,30 @@ public class AddPdxEnum extends BaseCommand {
private AddPdxEnum() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
logger.debug("{}: Received get pdx id for enum request ({} parts) from {}",
- servConn.getName(), msg.getNumberOfParts(), servConn.getSocketString());
+ serverConnection.getName(), clientMessage.getNumberOfParts(),
+ serverConnection.getSocketString());
}
- int noOfParts = msg.getNumberOfParts();
+ int noOfParts = clientMessage.getNumberOfParts();
- EnumInfo enumInfo = (EnumInfo) msg.getPart(0).getObject();
- int enumId = msg.getPart(1).getInt();
+ EnumInfo enumInfo = (EnumInfo) clientMessage.getPart(0).getObject();
+ int enumId = clientMessage.getPart(1).getInt();
try {
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
TypeRegistry registry = cache.getPdxRegistry();
registry.addRemoteEnum(enumId, enumInfo);
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
index 9b8302e..3feba0d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
@@ -39,33 +39,34 @@ public class AddPdxType extends BaseCommand {
private AddPdxType() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
logger.debug("{}: Received get pdx id for type request ({} parts) from {}",
- servConn.getName(), msg.getNumberOfParts(), servConn.getSocketString());
+ serverConnection.getName(), clientMessage.getNumberOfParts(),
+ serverConnection.getSocketString());
}
- int noOfParts = msg.getNumberOfParts();
+ int noOfParts = clientMessage.getNumberOfParts();
- PdxType type = (PdxType) msg.getPart(0).getObject();
- int typeId = msg.getPart(1).getInt();
+ PdxType type = (PdxType) clientMessage.getPart(0).getObject();
+ int typeId = clientMessage.getPart(1).getInt();
// The native client needs this line
// because it doesn't set the type id on the
// client side.
type.setTypeId(typeId);
try {
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
TypeRegistry registry = cache.getPdxRegistry();
registry.addRemoteType(typeId, type);
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
index 959430c..ab19954 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
@@ -47,15 +47,15 @@ public class ClearRegion extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, callbackArgPart = null;
String regionName = null;
Object callbackArg = null;
Part eventPart = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
@@ -63,36 +63,38 @@ public class ClearRegion extends BaseCommand {
stats.incReadClearRegionRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- eventPart = msg.getPart(1);
+ regionNamePart = clientMessage.getPart(0);
+ eventPart = clientMessage.getPart(1);
// callbackArgPart = null; (redundant assignment)
- if (msg.getNumberOfParts() > 2) {
- callbackArgPart = msg.getPart(2);
+ if (clientMessage.getNumberOfParts() > 2) {
+ callbackArgPart = clientMessage.getPart(2);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
regionName = regionNamePart.getString();
if (logger.isDebugEnabled()) {
- logger.debug(servConn.getName() + ": Received clear region request (" + msg.getPayloadLength()
- + " bytes) from " + servConn.getSocketString() + " for region " + regionName);
+ logger.debug(serverConnection.getName() + ": Received clear region request ("
+ + clientMessage.getPayloadLength() + " bytes) from " + serverConnection.getSocketString()
+ + " for region " + regionName);
}
// Process the clear region request
if (regionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ClearRegion_0_THE_INPUT_REGION_NAME_FOR_THE_CLEAR_REGION_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
String errMessage =
LocalizedStrings.ClearRegion_THE_INPUT_REGION_NAME_FOR_THE_CLEAR_REGION_REQUEST_IS_NULL
.toLocalizedString();
- writeErrorResponse(msg, MessageType.CLEAR_REGION_DATA_ERROR, errMessage, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.CLEAR_REGION_DATA_ERROR, errMessage,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -100,35 +102,36 @@ public class ClearRegion extends BaseCommand {
if (region == null) {
String reason = LocalizedStrings.ClearRegion_WAS_NOT_FOUND_DURING_CLEAR_REGION_REGUEST
.toLocalizedString();
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
try {
// Clear the region
this.securityService.authorizeRegionWrite(regionName);
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
RegionClearOperationContext clearContext =
authzRequest.clearAuthorize(regionName, callbackArg);
callbackArg = clearContext.getCallbackArg();
}
- region.basicBridgeClear(callbackArg, servConn.getProxyID(),
+ region.basicBridgeClear(callbackArg, serverConnection.getProxyID(),
true /* boolean from cache Client */, eventId);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// If an exception occurs during the clear, preserve the connection
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -138,10 +141,11 @@ public class ClearRegion extends BaseCommand {
start = DistributionStats.getStatTime();
stats.incProcessClearRegionTime(start - oldStart);
}
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug(servConn.getName() + ": Sent clear region response for region " + regionName);
+ logger.debug(
+ serverConnection.getName() + ": Sent clear region response for region " + regionName);
}
stats.incWriteClearRegionResponseTime(DistributionStats.getStatTime() - start);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
index d50e522..cf9c470 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
@@ -35,34 +35,36 @@ public class ClientReady extends BaseCommand {
private ClientReady() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- CacheServerStats stats = servConn.getCacheServerStats();
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ CacheServerStats stats = serverConnection.getCacheServerStats();
{
long oldStart = start;
start = DistributionStats.getStatTime();
stats.incReadClientReadyRequestTime(start - oldStart);
}
try {
- String clientHost = servConn.getSocketHost();
- int clientPort = servConn.getSocketPort();
+ String clientHost = serverConnection.getSocketHost();
+ int clientPort = serverConnection.getSocketPort();
if (logger.isDebugEnabled()) {
logger.debug("{}: Received client ready request ({} bytes) from {} on {}:{}",
- servConn.getName(), msg.getPayloadLength(), servConn.getProxyID(), clientHost,
- clientPort);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getProxyID(), clientHost, clientPort);
}
- servConn.getAcceptor().getCacheClientNotifier().readyForEvents(servConn.getProxyID());
+ serverConnection.getAcceptor().getCacheClientNotifier()
+ .readyForEvents(serverConnection.getProxyID());
long oldStart = start;
start = DistributionStats.getStatTime();
stats.incProcessClientReadyTime(start - oldStart);
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug(servConn.getName() + ": Processed client ready request from "
- + servConn.getProxyID() + " on " + clientHost + ":" + clientPort);
+ logger.debug(serverConnection.getName() + ": Processed client ready request from "
+ + serverConnection.getProxyID() + " on " + clientHost + ":" + clientPort);
}
} finally {
stats.incWriteClientReadyResponseTime(DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
index 66045aa..21f0cad 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
@@ -39,43 +39,44 @@ public class CloseConnection extends BaseCommand {
private CloseConnection() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- CacheServerStats stats = servConn.getCacheServerStats();
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ CacheServerStats stats = serverConnection.getCacheServerStats();
long oldStart = start;
- boolean respondToClient = servConn.getClientVersion().compareTo(Version.GFE_90) >= 0;
+ boolean respondToClient = serverConnection.getClientVersion().compareTo(Version.GFE_90) >= 0;
start = DistributionStats.getStatTime();
stats.incReadCloseConnectionRequestTime(start - oldStart);
if (respondToClient) {
// newer clients will wait for a response or EOFException
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
}
try {
- servConn.setClientDisconnectCleanly();
- String clientHost = servConn.getSocketHost();
- int clientPort = servConn.getSocketPort();
+ serverConnection.setClientDisconnectCleanly();
+ String clientHost = serverConnection.getSocketHost();
+ int clientPort = serverConnection.getSocketPort();
if (logger.isDebugEnabled()) {
- logger.debug("{}: Received close request ({} bytes) from {}:{}", servConn.getName(),
- msg.getPayloadLength(), clientHost, clientPort);
+ logger.debug("{}: Received close request ({} bytes) from {}:{}", serverConnection.getName(),
+ clientMessage.getPayloadLength(), clientHost, clientPort);
}
- Part keepalivePart = msg.getPart(0);
+ Part keepalivePart = clientMessage.getPart(0);
byte[] keepaliveByte = keepalivePart.getSerializedForm();
boolean keepalive = (keepaliveByte == null || keepaliveByte[0] == 0) ? false : true;
- servConn.getAcceptor().getCacheClientNotifier().setKeepAlive(servConn.getProxyID(),
- keepalive);
+ serverConnection.getAcceptor().getCacheClientNotifier()
+ .setKeepAlive(serverConnection.getProxyID(), keepalive);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Processed close request from {}:{}, keepAlive: {}", servConn.getName(),
- clientHost, clientPort, keepalive);
+ logger.debug("{}: Processed close request from {}:{}, keepAlive: {}",
+ serverConnection.getName(), clientHost, clientPort, keepalive);
}
} finally {
if (respondToClient) {
- writeReply(msg, servConn);
+ writeReply(clientMessage, serverConnection);
}
- servConn.setFlagProcessMessagesAsFalse();
+ serverConnection.setFlagProcessMessagesAsFalse();
stats.incProcessCloseConnectionTime(DistributionStats.getStatTime() - start);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
index 55ef09b..366d77c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
@@ -50,12 +50,13 @@ public class CommitCommand extends BaseCommand {
private CommitCommand() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- TXManagerImpl txMgr = (TXManagerImpl) servConn.getCache().getCacheTransactionManager();
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ TXManagerImpl txMgr = (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager();
InternalDistributedMember client =
- (InternalDistributedMember) servConn.getProxyID().getDistributedMember();
- int uniqId = msg.getTransactionId();
+ (InternalDistributedMember) serverConnection.getProxyID().getDistributedMember();
+ int uniqId = clientMessage.getTransactionId();
TXId txId = new TXId(client, uniqId);
TXCommitMessage commitMsg = null;
if (txMgr.isHostedTxRecentlyCompleted(txId)) {
@@ -64,11 +65,11 @@ public class CommitCommand extends BaseCommand {
logger.debug("TX: returning a recently committed txMessage for tx: {}", txId);
}
if (!txMgr.isExceptionToken(commitMsg)) {
- writeCommitResponse(commitMsg, msg, servConn);
+ writeCommitResponse(commitMsg, clientMessage, serverConnection);
commitMsg.setClientVersion(null); // fixes bug 46529
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
} else {
- sendException(msg, servConn, txMgr.getExceptionForToken(commitMsg, txId));
+ sendException(clientMessage, serverConnection, txMgr.getExceptionForToken(commitMsg, txId));
}
txMgr.removeHostedTXState(txId);
return;
@@ -87,10 +88,10 @@ public class CommitCommand extends BaseCommand {
txMgr.commit();
commitMsg = txProxy.getCommitMessage();
- writeCommitResponse(commitMsg, msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeCommitResponse(commitMsg, clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
- sendException(msg, servConn, e);
+ sendException(clientMessage, serverConnection, e);
} finally {
if (txId != null) {
txMgr.removeHostedTXState(txId);
@@ -115,7 +116,7 @@ public class CommitCommand extends BaseCommand {
if (response != null) {
response.setClientVersion(servConn.getClientVersion());
}
- responseMsg.addObjPart(response, zipValues);
+ responseMsg.addObjPart(response, false);
servConn.getCache().getCancelCriterion().checkCancelInProgress(null);
if (logger.isDebugEnabled()) {
logger.debug("TX: sending a nonNull response for transaction: {}",
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
index c1b67e1..9cb2528 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java
@@ -51,34 +51,36 @@ public class ContainsKey extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
Part regionNamePart = null;
Part keyPart = null;
String regionName = null;
Object key = null;
- CacheServerStats stats = servConn.getCacheServerStats();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
start = DistributionStats.getStatTime();
stats.incReadContainsKeyRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- keyPart = msg.getPart(1);
+ regionNamePart = clientMessage.getPart(0);
+ keyPart = clientMessage.getPart(1);
regionName = regionNamePart.getString();
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
logger.debug("{}: Received containsKey request ({} bytes) from {} for region {} key {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName, key);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key);
}
// Process the containsKey request
@@ -87,47 +89,48 @@ public class ContainsKey extends BaseCommand {
if (key == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ContainsKey_0_THE_INPUT_KEY_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage = LocalizedStrings.ContainsKey_THE_INPUT_KEY_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL
.toLocalizedString();
}
if (regionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ContainsKey_0_THE_INPUT_REGION_NAME_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage =
LocalizedStrings.ContainsKey_THE_INPUT_REGION_NAME_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL
.toLocalizedString();
}
- writeErrorResponse(msg, MessageType.CONTAINS_KEY_DATA_ERROR, errMessage, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.CONTAINS_KEY_DATA_ERROR, errMessage,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason =
LocalizedStrings.ContainsKey_WAS_NOT_FOUND_DURING_CONTAINSKEY_REQUEST.toLocalizedString();
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
try {
this.securityService.authorizeRegionRead(regionName, key.toString());
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
try {
authzRequest.containsKeyAuthorize(regionName, key);
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -140,10 +143,10 @@ public class ContainsKey extends BaseCommand {
start = DistributionStats.getStatTime();
stats.incProcessContainsKeyTime(start - oldStart);
}
- writeContainsKeyResponse(containsKey, msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeContainsKeyResponse(containsKey, clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent containsKey response for region {} key {}", servConn.getName(),
+ logger.debug("{}: Sent containsKey response for region {} key {}", serverConnection.getName(),
regionName, key);
}
stats.incWriteContainsKeyResponseTime(DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
index dc8f9eb..b2ce055 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java
@@ -55,34 +55,36 @@ public class ContainsKey66 extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
Part regionNamePart = null, keyPart = null;
String regionName = null;
Object key = null;
ContainsKeyOp.MODE mode;
- CacheServerStats stats = servConn.getCacheServerStats();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
start = DistributionStats.getStatTime();
stats.incReadContainsKeyRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- keyPart = msg.getPart(1);
- mode = ContainsKeyOp.MODE.values()[(msg.getPart(2).getInt())];
+ regionNamePart = clientMessage.getPart(0);
+ keyPart = clientMessage.getPart(1);
+ mode = ContainsKeyOp.MODE.values()[(clientMessage.getPart(2).getInt())];
regionName = regionNamePart.getString();
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
logger.debug("{}: Received containsKey request ({} bytes) from {} for region {} key {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName, key);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key);
}
// Process the containsKey request
@@ -91,46 +93,47 @@ public class ContainsKey66 extends BaseCommand {
if (key == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ContainsKey_0_THE_INPUT_KEY_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage = LocalizedStrings.ContainsKey_THE_INPUT_KEY_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL
.toLocalizedString();
}
if (regionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ContainsKey_0_THE_INPUT_REGION_NAME_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage =
LocalizedStrings.ContainsKey_THE_INPUT_REGION_NAME_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL
.toLocalizedString();
}
- writeErrorResponse(msg, MessageType.CONTAINS_KEY_DATA_ERROR, errMessage, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.CONTAINS_KEY_DATA_ERROR, errMessage,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason =
LocalizedStrings.ContainsKey_WAS_NOT_FOUND_DURING_CONTAINSKEY_REQUEST.toLocalizedString();
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
try {
this.securityService.authorizeRegionRead(regionName, key.toString());
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
try {
authzRequest.containsKeyAuthorize(regionName, key);
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -157,10 +160,10 @@ public class ContainsKey66 extends BaseCommand {
start = DistributionStats.getStatTime();
stats.incProcessContainsKeyTime(start - oldStart);
}
- writeContainsKeyResponse(containsKey, msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeContainsKeyResponse(containsKey, clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent containsKey response for region {} key {}", servConn.getName(),
+ logger.debug("{}: Sent containsKey response for region {} key {}", serverConnection.getName(),
regionName, key);
}
stats.incWriteContainsKeyResponseTime(DistributionStats.getStatTime() - start);
[32/35] geode git commit: milestone
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
index d3f68f2..61c25c7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
@@ -118,7 +118,7 @@ public class Destroy65Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.destroy65.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy65.cmdExecute(, this.message, 0);
verify(this.responseMessage).send(this.serverConnection);
}
@@ -128,7 +128,7 @@ public class Destroy65Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.destroy65.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy65.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
verify(this.responseMessage).send(this.serverConnection);
@@ -141,7 +141,7 @@ public class Destroy65Test {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
- this.destroy65.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy65.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
@@ -152,7 +152,7 @@ public class Destroy65Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.destroy65.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy65.cmdExecute(, this.message, 0);
verify(this.authzRequest).destroyAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
verify(this.responseMessage).send(this.serverConnection);
@@ -165,7 +165,7 @@ public class Destroy65Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.destroyAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
- this.destroy65.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy65.cmdExecute(, this.message, 0);
verify(this.authzRequest).destroyAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
index 4abdebf..ec573bf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
@@ -110,7 +110,7 @@ public class DestroyRegionTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.destroyRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroyRegion.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeDataManage();
verify(this.responseMessage).send(this.serverConnection);
@@ -121,7 +121,7 @@ public class DestroyRegionTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.destroyRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroyRegion.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeDataManage();
verify(this.responseMessage).send(this.serverConnection);
@@ -133,7 +133,7 @@ public class DestroyRegionTest {
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
doThrow(new NotAuthorizedException("")).when(this.securityService).authorizeDataManage();
- this.destroyRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroyRegion.cmdExecute(, this.message, 0);
verify(this.errorResponseMessage).send(this.serverConnection);
}
@@ -143,7 +143,7 @@ public class DestroyRegionTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.destroyRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroyRegion.cmdExecute(, this.message, 0);
verify(this.authzRequest).destroyRegionAuthorize(eq(REGION_NAME), eq(CALLBACK_ARG));
verify(this.responseMessage).send(this.serverConnection);
@@ -156,7 +156,7 @@ public class DestroyRegionTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.destroyRegionAuthorize(eq(REGION_NAME), eq(CALLBACK_ARG));
- this.destroyRegion.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroyRegion.cmdExecute(, this.message, 0);
verify(this.authzRequest).destroyRegionAuthorize(eq(REGION_NAME), eq(CALLBACK_ARG));
verify(this.errorResponseMessage).send(this.serverConnection);
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
index 24105a6..ae5486a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
@@ -121,7 +121,7 @@ public class DestroyTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.destroy.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy.cmdExecute(, this.message, 0);
verify(this.replyMessage).send(this.serverConnection);
}
@@ -131,7 +131,7 @@ public class DestroyTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.destroy.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
verify(this.replyMessage).send(this.serverConnection);
@@ -144,7 +144,7 @@ public class DestroyTest {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
- this.destroy.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy.cmdExecute(, this.message, 0);
verify(this.errorResponseMessage).send(eq(this.serverConnection));
@@ -155,7 +155,7 @@ public class DestroyTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.destroy.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy.cmdExecute(, this.message, 0);
verify(this.authzRequest).destroyAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
verify(this.replyMessage).send(this.serverConnection);
@@ -168,7 +168,7 @@ public class DestroyTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.destroyAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
- this.destroy.cmdExecute(this.message, this.serverConnection, 0);
+ this.destroy.cmdExecute(, this.message, 0);
verify(this.authzRequest).destroyAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
index 8df33ab..f6dada3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
@@ -41,7 +41,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.control.HeapMemoryMonitor;
import org.apache.geode.internal.cache.control.InternalResourceManager;
-import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
@@ -153,7 +152,7 @@ public class ExecuteFunction65Test {
public void nonSecureShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.executeFunction65.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction65.cmdExecute(, this.message, 0);
// verify(this.functionResponseMessage).sendChunk(this.serverConnection); // TODO: why do none
// of the reply message types get sent?
@@ -164,7 +163,7 @@ public class ExecuteFunction65Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.executeFunction65.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction65.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeDataWrite();
// verify(this.replyMessage).send(this.serverConnection); TODO: why do none of the reply message
@@ -177,7 +176,7 @@ public class ExecuteFunction65Test {
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
doThrow(new NotAuthorizedException("")).when(this.securityService).authorizeDataWrite();
- this.executeFunction65.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction65.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeDataWrite();
// verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -188,7 +187,7 @@ public class ExecuteFunction65Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.executeFunction65.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction65.cmdExecute(, this.message, 0);
verify(this.authzRequest).executeFunctionAuthorize(eq(FUNCTION_ID), any(), any(), any(),
eq(false));
@@ -203,7 +202,7 @@ public class ExecuteFunction65Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.executeFunctionAuthorize(eq(FUNCTION_ID), any(), any(), any(), eq(false));
- this.executeFunction65.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction65.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeDataWrite();
// verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
index 3c60419..5166250 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
@@ -150,7 +150,7 @@ public class ExecuteFunction66Test {
public void nonSecureShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.executeFunction66.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction66.cmdExecute(, this.message, 0);
// verify(this.functionResponseMessage).sendChunk(this.serverConnection); // TODO: why do none
// of the reply message types get sent?
@@ -161,7 +161,7 @@ public class ExecuteFunction66Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.executeFunction66.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction66.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeDataWrite();
// verify(this.replyMessage).send(this.serverConnection); TODO: why do none of the reply message
@@ -175,7 +175,7 @@ public class ExecuteFunction66Test {
doThrow(new NotAuthorizedException("")).when(this.securityService).authorizeDataWrite();
assertThatThrownBy(
- () -> this.executeFunction66.cmdExecute(this.message, this.serverConnection, 0))
+ () -> this.executeFunction66.cmdExecute(, this.message, 0))
.isExactlyInstanceOf(NullPointerException.class);
verify(this.securityService).authorizeDataWrite();
@@ -187,7 +187,7 @@ public class ExecuteFunction66Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.executeFunction66.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction66.cmdExecute(, this.message, 0);
verify(this.authzRequest).executeFunctionAuthorize(eq(FUNCTION_ID), any(), any(), any(),
eq(false));
@@ -203,7 +203,7 @@ public class ExecuteFunction66Test {
.executeFunctionAuthorize(eq(FUNCTION_ID), any(), any(), any(), eq(false));
assertThatThrownBy(
- () -> this.executeFunction66.cmdExecute(this.message, this.serverConnection, 0))
+ () -> this.executeFunction66.cmdExecute(, this.message, 0))
.isExactlyInstanceOf(NullPointerException.class);
verify(this.securityService).authorizeDataWrite();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
index 67b5ca6..37bc9f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
@@ -33,7 +33,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.control.ResourceManager;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.operations.ExecuteFunctionOperationContext;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -156,7 +155,7 @@ public class ExecuteFunctionTest {
public void nonSecureShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.executeFunction.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction.cmdExecute(, this.message, 0);
// verify(this.functionResponseMessage).sendChunk(this.serverConnection); // TODO: why do none
// of the reply message types get sent?
@@ -167,7 +166,7 @@ public class ExecuteFunctionTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.executeFunction.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeDataWrite();
// verify(this.replyMessage).send(this.serverConnection); TODO: why do none of the reply message
@@ -180,7 +179,7 @@ public class ExecuteFunctionTest {
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
doThrow(new NotAuthorizedException("")).when(this.securityService).authorizeDataWrite();
- this.executeFunction.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeDataWrite();
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -191,7 +190,7 @@ public class ExecuteFunctionTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.executeFunction.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction.cmdExecute(, this.message, 0);
verify(this.authzRequest).executeFunctionAuthorize(eq(FUNCTION_ID), any(), any(), any(),
eq(false));
@@ -206,7 +205,7 @@ public class ExecuteFunctionTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.executeFunctionAuthorize(eq(FUNCTION_ID), any(), any(), any(), eq(false));
- this.executeFunction.cmdExecute(this.message, this.serverConnection, 0);
+ this.executeFunction.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
index d81dfd7..33572db 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
@@ -114,7 +114,7 @@ public class Get70Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.get70.cmdExecute(this.message, this.serverConnection, 0);
+ this.get70.cmdExecute(, this.message, 0);
verify(this.responseMessage).send(this.serverConnection);
}
@@ -123,7 +123,7 @@ public class Get70Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.get70.cmdExecute(this.message, this.serverConnection, 0);
+ this.get70.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.responseMessage).send(this.serverConnection);
@@ -136,7 +136,7 @@ public class Get70Test {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME), eq(KEY));
- this.get70.cmdExecute(this.message, this.serverConnection, 0);
+ this.get70.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
@@ -147,7 +147,7 @@ public class Get70Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.get70.cmdExecute(this.message, this.serverConnection, 0);
+ this.get70.cmdExecute(, this.message, 0);
verify(this.authzRequest).getAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
verify(this.responseMessage).send(this.serverConnection);
@@ -160,7 +160,7 @@ public class Get70Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest).getAuthorize(eq(REGION_NAME),
eq(KEY), eq(CALLBACK_ARG));
- this.get70.cmdExecute(this.message, this.serverConnection, 0);
+ this.get70.cmdExecute(, this.message, 0);
verify(this.authzRequest).getAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
index 974fa05..a481b3a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
@@ -100,7 +100,7 @@ public class GetAll651Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.getAll651.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll651.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(eq(this.serverConnection));
}
@@ -110,7 +110,7 @@ public class GetAll651Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.getAll651.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll651.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPart(argument.capture(), eq(false));
@@ -136,7 +136,7 @@ public class GetAll651Test {
.authorizeRegionRead(eq(REGION_NAME), eq(key.toString()));
}
- this.getAll651.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll651.cmdExecute(, this.message, 0);
for (Object key : KEYS) {
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(key.toString()));
@@ -158,7 +158,7 @@ public class GetAll651Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.getAll651.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll651.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPart(argument.capture(), eq(false));
@@ -184,7 +184,7 @@ public class GetAll651Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest).getAuthorize(eq(REGION_NAME),
eq(key.toString()), eq(null));
}
- this.getAll651.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll651.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPart(argument.capture(), eq(false));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
index 018993c..7294797 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
@@ -113,7 +113,7 @@ public class GetAll70Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
}
@@ -123,7 +123,7 @@ public class GetAll70Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPartNoCopying(argument.capture());
@@ -149,7 +149,7 @@ public class GetAll70Test {
.authorizeRegionRead(eq(REGION_NAME), eq(key.toString()));
}
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
for (Object key : KEYS) {
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(key.toString()));
@@ -171,7 +171,7 @@ public class GetAll70Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPartNoCopying(argument.capture());
@@ -198,7 +198,7 @@ public class GetAll70Test {
eq(key.toString()), eq(null));
}
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPartNoCopying(argument.capture());
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
index cebf988..57f9390 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
@@ -97,7 +97,7 @@ public class GetAllTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.getAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(eq(this.serverConnection));
}
@@ -107,7 +107,7 @@ public class GetAllTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.getAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPart(argument.capture(), eq(false));
@@ -133,7 +133,7 @@ public class GetAllTest {
.authorizeRegionRead(eq(REGION_NAME), eq(key.toString()));
}
- this.getAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll.cmdExecute(, this.message, 0);
for (Object key : KEYS) {
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(key.toString()));
@@ -155,7 +155,7 @@ public class GetAllTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.getAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPart(argument.capture(), eq(false));
@@ -181,7 +181,7 @@ public class GetAllTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest).getAuthorize(eq(REGION_NAME),
eq(key.toString()), eq(null));
}
- this.getAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPart(argument.capture(), eq(false));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
index 112ea64..c02f896 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
@@ -107,7 +107,7 @@ public class GetAllWithCallbackTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(eq(this.serverConnection));
}
@@ -117,7 +117,7 @@ public class GetAllWithCallbackTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPartNoCopying(argument.capture());
@@ -143,7 +143,7 @@ public class GetAllWithCallbackTest {
.authorizeRegionRead(eq(REGION_NAME), eq(key.toString()));
}
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
for (Object key : KEYS) {
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(key.toString()));
@@ -165,7 +165,7 @@ public class GetAllWithCallbackTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPartNoCopying(argument.capture());
@@ -192,7 +192,7 @@ public class GetAllWithCallbackTest {
eq(key.toString()), eq(null));
}
- this.getAll70.cmdExecute(this.message, this.serverConnection, 0);
+ this.getAll70.cmdExecute(, this.message, 0);
ArgumentCaptor<ObjectPartList> argument = ArgumentCaptor.forClass(ObjectPartList.class);
verify(this.chunkedResponseMessage).addObjPartNoCopying(argument.capture());
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
index c86ecb4..00193f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
@@ -73,7 +73,7 @@ public class GetClientPartitionAttributesCommand66Test {
public void noSecuirtyShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.getClientPartitionAttributesCommand66.cmdExecute(this.message, this.serverConnection, 0);
+ this.getClientPartitionAttributesCommand66.cmdExecute(, this.message, 0);
verify(this.responseMessage).send();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
index fe144d7..7c1bcbc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
@@ -19,8 +19,6 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -76,7 +74,7 @@ public class GetClientPartitionAttributesCommandTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.getClientPartitionAttributesCommand.cmdExecute(this.message, this.serverConnection, 0);
+ this.getClientPartitionAttributesCommand.cmdExecute(, this.message, 0);
verify(this.responseMessage).send();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
index b261347..45573ab 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
@@ -115,7 +115,7 @@ public class InvalidateTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.invalidate.cmdExecute(this.message, this.serverConnection, 0);
+ this.invalidate.cmdExecute(, this.message, 0);
verify(this.responseMessage).send(this.serverConnection);
}
@@ -125,7 +125,7 @@ public class InvalidateTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.invalidate.cmdExecute(this.message, this.serverConnection, 0);
+ this.invalidate.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY_STRING));
verify(this.responseMessage).send(this.serverConnection);
@@ -138,7 +138,7 @@ public class InvalidateTest {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionWrite(eq(REGION_NAME), eq(KEY_STRING));
- this.invalidate.cmdExecute(this.message, this.serverConnection, 0);
+ this.invalidate.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY_STRING));
verify(this.errorResponseMessage).send(this.serverConnection);
@@ -149,7 +149,7 @@ public class InvalidateTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.invalidate.cmdExecute(this.message, this.serverConnection, 0);
+ this.invalidate.cmdExecute(, this.message, 0);
verify(this.authzRequest).invalidateAuthorize(eq(REGION_NAME), eq(KEY_STRING),
eq(CALLBACK_ARG));
@@ -163,7 +163,7 @@ public class InvalidateTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.invalidateAuthorize(eq(REGION_NAME), eq(KEY_STRING), eq(CALLBACK_ARG));
- this.invalidate.cmdExecute(this.message, this.serverConnection, 0);
+ this.invalidate.cmdExecute(, this.message, 0);
verify(this.authzRequest).invalidateAuthorize(eq(REGION_NAME), eq(KEY_STRING),
eq(CALLBACK_ARG));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
index 5f09eaa..493b7fc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
@@ -97,7 +97,7 @@ public class KeySetTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.keySet.cmdExecute(this.message, this.serverConnection, 0);
+ this.keySet.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
}
@@ -107,7 +107,7 @@ public class KeySetTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.keySet.cmdExecute(this.message, this.serverConnection, 0);
+ this.keySet.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -120,7 +120,7 @@ public class KeySetTest {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME));
- this.keySet.cmdExecute(this.message, this.serverConnection, 0);
+ this.keySet.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -131,7 +131,7 @@ public class KeySetTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.keySet.cmdExecute(this.message, this.serverConnection, 0);
+ this.keySet.cmdExecute(, this.message, 0);
verify(this.authzRequest).keySetAuthorize(eq(REGION_NAME));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -144,7 +144,7 @@ public class KeySetTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.keySetAuthorize(eq(REGION_NAME));
- this.keySet.cmdExecute(this.message, this.serverConnection, 0);
+ this.keySet.cmdExecute(, this.message, 0);
verify(this.authzRequest).keySetAuthorize(eq(REGION_NAME));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
index 2b4110e..4783fba 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
@@ -139,7 +139,7 @@ public class Put61Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.put61.cmdExecute(this.message, this.serverConnection, 0);
+ this.put61.cmdExecute(, this.message, 0);
verify(this.replyMessage).send(this.serverConnection);
}
@@ -149,7 +149,7 @@ public class Put61Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.put61.cmdExecute(this.message, this.serverConnection, 0);
+ this.put61.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
verify(this.replyMessage).send(this.serverConnection);
@@ -162,7 +162,7 @@ public class Put61Test {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
- this.put61.cmdExecute(this.message, this.serverConnection, 0);
+ this.put61.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(this.serverConnection);
@@ -173,7 +173,7 @@ public class Put61Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.put61.cmdExecute(this.message, this.serverConnection, 0);
+ this.put61.cmdExecute(, this.message, 0);
ArgumentCaptor<byte[]> argument = ArgumentCaptor.forClass(byte[].class);
verify(this.replyMessage).addBytesPart(argument.capture());
@@ -192,7 +192,7 @@ public class Put61Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest).putAuthorize(eq(REGION_NAME),
eq(KEY), eq(null), eq(true), eq(CALLBACK_ARG));
- this.put61.cmdExecute(this.message, this.serverConnection, 0);
+ this.put61.cmdExecute(, this.message, 0);
verify(this.authzRequest).putAuthorize(eq(REGION_NAME), eq(KEY), eq(null), eq(true),
eq(CALLBACK_ARG));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
index 8a1c870..100d301 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
@@ -160,7 +160,7 @@ public class Put65Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.put65.cmdExecute(this.message, this.serverConnection, 0);
+ this.put65.cmdExecute(, this.message, 0);
verify(this.replyMessage).send(this.serverConnection);
}
@@ -170,7 +170,7 @@ public class Put65Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.put65.cmdExecute(this.message, this.serverConnection, 0);
+ this.put65.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
verify(this.replyMessage).send(this.serverConnection);
@@ -183,7 +183,7 @@ public class Put65Test {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
- this.put65.cmdExecute(this.message, this.serverConnection, 0);
+ this.put65.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(this.serverConnection);
@@ -194,7 +194,7 @@ public class Put65Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.put65.cmdExecute(this.message, this.serverConnection, 0);
+ this.put65.cmdExecute(, this.message, 0);
ArgumentCaptor<byte[]> argument = ArgumentCaptor.forClass(byte[].class);
verify(this.replyMessage).addBytesPart(argument.capture());
@@ -213,7 +213,7 @@ public class Put65Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest).putAuthorize(eq(REGION_NAME),
eq(KEY), eq(VALUE), eq(true), eq(CALLBACK_ARG));
- this.put65.cmdExecute(this.message, this.serverConnection, 0);
+ this.put65.cmdExecute(, this.message, 0);
verify(this.authzRequest).putAuthorize(eq(REGION_NAME), eq(KEY), eq(VALUE), eq(true),
eq(CALLBACK_ARG));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
index abd6649..7ffe30c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
@@ -135,7 +135,7 @@ public class PutTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.put.cmdExecute(this.message, this.serverConnection, 0);
+ this.put.cmdExecute(, this.message, 0);
verify(this.replyMessage).send(this.serverConnection);
}
@@ -145,7 +145,7 @@ public class PutTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.put.cmdExecute(this.message, this.serverConnection, 0);
+ this.put.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
verify(this.replyMessage).send(this.serverConnection);
@@ -158,7 +158,7 @@ public class PutTest {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
- this.put.cmdExecute(this.message, this.serverConnection, 0);
+ this.put.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(this.serverConnection);
@@ -169,7 +169,7 @@ public class PutTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.put.cmdExecute(this.message, this.serverConnection, 0);
+ this.put.cmdExecute(, this.message, 0);
ArgumentCaptor<byte[]> argument = ArgumentCaptor.forClass(byte[].class);
verify(this.replyMessage).addBytesPart(argument.capture());
@@ -188,7 +188,7 @@ public class PutTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest).putAuthorize(eq(REGION_NAME),
eq(KEY), eq(VALUE), eq(true), eq(CALLBACK_ARG));
- this.put.cmdExecute(this.message, this.serverConnection, 0);
+ this.put.cmdExecute(, this.message, 0);
verify(this.authzRequest).putAuthorize(eq(REGION_NAME), eq(KEY), eq(VALUE), eq(true),
eq(CALLBACK_ARG));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
index 6f6da3a..c76ace5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
@@ -120,7 +120,7 @@ public class RegisterInterest61Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.registerInterest61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest61.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
}
@@ -130,7 +130,7 @@ public class RegisterInterest61Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.registerInterest61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest61.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -143,7 +143,7 @@ public class RegisterInterest61Test {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME), eq(KEY));
- this.registerInterest61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest61.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -154,7 +154,7 @@ public class RegisterInterest61Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.registerInterest61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest61.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt(), any());
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -168,7 +168,7 @@ public class RegisterInterest61Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.registerInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt(), any());
- this.registerInterest61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest61.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt(), any());
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
index 2b91b99..9b0398d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
@@ -126,7 +126,7 @@ public class RegisterInterestList61Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.registerInterestList61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList61.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
}
@@ -136,7 +136,7 @@ public class RegisterInterestList61Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.registerInterestList61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList61.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -149,7 +149,7 @@ public class RegisterInterestList61Test {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME));
- this.registerInterestList61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList61.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -160,7 +160,7 @@ public class RegisterInterestList61Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.registerInterestList61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList61.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestListAuthorize(eq(REGION_NAME), any(), any());
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -174,7 +174,7 @@ public class RegisterInterestList61Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.registerInterestListAuthorize(eq(REGION_NAME), any(), any());
- this.registerInterestList61.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList61.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestListAuthorize(eq(REGION_NAME), any(), any());
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
index 94163ea..b684169 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
@@ -131,7 +131,7 @@ public class RegisterInterestList66Test {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.registerInterestList66.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList66.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
}
@@ -141,7 +141,7 @@ public class RegisterInterestList66Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.registerInterestList66.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList66.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -154,7 +154,7 @@ public class RegisterInterestList66Test {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME));
- this.registerInterestList66.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList66.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -165,7 +165,7 @@ public class RegisterInterestList66Test {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.registerInterestList66.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList66.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestListAuthorize(eq(REGION_NAME), any(), any());
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -179,7 +179,7 @@ public class RegisterInterestList66Test {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.registerInterestListAuthorize(eq(REGION_NAME), any(), any());
- this.registerInterestList66.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList66.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestListAuthorize(eq(REGION_NAME), any(), any());
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
index 514eb9b..3c3a253 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
@@ -126,7 +126,7 @@ public class RegisterInterestListTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.registerInterestList.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
}
@@ -136,7 +136,7 @@ public class RegisterInterestListTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.registerInterestList.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -149,7 +149,7 @@ public class RegisterInterestListTest {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME));
- this.registerInterestList.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -160,7 +160,7 @@ public class RegisterInterestListTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.registerInterestList.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestListAuthorize(eq(REGION_NAME), any(), any());
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -174,7 +174,7 @@ public class RegisterInterestListTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.registerInterestListAuthorize(eq(REGION_NAME), any(), any());
- this.registerInterestList.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterestList.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestListAuthorize(eq(REGION_NAME), any(), any());
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
index 0b02a2c..f108ef5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
@@ -115,7 +115,7 @@ public class RegisterInterestTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.registerInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
}
@@ -125,7 +125,7 @@ public class RegisterInterestTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.registerInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -138,7 +138,7 @@ public class RegisterInterestTest {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME), eq(KEY));
- this.registerInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -149,7 +149,7 @@ public class RegisterInterestTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.registerInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt(), any());
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
@@ -163,7 +163,7 @@ public class RegisterInterestTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest)
.registerInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt(), any());
- this.registerInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.registerInterest.cmdExecute(, this.message, 0);
verify(this.authzRequest).registerInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt(), any());
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
index 97cd581..0677642 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
@@ -123,7 +123,7 @@ public class RemoveAllTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.removeAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.removeAll.cmdExecute(, this.message, 0);
verify(this.chunkedResponseMessage).sendChunk(eq(this.serverConnection));
}
@@ -133,7 +133,7 @@ public class RemoveAllTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.removeAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.removeAll.cmdExecute(, this.message, 0);
for (Object key : KEYS) {
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME));
@@ -152,7 +152,7 @@ public class RemoveAllTest {
.authorizeRegionRead(eq(REGION_NAME), eq(key.toString()));
}
- this.removeAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.removeAll.cmdExecute(, this.message, 0);
for (Object key : KEYS) {
verify(this.securityService).authorizeRegionWrite(eq(REGION_NAME));
@@ -166,7 +166,7 @@ public class RemoveAllTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.removeAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.removeAll.cmdExecute(, this.message, 0);
for (Object key : KEYS) {
verify(this.authzRequest).removeAllAuthorize(eq(REGION_NAME), any(), any());
@@ -184,7 +184,7 @@ public class RemoveAllTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest).getAuthorize(eq(REGION_NAME),
eq(key.toString()), eq(null));
}
- this.removeAll.cmdExecute(this.message, this.serverConnection, 0);
+ this.removeAll.cmdExecute(, this.message, 0);
for (Object key : KEYS) {
verify(this.authzRequest).removeAllAuthorize(eq(REGION_NAME), any(), any());
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
index 428ddde..fadf19e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
@@ -112,7 +112,7 @@ public class RequestTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.request.cmdExecute(this.message, this.serverConnection, 0);
+ this.request.cmdExecute(, this.message, 0);
verify(this.responseMessage).send(this.serverConnection);
}
@@ -121,7 +121,7 @@ public class RequestTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.request.cmdExecute(this.message, this.serverConnection, 0);
+ this.request.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.responseMessage).send(this.serverConnection);
@@ -134,7 +134,7 @@ public class RequestTest {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME), eq(KEY));
- this.request.cmdExecute(this.message, this.serverConnection, 0);
+ this.request.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
@@ -145,7 +145,7 @@ public class RequestTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.request.cmdExecute(this.message, this.serverConnection, 0);
+ this.request.cmdExecute(, this.message, 0);
verify(this.authzRequest).getAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
verify(this.responseMessage).send(this.serverConnection);
@@ -158,7 +158,7 @@ public class RequestTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest).getAuthorize(eq(REGION_NAME),
eq(KEY), eq(CALLBACK_ARG));
- this.request.cmdExecute(this.message, this.serverConnection, 0);
+ this.request.cmdExecute(, this.message, 0);
verify(this.authzRequest).getAuthorize(eq(REGION_NAME), eq(KEY), eq(CALLBACK_ARG));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
index b894590..4044d37 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
@@ -150,7 +150,7 @@ public class UnregisterInterestTest {
public void noSecurityShouldSucceed() throws Exception {
when(this.securityService.isClientSecurityRequired()).thenReturn(false);
- this.unregisterInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.unregisterInterest.cmdExecute(, this.message, 0);
verify(this.replyMessage).send(this.serverConnection);
}
@@ -159,7 +159,7 @@ public class UnregisterInterestTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(true);
- this.unregisterInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.unregisterInterest.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.replyMessage).send(this.serverConnection);
@@ -172,7 +172,7 @@ public class UnregisterInterestTest {
doThrow(new NotAuthorizedException("")).when(this.securityService)
.authorizeRegionRead(eq(REGION_NAME), eq(KEY));
- this.unregisterInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.unregisterInterest.cmdExecute(, this.message, 0);
verify(this.securityService).authorizeRegionRead(eq(REGION_NAME), eq(KEY));
verify(this.errorResponseMessage).send(eq(this.serverConnection));
@@ -183,7 +183,7 @@ public class UnregisterInterestTest {
when(this.securityService.isClientSecurityRequired()).thenReturn(true);
when(this.securityService.isIntegratedSecurity()).thenReturn(false);
- this.unregisterInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.unregisterInterest.cmdExecute(, this.message, 0);
verify(this.authzRequest).unregisterInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt());
verify(this.replyMessage).send(this.serverConnection);
@@ -196,7 +196,7 @@ public class UnregisterInterestTest {
doThrow(new NotAuthorizedException("")).when(this.authzRequest).getAuthorize(eq(REGION_NAME),
eq(KEY), any());
- this.unregisterInterest.cmdExecute(this.message, this.serverConnection, 0);
+ this.unregisterInterest.cmdExecute(, this.message, 0);
verify(this.authzRequest).unregisterInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt());
verify(this.replyMessage).send(eq(this.serverConnection));
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
index 66e8ff1..8b563ac 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* The InitializerJUnitTest class is a test suite of test cases testing the contract and
- * functionality of the Initializer utility class.
+ * functionality of the ConfigInitialization utility class.
* <p/>
*
* @see org.apache.geode.internal.lang.Initializer
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/security/FakePostProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/FakePostProcessor.java b/geode-core/src/test/java/org/apache/geode/internal/security/FakePostProcessor.java
new file mode 100644
index 0000000..3ab92d6
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/FakePostProcessor.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security;
+
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.apache.geode.security.PostProcessor;
+
+public class FakePostProcessor implements PostProcessor {
+
+ private final AtomicInteger initInvocations = new AtomicInteger(0);
+ private final AtomicInteger processRegionValueInvocations = new AtomicInteger(0);
+ private final AtomicInteger closeInvocations = new AtomicInteger(0);
+
+ private final AtomicReference<Properties> securityPropsRef = new AtomicReference<>();
+ private final AtomicReference<ProcessRegionValueArguments> processRegionValueArgumentsRef = new AtomicReference<>();
+
+ @Override
+ public void init(Properties securityProps) {
+ this.initInvocations.incrementAndGet();
+ this.securityPropsRef.set(securityProps);
+ }
+
+ @Override
+ public Object processRegionValue(final Object principal, final String regionName, final Object key, final Object value) {
+ this.processRegionValueInvocations.incrementAndGet();
+ this.processRegionValueArgumentsRef.set(new ProcessRegionValueArguments(principal, regionName, key, value));
+ return this.processRegionValueArgumentsRef.get();
+ }
+
+ @Override
+ public void close() {
+ this.closeInvocations.incrementAndGet();
+ }
+
+ public int getInitInvocations() {
+ return this.initInvocations.get();
+ }
+
+ public int getProcessRegionValueInvocations() {
+ return this.processRegionValueInvocations.get();
+ }
+
+ public int getCloseInvocations() {
+ return this.closeInvocations.get();
+ }
+
+ public Properties getSecurityProps() {
+ return this.securityPropsRef.get();
+ }
+
+ public ProcessRegionValueArguments getProcessRegionValueArguments() {
+ return this.processRegionValueArgumentsRef.get();
+ }
+
+ public static class ProcessRegionValueArguments {
+ private final Object principal;
+ private final String regionName;
+ private final Object key;
+ private final Object value;
+
+ public ProcessRegionValueArguments(final Object principal, final String regionName, final Object key, final Object value) {
+ this.principal = principal;
+ this.regionName = regionName;
+ this.key = key;
+ this.value = value;
+ }
+
+ public Object getPrincipal() {
+ return this.principal;
+ }
+
+ public String getRegionName() {
+ return this.regionName;
+ }
+
+ public Object getKey() {
+ return this.key;
+ }
+
+ public Object getValue() {
+ return this.value;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/security/FakeSecurityManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/FakeSecurityManager.java b/geode-core/src/test/java/org/apache/geode/internal/security/FakeSecurityManager.java
new file mode 100644
index 0000000..1fc7ae3
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/FakeSecurityManager.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security;
+
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.security.SecurityManager;
+
+public class FakeSecurityManager implements SecurityManager {
+
+ private final AtomicInteger initInvocations = new AtomicInteger(0);
+ private final AtomicInteger authenticateInvocations = new AtomicInteger(0);
+ private final AtomicInteger authorizeInvocations = new AtomicInteger(0);
+ private final AtomicInteger closeInvocations = new AtomicInteger(0);
+
+ private final AtomicReference<Properties> securityPropsRef = new AtomicReference<>();
+ private final AtomicReference<Properties> credentialsRef = new AtomicReference<>();
+ private final AtomicReference<AuthorizeArguments> processAuthorizeArgumentsRef = new AtomicReference<>();
+
+ @Override
+ public void init(final Properties securityProps) {
+ this.initInvocations.incrementAndGet();
+ this.securityPropsRef.set(securityProps);
+ }
+
+ @Override
+ public Object authenticate(final Properties credentials) throws AuthenticationFailedException {
+ this.authenticateInvocations.incrementAndGet();
+ this.credentialsRef.set(credentials);
+ return credentials;
+ }
+
+ @Override
+ public boolean authorize(final Object principal, final ResourcePermission permission) {
+ this.authorizeInvocations.incrementAndGet();
+ this.processAuthorizeArgumentsRef.set(new AuthorizeArguments(principal, permission));
+ return true;
+ }
+
+ @Override
+ public void close() {
+ this.closeInvocations.incrementAndGet();
+ }
+
+ public int getInitInvocations() {
+ return this.initInvocations.get();
+ }
+
+ public int getAuthenticateInvocations() {
+ return this.authenticateInvocations.get();
+ }
+
+ public int getAuthorizeInvocations() {
+ return this.authorizeInvocations.get();
+ }
+
+ public int getCloseInvocations() {
+ return this.closeInvocations.get();
+ }
+
+ public Properties getSecurityProps() {
+ return this.securityPropsRef.get();
+ }
+
+ public AuthorizeArguments getAuthorizeArguments() {
+ return this.processAuthorizeArgumentsRef.get();
+ }
+
+ public static class AuthorizeArguments {
+ private final Object principal;
+ private final ResourcePermission permission;
+
+ public AuthorizeArguments(final Object principal, final ResourcePermission permission) {
+ this.principal = principal;
+ this.permission = permission;
+ }
+
+ public Object getPrincipal() {
+ return this.principal;
+ }
+
+ public ResourcePermission getPermission() {
+ return this.permission;
+ }
+ }
+}
[31/35] geode git commit: milestone
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
new file mode 100644
index 0000000..9bb81ac
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
@@ -0,0 +1,226 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.security;
+
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.util.Properties;
+
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.SecurityManager;
+import org.apache.geode.test.junit.categories.UnitTest;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class SecurityServiceFactoryTest {
+
+ @Test
+ public void getPostProcessor_null_throwsNPE() throws Exception {
+ assertThatThrownBy(() -> SecurityServiceFactory.getPostProcessor(null, null)).isExactlyInstanceOf(NullPointerException.class);
+ }
+
+ @Test
+ public void getPostProcessor_returnsPostProcessor() throws Exception {
+ PostProcessor mockPostProcessor = mock(PostProcessor.class);
+
+ assertThat(SecurityServiceFactory.getPostProcessor(mockPostProcessor, null)).isSameAs(mockPostProcessor);
+ }
+
+ @Test
+ public void getPostProcessor_SecurityConfig_initsPostProcessor() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_POST_PROCESSOR, FakePostProcessor.class.getName());
+
+ PostProcessor postProcessor = SecurityServiceFactory.getPostProcessor(null, securityConfig);
+
+ assertThat(postProcessor).isInstanceOf(FakePostProcessor.class);
+
+ FakePostProcessor fakePostProcessor = (FakePostProcessor) postProcessor;
+
+ assertThat(fakePostProcessor.getInitInvocations()).isEqualTo(1);
+ assertThat(fakePostProcessor.getSecurityProps()).isSameAs(securityConfig);
+ }
+
+ @Test
+ public void getPostProcessor_prefersPostProcessorOverSecurityConfig() throws Exception {
+ PostProcessor mockPostProcessor = mock(PostProcessor.class);
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_POST_PROCESSOR, FakePostProcessor.class.getName());
+
+ assertThat(SecurityServiceFactory.getPostProcessor(mockPostProcessor, securityConfig)).isSameAs(mockPostProcessor);
+ }
+
+ @Test
+ public void getSecurityManager_null_throwsNPE() throws Exception {
+ assertThatThrownBy(() -> SecurityServiceFactory.getSecurityManager(null, null)).isExactlyInstanceOf(NullPointerException.class);
+ }
+
+ @Test
+ public void getSecurityManager_returnsSecurityManager() throws Exception {
+ SecurityManager mockSecurityManager = mock(SecurityManager.class);
+
+ assertThat(SecurityServiceFactory.getSecurityManager(mockSecurityManager, null)).isSameAs(mockSecurityManager);
+ }
+
+ @Test
+ public void getSecurityManager_SecurityConfig_initsSecurityManager() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_MANAGER, FakeSecurityManager.class.getName());
+
+ SecurityManager securityManager = SecurityServiceFactory.getSecurityManager(null, securityConfig);
+
+ assertThat(securityManager).isInstanceOf(FakeSecurityManager.class);
+
+ FakeSecurityManager fakeSecurityManager = (FakeSecurityManager) securityManager;
+
+ assertThat(fakeSecurityManager.getInitInvocations()).isEqualTo(1);
+ assertThat(fakeSecurityManager.getSecurityProps()).isSameAs(securityConfig);
+ }
+
+ @Test
+ public void getSecurityManager_prefersSecurityManagerOverSecurityConfig() throws Exception {
+ SecurityManager mockSecurityManager = mock(SecurityManager.class);
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_MANAGER, FakePostProcessor.class.getName());
+
+ assertThat(SecurityServiceFactory.getSecurityManager(mockSecurityManager, securityConfig)).isSameAs(mockSecurityManager);
+ }
+
+ @Test
+ public void determineType_null_throwsNPE() throws Exception {
+ assertThatThrownBy(() -> SecurityServiceFactory.determineType(null, null)).isExactlyInstanceOf(NullPointerException.class);
+ }
+
+ @Test
+ public void determineType_shiro_returnsCUSTOM() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_SHIRO_INIT, "value");
+
+ assertThat(SecurityServiceFactory.determineType(securityConfig, null)).isSameAs(SecurityServiceType.CUSTOM);
+ }
+
+ @Test
+ public void determineType_securityManager_returnsENABLED() throws Exception {
+ Properties securityConfig = new Properties();
+ SecurityManager mockSecurityManager = mock(SecurityManager.class);
+
+ assertThat(SecurityServiceFactory.determineType(securityConfig, mockSecurityManager)).isSameAs(SecurityServiceType.ENABLED);
+ }
+
+ @Test
+ public void determineType_prefersCUSTOM() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_SHIRO_INIT, "value");
+ securityConfig.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "value");
+ securityConfig.setProperty(SECURITY_PEER_AUTHENTICATOR, "value");
+ SecurityManager mockSecurityManager = mock(SecurityManager.class);
+
+ assertThat(SecurityServiceFactory.determineType(securityConfig, mockSecurityManager)).isSameAs(SecurityServiceType.CUSTOM);
+ }
+
+ @Test
+ public void determineType_clientAuthenticator_returnsLEGACY() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "value");
+
+ assertThat(SecurityServiceFactory.determineType(securityConfig, null)).isSameAs(SecurityServiceType.LEGACY);
+ }
+
+ @Test
+ public void determineType_peerAuthenticator_returnsLEGACY() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_PEER_AUTHENTICATOR, "value");
+
+ assertThat(SecurityServiceFactory.determineType(securityConfig, null)).isSameAs(SecurityServiceType.LEGACY);
+ }
+
+ @Test
+ public void determineType_authenticators_returnsLEGACY() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "value");
+ securityConfig.setProperty(SECURITY_PEER_AUTHENTICATOR, "value");
+
+ assertThat(SecurityServiceFactory.determineType(securityConfig, null)).isSameAs(SecurityServiceType.LEGACY);
+ }
+
+ @Test
+ public void determineType_empty_returnsDISABLED() throws Exception {
+ Properties securityConfig = new Properties();
+
+ assertThat(SecurityServiceFactory.determineType(securityConfig, null)).isSameAs(SecurityServiceType.DISABLED);
+ }
+
+ @Test
+ @Ignore("Move to IntegrationTest with shiro config")
+ public void create_shiro_createsCustomSecurityService() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_SHIRO_INIT, "value");
+
+ assertThat(SecurityServiceFactory.create(securityConfig, null, null)).isInstanceOf(CustomSecurityService.class);
+ }
+
+ @Test
+ public void create_clientAuthenticator_createsLegacySecurityService() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "value");
+
+ assertThat(SecurityServiceFactory.create(securityConfig, null, null)).isInstanceOf(LegacySecurityService.class);
+ }
+
+ @Test
+ public void create_peerAuthenticator_createsLegacySecurityService() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_PEER_AUTHENTICATOR, "value");
+
+ assertThat(SecurityServiceFactory.create(securityConfig, null, null)).isInstanceOf(LegacySecurityService.class);
+ }
+
+ @Test
+ public void create_authenticators_createsLegacySecurityService() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "value");
+ securityConfig.setProperty(SECURITY_PEER_AUTHENTICATOR, "value");
+
+ assertThat(SecurityServiceFactory.create(securityConfig, null, null)).isInstanceOf(LegacySecurityService.class);
+ }
+
+ @Test
+ @Ignore("Move to IntegrationTest with shiro config")
+ public void create_all_createsCustomSecurityService() throws Exception {
+ Properties securityConfig = new Properties();
+ securityConfig.setProperty(SECURITY_SHIRO_INIT, "value");
+ securityConfig.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "value");
+ securityConfig.setProperty(SECURITY_PEER_AUTHENTICATOR, "value");
+
+ SecurityManager mockSecurityManager = mock(SecurityManager.class);
+ PostProcessor mockPostProcessor = mock(PostProcessor.class);
+
+ assertThat(SecurityServiceFactory.create(securityConfig, mockSecurityManager, mockPostProcessor)).isInstanceOf(CustomSecurityService.class);
+ }
+
+ @Test
+ public void create_none_createsDisabledSecurityService() throws Exception {
+ Properties securityConfig = new Properties();
+
+ assertThat(SecurityServiceFactory.create(securityConfig, null, null)).isInstanceOf(DisabledSecurityService.class);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
index 18929eb..5a6c3c4 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
@@ -31,6 +31,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class CloseCQ extends BaseCQCommand {
@@ -44,7 +45,7 @@ public class CloseCQ extends BaseCQCommand {
private CloseCQ() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
ClientProxyMembershipID id = serverConnection.getProxyID();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
index 86d53f5..026134f 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java
@@ -39,6 +39,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class ExecuteCQ extends BaseCQCommand {
protected static final Logger logger = LogService.getLogger();
@@ -52,7 +53,7 @@ public class ExecuteCQ extends BaseCQCommand {
private ExecuteCQ() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
AcceptorImpl acceptor = serverConnection.getAcceptor();
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
index fcc45de..f15046a 100755
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java
@@ -44,6 +44,7 @@ import org.apache.geode.internal.cache.vmotion.VMotionObserverHolder;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
/**
* @since GemFire 6.1
@@ -60,7 +61,7 @@ public class ExecuteCQ61 extends BaseCQCommand {
private ExecuteCQ61() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
AcceptorImpl acceptor = serverConnection.getAcceptor();
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java
index 0fab303..42b5602 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java
@@ -24,6 +24,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.security.SecurityService;
public class GetCQStats extends BaseCQCommand {
@@ -36,7 +37,7 @@ public class GetCQStats extends BaseCQCommand {
private GetCQStats() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
index c14bd72..c44d7d2 100755
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java
@@ -32,6 +32,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class GetDurableCQs extends BaseCQCommand {
@@ -44,7 +45,7 @@ public class GetDurableCQs extends BaseCQCommand {
private GetDurableCQs() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException, InterruptedException {
AcceptorImpl acceptor = serverConnection.getAcceptor();
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java
index 5f0118b..7c003e5 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java
@@ -24,6 +24,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.security.SecurityService;
public class MonitorCQ extends BaseCQCommand {
@@ -36,7 +37,7 @@ public class MonitorCQ extends BaseCQCommand {
private MonitorCQ() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
serverConnection.setAsTrue(REQUIRES_RESPONSE);
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java
index 99fbef1..ba5a962 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java
@@ -32,6 +32,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.security.AuthorizeRequest;
+import org.apache.geode.internal.security.SecurityService;
public class StopCQ extends BaseCQCommand {
@@ -44,7 +45,7 @@ public class StopCQ extends BaseCQCommand {
private StopCQ() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, final SecurityService securityService, long start)
throws IOException {
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
ClientProxyMembershipID id = serverConnection.getProxyID();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index 2fa9356..c96bc7b 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -29,8 +29,6 @@ import org.apache.geode.cache.lucene.internal.cli.functions.LuceneSearchIndexFun
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
-import org.apache.geode.internal.security.IntegratedSecurityService;
-import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.cli.Result;
@@ -80,8 +78,6 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
new LuceneDestroyIndexFunction();
private List<LuceneSearchResults> searchResults = null;
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
-
@CliCommand(value = LuceneCliStrings.LUCENE_LIST_INDEX,
help = LuceneCliStrings.LUCENE_LIST_INDEX__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
@@ -182,7 +178,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
Result result;
XmlEntity xmlEntity = null;
- this.securityService.authorizeRegionManage(regionPath);
+ getCache().getSecurityService().authorizeRegionManage(regionPath);
try {
final InternalCache cache = getCache();
// trim fields for any leading trailing spaces.
@@ -328,7 +324,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
CliStrings.format(LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__INDEX_CANNOT_BE_EMPTY));
}
- this.securityService.authorizeRegionManage(regionPath);
+ getCache().getSecurityService().authorizeRegionManage(regionPath);
Result result;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
index 087aff4..856cc09 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
@@ -36,6 +36,7 @@ import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
+import org.apache.geode.internal.security.DisabledSecurityService;
import org.apache.geode.tools.pulse.internal.data.PulseConstants;
import org.apache.geode.security.TestSecurityManager;
import org.apache.shiro.SecurityUtils;
@@ -79,7 +80,7 @@ public class Server {
SecurityUtils.setSecurityManager(securityManager);
// register the AccessControll bean
- AccessControlMBean acc = new AccessControlMBean();
+ AccessControlMBean acc = new AccessControlMBean(new DisabledSecurityService());
ObjectName accessControlMBeanON = new ObjectName(ResourceConstants.OBJECT_NAME_ACCESSCONTROL);
MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
platformMBeanServer.registerMBean(acc, accessControlMBeanON);
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
----------------------------------------------------------------------
diff --git a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
index 0f1a995..4cc52b2 100644
--- a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
+++ b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
@@ -53,7 +53,7 @@ import org.apache.geode.internal.logging.LogService;
* re-balancing request. Auto-Balancing is expected to prevent failures and data loss.
*
* <P>
- * This implementation is based on {@code Initializer} implementation. By default auto-balancing is
+ * This implementation is based on {@code ConfigInitialization} implementation. By default auto-balancing is
* disabled. A user needs to configure {@link AutoBalancer} during cache initialization
* {@link GemFireCache#getInitializer()}
*
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
index 06c0fb1..6d7363f 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
@@ -16,6 +16,9 @@
package org.apache.geode.rest.internal.web.security;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.security.DisabledSecurityService;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.security.GemFireSecurityException;
@@ -32,7 +35,26 @@ import java.util.Properties;
@Component
public class GeodeAuthenticationProvider implements AuthenticationProvider {
- private SecurityService securityService = SecurityService.getSecurityService();
+
+ private final SecurityService securityService;
+
+ public GeodeAuthenticationProvider() {
+ // TODO: can we pass SecurityService in?
+ this.securityService = findSecurityService();
+ }
+
+ private static SecurityService findSecurityService() {
+ InternalCache cache = GemFireCacheImpl.getInstance();
+ if (cache != null) {
+ return cache.getSecurityService();
+ } else {
+ return new DisabledSecurityService();
+ }
+ }
+
+ public SecurityService getSecurityService() {
+ return this.securityService;
+ }
@Override
public Authentication authenticate(Authentication authentication) throws AuthenticationException {
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
index f0491b7..632f837 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
@@ -35,8 +35,6 @@ import org.springframework.security.config.http.SessionCreationPolicy;
@ComponentScan("org.apache.geode.rest.internal.web")
public class RestSecurityConfiguration extends WebSecurityConfigurerAdapter {
- private SecurityService securityService = IntegratedSecurityService.getSecurityService();
-
@Autowired
private GeodeAuthenticationProvider authProvider;
@@ -58,7 +56,7 @@ public class RestSecurityConfiguration extends WebSecurityConfigurerAdapter {
"/webjars/springfox-swagger-ui/**", "/swagger-resources/**")
.permitAll().anyRequest().authenticated().and().csrf().disable();
- if (securityService.isIntegratedSecurity()) {
+ if (this.authProvider.getSecurityService().isIntegratedSecurity()) {
http.httpBasic();
} else {
http.authorizeRequests().anyRequest().permitAll();
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/SecurityServiceProvider.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/SecurityServiceProvider.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/SecurityServiceProvider.java
new file mode 100644
index 0000000..6bfb28f
--- /dev/null
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/SecurityServiceProvider.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.rest.internal.web.security;
+
+public class SecurityServiceProvider {
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/d5dc97c8/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
index 00156cd..a58bcba 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
@@ -41,8 +41,7 @@ public class LoginHandlerInterceptorRequestHeaderJUnitTest {
public void before() {
LoginHandlerInterceptor.getEnvironment().clear();
securityService = Mockito.mock(SecurityService.class);
- interceptor = new LoginHandlerInterceptor();
- interceptor.setSecurityService(securityService);
+ interceptor = new LoginHandlerInterceptor(securityService);
}
@After
[16/35] geode git commit: GEODE-3011 Correct a Lucene gfsh query
example
Posted by kl...@apache.org.
GEODE-3011 Correct a Lucene gfsh query example
This closes #553
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f7e1ba2d
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f7e1ba2d
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f7e1ba2d
Branch: refs/heads/feature/GEODE-2632-19
Commit: f7e1ba2dcbe129af32d7f6226555ee09ec66d939
Parents: c1288ac
Author: Karen Miller <km...@pivotal.io>
Authored: Wed May 31 13:28:28 2017 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Wed May 31 15:12:27 2017 -0700
----------------------------------------------------------------------
geode-docs/tools_modules/lucene_integration.html.md.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/f7e1ba2d/geode-docs/tools_modules/lucene_integration.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/lucene_integration.html.md.erb b/geode-docs/tools_modules/lucene_integration.html.md.erb
index 2788338..166a3b7 100644
--- a/geode-docs/tools_modules/lucene_integration.html.md.erb
+++ b/geode-docs/tools_modules/lucene_integration.html.md.erb
@@ -134,8 +134,8 @@ as there will be no field name to use in the case of a primitive type.
For details, see the [gfsh search lucene](gfsh/command-pages/search.html#search_lucene") command reference page.
``` pre
-gfsh> lucene search --regionName=/orders -queryStrings="John*" --defaultField=field1
- --limit=100
+gfsh>search lucene --name=indexName --region=/orders --queryStrings="John*"
+ --defaultField=customer --limit=100
```
### <a id="api-query-example" class="no-quick-link"></a>Java API Example to Query using a Lucene Index
[22/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
index 7d28d52..053b2a8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java
@@ -37,22 +37,25 @@ public class RegisterDataSerializers extends BaseCommand {
private RegisterDataSerializers() {}
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
if (logger.isDebugEnabled()) {
logger.debug("{}: Received register dataserializer request ({} parts) from {}",
- servConn.getName(), msg.getNumberOfParts(), servConn.getSocketString());
+ serverConnection.getName(), clientMessage.getNumberOfParts(),
+ serverConnection.getSocketString());
}
- int noOfParts = msg.getNumberOfParts();
+ int noOfParts = clientMessage.getNumberOfParts();
// 2 parts per instantiator and one eventId part
int noOfDataSerializers = (noOfParts - 1) / 2;
// retrieve eventID from the last Part
- ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(msg.getPart(noOfParts - 1).getSerializedForm());
+ ByteBuffer eventIdPartsBuffer =
+ ByteBuffer.wrap(clientMessage.getPart(noOfParts - 1).getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
byte[][] serializedDataSerializers = new byte[noOfDataSerializers * 2][];
boolean caughtCNFE = false;
@@ -60,12 +63,12 @@ public class RegisterDataSerializers extends BaseCommand {
try {
for (int i = 0; i < noOfParts - 1; i = i + 2) {
- Part dataSerializerClassNamePart = msg.getPart(i);
+ Part dataSerializerClassNamePart = clientMessage.getPart(i);
serializedDataSerializers[i] = dataSerializerClassNamePart.getSerializedForm();
String dataSerializerClassName =
(String) CacheServerHelper.deserialize(serializedDataSerializers[i]);
- Part idPart = msg.getPart(i + 1);
+ Part idPart = clientMessage.getPart(i + 1);
serializedDataSerializers[i + 1] = idPart.getSerializedForm();
int id = idPart.getInt();
@@ -73,7 +76,7 @@ public class RegisterDataSerializers extends BaseCommand {
try {
dataSerializerClass = InternalDataSerializer.getCachedClass(dataSerializerClassName);
InternalDataSerializer.register(dataSerializerClass, true, eventId,
- servConn.getProxyID());
+ serverConnection.getProxyID());
} catch (ClassNotFoundException e) {
// If a ClassNotFoundException is caught, store it, but continue
// processing other instantiators
@@ -82,26 +85,27 @@ public class RegisterDataSerializers extends BaseCommand {
}
}
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
// If a ClassNotFoundException was caught while processing the
// instantiators, send it back to the client. Note: This only sends
// the last CNFE.
if (caughtCNFE) {
- writeException(msg, cnfe, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, cnfe, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
// Send reply to client if necessary. If an exception occurs in the above
// code, then the reply has already been sent.
- if (!servConn.getTransientFlag(RESPONDED)) {
- writeReply(msg, servConn);
+ if (!serverConnection.getTransientFlag(RESPONDED)) {
+ writeReply(clientMessage, serverConnection);
}
if (logger.isDebugEnabled()) {
- logger.debug("Registered dataserializer for MembershipId = {}", servConn.getMembershipID());
+ logger.debug("Registered dataserializer for MembershipId = {}",
+ serverConnection.getMembershipID());
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
index 1e701fc..df5a46c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
@@ -49,23 +49,26 @@ public class RegisterInstantiators extends BaseCommand {
private RegisterInstantiators() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException {
if (logger.isDebugEnabled()) {
logger.debug("{}: Received register instantiator request ({} parts) from {}",
- servConn.getName(), msg.getNumberOfParts(), servConn.getSocketString());
+ serverConnection.getName(), clientMessage.getNumberOfParts(),
+ serverConnection.getSocketString());
}
- int noOfParts = msg.getNumberOfParts();
+ int noOfParts = clientMessage.getNumberOfParts();
// Assert parts
Assert.assertTrue((noOfParts - 1) % 3 == 0);
// 3 parts per instantiator and one eventId part
int noOfInstantiators = (noOfParts - 1) / 3;
// retrieve eventID from the last Part
- ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(msg.getPart(noOfParts - 1).getSerializedForm());
+ ByteBuffer eventIdPartsBuffer =
+ ByteBuffer.wrap(clientMessage.getPart(noOfParts - 1).getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
byte[][] serializedInstantiators = new byte[noOfInstantiators * 3][];
boolean caughtCNFE = false;
@@ -73,17 +76,17 @@ public class RegisterInstantiators extends BaseCommand {
try {
for (int i = 0; i < noOfParts - 1; i = i + 3) {
- Part instantiatorPart = msg.getPart(i);
+ Part instantiatorPart = clientMessage.getPart(i);
serializedInstantiators[i] = instantiatorPart.getSerializedForm();
String instantiatorClassName =
(String) CacheServerHelper.deserialize(serializedInstantiators[i]);
- Part instantiatedPart = msg.getPart(i + 1);
+ Part instantiatedPart = clientMessage.getPart(i + 1);
serializedInstantiators[i + 1] = instantiatedPart.getSerializedForm();
String instantiatedClassName =
(String) CacheServerHelper.deserialize(serializedInstantiators[i + 1]);
- Part idPart = msg.getPart(i + 2);
+ Part idPart = clientMessage.getPart(i + 2);
serializedInstantiators[i + 2] = idPart.getSerializedForm();
int id = idPart.getInt();
@@ -92,7 +95,7 @@ public class RegisterInstantiators extends BaseCommand {
instantiatorClass = InternalDataSerializer.getCachedClass(instantiatorClassName);
instantiatedClass = InternalDataSerializer.getCachedClass(instantiatedClassName);
InternalInstantiator.register(instantiatorClass, instantiatedClass, id, true, eventId,
- servConn.getProxyID());
+ serverConnection.getProxyID());
} catch (ClassNotFoundException e) {
// If a ClassNotFoundException is caught, store it, but continue
// processing other instantiators
@@ -102,17 +105,17 @@ public class RegisterInstantiators extends BaseCommand {
}
} catch (Exception e) {
logger.warn(LocalizedMessage.create(LocalizedStrings.RegisterInstantiators_BAD_CLIENT,
- new Object[] {servConn.getMembershipID(), e.getLocalizedMessage()}));
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ new Object[] {serverConnection.getMembershipID(), e.getLocalizedMessage()}));
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
// If a ClassNotFoundException was caught while processing the
// instantiators, send it back to the client. Note: This only sends
// the last CNFE.
if (caughtCNFE) {
- writeException(msg, cnfe, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, cnfe, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
// Send the instantiators on to other clients if we hit an error
// due to a missing class, because they were not distributed
@@ -120,7 +123,7 @@ public class RegisterInstantiators extends BaseCommand {
// been distributed if successfully registered.
ClientInstantiatorMessage clientInstantiatorMessage =
new ClientInstantiatorMessage(EnumListenerEvent.AFTER_REGISTER_INSTANTIATOR,
- serializedInstantiators, servConn.getProxyID(), eventId);
+ serializedInstantiators, serverConnection.getProxyID(), eventId);
// Notify other clients
CacheClientNotifier.routeClientMessage(clientInstantiatorMessage);
@@ -129,12 +132,13 @@ public class RegisterInstantiators extends BaseCommand {
// Send reply to client if necessary. If an exception occurs in the above
// code, then the reply has already been sent.
- if (!servConn.getTransientFlag(RESPONDED)) {
- writeReply(msg, servConn);
+ if (!serverConnection.getTransientFlag(RESPONDED)) {
+ writeReply(clientMessage, serverConnection);
}
if (logger.isDebugEnabled()) {
- logger.debug("Registered instantiators for MembershipId = {}", servConn.getMembershipID());
+ logger.debug("Registered instantiators for MembershipId = {}",
+ serverConnection.getMembershipID());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
index 52a929f..edd917a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
@@ -46,51 +46,51 @@ public class RegisterInterest extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null;
String regionName = null;
Object key = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
// bserverStats.incLong(readDestroyRequestTimeId,
// DistributionStats.getStatTime() - start);
// bserverStats.incInt(destroyRequestsId, 1);
// start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
InterestResultPolicy policy = null;
// Retrieve the interest type
- int interestType = msg.getPart(1).getInt();
+ int interestType = clientMessage.getPart(1).getInt();
// Retrieve the InterestResultPolicy
try {
- policy = (InterestResultPolicy) msg.getPart(2).getObject();
+ policy = (InterestResultPolicy) clientMessage.getPart(2).getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean isDurable = false;
try {
- Part durablePart = msg.getPart(3);
+ Part durablePart = clientMessage.getPart(3);
byte[] durablePartBytes = (byte[]) durablePart.getObject();
isDurable = durablePartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// Retrieve the key
- keyPart = msg.getPart(4);
+ keyPart = clientMessage.getPart(4);
regionName = regionNamePart.getString();
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -98,21 +98,22 @@ public class RegisterInterest extends BaseCommand {
// VJR: Check for a sixth part for client version 6.0.3 onwards for the
// time being until refactoring into a new command version.
- if (msg.getNumberOfParts() > 5) {
+ if (clientMessage.getNumberOfParts() > 5) {
try {
- Part notifyPart = msg.getPart(5);
+ Part notifyPart = clientMessage.getPart(5);
byte[] notifyPartBytes = (byte[]) notifyPart.getObject();
sendUpdatesAsInvalidates = notifyPartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
if (logger.isDebugEnabled()) {
logger.debug("{}: Received register interest request ({} bytes) from {} for region {} key {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName, key);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key);
}
// Process the register interest request
@@ -126,19 +127,19 @@ public class RegisterInterest extends BaseCommand {
message =
LocalizedStrings.RegisterInterest_THE_INPUT_REGION_NAME_FOR_THE_REGISTER_INTEREST_REQUEST_IS_NULL;
}
- logger.warn("{}: {}", servConn.getName(), message.toLocalizedString());
- writeChunkedErrorResponse(msg, MessageType.REGISTER_INTEREST_DATA_ERROR,
- message.toLocalizedString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), message.toLocalizedString());
+ writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR,
+ message.toLocalizedString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// input key not null
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
logger.info(LocalizedMessage.create(
LocalizedStrings.RegisterInterest_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_REQUEST,
- new Object[] {servConn.getName(), regionName}));
+ new Object[] {serverConnection.getName(), regionName}));
// writeChunkedErrorResponse(msg,
// MessageType.REGISTER_INTEREST_DATA_ERROR, message);
// responded = true;
@@ -151,7 +152,7 @@ public class RegisterInterest extends BaseCommand {
this.securityService.authorizeRegionRead(regionName, key.toString());
}
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
RegisterInterestOperationContext registerContext =
@@ -159,14 +160,15 @@ public class RegisterInterest extends BaseCommand {
key = registerContext.getKey();
}
}
- servConn.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, key,
- servConn.getProxyID(), interestType, isDurable, sendUpdatesAsInvalidates, false, 0, true);
+ serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName,
+ key, serverConnection.getProxyID(), interestType, isDurable, sendUpdatesAsInvalidates,
+ false, 0, true);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -177,46 +179,47 @@ public class RegisterInterest extends BaseCommand {
// DistributionStats.getStatTime() - start);
// start = DistributionStats.getStatTime();
- CacheClientProxy ccp =
- servConn.getAcceptor().getCacheClientNotifier().getClientProxy(servConn.getProxyID());
+ CacheClientProxy ccp = serverConnection.getAcceptor().getCacheClientNotifier()
+ .getClientProxy(serverConnection.getProxyID());
if (ccp == null) {
// fix for 37593
IOException ioex = new IOException(
LocalizedStrings.RegisterInterest_CACHECLIENTPROXY_FOR_THIS_CLIENT_IS_NO_LONGER_ON_THE_SERVER_SO_REGISTERINTEREST_OPERATION_IS_UNSUCCESSFUL
.toLocalizedString());
- writeChunkedException(msg, ioex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, ioex, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean isPrimary = ccp.isPrimary();
- ChunkedMessage chunkedResponseMsg = servConn.getRegisterInterestResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getRegisterInterestResponseMessage();
if (!isPrimary) {
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_SECONDARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
chunkedResponseMsg.setLastChunk(true);
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Sending register interest response chunk from secondary for region: {} for key: {} chunk=<{}>",
- servConn.getName(), regionName, key, chunkedResponseMsg);
+ serverConnection.getName(), regionName, key, chunkedResponseMsg);
}
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
} // !isPrimary
else { // isPrimary
// Send header which describes how many chunks will follow
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_PRIMARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
- fillAndSendRegisterInterestResponseChunks(region, key, interestType, policy, servConn);
- servConn.setAsTrue(RESPONDED);
+ fillAndSendRegisterInterestResponseChunks(region, key, interestType, policy,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn, chunkedResponseMsg);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection, chunkedResponseMsg);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -224,8 +227,8 @@ public class RegisterInterest extends BaseCommand {
// logger.debug(getName() + ": Sent chunk (1 of 1) of register interest
// response (" + chunkedResponseMsg.getBufferLength() + " bytes) for
// region " + regionName + " key " + key);
- logger.debug("{}: Sent register interest response for region {} key {}", servConn.getName(),
- regionName, key);
+ logger.debug("{}: Sent register interest response for region {} key {}",
+ serverConnection.getName(), regionName, key);
}
// bserverStats.incLong(writeDestroyResponseTimeId,
// DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
index 5ddb241..bad3bed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
@@ -60,67 +60,67 @@ public class RegisterInterest61 extends BaseCommand {
RegisterInterest61() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null;
String regionName = null;
Object key = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
// bserverStats.incLong(readDestroyRequestTimeId,
// DistributionStats.getStatTime() - start);
// bserverStats.incInt(destroyRequestsId, 1);
// start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
InterestResultPolicy policy = null;
// Retrieve the interest type
- int interestType = msg.getPart(1).getInt();
+ int interestType = clientMessage.getPart(1).getInt();
// Retrieve the InterestResultPolicy
try {
- policy = (InterestResultPolicy) msg.getPart(2).getObject();
+ policy = (InterestResultPolicy) clientMessage.getPart(2).getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean isDurable = false;
try {
- Part durablePart = msg.getPart(3);
+ Part durablePart = clientMessage.getPart(3);
byte[] durablePartBytes = (byte[]) durablePart.getObject();
isDurable = durablePartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// region data policy
byte[] regionDataPolicyPartBytes;
boolean serializeValues = false;
try {
- Part regionDataPolicyPart = msg.getPart(msg.getNumberOfParts() - 1);
+ Part regionDataPolicyPart = clientMessage.getPart(clientMessage.getNumberOfParts() - 1);
regionDataPolicyPartBytes = (byte[]) regionDataPolicyPart.getObject();
- if (servConn.getClientVersion().compareTo(Version.GFE_80) >= 0) {
+ if (serverConnection.getClientVersion().compareTo(Version.GFE_80) >= 0) {
// The second byte here is serializeValues
serializeValues = regionDataPolicyPartBytes[1] == (byte) 0x01;
}
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// Retrieve the key
- keyPart = msg.getPart(4);
+ keyPart = clientMessage.getPart(4);
regionName = regionNamePart.getString();
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -128,14 +128,14 @@ public class RegisterInterest61 extends BaseCommand {
// VJR: Check for a sixth part for client version 6.0.3 onwards for the
// time being until refactoring into a new command version.
- if (msg.getNumberOfParts() > 5) {
+ if (clientMessage.getNumberOfParts() > 5) {
try {
- Part notifyPart = msg.getPart(5);
+ Part notifyPart = clientMessage.getPart(5);
byte[] notifyPartBytes = (byte[]) notifyPart.getObject();
sendUpdatesAsInvalidates = notifyPartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -143,7 +143,8 @@ public class RegisterInterest61 extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Received register interest 61 request ({} bytes) from {} for region {} key {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName, key);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key);
}
// test hook to trigger vMotion during register Interest
@@ -164,19 +165,19 @@ public class RegisterInterest61 extends BaseCommand {
message =
LocalizedStrings.RegisterInterest_THE_INPUT_REGION_NAME_FOR_THE_REGISTER_INTEREST_REQUEST_IS_NULL;
}
- logger.warn("{}: {}", servConn.getName(), message.toLocalizedString());
- writeChunkedErrorResponse(msg, MessageType.REGISTER_INTEREST_DATA_ERROR,
- message.toLocalizedString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), message.toLocalizedString());
+ writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR,
+ message.toLocalizedString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// input key not null
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
logger.info(LocalizedMessage.create(
LocalizedStrings.RegisterInterest_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_REQUEST,
- new Object[] {servConn.getName(), regionName}));
+ new Object[] {serverConnection.getName(), regionName}));
// writeChunkedErrorResponse(msg,
// MessageType.REGISTER_INTEREST_DATA_ERROR, message);
// responded = true;
@@ -190,7 +191,7 @@ public class RegisterInterest61 extends BaseCommand {
this.securityService.authorizeRegionRead(regionName, key.toString());
}
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
RegisterInterestOperationContext registerContext =
@@ -198,15 +199,15 @@ public class RegisterInterest61 extends BaseCommand {
key = registerContext.getKey();
}
}
- servConn.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, key,
- servConn.getProxyID(), interestType, isDurable, sendUpdatesAsInvalidates, true,
- regionDataPolicyPartBytes[0], true);
+ serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName,
+ key, serverConnection.getProxyID(), interestType, isDurable, sendUpdatesAsInvalidates,
+ true, regionDataPolicyPartBytes[0], true);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -217,47 +218,47 @@ public class RegisterInterest61 extends BaseCommand {
// DistributionStats.getStatTime() - start);
// start = DistributionStats.getStatTime();
- CacheClientProxy ccp =
- servConn.getAcceptor().getCacheClientNotifier().getClientProxy(servConn.getProxyID());
+ CacheClientProxy ccp = serverConnection.getAcceptor().getCacheClientNotifier()
+ .getClientProxy(serverConnection.getProxyID());
if (ccp == null) {
// fix for 37593
IOException ioex = new IOException(
LocalizedStrings.RegisterInterest_CACHECLIENTPROXY_FOR_THIS_CLIENT_IS_NO_LONGER_ON_THE_SERVER_SO_REGISTERINTEREST_OPERATION_IS_UNSUCCESSFUL
.toLocalizedString());
- writeChunkedException(msg, ioex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, ioex, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean isPrimary = ccp.isPrimary();
- ChunkedMessage chunkedResponseMsg = servConn.getRegisterInterestResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getRegisterInterestResponseMessage();
if (!isPrimary) {
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_SECONDARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
chunkedResponseMsg.setLastChunk(true);
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Sending register interest response chunk from secondary for region: {} for key: {} chunk=<{}>",
- servConn.getName(), regionName, key, chunkedResponseMsg);
+ serverConnection.getName(), regionName, key, chunkedResponseMsg);
}
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
} // !isPrimary
else { // isPrimary
// Send header which describes how many chunks will follow
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_PRIMARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
fillAndSendRegisterInterestResponseChunks(region, key, interestType, serializeValues,
- policy, servConn);
- servConn.setAsTrue(RESPONDED);
+ policy, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn, chunkedResponseMsg);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection, chunkedResponseMsg);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -265,8 +266,8 @@ public class RegisterInterest61 extends BaseCommand {
// logger.debug(getName() + ": Sent chunk (1 of 1) of register interest
// response (" + chunkedResponseMsg.getBufferLength() + " bytes) for
// region " + regionName + " key " + key);
- logger.debug("{}: Sent register interest response for region {} key {}", servConn.getName(),
- regionName, key);
+ logger.debug("{}: Sent register interest response for region {} key {}",
+ serverConnection.getName(), regionName, key);
}
// bserverStats.incLong(writeDestroyResponseTimeId,
// DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
index cd16790..5f5fafa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java
@@ -49,57 +49,57 @@ public class RegisterInterestList extends BaseCommand {
RegisterInterestList() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, numberOfKeysPart = null;
String regionName = null;
Object key = null;
InterestResultPolicy policy;
List keys = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
int numberOfKeys = 0, partNumber = 0;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
- ChunkedMessage chunkedResponseMsg = servConn.getRegisterInterestResponseMessage();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ ChunkedMessage chunkedResponseMsg = serverConnection.getRegisterInterestResponseMessage();
// bserverStats.incLong(readDestroyRequestTimeId,
// DistributionStats.getStatTime() - start);
// bserverStats.incInt(destroyRequestsId, 1);
// start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
// Retrieve the InterestResultPolicy
try {
- policy = (InterestResultPolicy) msg.getPart(1).getObject();
+ policy = (InterestResultPolicy) clientMessage.getPart(1).getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean isDurable = false;
try {
- Part durablePart = msg.getPart(2);
+ Part durablePart = clientMessage.getPart(2);
byte[] durablePartBytes = (byte[]) durablePart.getObject();
isDurable = durablePartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- numberOfKeysPart = msg.getPart(3);
+ numberOfKeysPart = clientMessage.getPart(3);
numberOfKeys = numberOfKeysPart.getInt();
partNumber = 4;
keys = new ArrayList();
for (int i = 0; i < numberOfKeys; i++) {
- keyPart = msg.getPart(partNumber + i);
+ keyPart = clientMessage.getPart(partNumber + i);
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
keys.add(key);
@@ -109,14 +109,14 @@ public class RegisterInterestList extends BaseCommand {
// VJR: Check for an extra part for client version 6.0.3 onwards for the
// time being until refactoring into a new command version.
- if (msg.getNumberOfParts() > (numberOfKeys + partNumber)) {
+ if (clientMessage.getNumberOfParts() > (numberOfKeys + partNumber)) {
try {
- Part notifyPart = msg.getPart(numberOfKeys + partNumber);
+ Part notifyPart = clientMessage.getPart(numberOfKeys + partNumber);
byte[] notifyPartBytes = (byte[]) notifyPart.getObject();
sendUpdatesAsInvalidates = notifyPartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -124,8 +124,8 @@ public class RegisterInterestList extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Received register interest request ({} bytes) from {} for the following {} keys in region {}: {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), numberOfKeys,
- regionName, keys);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), numberOfKeys, regionName, keys);
}
/*
@@ -154,25 +154,26 @@ public class RegisterInterestList extends BaseCommand {
LocalizedStrings.RegisterInterest_THE_INPUT_REGION_NAME_FOR_THE_REGISTER_INTEREST_REQUEST_IS_NULL;
}
String s = errMessage.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), s);
- writeChunkedErrorResponse(msg, MessageType.REGISTER_INTEREST_DATA_ERROR, s, servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), s);
+ writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR, s,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// key not null
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
logger.info(LocalizedMessage.create(
LocalizedStrings.RegisterInterestList_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_LIST_REQUEST,
- new Object[] {servConn.getName(), regionName}));
+ new Object[] {serverConnection.getName(), regionName}));
// writeChunkedErrorResponse(msg,
// MessageType.REGISTER_INTEREST_DATA_ERROR, message);
// responded = true;
} // else { // region not null
try {
this.securityService.authorizeRegionRead(regionName);
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
RegisterInterestOperationContext registerContext =
@@ -181,14 +182,14 @@ public class RegisterInterestList extends BaseCommand {
}
}
// Register interest
- servConn.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, keys,
- servConn.getProxyID(), isDurable, sendUpdatesAsInvalidates, false, 0, true);
+ serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName,
+ keys, serverConnection.getProxyID(), isDurable, sendUpdatesAsInvalidates, false, 0, true);
} catch (Exception ex) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ex);
+ checkForInterrupt(serverConnection, ex);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, ex, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -197,36 +198,37 @@ public class RegisterInterestList extends BaseCommand {
// DistributionStats.getStatTime() - start);
// start = DistributionStats.getStatTime();
- boolean isPrimary = servConn.getAcceptor().getCacheClientNotifier()
- .getClientProxy(servConn.getProxyID()).isPrimary();
+ boolean isPrimary = serverConnection.getAcceptor().getCacheClientNotifier()
+ .getClientProxy(serverConnection.getProxyID()).isPrimary();
if (!isPrimary) {
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_SECONDARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
chunkedResponseMsg.setLastChunk(true);
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Sending register interest response chunk from secondary for region: {} for key: {} chunk=<{}>",
- servConn.getName(), regionName, key, chunkedResponseMsg);
+ serverConnection.getName(), regionName, key, chunkedResponseMsg);
}
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
} else { // isPrimary
// Send header which describes how many chunks will follow
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_PRIMARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
- fillAndSendRegisterInterestResponseChunks(region, keys, InterestType.KEY, policy, servConn);
- servConn.setAsTrue(RESPONDED);
+ fillAndSendRegisterInterestResponseChunks(region, keys, InterestType.KEY, policy,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// otherwise send the exception back to client
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -236,7 +238,7 @@ public class RegisterInterestList extends BaseCommand {
// region " + regionName + " key " + key);
logger.debug(
"{}: Sent register interest response for the following {} keys in region {}: {}",
- servConn.getName(), numberOfKeys, regionName, keys);
+ serverConnection.getName(), numberOfKeys, regionName, keys);
}
// bserverStats.incLong(writeDestroyResponseTimeId,
// DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
index 6e006ca..40a3c25 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java
@@ -49,67 +49,67 @@ public class RegisterInterestList61 extends BaseCommand {
RegisterInterestList61() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, numberOfKeysPart = null;
String regionName = null;
Object key = null;
InterestResultPolicy policy;
List keys = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
int numberOfKeys = 0, partNumber = 0;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
- ChunkedMessage chunkedResponseMsg = servConn.getRegisterInterestResponseMessage();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ ChunkedMessage chunkedResponseMsg = serverConnection.getRegisterInterestResponseMessage();
// bserverStats.incLong(readDestroyRequestTimeId,
// DistributionStats.getStatTime() - start);
// bserverStats.incInt(destroyRequestsId, 1);
// start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
// Retrieve the InterestResultPolicy
try {
- policy = (InterestResultPolicy) msg.getPart(1).getObject();
+ policy = (InterestResultPolicy) clientMessage.getPart(1).getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean isDurable = false;
try {
- Part durablePart = msg.getPart(2);
+ Part durablePart = clientMessage.getPart(2);
byte[] durablePartBytes = (byte[]) durablePart.getObject();
isDurable = durablePartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// region data policy
byte[] regionDataPolicyPartBytes;
try {
- Part regionDataPolicyPart = msg.getPart(msg.getNumberOfParts() - 1);
+ Part regionDataPolicyPart = clientMessage.getPart(clientMessage.getNumberOfParts() - 1);
regionDataPolicyPartBytes = (byte[]) regionDataPolicyPart.getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- numberOfKeysPart = msg.getPart(3);
+ numberOfKeysPart = clientMessage.getPart(3);
numberOfKeys = numberOfKeysPart.getInt();
partNumber = 4;
keys = new ArrayList();
for (int i = 0; i < numberOfKeys; i++) {
- keyPart = msg.getPart(partNumber + i);
+ keyPart = clientMessage.getPart(partNumber + i);
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
keys.add(key);
@@ -119,14 +119,14 @@ public class RegisterInterestList61 extends BaseCommand {
// VJR: Check for an extra part for client version 6.0.3 onwards for the
// time being until refactoring into a new command version.
- if (msg.getNumberOfParts() > (numberOfKeys + partNumber)) {
+ if (clientMessage.getNumberOfParts() > (numberOfKeys + partNumber)) {
try {
- Part notifyPart = msg.getPart(numberOfKeys + partNumber);
+ Part notifyPart = clientMessage.getPart(numberOfKeys + partNumber);
byte[] notifyPartBytes = (byte[]) notifyPart.getObject();
sendUpdatesAsInvalidates = notifyPartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -134,8 +134,8 @@ public class RegisterInterestList61 extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Received register interest 61 request ({} bytes) from {} for the following {} keys in region {}: {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), numberOfKeys,
- regionName, keys);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), numberOfKeys, regionName, keys);
}
/*
@@ -164,25 +164,26 @@ public class RegisterInterestList61 extends BaseCommand {
LocalizedStrings.RegisterInterest_THE_INPUT_REGION_NAME_FOR_THE_REGISTER_INTEREST_REQUEST_IS_NULL;
}
String s = errMessage.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), s);
- writeChunkedErrorResponse(msg, MessageType.REGISTER_INTEREST_DATA_ERROR, s, servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), s);
+ writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR, s,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
logger.info(LocalizedMessage.create(
LocalizedStrings.RegisterInterestList_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_LIST_REQUEST,
- new Object[] {servConn.getName(), regionName}));
+ new Object[] {serverConnection.getName(), regionName}));
// writeChunkedErrorResponse(msg,
// MessageType.REGISTER_INTEREST_DATA_ERROR, message);
// responded = true;
} // else { // region not null
try {
this.securityService.authorizeRegionRead(regionName);
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
RegisterInterestOperationContext registerContext =
@@ -191,15 +192,15 @@ public class RegisterInterestList61 extends BaseCommand {
}
}
// Register interest
- servConn.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, keys,
- servConn.getProxyID(), isDurable, sendUpdatesAsInvalidates, true,
+ serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName,
+ keys, serverConnection.getProxyID(), isDurable, sendUpdatesAsInvalidates, true,
regionDataPolicyPartBytes[0], true);
} catch (Exception ex) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ex);
+ checkForInterrupt(serverConnection, ex);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, ex, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -208,36 +209,37 @@ public class RegisterInterestList61 extends BaseCommand {
// DistributionStats.getStatTime() - start);
// start = DistributionStats.getStatTime();
- boolean isPrimary = servConn.getAcceptor().getCacheClientNotifier()
- .getClientProxy(servConn.getProxyID()).isPrimary();
+ boolean isPrimary = serverConnection.getAcceptor().getCacheClientNotifier()
+ .getClientProxy(serverConnection.getProxyID()).isPrimary();
if (!isPrimary) {
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_SECONDARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
chunkedResponseMsg.setLastChunk(true);
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Sending register interest response chunk from secondary for region: {} for key: {} chunk=<{}>",
- servConn.getName(), regionName, key, chunkedResponseMsg);
+ serverConnection.getName(), regionName, key, chunkedResponseMsg);
}
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
} else { // isPrimary
// Send header which describes how many chunks will follow
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_PRIMARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
- fillAndSendRegisterInterestResponseChunks(region, keys, InterestType.KEY, policy, servConn);
- servConn.setAsTrue(RESPONDED);
+ fillAndSendRegisterInterestResponseChunks(region, keys, InterestType.KEY, policy,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// otherwise send the exception back to client
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -247,7 +249,7 @@ public class RegisterInterestList61 extends BaseCommand {
// region " + regionName + " key " + key);
logger.debug(
"{}: Sent register interest response for the following {} keys in region {}: {}",
- servConn.getName(), numberOfKeys, regionName, keys);
+ serverConnection.getName(), numberOfKeys, regionName, keys);
}
// bserverStats.incLong(writeDestroyResponseTimeId,
// DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
index 8a61364..6a2ad95 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
@@ -55,88 +55,88 @@ public class RegisterInterestList66 extends BaseCommand {
RegisterInterestList66() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null;// numberOfKeysPart = null;
String regionName = null;
Object key = null;
InterestResultPolicy policy;
List keys = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
int numberOfKeys = 0, partNumber = 0;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
- ChunkedMessage chunkedResponseMsg = servConn.getRegisterInterestResponseMessage();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ ChunkedMessage chunkedResponseMsg = serverConnection.getRegisterInterestResponseMessage();
// bserverStats.incLong(readDestroyRequestTimeId,
// DistributionStats.getStatTime() - start);
// bserverStats.incInt(destroyRequestsId, 1);
// start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
// Retrieve the InterestResultPolicy
try {
- policy = (InterestResultPolicy) msg.getPart(1).getObject();
+ policy = (InterestResultPolicy) clientMessage.getPart(1).getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean isDurable = false;
try {
- Part durablePart = msg.getPart(2);
+ Part durablePart = clientMessage.getPart(2);
byte[] durablePartBytes = (byte[]) durablePart.getObject();
isDurable = durablePartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// region data policy
byte[] regionDataPolicyPartBytes;
boolean serializeValues = false;
try {
- Part regionDataPolicyPart = msg.getPart(msg.getNumberOfParts() - 1);
+ Part regionDataPolicyPart = clientMessage.getPart(clientMessage.getNumberOfParts() - 1);
regionDataPolicyPartBytes = (byte[]) regionDataPolicyPart.getObject();
- if (servConn.getClientVersion().compareTo(Version.GFE_80) >= 0) {
+ if (serverConnection.getClientVersion().compareTo(Version.GFE_80) >= 0) {
// The second byte here is serializeValues
serializeValues = regionDataPolicyPartBytes[1] == (byte) 0x01;
}
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
partNumber = 3;
- Part list = msg.getPart(partNumber);
+ Part list = clientMessage.getPart(partNumber);
try {
keys = (List) list.getObject();
numberOfKeys = keys.size();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean sendUpdatesAsInvalidates = false;
try {
- Part notifyPart = msg.getPart(partNumber + 1);
+ Part notifyPart = clientMessage.getPart(partNumber + 1);
byte[] notifyPartBytes = (byte[]) notifyPart.getObject();
sendUpdatesAsInvalidates = notifyPartBytes[0] == 0x01;
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Received register interest 66 request ({} bytes) from {} for the following {} keys in region {}: {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), numberOfKeys,
- regionName, keys);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), numberOfKeys, regionName, keys);
}
/*
@@ -165,24 +165,25 @@ public class RegisterInterestList66 extends BaseCommand {
LocalizedStrings.RegisterInterest_THE_INPUT_REGION_NAME_FOR_THE_REGISTER_INTEREST_REQUEST_IS_NULL;
}
String s = errMessage.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), s);
- writeChunkedErrorResponse(msg, MessageType.REGISTER_INTEREST_DATA_ERROR, s, servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), s);
+ writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR, s,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
// key not null
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
logger.info(LocalizedMessage.create(
LocalizedStrings.RegisterInterestList_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_LIST_REQUEST,
- new Object[] {servConn.getName(), regionName}));
+ new Object[] {serverConnection.getName(), regionName}));
// writeChunkedErrorResponse(msg,
// MessageType.REGISTER_INTEREST_DATA_ERROR, message);
// responded = true;
} // else { // region not null
try {
this.securityService.authorizeRegionRead(regionName);
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (!DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
RegisterInterestOperationContext registerContext =
@@ -191,15 +192,15 @@ public class RegisterInterestList66 extends BaseCommand {
}
}
// Register interest
- servConn.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, keys,
- servConn.getProxyID(), isDurable, sendUpdatesAsInvalidates, true,
+ serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName,
+ keys, serverConnection.getProxyID(), isDurable, sendUpdatesAsInvalidates, true,
regionDataPolicyPartBytes[0], true);
} catch (Exception ex) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ex);
+ checkForInterrupt(serverConnection, ex);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, ex, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -208,37 +209,37 @@ public class RegisterInterestList66 extends BaseCommand {
// DistributionStats.getStatTime() - start);
// start = DistributionStats.getStatTime();
- boolean isPrimary = servConn.getAcceptor().getCacheClientNotifier()
- .getClientProxy(servConn.getProxyID()).isPrimary();
+ boolean isPrimary = serverConnection.getAcceptor().getCacheClientNotifier()
+ .getClientProxy(serverConnection.getProxyID()).isPrimary();
if (!isPrimary) {
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_SECONDARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
chunkedResponseMsg.setLastChunk(true);
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Sending register interest response chunk from secondary for region: {} for key: {} chunk=<{}>",
- servConn.getName(), regionName, key, chunkedResponseMsg);
+ serverConnection.getName(), regionName, key, chunkedResponseMsg);
}
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
} else { // isPrimary
// Send header which describes how many chunks will follow
chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_PRIMARY);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
fillAndSendRegisterInterestResponseChunks(region, keys, InterestType.KEY, serializeValues,
- policy, servConn);
- servConn.setAsTrue(RESPONDED);
+ policy, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// otherwise send the exception back to client
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -248,7 +249,7 @@ public class RegisterInterestList66 extends BaseCommand {
// region " + regionName + " key " + key);
logger.debug(
"{}: Sent register interest response for the following {} keys in region {}: {}",
- servConn.getName(), numberOfKeys, regionName, keys);
+ serverConnection.getName(), numberOfKeys, regionName, keys);
}
// bserverStats.incLong(writeDestroyResponseTimeId,
// DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
index 88386a1..a295c54 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java
@@ -61,7 +61,7 @@ public class RemoveAll extends BaseCommand {
protected RemoveAll() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long startp)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startp)
throws IOException, InterruptedException {
long start = startp; // copy this since we need to modify it
Part regionNamePart = null, numberOfKeysPart = null, keyPart = null;
@@ -73,11 +73,11 @@ public class RemoveAll extends BaseCommand {
VersionedObjectList response = null;
StringBuffer errMessage = new StringBuffer();
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
{
long oldStart = start;
start = DistributionStats.getStatTime();
@@ -87,7 +87,7 @@ public class RemoveAll extends BaseCommand {
try {
// Retrieve the data from the message parts
// part 0: region name
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
if (regionName == null) {
@@ -95,45 +95,47 @@ public class RemoveAll extends BaseCommand {
LocalizedStrings.RemoveAll_THE_INPUT_REGION_NAME_FOR_THE_REMOVEALL_REQUEST_IS_NULL
.toLocalizedString();
logger.warn(LocalizedMessage.create(LocalizedStrings.TWO_ARG_COLON,
- new Object[] {servConn.getName(), txt}));
+ new Object[] {serverConnection.getName(), txt}));
errMessage.append(txt);
- writeChunkedErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = " was not found during removeAll request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// part 1: eventID
- eventPart = msg.getPart(1);
+ eventPart = clientMessage.getPart(1);
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
Breadcrumbs.setEventId(eventId);
// part 2: flags
- int flags = msg.getPart(2).getInt();
+ int flags = clientMessage.getPart(2).getInt();
boolean clientIsEmpty = (flags & PutAllOp.FLAG_EMPTY) != 0;
boolean clientHasCCEnabled = (flags & PutAllOp.FLAG_CONCURRENCY_CHECKS) != 0;
// part 3: callbackArg
- Object callbackArg = msg.getPart(3).getObject();
+ Object callbackArg = clientMessage.getPart(3).getObject();
// part 4: number of keys
- numberOfKeysPart = msg.getPart(4);
+ numberOfKeysPart = clientMessage.getPart(4);
numberOfKeys = numberOfKeysPart.getInt();
if (logger.isDebugEnabled()) {
StringBuilder buffer = new StringBuilder();
- buffer.append(servConn.getName()).append(": Received removeAll request from ")
- .append(servConn.getSocketString()).append(" for region ").append(regionName)
+ buffer.append(serverConnection.getName()).append(": Received removeAll request from ")
+ .append(serverConnection.getSocketString()).append(" for region ").append(regionName)
.append(callbackArg != null ? (" callbackArg " + callbackArg) : "").append(" with ")
.append(numberOfKeys).append(" keys.");
logger.debug(buffer);
@@ -141,21 +143,21 @@ public class RemoveAll extends BaseCommand {
ArrayList<Object> keys = new ArrayList<Object>(numberOfKeys);
ArrayList<VersionTag> retryVersions = new ArrayList<VersionTag>(numberOfKeys);
for (int i = 0; i < numberOfKeys; i++) {
- keyPart = msg.getPart(5 + i);
+ keyPart = clientMessage.getPart(5 + i);
key = keyPart.getStringOrObject();
if (key == null) {
String txt =
LocalizedStrings.RemoveAll_ONE_OF_THE_INPUT_KEYS_FOR_THE_REMOVEALL_REQUEST_IS_NULL
.toLocalizedString();
logger.warn(LocalizedMessage.create(LocalizedStrings.TWO_ARG_COLON,
- new Object[] {servConn.getName(), txt}));
+ new Object[] {serverConnection.getName(), txt}));
errMessage.append(txt);
- writeChunkedErrorResponse(msg, MessageType.PUT_DATA_ERROR, errMessage.toString(),
- servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- if (msg.isRetry()) {
+ if (clientMessage.isRetry()) {
// Constuct the thread id/sequence id information for this element of the bulk op
// The sequence id is constructed from the base sequence id and the offset
@@ -181,15 +183,16 @@ public class RemoveAll extends BaseCommand {
keys.add(key);
} // for
- if (msg.getNumberOfParts() == (5 + numberOfKeys + 1)) {// it means optional timeout has been
- // added
- int timeout = msg.getPart(5 + numberOfKeys).getInt();
- servConn.setRequestSpecificTimeout(timeout);
+ if (clientMessage.getNumberOfParts() == (5 + numberOfKeys + 1)) {// it means optional timeout
+ // has been
+ // added
+ int timeout = clientMessage.getPart(5 + numberOfKeys).getInt();
+ serverConnection.setRequestSpecificTimeout(timeout);
}
this.securityService.authorizeRegionWrite(regionName);
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
authzRequest.createRegionAuthorize(regionName);
@@ -200,8 +203,8 @@ public class RemoveAll extends BaseCommand {
}
}
- response = region.basicBridgeRemoveAll(keys, retryVersions, servConn.getProxyID(), eventId,
- callbackArg);
+ response = region.basicBridgeRemoveAll(keys, retryVersions, serverConnection.getProxyID(),
+ eventId, callbackArg);
if (!region.getConcurrencyChecksEnabled() || clientIsEmpty || !clientHasCCEnabled) {
// the client only needs this if versioning is being used and the client
// has storage
@@ -216,33 +219,34 @@ public class RemoveAll extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeReplyWithRefreshMetadata(msg, response, servConn, pr, pr.getNetworkHopType());
+ writeReplyWithRefreshMetadata(clientMessage, response, serverConnection, pr,
+ pr.getNetworkHopType());
pr.clearNetworkHopData();
replyWithMetaData = true;
}
}
} catch (RegionDestroyedException rde) {
- writeChunkedException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, rde, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (ResourceException re) {
- writeChunkedException(msg, re, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, re, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (PutAllPartialResultException pre) {
- writeChunkedException(msg, pre, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, pre, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (Exception ce) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, ce);
+ checkForInterrupt(serverConnection, ce);
// If an exception occurs during the op, preserve the connection
- writeChunkedException(msg, ce, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, ce, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
// if (logger.fineEnabled()) {
logger.warn(LocalizedMessage.create(LocalizedStrings.Generic_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), ce);
+ serverConnection.getName()), ce);
// }
return;
} finally {
@@ -251,20 +255,21 @@ public class RemoveAll extends BaseCommand {
stats.incProcessRemoveAllTime(start - oldStart);
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending removeAll response back to {} for region {}{}", servConn.getName(),
- servConn.getSocketString(), regionName, (logger.isTraceEnabled() ? ": " + response : ""));
+ logger.debug("{}: Sending removeAll response back to {} for region {}{}",
+ serverConnection.getName(), serverConnection.getSocketString(), regionName,
+ (logger.isTraceEnabled() ? ": " + response : ""));
}
// Increment statistics and write the reply
if (!replyWithMetaData) {
- writeReply(msg, response, servConn);
+ writeReply(clientMessage, response, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
stats.incWriteRemoveAllResponseTime(DistributionStats.getStatTime() - start);
}
@Override
- protected void writeReply(Message origMsg, ServerConnection servConn) throws IOException {
+ protected void writeReply(Message origMsg, ServerConnection serverConnection) throws IOException {
throw new UnsupportedOperationException();
}
@@ -285,7 +290,7 @@ public class RemoveAll extends BaseCommand {
}
replyMsg.sendHeader();
if (listSize > 0) {
- int chunkSize = 2 * maximumChunkSize;
+ int chunkSize = 2 * MAXIMUM_CHUNK_SIZE;
// Chunker will stream over the list in its toData method
VersionedObjectList.Chunker chunk =
new VersionedObjectList.Chunker(response, chunkSize, false, false);
@@ -317,7 +322,7 @@ public class RemoveAll extends BaseCommand {
}
@Override
- protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection servConn,
+ protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection serverConnection,
PartitionedRegion pr, byte nwHop) throws IOException {
throw new UnsupportedOperationException();
}
@@ -345,7 +350,7 @@ public class RemoveAll extends BaseCommand {
replyMsg.setLastChunk(false);
replyMsg.sendChunk(servConn);
- int chunkSize = 2 * maximumChunkSize; // maximumChunkSize
+ int chunkSize = 2 * MAXIMUM_CHUNK_SIZE; // MAXIMUM_CHUNK_SIZE
// Chunker will stream over the list in its toData method
VersionedObjectList.Chunker chunk =
new VersionedObjectList.Chunker(response, chunkSize, false, false);
@@ -371,7 +376,7 @@ public class RemoveAll extends BaseCommand {
}
pr.getPrStats().incPRMetaDataSentCount();
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADAT tx: {}", servConn.getName(),
+ logger.trace("{}: rpl with REFRESH_METADATA tx: {}", servConn.getName(),
origMsg.getTransactionId());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
index 42a5bec..cc42e0d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
@@ -33,9 +33,9 @@ public class RemoveUserAuth extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, ClassNotFoundException, InterruptedException {
- boolean isSecureMode = msg.isSecureMode();
+ boolean isSecureMode = clientMessage.isSecureMode();
if (!isSecureMode) {
// need to throw exception
@@ -43,29 +43,29 @@ public class RemoveUserAuth extends BaseCommand {
}
try {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- Part keepalivePart = msg.getPart(0);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ Part keepalivePart = clientMessage.getPart(0);
byte[] keepaliveByte = keepalivePart.getSerializedForm();
boolean keepalive = (keepaliveByte == null || keepaliveByte[0] == 0) ? false : true;
- servConn.getSecurityLogWriter().fine("remove user auth keep alive " + keepalive);
- servConn.removeUserAuth(msg, keepalive);
- writeReply(msg, servConn);
+ serverConnection.getSecurityLogWriter().fine("remove user auth keep alive " + keepalive);
+ serverConnection.removeUserAuth(clientMessage, keepalive);
+ writeReply(clientMessage, serverConnection);
} catch (GemFireSecurityException gfse) {
- if (servConn.getSecurityLogWriter().warningEnabled()) {
- servConn.getSecurityLogWriter().warning(LocalizedStrings.ONE_ARG,
- servConn.getName() + ": Security exception: " + gfse.getMessage());
+ if (serverConnection.getSecurityLogWriter().warningEnabled()) {
+ serverConnection.getSecurityLogWriter().warning(LocalizedStrings.ONE_ARG,
+ serverConnection.getName() + ": Security exception: " + gfse.getMessage());
}
- writeException(msg, gfse, false, servConn);
+ writeException(clientMessage, gfse, false, serverConnection);
} catch (Exception ex) {
// TODO Auto-generated catch block
- if (servConn.getLogWriter().warningEnabled()) {
- servConn.getLogWriter().warning(
+ if (serverConnection.getLogWriter().warningEnabled()) {
+ serverConnection.getLogWriter().warning(
LocalizedStrings.CacheClientNotifier_AN_EXCEPTION_WAS_THROWN_FOR_CLIENT_0_1,
- new Object[] {servConn.getProxyID(), ""}, ex);
+ new Object[] {serverConnection.getProxyID(), ""}, ex);
}
- writeException(msg, ex, false, servConn);
+ writeException(clientMessage, ex, false, serverConnection);
} finally {
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
}
[14/35] geode git commit: GEODE-2967: Fixing a test change
Posted by kl...@apache.org.
GEODE-2967: Fixing a test change
* A query was modified in a test that was not intended to be changed.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a416a325
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a416a325
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a416a325
Branch: refs/heads/feature/GEODE-2632-19
Commit: a416a3256049210f11bc7bd6bbb1513a220a3550
Parents: 64e4f72
Author: nabarun <nn...@pivotal.io>
Authored: Tue May 30 14:40:12 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Wed May 31 11:12:41 2017 -0700
----------------------------------------------------------------------
.../apache/geode/cache/query/internal/index/IndexUseJUnitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a416a325/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
index 9c8756c..a96a96d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
@@ -1383,7 +1383,7 @@ public class IndexUseJUnitTest {
@Test
public void testIndexUseSelfJoin() throws Exception {
- String[] queries = {"SELECT DISTINCT * FROM /pos p1, /pos p2 where p1.status = p1.status",
+ String[] queries = {"SELECT DISTINCT * FROM /pos p1, /pos p2 where p1.status = p2.status",
"SELECT DISTINCT * FROM /pos p1, /pos p2 where p1.ID = p2.ID",
"SELECT DISTINCT * FROM /pos p1, /pos p2 where p1.P1.secId = p2.P1.secId",
"SELECT DISTINCT * FROM /pos p1, /pos p2 where p1.status = p2.status and p1.status = 'active'",
[13/35] geode git commit: GEODE-3002 Clarify __REGION_VALUE_FIELD in
Lucene docs
Posted by kl...@apache.org.
GEODE-3002 Clarify __REGION_VALUE_FIELD in Lucene docs
This closes #550
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/64e4f727
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/64e4f727
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/64e4f727
Branch: refs/heads/feature/GEODE-2632-19
Commit: 64e4f72774e1ee811ea7f920fcb9a9598191bd4a
Parents: 5f4a797
Author: Karen Miller <km...@pivotal.io>
Authored: Tue May 30 13:39:00 2017 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Wed May 31 10:48:49 2017 -0700
----------------------------------------------------------------------
.../gfsh/command-pages/create.html.md.erb | 15 +++++------
.../gfsh/command-pages/search.html.md.erb | 26 ++++++++++----------
.../lucene_integration.html.md.erb | 10 +++++---
3 files changed, 27 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/64e4f727/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
index ef68f90..1f63ead 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
@@ -674,7 +674,8 @@ See also [describe lucene index](describe.html#describe_lucene_index), [destroy
**Syntax:**
``` pre
-create lucene index --name=value --region=value --field=value(,value)* [--analyzer=value(,value)*] [--group=value(,value)*]
+create lucene index --name=value --region=value --field=value(,value)*
+ [--analyzer=value(,value)*] [--group=value(,value)*]
```
**Parameters, create lucene index:**
@@ -691,20 +692,20 @@ create lucene index --name=value --region=value --field=value(,value)* [--analyz
**Example Commands:**
``` pre
-gfsh>create region --name=Person --type=PARTITION_REDUNDANT_PERSISTENT
-
-gfsh>create lucene index --name=customerIndex --region=/Customer
- --field=symbol,revenue,SSN,name,email,address,__REGION_VALUE_FIELD
+create lucene index --name=customerIndex --region=/Customer
+ --field=__REGION_VALUE_FIELD
gfsh>create lucene index --name=analyzerIndex --region=/Person
--field=name,email,address,revenue
- --analyzer=DEFAULT,org.apache.lucene.analysis.core.KeywordAnalyzer,examples.MyCharacterAnalyzer,DEFAULT
+ --analyzer=DEFAULT,org.apache.lucene.analysis.core.KeywordAnalyzer,
+ examples.MyCharacterAnalyzer,DEFAULT
```
**Sample Output:**
``` pre
-gfsh>create lucene index --name=testIndex --region=testRegion --field=__REGION_VALUE_FIELD
+gfsh>create lucene index --name=testIndex --region=testRegion
+ --field=__REGION_VALUE_FIELD
Member | Status
-------------------------------------- | ---------------------------------
192.168.1.23(server505:17200)<v1>:1025 | Successfully created lucene index
http://git-wip-us.apache.org/repos/asf/geode/blob/64e4f727/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb
index 1c63ecf..085f3a3 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb
@@ -52,22 +52,22 @@ search lucene --name=value --region=value --queryStrings=value --defaultField=va
<tbody>
<tr>
<td><span class="keyword parmname">\-\-name</span></td>
-<td><em>Required</em>. Name of the lucene index to search.</td>
+<td><em>Required</em>. Name of the Lucene index to search.</td>
<td> </td>
</tr>
<tr>
<td><span class="keyword parmname">\-\-region</span></td>
-<td><em>Required</em>. Name/Path of the region where the lucene index exists.</td>
+<td><em>Required</em>. Name/Path of the region where the Lucene index exists.</td>
<td> </td>
</tr>
<tr>
<td><span class="keyword parmname" style="whitespace:nowrap;">‑‐queryStrings</span></td>
-<td><em>Required</em>. Query string to search the lucene index. Surround a string with double quote marks to do an exact match of the string.</td>
+<td><em>Required</em>. Query string to search the Lucene index. Use <code>__REGION_VALUE_FIELD</code> as the field name within the query string when the field is a primitive value. Surround a string with double quote marks to do an exact match of the string.</td>
<td> </td>
</tr>
<tr>
<td><span class="keyword parmname" style="whitespace:nowrap;">‑‐defaultField</span></td>
-<td><em>Required</em>. Default field to search in.</td>
+<td><em>Required</em>. Default field to search in. <code>__REGION_VALUE_FIELD</code> identifies the field as a primitive value.</td>
<td> </td>
</tr>
<tr>
@@ -85,7 +85,7 @@ search lucene --name=value --region=value --queryStrings=value --defaultField=va
``` pre
gfsh> search lucene --name=testIndex --region=/testRegion --queryStrings=value1
- --defaultField=__REGION_VALUE_FIELD
+ --defaultField=__REGION_VALUE_FIELD
gfsh> search lucene --name=indexOfStrings --region=/stringTestRegion
@@ -97,20 +97,20 @@ gfsh> search lucene --name=indexOfStrings --region=/stringTestRegion
``` pre
gfsh>search lucene --name=testIndex --region=/testRegion --queryStrings=value*
- --defaultField=__REGION_VALUE_FIELD
+ --defaultField=__REGION_VALUE_FIELD
key | value | score
--- | ------ | -----
3 | value3 | 1
2 | value2 | 1
1 | value1 | 1
+```
-gfsh>search lucene --region=/Person --name=analyzerIndex --defaultField=address
- --queryStrings="97763"
- key | value | score
------- | --------------------------------------------------------------------------------------------------------- | ---------
-key763 | Person{name='Fred Freeloader', email='ffl@example.com', address='763 Miles Dv, Portland_OR_97763', re.. | 1.6694657
-
-
+``` pre
+gfsh>search lucene --region=/Person --name=analyzerIndex
+ --defaultField=addr --queryStrings="97763"
+ key | value | score
+------ | ------------------------------------------------------------------ | --------
+key763 | Person{name='Kris Cat', addr='7 Ash St, Portland_OR_97763', emai.. | 1.669657
```
http://git-wip-us.apache.org/repos/asf/geode/blob/64e4f727/geode-docs/tools_modules/lucene_integration.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/lucene_integration.html.md.erb b/geode-docs/tools_modules/lucene_integration.html.md.erb
index 41d429b..457fff7 100644
--- a/geode-docs/tools_modules/lucene_integration.html.md.erb
+++ b/geode-docs/tools_modules/lucene_integration.html.md.erb
@@ -94,10 +94,12 @@ gfsh>create lucene index --name=indexName --region=/orders --field=customer,tags
gfsh>create lucene index --name=indexName --region=/orders
--field=customer,tags --analyzer=DEFAULT,org.apache.lucene.analysis.bg.BulgarianAnalyzer
```
-To use the entire value as a single field set the required `--field`
-option to be `__REGION_VALUE_FIELD`.
-This is only supported when the region entry value is a `String`, `Long`,
-`Integer`, `Float`, or `Double`.
+The value `__REGION_VALUE_FIELD` identifies when the
+field is a single primitive type.
+Use it to define the `--field` option,
+as there will be no field name to use in the case of a primitive type.
+`__REGION_VALUE_FIELD` supports entry values of type `String`, `Long`,
+`Integer`, `Float`, and `Double`.
### <a id="xml-configuration" class="no-quick-link"></a>XML Configuration to Create an Index
[15/35] geode git commit: GEODE-2994 Take backups when region ops are
quiescent
Posted by kl...@apache.org.
GEODE-2994 Take backups when region ops are quiescent
This closes #544
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c1288ac8
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c1288ac8
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c1288ac8
Branch: refs/heads/feature/GEODE-2632-19
Commit: c1288ac87f1cdee0e34441ab181eeb0506ad4554
Parents: a416a32
Author: Karen Miller <km...@pivotal.io>
Authored: Fri May 26 10:29:29 2017 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Wed May 31 15:01:08 2017 -0700
----------------------------------------------------------------------
.../disk_storage/backup_restore_disk_store.html.md.erb | 10 ++++++++++
.../tools_modules/lucene_integration.html.md.erb | 13 ++++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/c1288ac8/geode-docs/managing/disk_storage/backup_restore_disk_store.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/managing/disk_storage/backup_restore_disk_store.html.md.erb b/geode-docs/managing/disk_storage/backup_restore_disk_store.html.md.erb
index 123ae31..deb942b 100644
--- a/geode-docs/managing/disk_storage/backup_restore_disk_store.html.md.erb
+++ b/geode-docs/managing/disk_storage/backup_restore_disk_store.html.md.erb
@@ -38,6 +38,16 @@ Do not try to create backup files from a running system by using your operating
**Preparing to Make a Backup**
- Consider compacting your disk store before making a backup. If auto-compaction is turned off, you may want to do a manual compaction to save on the quantity of data copied over the network by the backup. For more information on configuring a manual compaction, see [Manual Compaction](compacting_disk_stores.html#compacting_disk_stores__li_63CF8C35153D4173AADF7DC35FEC61F9).
+- Take the backup when region operations are quiescent,
+to avoid the possibility of an inconsistency between region data and
+an asynchronous event queue (AEQ) or a WAN Gateway sender
+(which uses a persistent queue).
+A region operation that causes a persisted write to a region
+involves a disk operation.
+The associated queue operation also causes a disk operation.
+These two disk operations are not made atomically,
+so if a backup is made between the two disk operations,
+then the backup represents inconsistent data in the region and the queue.
- Run the backup during a period of low activity in your system. The backup does not block system activities, but it uses file system resources on all hosts in your distributed system, and it can affect performance.
- Configure each member with any additional files or directories to be backed up by modifying the member's `cache.xml` file. Additional items that ought to be included in the backup:
http://git-wip-us.apache.org/repos/asf/geode/blob/c1288ac8/geode-docs/tools_modules/lucene_integration.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/lucene_integration.html.md.erb b/geode-docs/tools_modules/lucene_integration.html.md.erb
index 457fff7..2788338 100644
--- a/geode-docs/tools_modules/lucene_integration.html.md.erb
+++ b/geode-docs/tools_modules/lucene_integration.html.md.erb
@@ -296,8 +296,11 @@ will return `object_2`.
will return `object_3`.
- Backups should only be made for regions with Lucene indexes
when there are no puts, updates, or deletes in progress.
-Incremental backups will not be consistent for the region and
-its index upon restart if these operations were in progress,
-due to the delayed processing associated with the asynchronous event queue.
-If region data needs to be restored from a backup,
-follow the same procedure as given for changing an index.
+A backup might cause an inconsistency between region data and a Lucene index.
+Both the region operation and the associated index operation
+cause disk operations,
+yet those disk operations are not done atomically.
+Therefore, if a backup were taken between
+the persisted write to a region
+and the resulting persisted write to the Lucene index,
+then the backup represents inconsistent data in the region and Lucene index.
[30/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
GEODE-2632: refactoring preparations for SecurityService and BaseCommand changes
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d1ec508e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d1ec508e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d1ec508e
Branch: refs/heads/feature/GEODE-2632-19
Commit: d1ec508ee628f75d1f26dbfd6db5a237745623b5
Parents: f7e1ba2
Author: Kirk Lund <kl...@apache.org>
Authored: Thu May 18 13:28:38 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 31 16:11:34 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/geode/GemFireException.java | 94 +-
.../java/org/apache/geode/Instantiator.java | 143 +-
.../org/apache/geode/cache/CacheException.java | 14 +-
.../geode/cache/CacheRuntimeException.java | 17 +-
.../geode/cache/client/internal/AbstractOp.java | 2 +-
.../geode/cache/client/internal/PingOp.java | 10 +-
.../org/apache/geode/internal/DSFIDFactory.java | 2 +-
.../geode/internal/cache/PartitionedRegion.java | 3 +-
.../internal/cache/tier/CachedRegionHelper.java | 18 +-
.../geode/internal/cache/tier/Command.java | 17 +-
.../cache/tier/sockets/BaseCommand.java | 762 +++---
.../cache/tier/sockets/BaseCommandQuery.java | 20 +-
.../cache/tier/sockets/CacheClientNotifier.java | 112 +-
.../cache/tier/sockets/CacheClientProxy.java | 4 +-
.../cache/tier/sockets/CacheClientUpdater.java | 867 ++++---
.../cache/tier/sockets/ChunkedMessage.java | 21 +-
.../internal/cache/tier/sockets/Message.java | 581 ++---
.../cache/tier/sockets/ServerConnection.java | 68 +-
.../ServerInterestRegistrationMessage.java | 121 +
.../cache/tier/sockets/command/AddPdxEnum.java | 23 +-
.../cache/tier/sockets/command/AddPdxType.java | 23 +-
.../cache/tier/sockets/command/ClearRegion.java | 56 +-
.../cache/tier/sockets/command/ClientReady.java | 24 +-
.../tier/sockets/command/CloseConnection.java | 33 +-
.../tier/sockets/command/CommitCommand.java | 25 +-
.../cache/tier/sockets/command/ContainsKey.java | 49 +-
.../tier/sockets/command/ContainsKey66.java | 51 +-
.../tier/sockets/command/CreateRegion.java | 48 +-
.../cache/tier/sockets/command/Default.java | 11 +-
.../cache/tier/sockets/command/Destroy.java | 79 +-
.../cache/tier/sockets/command/Destroy65.java | 116 +-
.../cache/tier/sockets/command/Destroy70.java | 4 +-
.../tier/sockets/command/DestroyRegion.java | 76 +-
.../tier/sockets/command/ExecuteFunction.java | 27 +-
.../tier/sockets/command/ExecuteFunction65.java | 31 +-
.../tier/sockets/command/ExecuteFunction66.java | 41 +-
.../tier/sockets/command/ExecuteFunction70.java | 5 +-
.../sockets/command/ExecuteRegionFunction.java | 37 +-
.../command/ExecuteRegionFunction61.java | 41 +-
.../command/ExecuteRegionFunction65.java | 41 +-
.../command/ExecuteRegionFunction66.java | 45 +-
.../command/ExecuteRegionFunctionSingleHop.java | 47 +-
.../sockets/command/GatewayReceiverCommand.java | 219 +-
.../cache/tier/sockets/command/Get70.java | 78 +-
.../cache/tier/sockets/command/GetAll.java | 54 +-
.../cache/tier/sockets/command/GetAll651.java | 55 +-
.../cache/tier/sockets/command/GetAll70.java | 57 +-
.../cache/tier/sockets/command/GetAllForRI.java | 2 +-
.../sockets/command/GetAllWithCallback.java | 60 +-
.../command/GetClientPRMetadataCommand.java | 28 +-
.../command/GetClientPRMetadataCommand66.java | 28 +-
.../GetClientPartitionAttributesCommand.java | 28 +-
.../GetClientPartitionAttributesCommand66.java | 28 +-
.../sockets/command/GetFunctionAttribute.java | 17 +-
.../tier/sockets/command/GetPDXEnumById.java | 25 +-
.../tier/sockets/command/GetPDXIdForEnum.java | 23 +-
.../tier/sockets/command/GetPDXIdForType.java | 25 +-
.../tier/sockets/command/GetPDXTypeById.java | 25 +-
.../tier/sockets/command/GetPdxEnums70.java | 22 +-
.../tier/sockets/command/GetPdxTypes70.java | 22 +-
.../cache/tier/sockets/command/Invalid.java | 10 +-
.../cache/tier/sockets/command/Invalidate.java | 78 +-
.../tier/sockets/command/Invalidate70.java | 4 +-
.../cache/tier/sockets/command/KeySet.java | 61 +-
.../cache/tier/sockets/command/MakePrimary.java | 25 +-
.../tier/sockets/command/ManagementCommand.java | 2 +-
.../cache/tier/sockets/command/PeriodicAck.java | 33 +-
.../cache/tier/sockets/command/Ping.java | 31 +-
.../cache/tier/sockets/command/Put.java | 95 +-
.../cache/tier/sockets/command/Put61.java | 112 +-
.../cache/tier/sockets/command/Put65.java | 165 +-
.../cache/tier/sockets/command/Put70.java | 4 +-
.../cache/tier/sockets/command/PutAll.java | 93 +-
.../cache/tier/sockets/command/PutAll70.java | 109 +-
.../cache/tier/sockets/command/PutAll80.java | 125 +-
.../sockets/command/PutUserCredentials.java | 33 +-
.../cache/tier/sockets/command/Query.java | 27 +-
.../cache/tier/sockets/command/Query651.java | 43 +-
.../command/RegisterDataSerializers.java | 34 +-
.../sockets/command/RegisterInstantiators.java | 40 +-
.../tier/sockets/command/RegisterInterest.java | 95 +-
.../sockets/command/RegisterInterest61.java | 105 +-
.../sockets/command/RegisterInterestList.java | 92 +-
.../sockets/command/RegisterInterestList61.java | 98 +-
.../sockets/command/RegisterInterestList66.java | 95 +-
.../cache/tier/sockets/command/RemoveAll.java | 109 +-
.../tier/sockets/command/RemoveUserAuth.java | 32 +-
.../cache/tier/sockets/command/Request.java | 72 +-
.../tier/sockets/command/RequestEventValue.java | 58 +-
.../tier/sockets/command/RollbackCommand.java | 20 +-
.../cache/tier/sockets/command/Size.java | 36 +-
.../tier/sockets/command/TXFailoverCommand.java | 28 +-
.../command/TXSynchronizationCommand.java | 56 +-
.../sockets/command/UnregisterInterest.java | 54 +-
.../sockets/command/UnregisterInterestList.java | 53 +-
.../command/UpdateClientNotification.java | 5 +-
.../apache/geode/internal/tcp/Connection.java | 2 +-
.../org/apache/geode/internal/util/IOUtils.java | 6 +-
.../geode/distributed/ServerLauncherUtils.java | 30 +
.../ha/BlockingHARegionQueueJUnitTest.java | 169 +-
.../cache/ha/HARegionQueueJUnitTest.java | 2307 +++++++++---------
.../cache/tier/sockets/CacheServerUtils.java | 55 +
.../cache/tier/sockets/MessageJUnitTest.java | 64 +-
.../internal/JUnit4DistributedTestCase.java | 2 +-
.../sanctionedDataSerializables.txt | 1074 ++++----
.../cache/tier/sockets/command/CloseCQ.java | 38 +-
.../cache/tier/sockets/command/ExecuteCQ.java | 45 +-
.../cache/tier/sockets/command/ExecuteCQ61.java | 57 +-
.../cache/tier/sockets/command/GetCQStats.java | 33 +-
.../tier/sockets/command/GetDurableCQs.java | 44 +-
.../cache/tier/sockets/command/MonitorCQ.java | 37 +-
.../cache/tier/sockets/command/StopCQ.java | 38 +-
.../geode/test/junit/categories/UnitTest.java | 2 +-
.../SerializableErrorCollector.java | 22 +
...arallelGatewaySenderOperationsDUnitTest.java | 17 +-
115 files changed, 5375 insertions(+), 5404 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/GemFireException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireException.java b/geode-core/src/main/java/org/apache/geode/GemFireException.java
index 02bf025..cd80019 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireException.java
@@ -12,76 +12,56 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode;
/**
* This is the abstract superclass of exceptions that are thrown to indicate incorrect usage of
* GemFire.
- *
+ * <p>
* Since these exceptions are unchecked, this class really <em>ought</em> to be called
- * <code>GemFireRuntimeException</code>; however, the current name is retained for compatibility's
- * sake.
- *
- * @see org.apache.geode.GemFireCheckedException
+ * {@code GemFireRuntimeException}; however, the current name is retained for compatibility's sake.
+ * <p>
+ * This class is abstract to enforce throwing more specific exception types. Please avoid using
+ * GemFireException to describe an arbitrary error condition
+ *
+ * @see GemFireCheckedException
* @see org.apache.geode.cache.CacheRuntimeException
*/
-// Implementation note: This class is abstract so that we are forced
-// to have more specific exception types. We want to avoid using
-// GemFireException to describe an arbitrary error condition (think
-// GsError).
public abstract class GemFireException extends RuntimeException {
- public static final long serialVersionUID = -6972360779789402295L;
-
- /** The cause of this <code>GemFireException</code> */
- // private Throwable cause;
-
- ////////////////////// Constructors //////////////////////
+ private static final long serialVersionUID = -6972360779789402295L;
/**
- * Creates a new <code>GemFireException</code> with no detailed message.
+ * Creates a new {@code GemFireException} with no detailed message.
*/
public GemFireException() {
super();
}
/**
- * Creates a new <code>GemFireException</code> with the given detail message.
+ * Creates a new {@code GemFireException} with the given detail message.
*/
public GemFireException(String message) {
super(message);
}
/**
- * Creates a new <code>GemFireException</code> with the given detail message and cause.
+ * Creates a new {@code GemFireException} with the given detail message and cause.
*/
public GemFireException(String message, Throwable cause) {
super(message, cause);
- // this.cause = cause;
}
/**
- * Creates a new <code>GemFireException</code> with the given cause and no detail message
+ * Creates a new {@code GemFireException} with the given cause and no detail message
*/
public GemFireException(Throwable cause) {
super(cause);
- // this.cause = cause;
}
- //////////////////// Instance Methods ////////////////////
-
/**
- * Returns the cause of this <code>GemFireException</code> or <code>null</code> if the cause is
+ * Returns the root cause of this {@code GemFireException} or {@code null} if the cause is
* nonexistent or unknown.
*/
- // public Throwable getCause() {
- // return this.cause;
- // }
-
- /**
- * Returns the root cause of this <code>GemFireException</code> or <code>null</code> if the cause
- * is nonexistent or unknown.
- */
public Throwable getRootCause() {
if (this.getCause() == null) {
return null;
@@ -93,52 +73,4 @@ public abstract class GemFireException extends RuntimeException {
return root;
}
- // public void printStackTrace() {
- // super.printStackTrace();
- // if (this.cause != null) {
- // System.err.println("Caused by:");
- // this.cause.printStackTrace();
- // }
- // }
-
- // public void printStackTrace(java.io.PrintWriter pw) {
- // super.printStackTrace(pw);
- //
- // if (this.cause != null) {
- // pw.println("Caused by:");
- // this.cause.printStackTrace(pw);
- // }
- // }
- //
- // public String getMessage() {
- // if (this.cause != null) {
- // String ourMsg = super.getMessage();
- // if (ourMsg == null || ourMsg.length() == 0) {
- // //ourMsg = super.toString(); //causes inifinite recursion
- // ourMsg = "";
- // }
- // StringBuffer sb = new StringBuffer(ourMsg);
- // sb.append(" Caused by: ");
- // String causeMsg = this.cause.getMessage();
- // if (causeMsg == null || causeMsg.length() == 0) {
- // causeMsg = this.cause.toString();
- // }
- // sb.append(causeMsg);
- // return sb.toString();
- // } else {
- // return super.getMessage();
- // }
- // }
-
- /**
- * Represent the receiver as well as the cause
- */
- // public String toString() {
- // String result = super.toString();
- // if (cause != null) {
- // result = result + ", caused by " + cause.toString();
- // }
- // return result;
- // }
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/Instantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/Instantiator.java b/geode-core/src/main/java/org/apache/geode/Instantiator.java
index 3c1ca06..ea42057 100644
--- a/geode-core/src/main/java/org/apache/geode/Instantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/Instantiator.java
@@ -20,16 +20,16 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- * <code>Instantiator</code> allows classes that implement {@link DataSerializable} to be registered
- * with the data serialization framework. Knowledge of <code>DataSerializable</code> classes allows
- * the framework to optimize how instances of those classes are data serialized.
+ * {@code Instantiator} allows classes that implement {@link DataSerializable} to be registered with
+ * the data serialization framework. Knowledge of {@code DataSerializable} classes allows the
+ * framework to optimize how instances of those classes are data serialized.
*
* <P>
*
- * Ordinarily, when a <code>DataSerializable</code> object is written using
+ * Ordinarily, when a {@code DataSerializable} object is written using
* {@link DataSerializer#writeObject(Object, java.io.DataOutput)}, a special marker class id is
- * written to the stream followed by the class name of the <code>DataSerializable</code> object.
- * After the marker class id is read by {@link DataSerializer#readObject} it performs the following
+ * written to the stream followed by the class name of the {@code DataSerializable} object. After
+ * the marker class id is read by {@link DataSerializer#readObject} it performs the following
* operations,
*
* <OL>
@@ -44,23 +44,20 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* </OL>
*
- * However, if a <code>DataSerializable</code> class is {@linkplain #register(Instantiator)
- * registered} with the data serialization framework and assigned a unique class id, an important
- * optimization can be performed that avoid the expense of using reflection to instantiate the
- * <code>DataSerializable</code> class. When the object is written using
+ * However, if a {@code DataSerializable} class is {@linkplain #register(Instantiator) registered}
+ * with the data serialization framework and assigned a unique class id, an important optimization
+ * can be performed that avoid the expense of using reflection to instantiate the
+ * {@code DataSerializable} class. When the object is written using
* {@link DataSerializer#writeObject(Object, java.io.DataOutput)}, the object's registered class id
* is written to the stream. Consequently, when the data is read from the stream, the
- * {@link #newInstance} method of the appropriate <code>Instantiator</code> instance is invoked to
- * create an "empty" instance of the <code>DataSerializable</code> instead of using reflection to
- * create the new instance.
+ * {@link #newInstance} method of the appropriate {@code Instantiator} instance is invoked to create
+ * an "empty" instance of the {@code DataSerializable} instead of using reflection to create the new
+ * instance.
*
* <P>
*
- * Commonly, a <code>DataSerializable</code> class will register itself with the
- * <code>Instantiator</code> in a static initializer as shown in the below example code.
- *
- * <!-- The source code for the CompanySerializer class resides in tests/com/examples/ds/User.java
- * Please keep the below code snippet in sync with that file. -->
+ * Commonly, a {@code DataSerializable} class will register itself with the {@code Instantiator} in
+ * a static initializer as shown in the below example code.
*
* <PRE>
public class User implements DataSerializable {
@@ -101,22 +98,21 @@ public class User implements DataSerializable {
}
* </PRE>
*
- * <code>Instantiator</code>s may be distributed to other members of the distributed system when
- * they are registered. Consider the following scenario in which VM1 and VM2 are members of the same
+ * {@code Instantiator}s may be distributed to other members of the distributed system when they are
+ * registered. Consider the following scenario in which VM1 and VM2 are members of the same
* distributed system. Both VMs define the sameRegion and VM2's region replicates the contents of
- * VM1's using replication. VM1 puts an instance of the above <code>User</code> class into the
- * region. The act of instantiating <code>User</code> will load the <code>User</code> class and
- * invoke its static initializer, thus registering the <code>Instantiator</code> with the data
- * serialization framework. Because the region is a replicate, the <code>User</code> will be data
- * serialized and sent to VM2. However, when VM2 attempts to data deserialize the <code>User</code>,
- * its <code>Instantiator</code> will not necessarily be registered because <code>User</code>'s
- * static initializer may not have been invoked yet. As a result, an exception would be logged while
- * deserializing the <code>User</code> and the replicate would not appear to have the new value. So,
- * in order to ensure that the <code>Instantiator</code> is registered in VM2, the data
- * serialization framework distributes a message to each member when an <code>Instantiator</code> is
- * {@linkplain #register(Instantiator) registered}.
+ * VM1's using replication. VM1 puts an instance of the above {@code User} class into the region.
+ * The act of instantiating {@code User} will load the {@code User} class and invoke its static
+ * initializer, thus registering the {@code Instantiator} with the data serialization framework.
+ * Because the region is a replicate, the {@code User} will be data serialized and sent to VM2.
+ * However, when VM2 attempts to data deserialize the {@code User}, its {@code Instantiator} will
+ * not necessarily be registered because {@code User}'s static initializer may not have been invoked
+ * yet. As a result, an exception would be logged while deserializing the {@code User} and the
+ * replicate would not appear to have the new value. So, in order to ensure that the
+ * {@code Instantiator} is registered in VM2, the data serialization framework distributes a message
+ * to each member when an {@code Instantiator} is {@linkplain #register(Instantiator) registered}.
* <p>
- * Note that the framework does not require that an <code>Instantiator</code> be
+ * Note that the framework does not require that an {@code Instantiator} be
* {@link java.io.Serializable}, but it does require that it provide a
* {@linkplain #Instantiator(Class, int) two-argument constructor}.
*
@@ -133,63 +129,64 @@ public abstract class Instantiator {
*/
private Class<? extends DataSerializable> clazz;
- /** The id of this <code>Instantiator</code> */
+ /** The id of this {@code Instantiator} */
private int id;
- /** The eventId of this <code>Instantiator</code> */
+ /** The eventId of this {@code Instantiator} */
private EventID eventId;
- /** The originator of this <code>Instantiator</code> */
+ /** The originator of this {@code Instantiator} */
private ClientProxyMembershipID context;
/**
- * Registers a <code>DataSerializable</code> class with the data serialization framework. This
- * method is usually invoked from the static initializer of a class that implements
- * <code>DataSerializable</code>.
+ * Registers a {@code DataSerializable} class with the data serialization framework. This method
+ * is usually invoked from the static initializer of a class that implements
+ * {@code DataSerializable}.
*
- * @param instantiator An <code>Instantiator</code> whose {@link #newInstance} method is invoked
- * when an object is data deserialized.
+ * @param instantiator An {@code Instantiator} whose {@link #newInstance} method is invoked when
+ * an object is data deserialized.
*
- * @throws IllegalStateException If class <code>c</code> is already registered with a different
- * class id, or another class has already been registered with id <code>classId</code>
- * @throws NullPointerException If <code>instantiator</code> is <code>null</code>.
+ * @throws IllegalStateException If class {@code c} is already registered with a different class
+ * id, or another class has already been registered with id {@code classId}
+ * @throws NullPointerException If {@code instantiator} is {@code null}.
*/
public static synchronized void register(Instantiator instantiator) {
InternalInstantiator.register(instantiator, true);
}
/**
- * Registers a <code>DataSerializable</code> class with the data serialization framework. This
- * method is usually invoked from the static initializer of a class that implements
- * <code>DataSerializable</code>.
+ * Registers a {@code DataSerializable} class with the data serialization framework. This method
+ * is usually invoked from the static initializer of a class that implements
+ * {@code DataSerializable}.
*
- * @param instantiator An <code>Instantiator</code> whose {@link #newInstance} method is invoked
- * when an object is data deserialized.
+ * @param instantiator An {@code Instantiator} whose {@link #newInstance} method is invoked when
+ * an object is data deserialized.
*
- * @param distribute True if the registered <code>Instantiator</code> has to be distributed to
- * other members of the distributed system. Note that if distribute is set to false it may
- * still be distributed in some cases.
+ * @param distribute True if the registered {@code Instantiator} has to be distributed to other
+ * members of the distributed system. Note that if distribute is set to false it may still
+ * be distributed in some cases.
*
- * @throws IllegalArgumentException If class <code>c</code> is already registered with a different
- * class id, or another class has already been registered with id <code>classId</code>
- * @throws NullPointerException If <code>instantiator</code> is <code>null</code>.
+ * @throws IllegalArgumentException If class {@code c} is already registered with a different
+ * class id, or another class has already been registered with id {@code classId}
+ * @throws NullPointerException If {@code instantiator} is {@code null}.
* @deprecated as of 9.0 use {@link Instantiator#register(Instantiator)} instead
*/
+ @Deprecated
public static synchronized void register(Instantiator instantiator, boolean distribute) {
InternalInstantiator.register(instantiator, distribute);
}
/**
- * Creates a new <code>Instantiator</code> that instantiates a given class.
+ * Creates a new {@code Instantiator} that instantiates a given class.
*
- * @param c The <code>DataSerializable</code> class to register. This class must have a static
- * initializer that registers this <code>Instantiator</code>.
- * @param classId A unique id for class <code>c</code>. The <code>classId</code> must not be zero.
- * This has been an <code>int</code> since dsPhase1.
+ * @param c The {@code DataSerializable} class to register. This class must have a static
+ * initializer that registers this {@code Instantiator}.
+ * @param classId A unique id for class {@code c}. The {@code classId} must not be zero. This has
+ * been an {@code int} since dsPhase1.
*
- * @throws IllegalArgumentException If <code>c</code> does not implement
- * <code>DataSerializable</code>, <code>classId</code> is less than or equal to zero.
- * @throws NullPointerException If <code>c</code> is <code>null</code>
+ * @throws IllegalArgumentException If {@code c} does not implement {@code DataSerializable},
+ * {@code classId} is less than or equal to zero.
+ * @throws NullPointerException If {@code c} is {@code null}
*/
public Instantiator(Class<? extends DataSerializable> c, int classId) {
if (c == null) {
@@ -204,8 +201,8 @@ public abstract class Instantiator {
}
if (classId == 0) {
- throw new IllegalArgumentException(LocalizedStrings.Instantiator_CLASS_ID_0_MUST_NOT_BE_0
- .toLocalizedString(Integer.valueOf(classId)));
+ throw new IllegalArgumentException(
+ LocalizedStrings.Instantiator_CLASS_ID_0_MUST_NOT_BE_0.toLocalizedString(classId));
}
this.clazz = c;
@@ -213,52 +210,50 @@ public abstract class Instantiator {
}
/**
- * Creates a new "empty" instance of a <Code>DataSerializable</code> class whose state will be
- * filled in by invoking its {@link DataSerializable#fromData fromData} method.
+ * Creates a new "empty" instance of a {@code DataSerializable} class whose state will be filled
+ * in by invoking its {@link DataSerializable#fromData fromData} method.
*
* @see DataSerializer#readObject
*/
public abstract DataSerializable newInstance();
/**
- * Returns the <code>DataSerializable</code> class that is instantiated by this
- * <code>Instantiator</code>.
+ * Returns the {@code DataSerializable} class that is instantiated by this {@code Instantiator}.
*/
public Class<? extends DataSerializable> getInstantiatedClass() {
return this.clazz;
}
/**
- * Returns the unique <code>id</code> of this <code>Instantiator</code>.
+ * Returns the unique {@code id} of this {@code Instantiator}.
*/
public int getId() {
return this.id;
}
/**
- * sets the unique <code>eventId</code> of this <code>Instantiator</code>. For internal use only.
+ * sets the unique {@code eventId} of this {@code Instantiator}. For internal use only.
*/
public void setEventId(Object/* EventID */ eventId) {
this.eventId = (EventID) eventId;
}
/**
- * Returns the unique <code>eventId</code> of this <code>Instantiator</code>. For internal use
- * only.
+ * Returns the unique {@code eventId} of this {@code Instantiator}. For internal use only.
*/
public Object/* EventID */ getEventId() {
return this.eventId;
}
/**
- * sets the context of this <code>Instantiator</code>. For internal use only.
+ * sets the context of this {@code Instantiator}. For internal use only.
*/
public void setContext(Object/* ClientProxyMembershipID */ context) {
this.context = (ClientProxyMembershipID) context;
}
/**
- * Returns the context of this <code>Instantiator</code>. For internal use only.
+ * Returns the context of this {@code Instantiator}. For internal use only.
*/
public Object/* ClientProxyMembershipID */ getContext() {
return this.context;
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/cache/CacheException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheException.java
index 79591d6..6309ad1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheException.java
@@ -16,36 +16,34 @@ package org.apache.geode.cache;
import org.apache.geode.GemFireException;
-
/**
* A generic exception, which indicates a cache error has occurred. All the other cache exceptions
* are subclasses of this class. This class is abstract and therefore only subclasses are
* instantiated.
*
- *
* @since GemFire 2.0
*/
public abstract class CacheException extends GemFireException {
- public static final long serialVersionUID = 7699432887938858940L;
+ private static final long serialVersionUID = 7699432887938858940L;
- /** Constructs a new <code>CacheException</code>. */
+ /** Constructs a new {@code CacheException}. */
public CacheException() {
super();
}
- /** Constructs a new <code>CacheException</code> with a message string. */
+ /** Constructs a new {@code CacheException} with a message string. */
public CacheException(String s) {
super(s);
}
/**
- * Constructs a <code>CacheException</code> with a message string and a base exception
+ * Constructs a {@code CacheException} with a message string and a base exception
*/
public CacheException(String s, Throwable cause) {
super(s, cause);
}
- /** Constructs a <code>CacheException</code> with a cause */
+ /** Constructs a {@code CacheException} with a cause */
public CacheException(Throwable cause) {
super(cause);
}
@@ -57,7 +55,7 @@ public abstract class CacheException extends GemFireException {
if (cause != null) {
String causeStr = cause.toString();
final String glue = ", caused by ";
- StringBuffer sb = new StringBuffer(result.length() + causeStr.length() + glue.length());
+ StringBuilder sb = new StringBuilder(result.length() + causeStr.length() + glue.length());
sb.append(result).append(glue).append(causeStr);
result = sb.toString();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
index a723b32..7732e96 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.cache;
import org.apache.geode.GemFireException;
@@ -22,20 +21,18 @@ import org.apache.geode.GemFireException;
* cache exceptions are the subclass of this class. This class is abstract so only subclasses can be
* instantiated
*
- *
* @since GemFire 3.0
*/
public abstract class CacheRuntimeException extends GemFireException {
- public static final long serialVersionUID = 6750107573015376688L;
+ private static final long serialVersionUID = 6750107573015376688L;
/**
- * Creates a new instance of <code>CacheRuntimeException</code> without detail message.
+ * Creates a new instance of {@code CacheRuntimeException} without detail message.
*/
public CacheRuntimeException() {}
-
/**
- * Constructs an instance of <code>CacheRuntimeException</code> with the specified detail message.
+ * Constructs an instance of {@code CacheRuntimeException} with the specified detail message.
*
* @param msg the detail message
*/
@@ -44,8 +41,8 @@ public abstract class CacheRuntimeException extends GemFireException {
}
/**
- * Constructs an instance of <code>CacheRuntimeException</code> with the specified detail message
- * and cause.
+ * Constructs an instance of {@code CacheRuntimeException} with the specified detail message and
+ * cause.
*
* @param msg the detail message
* @param cause the causal Throwable
@@ -55,7 +52,7 @@ public abstract class CacheRuntimeException extends GemFireException {
}
/**
- * Constructs an instance of <code>CacheRuntimeException</code> with the specified cause.
+ * Constructs an instance of {@code CacheRuntimeException} with the specified cause.
*
* @param cause the causal Throwable
*/
@@ -70,7 +67,7 @@ public abstract class CacheRuntimeException extends GemFireException {
if (cause != null) {
String causeStr = cause.toString();
final String glue = ", caused by ";
- StringBuffer sb = new StringBuffer(result.length() + causeStr.length() + glue.length());
+ StringBuilder sb = new StringBuilder(result.length() + causeStr.length() + glue.length());
sb.append(result).append(glue).append(causeStr);
result = sb.toString();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
index a0cb7d4..7af4f4f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
@@ -228,7 +228,7 @@ public abstract class AbstractOp implements Op {
protected abstract Object processResponse(Message msg) throws Exception;
/**
- * Return true of <code>msgType</code> indicates the operation had an error on the server.
+ * Return true of <code>messageType</code> indicates the operation had an error on the server.
*/
protected abstract boolean isErrorResponse(int msgType);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/cache/client/internal/PingOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PingOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PingOp.java
index cc30f1c..2e52542 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PingOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PingOp.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.client.internal;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.Message;
@@ -25,6 +24,7 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
* @since GemFire 5.7
*/
public class PingOp {
+
/**
* Ping the specified server to see if it is still alive
*
@@ -47,13 +47,13 @@ public class PingOp {
/**
* @throws org.apache.geode.SerializationException if serialization fails
*/
- public PingOpImpl() {
+ PingOpImpl() {
super(MessageType.PING, 0);
}
@Override
protected void processSecureBytes(Connection cnx, Message message) throws Exception {
- Message.messageType.set(null);
+ Message.MESSAGE_TYPE.set(null);
}
@Override
@@ -64,9 +64,9 @@ public class PingOp {
@Override
protected void sendMessage(Connection cnx) throws Exception {
getMessage().clearMessageHasSecurePartFlag();
- startTime = System.currentTimeMillis();
+ this.startTime = System.currentTimeMillis();
getMessage().send(false);
- Message.messageType.set(MessageType.PING);
+ Message.MESSAGE_TYPE.set(MessageType.PING);
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
index ac500e6..5b0d86b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
@@ -372,7 +372,7 @@ import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAbortM
import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAckMessage;
import org.apache.geode.internal.cache.snapshot.SnapshotPacket;
import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
-import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier.ServerInterestRegistrationMessage;
+import org.apache.geode.internal.cache.tier.sockets.ServerInterestRegistrationMessage;
import org.apache.geode.internal.cache.tier.sockets.ClientBlacklistProcessor.ClientBlacklistMessage;
import org.apache.geode.internal.cache.tier.sockets.ClientDataSerializerMessage;
import org.apache.geode.internal.cache.tier.sockets.ClientInstantiatorMessage;
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 8d4eaf7..02d04b3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -183,7 +183,6 @@ import org.apache.geode.internal.cache.partitioned.ContainsKeyValueMessage;
import org.apache.geode.internal.cache.partitioned.ContainsKeyValueMessage.ContainsKeyValueResponse;
import org.apache.geode.internal.cache.partitioned.DestroyMessage;
import org.apache.geode.internal.cache.partitioned.DestroyMessage.DestroyResponse;
-import org.apache.geode.internal.cache.partitioned.DestroyRegionOnDataStoreMessage;
import org.apache.geode.internal.cache.partitioned.DumpAllPRConfigMessage;
import org.apache.geode.internal.cache.partitioned.DumpB2NRegion;
import org.apache.geode.internal.cache.partitioned.DumpB2NRegion.DumpB2NResponse;
@@ -4479,7 +4478,7 @@ public class PartitionedRegion extends LocalRegion
values.addObjectPart(key, ge.value, ge.isObject, ge.versionTag);
}
- if (values.size() == BaseCommand.maximumChunkSize) {
+ if (values.size() == BaseCommand.MAXIMUM_CHUNK_SIZE) {
BaseCommand.sendNewRegisterInterestResponseChunk(this, "keyList", values, false,
servConn);
values.clear();
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
index a82a804..940da95 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
@@ -27,21 +27,19 @@ import org.apache.geode.internal.cache.InternalCache;
public class CachedRegionHelper {
private final InternalCache cache;
+
private volatile boolean shutdown = false;
- // private Map regions;
- private volatile int slowEmulationSleep = 0;
- public CachedRegionHelper(InternalCache c) {
- this.cache = c;
- // this.regions = new WeakHashMap();
+ public CachedRegionHelper(InternalCache cache) {
+ this.cache = cache;
}
public void checkCancelInProgress(Throwable e) throws CancelException {
- cache.getCancelCriterion().checkCancelInProgress(e);
+ this.cache.getCancelCriterion().checkCancelInProgress(e);
}
public Region getRegion(String name) {
- return cache.getRegion(name);
+ return this.cache.getRegion(name);
}
public InternalCache getCache() {
@@ -53,12 +51,14 @@ public class CachedRegionHelper {
}
public boolean isShutdown() {
- return shutdown || cache.getCancelCriterion().isCancelInProgress();
+ return this.shutdown || this.cache.getCancelCriterion().isCancelInProgress();
}
+ /**
+ * CachedRegionHelper#close() does nothing
+ */
public void close() {
// cache = null;
- // regions = null;
}
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java
index 0c1c42a..d7f7c7b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Command.java
@@ -12,22 +12,17 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
-/**
- *
- */
public interface Command {
- public void execute(Message msg, ServerConnection servConn);
+ void execute(Message message, ServerConnection serverConnection);
- public final int RESPONDED = 1;
+ int RESPONDED = 1;
- public final int REQUIRES_RESPONSE = 2;
+ int REQUIRES_RESPONSE = 2;
- public final int REQUIRES_CHUNKED_RESPONSE = 3;
+ int REQUIRES_CHUNKED_RESPONSE = 3;
}
[06/35] geode git commit: GEODE-2952 document quoting of exact match
Lucene queries
Posted by kl...@apache.org.
GEODE-2952 document quoting of exact match Lucene queries
This closes #545
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c08d70dd
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c08d70dd
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c08d70dd
Branch: refs/heads/feature/GEODE-2632-19
Commit: c08d70dd4695dbbad17f86fa4227a13497ab0b08
Parents: fa808ac
Author: Karen Miller <km...@pivotal.io>
Authored: Fri May 26 15:10:43 2017 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Tue May 30 13:57:07 2017 -0700
----------------------------------------------------------------------
.../gfsh/command-pages/search.html.md.erb | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/c08d70dd/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb
index 6cdf362..1c63ecf 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/search.html.md.erb
@@ -62,7 +62,7 @@ search lucene --name=value --region=value --queryStrings=value --defaultField=va
</tr>
<tr>
<td><span class="keyword parmname" style="whitespace:nowrap;">‑‐queryStrings</span></td>
-<td><em>Required</em>. Query string to search the lucene index.</td>
+<td><em>Required</em>. Query string to search the lucene index. Surround a string with double quote marks to do an exact match of the string.</td>
<td> </td>
</tr>
<tr>
@@ -84,21 +84,28 @@ search lucene --name=value --region=value --queryStrings=value --defaultField=va
**Example Commands:**
``` pre
-gfsh> search lucene --name=testIndex --region=/testRegion --queryStrings=value1 --defaultField=__REGION_VALUE_FIELD
+gfsh> search lucene --name=testIndex --region=/testRegion --queryStrings=value1
+ --defaultField=__REGION_VALUE_FIELD
+
+gfsh> search lucene --name=indexOfStrings --region=/stringTestRegion
+ --queryStrings='__REGION_VALUE_FIELD:"my exact string"'
+ --defaultField=__REGION_VALUE_FIELD
```
**Sample Output:**
``` pre
-gfsh>search lucene --name=testIndex --region=/testRegion --queryStrings=value* --defaultField=__REGION_VALUE_FIELD
+gfsh>search lucene --name=testIndex --region=/testRegion --queryStrings=value*
+ --defaultField=__REGION_VALUE_FIELD
key | value | score
--- | ------ | -----
3 | value3 | 1
2 | value2 | 1
1 | value1 | 1
-gfsh>search lucene --region=/Person --name=analyzerIndex --defaultField=address --queryStrings="97763"
+gfsh>search lucene --region=/Person --name=analyzerIndex --defaultField=address
+ --queryStrings="97763"
key | value | score
------ | --------------------------------------------------------------------------------------------------------- | ---------
key763 | Person{name='Fred Freeloader', email='ffl@example.com', address='763 Miles Dv, Portland_OR_97763', re.. | 1.6694657
[18/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 88df942..f54ff74 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1,289 +1,289 @@
org/apache/geode/admin/RegionSubRegionSnapshot,2
fromData,62,2a2bb80023b500082a2bb900240100b5000b2a2bb80025b500052ab40005b9002601004d2cb9002701009900132cb900280100c000292ab6001ba7ffeab1
toData,30,2ab400082bb800202b2ab4000bb9002102002ab40005c000032bb80022b1
-
+
org/apache/geode/admin/internal/FinishBackupRequest,2
fromData,33,2a2bb700292a2bb8002ab500022a2bb8002ab500032a2bb8002bb6002cb50004b1
toData,33,2a2bb7002d2ab400022bb8002e2ab400032bb8002e2ab40004b8002f2bb80030b1
-
+
org/apache/geode/admin/internal/FinishBackupResponse,2
fromData,14,2a2bb700042a2bb80005b50003b1
toData,14,2a2bb700062ab400032bb80007b1
-
+
org/apache/geode/admin/internal/PrepareBackupResponse,2
fromData,14,2a2bb700042a2bb80005b50003b1
toData,14,2a2bb700062ab400032bb80007b1
-
+
org/apache/geode/admin/internal/SystemMemberCacheEventProcessor$SystemMemberCacheMessage,2
fromData,27,2a2bb7001a2a2bb8001bb5000c2a2bb9001c0100b8001db5000fb1
toData,27,2a2bb7001e2ab4000c2bb8001f2b2ab4000fb40020b900210200b1
-
+
org/apache/geode/admin/jmx/internal/StatAlertNotification,2
fromData,39,2a2bb8002ab600032a2bb8002bb600072a2bb8002cc0002dc0002db600052a2bb8002eb50008b1
toData,33,2ab600162bb800262ab600202bb800272ab6000e2bb800282ab400082bb80029b1
-
+
org/apache/geode/cache/ExpirationAttributes,2
fromData,22,2a2bb900120100b500022a2bb80013c00014b50004b1
toData,19,2b2ab40002b9001502002ab400042bb80016b1
-
+
org/apache/geode/cache/MembershipAttributes,2
fromData,39,2a2a2bb80032b7000bb500032a2bb900330100b80034b500052a2bb900330100b80035b50007b1
toData,89,2ab40003b9002c0100bd002d4d2ab40003b9002101004e03360415042cbea2001b2c15042db900240100c00025b90026010053840401a7ffe42c2bb8002e2b2ab40005b4002fb9003002002b2ab40007b40031b900300200b1
-
+
org/apache/geode/cache/SubscriptionAttributes,2
fromData,14,2a2bb9000f0100b80010b50003b1
toData,14,2b2ab40003b4000db9000e0200b1
-
+
org/apache/geode/cache/client/internal/CacheServerLoadMessage,2
fromData,52,2a2bb7000d2abb000e59b7000fb500022ab400022bb800102abb001159b70012b500032ab400032bb800102a2bb80013b50004b1
toData,30,2a2bb700142ab400022bb800152ab400032bb800152ab400042bb80016b1
-
+
org/apache/geode/cache/client/internal/locator/ClientConnectionRequest,2
fromData,14,2a2bb700042a2bb80005b50003b1
toData,14,2a2bb700062ab400032bb80007b1
-
+
org/apache/geode/cache/client/internal/locator/ClientConnectionResponse,2
fromData,35,2a2bb80004b500022ab400029900162abb000559b70006b500032ab400032bb60007b1
toData,31,2ab40003c6000704a70004033d1c2bb800081c99000b2ab400032bb60009b1
-
+
org/apache/geode/cache/client/internal/locator/ClientReplacementRequest,2
fromData,25,2a2bb700042abb000559b70006b500032ab400032bb80007b1
toData,14,2a2bb700082ab400032bb80009b1
-
+
org/apache/geode/cache/client/internal/locator/GetAllServersRequest,2
fromData,6,2a2bb70003b1
toData,6,2a2bb70004b1
-
+
org/apache/geode/cache/client/internal/locator/GetAllServersResponse,2
fromData,31,2a2bb80005b500032ab40003c600122ab40003b600049a00082a04b50002b1
toData,9,2ab400032bb80006b1
-
+
org/apache/geode/cache/client/internal/locator/LocatorListResponse,2
fromData,43,2a2bb80006b500032a2bb900070100b500052ab40003c600142ab40003b9000401009a00082a04b50002b1
toData,19,2ab400032bb800082b2ab40005b900090200b1
-
+
org/apache/geode/cache/client/internal/locator/LocatorStatusResponse,2
fromData,56,2a2bb6001f2a2bb600202a2bb600212a2bb600222a2bb600232a2bb600242a2bb600252a2bb600262a2bb600272a2bb600282a2bb60029b1
-toData,56,2a2bb600322a2bb600332a2bb600342a2bb600352a2bb600362a2bb600372a2bb600382a2bb600392a2bb6003a2a2bb6003b2a2bb6003cb1
-
+toData,56,2a2bb600312a2bb600322a2bb600332a2bb600342a2bb600352a2bb600362a2bb600372a2bb600382a2bb600392a2bb6003a2a2bb6003bb1
+
org/apache/geode/cache/client/internal/locator/QueueConnectionRequest,2
fromData,40,2a2bb700072a2bb80008b500042a2bb80009b500062a2bb8000ab500052a2bb9000b0100b50002b1
toData,40,2a2bb7000c2ab400042bb8000d2ab400062bb8000e2ab400052bb8000f2b2ab40002b900100200b1
-
+
org/apache/geode/cache/client/internal/locator/QueueConnectionResponse,2
fromData,41,2a2bb80006b500032a2bb80007b500042ab40004c600142ab40004b9000501009a00082a04b50002b1
toData,17,2ab400032bb800082ab400042bb80009b1
-
+
org/apache/geode/cache/client/internal/locator/ServerLocationRequest,2
fromData,9,2a2bb80003b50002b1
toData,9,2ab400022bb80004b1
-
+
org/apache/geode/cache/query/internal/CqEntry,2
fromData,17,2a2bb80009b500022a2bb80009b50003b1
toData,17,2ab400022bb8000b2ab400032bb8000bb1
-
+
org/apache/geode/cache/query/internal/CumulativeNonDistinctResults,2
fromData,126,2bb8001dc0001e4d2abb00035912042cb70005b500012cb9001f01003e2bb90020010037042abb001a59160488b70021b5000816043706160609949e00421d9900232bb800223a082ab40008bb0023592cc000241908b70025b90026020057a700152bb8001d3a082ab400081908b9002602005716060a653706a7ffbdb1
toData,125,2ab40001b900280100b9001f01003d2ab40001b9002801002bb80029bb002a5911040001b7002b4e2db6002c3a042ab600143a050336061905b9001501009900311905b9001601003a071c9900181907c0002db9002e01003a0819082bb8002fa7000919072db80029840601a7ffcb1904150685b600302d2bb60031b1
-
+
org/apache/geode/cache/query/internal/LinkedResultSet,2
fromData,40,2bb9001501003d2a2bb80016c00017b500071c3e1d9e00122a2bb80016b60018578403ffa7fff0b1
toData,46,2b2ab60019b9001a02002ab400072bb8001b2ab6001c4d2cb9001d01009900102cb9001e01002bb8001ba7ffedb1
-
+
org/apache/geode/cache/query/internal/LinkedStructSet,2
fromData,68,2a2bb900300100b500022bb9003101003d2a2bb80032c00020b500071c3e1d9e00242bb80032c000333a042abb000c592ab400071904b70034b60035578403ffa7ffdeb1
toData,66,2b2ab40002b9003702002b2ab60038b9003902002ab400072bb8003a2ab600284d2cb90029010099001a2cb9002a0100c000124e2db9003b01002bb8003aa7ffe3b1
-
+
org/apache/geode/cache/query/internal/NWayMergeResults,2
fromData,134,2bb8001ec0001f4d2abb00045912202cb70006b500022cb9002101003e2a2bb80022b500012bb90023010037042abb001b59160488b70024b5000916043706160609949e00421d9900232bb800253a082ab40009bb0026592cc000271908b70028b90029020057a700152bb8001e3a082ab400091908b9002902005716060a653706a7ffbdb1
toData,133,2ab40002b9002b0100b9002101003d2ab40002b9002b01002bb8002c2ab400012bb8002dbb002e5911040001b7002f4e2db600303a042ab600153a050336061905b9001601009900311905b9001701003a071c9900181907c00031b9003201003a0819082bb80033a7000919072db8002c840601a7ffcb1904150685b600342d2bb60035b1
-
+
org/apache/geode/cache/query/internal/NullToken,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/cache/query/internal/PRQueryTraceInfo,2
fromData,29,2a2bb900090100b500042a2bb9000a0100b500062a2bb8000bb50003b1
toData,29,2b2ab40004b9000502002b2ab40006b9000702002ab400032bb80008b1
-
+
org/apache/geode/cache/query/internal/ResultsBag,2
fromData,106,2a2bb80018c00019b5001a2a2bb9001b0100b50017b2001c9a00162ab400179c000fbb001d592ab40017b7001ebf2a2ab6001fb500042a2bb600202ab400172ab40021643d1c9e00232bb800184e2bb9001b010036042ab400042d1504b60022571c1504643da7ffdfb1
toData,116,2ab4001a2bb800242b2ab60025b9002602002a2bb600272ab600252ab40021643d2ab40004b60028b9002901004e2db9000a010099003f1c9e003b2db9000b0100c0002a3a041904b6002b3a0519052bb800241904b6002c36061c1506a200061c36062b1506b9002602001c1506643da7ffbeb1
-
+
org/apache/geode/cache/query/internal/ResultsCollectionWrapper,2
fromData,55,2bb9005801003d1c99000e2a2bb80059b50002a7000e2a2bb8005ac0005bb500022a2bb8005ac0005cb5000d2a2bb900580100b50004b1
toData,60,2ab40002c100543d2b1cb9005502001c9900112ab40002c0004e2bb80056a7000b2ab400022bb800572ab4000d2bb800572b2ab40004b900550200b1
-
+
org/apache/geode/cache/query/internal/ResultsSet,2
fromData,49,2bb9001801003dbb001959b7001a4e2d2bb8001b2a2db600051c360415049e00122a2bb8001cb6001d578404ffa7ffefb1
toData,70,2b2ab6001eb9001f02002ab60020b900040100c000194d2cc6000704a70004031221b800222c2bb800232ab600244e2db9002501009900102db9002601002bb80027a7ffedb1
-
+
org/apache/geode/cache/query/internal/SortedResultSet,2
fromData,40,2bb9001601003d2a2bb80017c00018b500081c3e1d9e00122a2bb80017b60019578403ffa7fff0b1
toData,46,2b2ab6001ab9001b02002ab400082bb8001c2ab6001d4d2cb9001e01009900102cb9001f01002bb8001ca7ffedb1
-
+
org/apache/geode/cache/query/internal/SortedStructSet,2
fromData,57,2a2bb900440100b500022bb9004501003d2a2bb80046c00034b500091c3e1d9e00192bb80046c000283a042a1904b60013578403ffa7ffe9b1
toData,64,2b2ab40002b9004702002b2ab6002bb9004802002ab400092bb800492ab6002c4d2cb9002601009900182cb900270100c00028c000284e2d2bb8004aa7ffe5b1
-
+
org/apache/geode/cache/query/internal/StructBag,2
fromData,16,2a2bb700482a2bb900490100b50002b1
toData,16,2a2bb7004a2b2ab40002b9004b0200b1
-
+
org/apache/geode/cache/query/internal/StructImpl,2
fromData,72,2a2bb80026c00027b500072a2bb80028b500082ab40008c600302ab400084d2cbe3e03360415041da2001f2c1504323a051905c1000999000b2a04b50002a70009840401a7ffe1b1
toData,17,2ab400072bb800292ab400082bb8002ab1
-
+
org/apache/geode/cache/query/internal/StructSet,2
fromData,58,2abb000359bb000459b70005b70006b500072bb9005101003d2a2bb80052c00041b5000c1c3e1d9e00122a2bb80052b60031578403ffa7fff0b1
toData,46,2b2ab6003ab9005302002ab4000c2bb800542ab6004a4d2cb9001201009900102cb9001301002bb80054a7ffedb1
-
+
org/apache/geode/cache/query/internal/Undefined,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/cache/query/internal/index/IndexCreationData,2
fromData,106,2a2bb9000f0100b500022a2bb9000f0100b500052a2bb9000f0100b500042a2bb900100100b500082bb9001101003d031ca0000d2ab2000cb50003a70019041ca0000d2ab2000eb50003a7000a2ab20012b500032bb9001001003e1d99000d2a2bb9000f0100b50006b1
toData,122,2b2ab40002b9000a02002b2ab40005b9000a02002b2ab40004b9000a02002b2ab40008b9000b0200b2000c2ab40003a6000d2b03b9000d0200a7001eb2000e2ab40003a6000d2b04b9000d0200a7000a2b05b9000d02002ab40006c600172b04b9000b02002b2ab40006b9000a0200a7000a2b03b9000b0200b1
-
+
org/apache/geode/cache/query/internal/types/CollectionTypeImpl,2
fromData,17,2a2bb700232a2bb80024c00025b50003b1
toData,14,2a2bb700262ab400032bb80027b1
-
+
org/apache/geode/cache/query/internal/types/MapTypeImpl,2
fromData,17,2a2bb7001c2a2bb8001dc00015b50003b1
toData,14,2a2bb7001e2ab400032bb8001fb1
-
+
org/apache/geode/cache/query/internal/types/ObjectTypeImpl,2
fromData,9,2a2bb8000ab50002b1
toData,9,2ab400022bb8000bb1
-
+
org/apache/geode/cache/query/internal/types/StructTypeImpl,2
fromData,28,2a2bb700292a2bb8002ab5000b2a2bb8002bc0002cc0002cb5000db1
toData,22,2a2bb7002d2ab4000b2bb8002e2ab4000d2bb8002fb1
-
+
org/apache/geode/cache/server/ServerLoad,2
fromData,41,2a2bb900070100b500022a2bb900070100b500042a2bb900070100b500032a2bb900070100b50005b1
toData,41,2b2ab40002b9000602002b2ab40004b9000602002b2ab40003b9000602002b2ab40005b900060200b1
-
+
org/apache/geode/cache/server/internal/ConnectionCountProbe,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/DistributionAdvisor$Profile,2
fromData,40,2abb001259b70013b500082ab400082bb800142a2bb900150100b500092a2bb900150100b50003b1
toData,29,2ab400082bb800102b2ab40009b9001102002b2ab40003b900110200b1
-
+
org/apache/geode/distributed/internal/DistributionMessage,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/HighPriorityAckedMessage,2
fromData,51,2a2bb700442a2bb900450100b500122ab800462bb90045010032b500092a2bb900470100b5000a2a2bb80048c00049b50007b1
toData,47,2a2bb700402b2ab40012b9004102002b2ab40009b60024b9004102002b2ab4000ab9004202002ab400072bb80043b1
-
+
org/apache/geode/distributed/internal/ReplyMessage,2
fromData,101,2a2bb7003d2bb9003e01003d2a1c05b8003fb500022a1c1008b8003fb500031c04b8003f99000d2a2bb900400100b500041c07b8003f9900132a2bb80041b500062a04b50007a700141c1040b8003f99000b2a2bb80041b500062a1c1080b8003fb50039b1
toData,132,2a2bb70038033d2ab400029900081c0580913d2ab4000799000b1c0780913da700102ab40006c600091c104080913d2ab400049900081c0480913d2ab400039900091c100880913d2ab400399900091c108080913d2b1cb9003a02002ab4000499000d2b2ab40004b9003b02002ab400079a000a2ab40006c6000b2ab400062bb8003cb1
-
+
org/apache/geode/distributed/internal/SerialAckedMessage,2
fromData,27,2a2bb7002c2a2bb9002d0100b500172a2bb8002ec0001fb50007b1
toData,24,2a2bb700292b2ab40017b9002a02002ab400072bb8002bb1
-
+
org/apache/geode/distributed/internal/ServerLocation,2
fromData,19,2a2bb8000bb500092a2bb9000c0100b5000ab1
toData,19,2ab400092bb8000d2b2ab4000ab9000e0200b1
-
+
org/apache/geode/distributed/internal/ShutdownMessage,2
fromData,27,2a2bb7000c2a2bb9000d0100b500032a2bb8000ec0000fb50002b1
toData,24,2a2bb700092b2ab40003b9000a02002ab400022bb8000bb1
-
+
org/apache/geode/distributed/internal/StartupMessage,3
fromDataProblem,38,2ab40037c7000e2abb006559b70066b500372ab400372bb60067572ab400371268b6006757b1
fromData,293,2a2bb700692a2bb8006ab500092a2bb9006b0100b5000c2a2bb9006c0100b5000d2a2bb9006c0100b500112bb9006b01003d033e1d1ca2003e2bb8006d3a042bb9006b010036051904c6000d19040301011505b8006ea700183a062ab2006f04bd00205903190653b60024b70070840301a7ffc32bb9006b01003e03360415041da200492bb8006d3a052bb8006d3a062bb9006b010036071905c600121906c6000d19051906150703b80071a700183a082ab2007204bd00205903190853b60024b70070840401a7ffb72a2bb80073c00074b500122a2bb9006b0100b500172a2bb8006ab500182a2bb9006c0100b50019bb005e59b7005f3a0419042bb600752a1904b60076b5000a2a1904b60077b5000b2a1904b60078b5000e2a1904b60079b5000fb1
toData,318,2a2bb7004b2ab400092bb8004c2b2ab4000cb9004d02002b2ab4000db9004e02002b2ab40011b9004e0200b8004f4d2b2cbeb9004d0200033e1d2cbea2001f2c1d32b600502bb800512b2c1d32b60052b9004d0200840301a7ffe1b800534e2b2dbeb9004d020003360415042dbea200782d150432c100549900302d150432c00054b60055b600563a052d150432c00054b60057b600563a062d150432c00054b600583607a700272d150432c00059b6005a3a052d150432c00059b6005b3a062d150432c00059b6005c360719052bb8005119062bb800512b1507b9004d0200840401a7ff872ab400122bb8005d2b2ab40017b9004d02002ab400182bb8004c2b2ab40019b9004e0200bb005e59b7005f3a0419042ab4000ab6006019042ab4000bb6006119042ab4000eb6006219042ab4000fb6006319042bb60064b1
-
+
org/apache/geode/distributed/internal/StartupResponseMessage,3
fromDataProblem,43,2ab40026c7000e2abb003859b70039b500262ab400262bb6003a572ab40026123b123cb8003db6003a57b1
fromData,220,2a2bb700442a2bb900450100b500202a2bb80046b500092a2bb900470100b5000a2bb9004501003d2a1cbd0013b500032a1cbc0ab50002033e1d1ca200332ab400031d2bb80048532ab400021d2bb9004501004fa700143a042ab400021d2bb9004501004f1904bf840301a7ffce2bb9004501003e2a1dbd0013b500042a1dbd0013b500052a1dbc0ab5000603360415041da2002c2ab4000415042bb80048532ab4000515042bb80048532ab4000615042bb9004501004f840401a7ffd42a2bb80049c0004ab5000c2a2bb900450100b5000e2a2bb80046b50011b1
toData,170,2a2bb7003e2b2ab40020b9003f02002ab400092bb800402b2ab4000ab9004102002b2ab40002beb9003f0200033d1c2ab40002bea2001f2ab400031c322bb800422b2ab400021c2eb9003f0200840201a7ffde2b2ab40006beb9003f0200033d1c2ab40006bea200292ab400041c322bb800422ab400051c322bb800422b2ab400061c2eb9003f0200840201a7ffd42ab4000c2bb800432b2ab4000eb9003f02002ab400112bb80040b1
-
+
org/apache/geode/distributed/internal/StartupResponseWithVersionMessage,2
fromData,43,2a2bb7001f2a2bb80020b50004bb001a59b7001b4d2c2bb600212a2cb60022b500062a2cb60023b50009b1
toData,43,2a2bb700182ab400042bb80019bb001a59b7001b4d2c2ab40006b6001c2c2ab40009b6001d2c2bb6001eb1
-
+
org/apache/geode/distributed/internal/WaitForViewInstallation,2
fromData,26,2a2bb7001c2a2bb9001d0100b500162a2bb9001e0100b50017b1
toData,26,2a2bb700192b2ab40016b9001a03002b2ab40017b9001b0200b1
-
+
org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryMessage,2
fromData,42,2a2bb700472a2bb80048b500032a2bb80049b500432a2bb9004a0100b500322a2bb9004b0100b50002b1
toData,42,2a2bb700412ab400032bb800422ab400432bb800442b2ab40032b9004502002b2ab40002b900460200b1
-
+
org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryReplyMessage,2
fromData,74,2a2bb700092a2bb9000a0100b500032ab4000304a000352bb8000bc0000c4d2cc600152abb000d592c2bb9000a0100b7000eb500042a2bb9000a0100b500062a2bb9000f0100b50007b1
toData,83,2a2bb700102b2ab40003b9001102002ab4000304a0003e2ab40004c7000b012bb80012a7001b2ab40004b600052bb800122b2ab40004b60013b9001102002b2ab40006b9001102002b2ab40007b900140300b1
-
+
org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorMessage,2
fromData,55,2a2bb700122a2bb80013b500022a2bb900140100b500032a2bb900140100b500052a2bb900150100b500042a2bb80016c00017b50006b1
toData,52,2a2bb700182ab400022bb800192b2ab40003b9001a02002b2ab40005b9001a02002b2ab40004b9001b03002ab400062bb8001cb1
-
+
org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorReplyMessage,2
fromData,30,2a2bb700052a2bb900060100b500022a2bb80007c00008c00008b50003b1
toData,24,2a2bb700092b2ab40002b9000a02002ab400032bb8000bb1
-
+
org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseMessage,2
fromData,52,2a2bb7004e2a2bb8004fb500032a2bb80050b5002b2a2bb900510100b5002a2a2bb900520100b500022a2bb900520100b50041b1
toData,52,2a2bb700492ab400032bb8004a2ab4002b2bb8004b2b2ab4002ab9004c02002b2ab40002b9004d02002b2ab40041b9004d0200b1
-
+
org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseReplyMessage,2
fromData,24,2a2bb700052a2bb80006b500072a2bb900080100b50003b1
toData,24,2a2bb700092ab400072bb8000a2b2ab40003b9000b0200b1
-
+
org/apache/geode/distributed/internal/locks/DLockRemoteToken,2
fromData,10,bb000e59120fb70010bf
toData,53,2ab400112bb800252ab40012b600152bb800252b2ab40012b60026b9002702002b2ab40013b9002702002b2ab40014b900280300b1
-
+
org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockRequestMessage,2
fromData,134,2a2bb700a62a2bb900a70100b500242a2bb800a8b500102a2bb900a90100b500112a2bb900a90100b500122a2bb900a90100b500132a2bb900aa0100b500552a2bb900aa0100b5000e2a2bb900ab0100b5000f2a2bb900ab0100b500142a2bb900ab0100b500152a2bb900a90100b500162a2bb900ab0100b500172a2bb900ab0100b5006cb1
toData,134,2a2bb700a02b2ab40024b900a102002ab400102bb800a22b2ab40011b900a303002b2ab40012b900a303002b2ab40013b900a303002b2ab40055b900a402002b2ab4000eb900a402002b2ab4000fb900a502002b2ab40014b900a502002b2ab40015b900a502002b2ab40016b900a303002b2ab40017b900a502002b2ab4006cb900a50200b1
-
+
org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockResponseMessage,2
fromData,72,2a2bb700442a2bb900450100b500032a2bb900460100b500112a2bb80047b500122a2bb900480100b5003f2a2bb80047b500412a2bb900490100b500132a2bb900490100b50043b1
toData,72,2a2bb7003b2b2ab40003b9003c02002b2ab40011b9003d02002ab400122bb8003e2b2ab4003fb9004003002ab400412bb8003e2b2ab40013b9004202002b2ab40043b900420200b1
-
+
org/apache/geode/distributed/internal/locks/DLockService$SuspendLockingToken,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor$DeposeGrantorMessage,2
fromData,55,2a2bb700162a2bb900170100b500092a2bb80018b500042a2bb80019c0001ab500052a2bb9001b0100b500062a2bb900170100b50007b1
toData,52,2a2bb7001c2b2ab40009b9001d02002ab400042bb8001e2ab400052bb8001f2b2ab40006b9002003002b2ab40007b9001d0200b1
-
+
org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitMessage,2
fromData,16,2a2bb7001d2a2bb9001e0100b50005b1
toData,16,2a2bb7001f2b2ab40005b900200200b1
-
+
org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitReplyMessage,2
fromData,38,2a2bb7000e2a2bb8000fb500042a2bb8000fb500052a2bb8000fb500062a2bb8000fb50007b1
toData,38,2a2bb700102ab400042bb800112ab400052bb800112ab400062bb800112ab400072bb80011b1
-
+
org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorInfoReplyMessage,2
fromData,47,2a2bb700142a2bb80015c00016b500052a2bb900170100b500092a2bb900180100b5000b2a2bb900190100b50007b1
toData,44,2a2bb7001a2ab400052bb8001b2b2ab40009b9001c03002b2ab4000bb9001d02002b2ab40007b9001e0200b1
-
+
org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorRequestMessage,2
fromData,73,2a2bb700292a2bb9002a0100b500052a2bb9002b0100b500062a2bb8002cb500072a2bb9002b0100b5000b2a2bb9002d0100b500092ab4000904a0000e2a2bb8002ec0002fb50008b1
toData,70,2a2bb700302b2ab40005b9003103002b2ab40006b9003202002ab400072bb800332b2ab4000bb9003202002b2ab40009b9003402002ab4000904a0000b2ab400082bb80035b1
-
+
org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedMessage,2
fromData,24,2a2bb700282a2bb900290100b500082a2bb8002ab50006b1
toData,24,2a2bb7002b2b2ab40008b9002c02002ab400062bb8002db1
-
+
org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedReplyMessage,2
fromData,16,2a2bb700172a2bb900180100b50008b1
toData,16,2a2bb700192b2ab40008b9001a0200b1
-
+
org/apache/geode/distributed/internal/membership/InternalDistributedMember,6
fromData,38,2a2bb6009f2ab6009ab900190100b20095b60078a100112ab400012bb900960200a700044db1
fromDataPre_GFE_7_1_0_0,282,2bb800a04d2bb900a101003e2a2bb8008fb500072ab2000499000e2c2ab40007b800a2a700072cb60008b500072bb900a3010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2bb900a1010036072bb900a1010036082bb900a3010036092bb800913a0a02360b2bb8008f3a0c1509100da0000e2a2bb8008fb50014a700152bb8008f3a0d190dc6000a190db800a4360b2bb8008f3a0d2bb80092b60093360e190db600779e0011bb004f59190d150eb70050a70004013a0f2a15042bb700943610bb003159150715081509150b190c190a190fb700323a112a2c1d1505150615101911b80018b500012ab40001b9003e01009e000704a7000403b80047b1
@@ -291,1848 +291,1844 @@ fromDataPre_GFE_9_0_0_0,282,2bb800a04d2bb900a101003e2a2bb8008fb500072ab200049900
toData,34,2a2bb600992ab40001b900190100b20095b60078a1000d2ab6009a2bb9008b0200b1
toDataPre_GFE_7_1_0_0,271,2ab40001b9003e01009e000704a7000403b800472ab600592bb8009b2b2ab60058b9009c02002ab400072bb80082033d2ab40001b9008301009900071c04803d2ab40001b9007301009900071c05803d2ab4003a9900071c07803d2b1c1100ff7e91b9009d02002b2ab40001b9003d0100b9009c02002b2ab40001b9004b0100b9009c02002b2ab40001b9003e0100b9009d02002ab40001b9004001002bb800852ab40001b9004c01002bb800822ab40001b9003e01003e1d100da0000e2ab400142bb80082a700132ab40001b9003f0100b8009e2bb800822ab40001b9004e01003a041904c70008124da700081904b600862bb800821904c7000911012ca700081904b60087b800882bb80089b1
toDataPre_GFE_9_0_0_0,266,2ab600592bb8009b2b2ab60058b9009c02002ab400072bb80082033d2ab40001b9008301009900071c04803d2ab40001b9007301009900071c05803d2ab4003a9900071c07803d1c1008803d2b1c1100ff7e91b9009d02002b2ab40001b9003d0100b9009c02002b2ab40001b9004b0100b9009c02002ab40001b9003e01003e2b1db9009d02002ab40001b9004001002bb800852ab40001b9004c01002bb800821d100da0000e2ab400142bb80082a700132ab40001b9003f0100b8009e2bb800822ab40001b9004e01003a041904c70008124da700081904b600862bb800821904c7000911012ca700081904b60087b800882bb800892ab40001b90019010036052b150504b8008ab1
-
+
org/apache/geode/distributed/internal/membership/NetView,2
fromData,109,2a2bb8006ec0002bb500132a2bb9006f0100b500082a2bb80070b5000bb200409a00122ab4000bc7000bbb004159b70042bf2abb000c592ab4000bb7000db5000e2a2bb80071b500102a2bb80071b500122a2bb80072b500052bb800734d2cc6000d2ab400042cb900180200b1
toData,60,2ab400132bb800682b2ab40008b9006902002a2ab4000b2bb7006a2ab400102bb8006b2ab400122bb8006b2ab400052bb8006c2ab400042bb8006db1
-
+
org/apache/geode/distributed/internal/membership/gms/GMSMember,2
fromData,62,2a2bb6004b2a2bb9004c0100b500072a2bb9004d0100b5003c2a2bb9004d0100b500092a2bb9004c0100b500082a2bb8004eb5000a2a2bb8004fb5000bb1
toData,62,2a2bb6003f2b2ab40007b9004002002b2ab4003cb9004102002b2ab40009b9004102002b2ab40008b9004002002ab4000a2bb800422ab4000b2bb80043b1
-
+
org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest,2
fromData,97,2a2bb8001dc0001ab500022bb9001e01003d2abb001f591cb70020b50005033e1d1ca2001a2ab400052bb8001dc0001ab90021020057840301a7ffe72a2bb9001e0100b500062a2bb9001e0100b500082a2bb80022b500042a2bb80023b50007b1
toData,114,2ab400022bb800142ab40005c6003a2b2ab40005b900150100b9001602002ab40005b9001701004d2cb9001801009900152cb900190100c0001a4e2d2bb80014a7ffe8a7000a2b03b9001602002b2ab40006b9001602002b2ab40008b9001602002ab400042bb8001b2ab400072bb8001cb1
-
+
org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse,2
fromData,105,2a2bb80026c00027b500022a2bb80026c00027b500032a2bb80028b5000a2a2bb80029b5000c2a2bb9002a0100b500092ab400099a00342a2bb9002a0100b500042a2bb9002a0100b500072a2bb9002a0100b500082a2bb80026c0002bb500052a2bb8002cb50006b1
toData,89,2ab400022bb800212ab400032bb800212ab4000a2bb800222ab4000c2bb800232b2ab40009b9002402002b2ab40004b9002402002b2ab40007b9002402002b2ab40008b9002402002ab400052bb800212ab400062bb80025b1
-
+
org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse,2
fromData,12,2a2bb80005c00006b50002b1
toData,9,2ab400022bb80004b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage,2
fromData,11,2a2bb900110100b50002b1
toData,11,2b2ab40002b900100200b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage,2
fromData,22,2a2bb900130100b500022a2bb80014c00015b50003b1
toData,19,2b2ab40002b9001102002ab400032bb80012b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage,2
fromData,49,2a2bb700112a2bb900120100b500072ab800132bb90012010032b500052a2bb80014c00015b500022a2bb80014b50006b1
toData,45,2a2bb7000d2b2ab40007b9000e02002b2ab40005b6000fb9000e02002ab400022bb800102ab400062bb80010b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage,2
fromData,48,2a2bb8001bc0001cb500042a2bb8001bb500052a2bb8001db500022a2bb9001e0100b6001f2a2bb900200100b50006b1
toData,45,2ab400042bb800162ab400052bb800162ab400022bb800172b2ab60018b9001902002b2ab40006b9001a0200b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage,2
fromData,47,2a2bb8001bc0001cb500022a2bb8001bc0001db500032a2bb8001eb500072a2bb8001fb500082a2bb8001fb50006b1
toData,41,2ab400022bb800182ab400032bb800182ab400072bb800192ab400082bb8001a2ab400062bb8001ab1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage,2
fromData,20,2a2bb8000cc0000db500032a2bb8000eb50004b1
toData,17,2ab400032bb8000a2ab400042bb8000bb1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage,2
fromData,20,2a2bb80015c00016b500032a2bb80017b50004b1
toData,17,2ab400032bb800132ab400042bb80014b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage,2
fromData,53,2bb9001b01003d033e1d1ca20029bb0016592bb8001cc0001d2bb8001eb7001f3a042ab400031904b90020020057840301a7ffd8b1
toData,81,2ab40003c600452b2ab40003b900110100b9001202002ab40003b9001301004d2cb9001401009900202cb900150100c000164e2db600172bb800182db600192bb8001aa7ffdda7000a2b03b900120200b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage,2
fromData,37,2a2bb7000e2a2bb9000f0100b500032a2bb900100100b500042a2bb80011c00012b50005b1
toData,34,2a2bb7000a2b2ab40003b9000b02002b2ab40004b9000c02002ab400052bb8000db1
-
+
org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage,2
fromData,8,bb000859b70009bf
toData,8,bb000859b70009bf
-
+
org/apache/geode/distributed/internal/streaming/StreamingOperation$RequestStreamingMessage,2
fromData,16,2a2bb700202a2bb900210100b50003b1
toData,16,2a2bb700222b2ab40003b900230200b1
-
+
org/apache/geode/distributed/internal/streaming/StreamingOperation$StreamingReplyMessage,2
fromData,339,2a2bb700142bb9001501003d2a2bb900150100b500102a2bb900160100b500112a2bb900160100b500032bb800174e2db20018b600199e000704a700040336041c02a0000b2a01b50002a701082a1cb5000e2abb001a591cb7001bb500022ab4000399000704b8001c2ab40008b8001d3a051905c1001e3606013a07150699000d1905c0001eb6001f3a0703360803360915091ca20087b20020c6000cb2002006b900210200150699000fb80022990009043608a700672bb800233a0a150699004a1907c600451907b90024010099003b1504360b150b99001715099a0012190ac100259a000704a7000403360b150b990019bb0026591907c00027190ac00028c00028b700293a0a2ab40002190ab9002a020057840901a7ff7915089900172a04b50004b20020c6000cb2002005b9002102002ab4000399001a03b8001ca700133a0c2ab4000399000703b8001c190cbfb1
toData,85,2a2bb7002b2ab4000dc7000d2b02b9002c0200a7000d2b2ab4000eb9002c02002b2ab40010b9002c02002b2ab40011b9002d02002b2ab40003b9002d02002ab4000dc600122ab4000e9e000b2ab4000d2bb6002eb1
-
+
org/apache/geode/distributed/internal/tcpserver/InfoRequest,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/tcpserver/InfoResponse,2
fromData,9,2a2bb80003b50002b1
toData,9,2ab400022bb80004b1
-
+
org/apache/geode/distributed/internal/tcpserver/ShutdownRequest,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/tcpserver/ShutdownResponse,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/tcpserver/VersionRequest,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/tcpserver/VersionResponse,2
fromData,11,2a2bb900060100b50004b1
toData,11,2b2ab40004b900050200b1
-
+
org/apache/geode/internal/DSFIDFactory,2
fromData,8,bb000259b70003bf
toData,8,bb000259b70003bf
-
+
org/apache/geode/internal/InternalDataSerializer$RegistrationMessage,2
fromData,39,2a2bb700282bb800292a2bb8002ab500042a2bb9002b0100b500062a2bb8002cc00008b50009b1
toData,32,2a2bb700242ab400042bb800252b2ab40006b9002602002ab400092bb80027b1
-
+
org/apache/geode/internal/InternalInstantiator$RegistrationContextMessage,2
fromData,14,2a2bb7001a2a2bb8001bb5000db1
toData,14,2a2bb7001c2ab4000d2bb8001db1
-
+
org/apache/geode/internal/InternalInstantiator$RegistrationMessage,3
fromDataProblem,38,2ab4000bc7000e2abb001b59b7001cb5000b2ab4000b2bb6001d572ab4000b121eb6001d57b1
fromData,125,2a2bb7001f2a2bb80020b500122a2bb80020b50013b80021c6004f2a2ab40012b80022b50003a7001b4d2ab2002404bd002559032c53b60026b700272a01b500032a2ab40013b80022b50005a7001b4d2ab2002804bd002559032c53b60026b700272a01b500052a2bb900290100b500072a2bb8002ac00009b5000ab1
toData,46,2a2bb700162ab40003b600172bb800182ab40005b600172bb800182b2ab40007b9001902002ab4000a2bb8001ab1
-
+
org/apache/geode/internal/ManagerInfo,2
fromData,61,2a2bb900540100b500182a2bb900540100b500192a2bb900540100b5001a2bb9005501003d1c9e00161cbc084e2b2db9005602002a2db80057b5001bb1
toData,74,2b2ab40018b9005002002b2ab40019b9005002002b2ab4001ab9005002002ab4001bc7000d2b03b900510200a7001d2ab4001bb600524d2b2cbeb9005102002b2c032cbeb900530400b1
-
+
org/apache/geode/internal/admin/ClientMembershipMessage,2
fromData,32,2a2bb7000d2a2bb8000eb500022a2bb8000eb500032a2bb9000f0100b50004b1
toData,32,2a2bb7000a2ab400022bb8000b2ab400032bb8000b2b2ab40004b9000c0200b1
-
+
org/apache/geode/internal/admin/remote/AddHealthListenerRequest,2
fromData,17,2a2bb700102a2bb80011c00012b50007b1
toData,14,2a2bb7000e2ab400072bb8000fb1
-
+
org/apache/geode/internal/admin/remote/AddHealthListenerResponse,2
fromData,16,2a2bb7000c2a2bb9000d0100b50008b1
toData,16,2a2bb7000a2b2ab40008b9000b0200b1
-
+
org/apache/geode/internal/admin/remote/AddStatListenerRequest,2
fromData,26,2a2bb700112a2bb900120100b500042a2bb900130100b50006b1
toData,26,2a2bb7000e2b2ab40004b9000f03002b2ab40006b900100200b1
-
+
org/apache/geode/internal/admin/remote/AddStatListenerResponse,2
fromData,16,2a2bb7000c2a2bb9000d0100b50008b1
toData,16,2a2bb7000a2b2ab40008b9000b0200b1
-
+
org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage,2
fromData,34,2a2bb7001a2a2bb9001b0100b500052a2bb9001b0100b500042a2bb8001cb50007b1
toData,34,2a2bb700172b2ab40005b9001802002b2ab40004b9001802002ab400072bb80019b1
-
+
org/apache/geode/internal/admin/remote/AdminConsoleMessage,2
fromData,16,2a2bb7000f2a2bb900100100b50005b1
toData,16,2a2bb7000d2b2ab40005b9000e0200b1
-
+
org/apache/geode/internal/admin/remote/AdminFailureResponse,2
fromData,17,2a2bb700092a2bb8000ac0000bb50005b1
toData,14,2a2bb700072ab400052bb80008b1
-
+
org/apache/geode/internal/admin/remote/AdminRequest,2
fromData,24,2a2bb7002b2a2bb9002c0100b500052a2bb8002db50003b1
toData,24,2a2bb700282b2ab40005b9002902002ab400032bb8002ab1
-
+
org/apache/geode/internal/admin/remote/AdminResponse,2
fromData,16,2a2bb700062a2bb900070100b50002b1
toData,16,2a2bb700042b2ab40002b900050200b1
-
+
org/apache/geode/internal/admin/remote/AlertLevelChangeMessage,2
fromData,16,2a2bb700132a2bb900140100b50004b1
toData,16,2a2bb700112b2ab40004b900120200b1
-
+
org/apache/geode/internal/admin/remote/AlertListenerMessage,2
fromData,69,2a2bb7001f2a2bb900200100b500062a2bb80021c00022b500072a2bb80023b500082a2bb80023b5000a2a2bb900240100b5000b2a2bb80023b5000c2a2bb80023b5000db1
toData,66,2a2bb7001a2b2ab40006b9001b02002ab400072bb8001c2ab400082bb8001d2ab4000a2bb8001d2b2ab4000bb9001e03002ab4000c2bb8001d2ab4000d2bb8001db1
-
+
org/apache/geode/internal/admin/remote/AlertsNotificationMessage,2
fromData,20,2a2bb700052a2bb80006c00007c00007b50003b1
toData,14,2a2bb700022ab400032bb80004b1
-
+
org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage,2
fromData,16,2a2bb700122a2bb900130100b50005b1
toData,16,2a2bb700102b2ab40005b900110200b1
-
+
org/apache/geode/internal/admin/remote/BridgeServerRequest,2
fromData,47,2a2bb700182a2bb900190100b500052a2bb900190100b500062a2bb8001ac0001bb5000a2a2bb900190100b5000fb1
toData,44,2a2bb700152b2ab40005b9001602002b2ab40006b9001602002ab4000a2bb800172b2ab4000fb900160200b1
-
+
org/apache/geode/internal/admin/remote/BridgeServerResponse,2
fromData,28,2a2bb700292a2bb8002ac0000fb5000b2a2bb8002ac00024b50025b1
toData,22,2a2bb700272ab4000b2bb800282ab400252bb80028b1
-
+
org/apache/geode/internal/admin/remote/CacheConfigRequest,2
fromData,36,2a2bb700112a2bb900120100b500032a2bb900130100b500042a2bb900130100b50006b1
toData,36,2a2bb7000e2b2ab40003b9000f02002b2ab40004b9001002002b2ab40006b900100200b1
-
+
org/apache/geode/internal/admin/remote/CacheConfigResponse,2
fromData,28,2a2bb7001c2a2bb8001dc00014b500092a2bb8001dc00017b50018b1
toData,22,2a2bb7001a2ab400092bb8001b2ab400182bb8001bb1
-
+
org/apache/geode/internal/admin/remote/CacheInfoRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/CacheInfoResponse,2
fromData,17,2a2bb7000f2a2bb80010c00008b5000ab1
toData,14,2a2bb7000d2ab4000a2bb8000eb1
-
+
org/apache/geode/internal/admin/remote/CancelStatListenerRequest,2
fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
toData,16,2a2bb7000b2b2ab40003b9000c0200b1
-
+
org/apache/geode/internal/admin/remote/CancelStatListenerResponse,2
fromData,6,2a2bb7000ab1
toData,6,2a2bb70009b1
-
+
org/apache/geode/internal/admin/remote/CancellationMessage,2
fromData,16,2a2bb7000c2a2bb9000d0100b50004b1
toData,16,2a2bb7000a2b2ab40004b9000b0200b1
-
+
org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage,2
fromData,16,2a2bb700072a2bb900080100b50003b1
toData,16,2a2bb700052b2ab40003b900060300b1
-
+
org/apache/geode/internal/admin/remote/ClientHealthStats,4
fromData,73,2a2bb80011b500052a2bb80011b500062a2bb80011b500072a2bb80011b500082a2bb80011b500092a2bb80011b5000b2a2bb80012b5000a2a2bb80013b5000c2a2bb80014b50004b1
fromDataPre_GFE_8_0_0_0,65,2a2bb80011b500052a2bb80011b500062a2bb80011b500072a2bb80011b500082a2bb80011b500092a2bb80011b5000b2a2bb80012b5000a2a2bb80013b5000cb1
toData,73,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400092bb8000d2ab4000b2bb8000d2ab4000a2bb8000e2ab4000c2bb8000f2ab400042bb80010b1
toDataPre_GFE_8_0_0_0,65,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400092bb8000d2ab4000b2bb8000d2ab4000a2bb8000e2ab4000c2bb8000fb1
-
+
org/apache/geode/internal/admin/remote/CompactRequest,2
fromData,6,2a2bb70029b1
toData,6,2a2bb7002ab1
-
+
org/apache/geode/internal/admin/remote/CompactResponse,2
fromData,14,2a2bb700042a2bb80005b50003b1
toData,14,2a2bb700062ab400032bb80007b1
-
+
org/apache/geode/internal/admin/remote/DestroyEntryMessage,2
fromData,25,2a2bb7001b2a2bb8001cc0001db500042a2bb8001cb50005b1
toData,22,2a2bb700192ab400042bb8001a2ab400052bb8001ab1
-
+
org/apache/geode/internal/admin/remote/DestroyRegionMessage,2
fromData,17,2a2bb7001a2a2bb8001bc0001cb50004b1
toData,14,2a2bb700182ab400042bb80019b1
-
+
org/apache/geode/internal/admin/remote/DurableClientInfoRequest,2
fromData,28,2a2bb7000c2a2bb8000db500032a2bb9000e0100b500042ab80005b1
toData,24,2a2bb700092ab400032bb8000a2b2ab40004b9000b0200b1
-
+
org/apache/geode/internal/admin/remote/DurableClientInfoResponse,2
fromData,16,2a2bb700172a2bb900180100b50002b1
toData,16,2a2bb700152b2ab40002b900160200b1
-
+
org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse,2
fromData,20,2a2bb7001e2a2bb8001fc00018c00018b50019b1
toData,14,2a2bb7001c2ab400192bb8001db1
-
+
org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest,2
fromData,27,2a2bb7000d2bb9000e01003d2bb8000fc000104e2a1c2db70003b1
toData,24,2a2bb7000a2b2ab40005b9000b02002ab400062bb8000cb1
-
+
org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse,2
fromData,14,2a2bb7000c2a2bb8000db50008b1
toData,14,2a2bb7000a2ab400082bb8000bb1
-
+
org/apache/geode/internal/admin/remote/FetchHostRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/FetchHostResponse,2
fromData,67,2a2bb700342a2bb80035b500132a2bb80036c00037b5000e2a2bb80036c00014b500262a2bb80036c00014b500192a2bb900380100b5002d2a2bb900390100b50002b1
toData,58,2a2bb7002f2ab400132bb800302ab4000e2bb800312ab400262bb800312ab400192bb800312b2ab4002db9003203002b2ab40002b900330200b1
-
+
org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest,2
fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
toData,16,2a2bb7000b2b2ab40003b9000c0300b1
-
+
org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse,2
fromData,20,2a2bb7000f2a2bb80010c00011c00011b50009b1
toData,14,2a2bb7000d2ab400092bb8000eb1
-
+
org/apache/geode/internal/admin/remote/FetchStatsRequest,2
fromData,14,2a2bb7000c2a2bb8000db50003b1
toData,14,2a2bb7000a2ab400032bb8000bb1
-
+
org/apache/geode/internal/admin/remote/FetchStatsResponse,2
fromData,20,2a2bb700152a2bb80016c00011c00011b5000fb1
toData,14,2a2bb700132ab4000f2bb80014b1
-
+
org/apache/geode/internal/admin/remote/FetchSysCfgRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/FetchSysCfgResponse,2
fromData,17,2a2bb7000d2a2bb8000ec0000fb50009b1
toData,14,2a2bb7000b2ab400092bb8000cb1
-
+
org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage,2
fromData,6,2a2bb70006b1
toData,6,2a2bb70005b1
-
+
org/apache/geode/internal/admin/remote/HealthListenerMessage,2
fromData,27,2a2bb7000e2a2bb9000f0100b500042a2bb80010c00011b50005b1
toData,24,2a2bb7000b2b2ab40004b9000c02002ab400052bb8000db1
-
+
org/apache/geode/internal/admin/remote/LicenseInfoRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/LicenseInfoResponse,2
fromData,17,2a2bb7000b2a2bb8000cc00005b50007b1
toData,14,2a2bb700092ab400072bb8000ab1
-
+
org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest,1
fromData,6,2a2bb7002fb1
-
+
org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse,2
fromData,124,2a2bb700072bb9000801003d2abb0009591cb7000ab50002033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400021904b9000e020057840301a7ffdd2bb9000801003d2abb0009591cb7000ab50003033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400031904b9000e020057840301a7ffddb1
toData,110,2a2bb7000f2b2ab40002b900100100b9001102002ab40002b9001201004d2cb9001301009900152cb900140100c000154e2d2bb80016a7ffe82b2ab40003b900100100b9001102002ab40003b9001201004d2cb9001301009900152cb900140100c000154e2d2bb80016a7ffe8b1
-
+
org/apache/geode/internal/admin/remote/ObjectDetailsRequest,2
fromData,24,2a2bb700182a2bb80019b500032a2bb9001a0100b50004b1
toData,24,2a2bb700152ab400032bb800162b2ab40004b900170200b1
-
+
org/apache/geode/internal/admin/remote/ObjectDetailsResponse,2
fromData,33,2a2bb700192a2bb8001ab5000b2a2bb8001ab5000d2a2bb8001ac0000eb50011b1
toData,30,2a2bb700172ab4000b2bb800182ab4000d2bb800182ab400112bb80018b1
-
+
org/apache/geode/internal/admin/remote/ObjectNamesRequest,2
fromData,6,2a2bb70014b1
toData,6,2a2bb70013b1
-
+
org/apache/geode/internal/admin/remote/ObjectNamesResponse,2
fromData,17,2a2bb700162a2bb80017c00008b5000ab1
toData,14,2a2bb700142ab4000a2bb80015b1
-
+
org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest,2
fromData,35,2a2bb700292abb002a59b7002bb500022ab400022bb8002c2a2bb9002d0100b50003b1
toData,24,2a2bb7002e2ab400022bb8002f2b2ab40003b900300200b1
-
+
org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest,2
fromData,6,2a2bb70009b1
toData,6,2a2bb70008b1
-
+
org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse,2
fromData,17,2a2bb7000e2a2bb8000fc00008b5000ab1
toData,14,2a2bb7000c2ab4000a2bb8000db1
-
+
org/apache/geode/internal/admin/remote/RegionAdminMessage,2
fromData,14,2a2bb700072a2bb80008b50002b1
toData,14,2a2bb700052ab400022bb80006b1
-
+
org/apache/geode/internal/admin/remote/RegionAdminRequest,2
fromData,14,2a2bb7000d2a2bb8000eb50002b1
toData,14,2a2bb7000b2ab400022bb8000cb1
-
+
org/apache/geode/internal/admin/remote/RegionAttributesRequest,2
fromData,6,2a2bb7000db1
toData,6,2a2bb7000cb1
-
+
org/apache/geode/internal/admin/remote/RegionAttributesResponse,2
fromData,17,2a2bb7000c2a2bb8000dc00005b50008b1
toData,14,2a2bb7000a2ab400082bb8000bb1
-
+
org/apache/geode/internal/admin/remote/RegionRequest,2
fromData,57,2a2bb700142a2bb900150100b500032a2bb900150100b500052a2bb80016b500062a2bb80016b500082a2bb80017c00018b5000b2ab80007b1
toData,50,2a2bb700102b2ab40003b9001102002b2ab40005b9001102002ab400062bb800122ab400082bb800122ab4000b2bb80013b1
-
+
org/apache/geode/internal/admin/remote/RegionResponse,2
fromData,33,2a2bb700262a2bb80027b500162a2bb80027b5001b2a2bb80028c0001db5001eb1
toData,30,2a2bb700232ab400162bb800242ab4001b2bb800242ab4001e2bb80025b1
-
+
org/apache/geode/internal/admin/remote/RegionSizeRequest,2
fromData,6,2a2bb70015b1
toData,6,2a2bb70014b1
-
+
org/apache/geode/internal/admin/remote/RegionSizeResponse,2
fromData,26,2a2bb7000e2a2bb9000f0100b500082a2bb9000f0100b5000ab1
toData,26,2a2bb7000c2b2ab40008b9000d02002b2ab4000ab9000d0200b1
-
+
org/apache/geode/internal/admin/remote/RegionStatisticsRequest,2
fromData,6,2a2bb7000db1
toData,6,2a2bb7000cb1
-
+
org/apache/geode/internal/admin/remote/RegionStatisticsResponse,2
fromData,17,2a2bb7000c2a2bb8000dc00005b50008b1
toData,14,2a2bb7000a2ab400082bb8000bb1
-
+
org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest,2
fromData,6,2a2bb70010b1
toData,6,2a2bb7000fb1
-
+
org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse,2
fromData,27,2a2bb700212a2bb900220100b500062a2bb80023c0000ab50002b1
toData,24,2a2bb7001e2b2ab40006b9001f02002ab400022bb80020b1
-
+
org/apache/geode/internal/admin/remote/RemoteBridgeServer,2
fromData,217,2a2bb900420100b500032a2bb900430100b5000a2a2bb900430100b500102a2bb900420100b500122a2bb900420100b500162a2bb900420100b5000e2a2bb900420100b500182a2bb900420100b5001a2a2bb900420100b500142a2bb80044b600452a2bb80046b600472a2bb80044b600482a2bb80049c0004ab6004b2a2bb8004cb6004d2a2bb900420100b5000c2a2bb900430100b500232ab600412bb900420100b9002902002ab600412bb80044b9002702002bb800444d2cc600102ab600412cb9002b0200a700102ab600412bb80044b9002d0200b1
toData,217,2b2ab40003b9003b02002b2ab4000ab9003c02002b2ab40010b9003c02002b2ab40012b9003b02002b2ab40016b9003b02002b2ab4000eb9003b02002b2ab40018b9003b02002b2ab4001ab9003b02002b2ab40014b9003b02002ab400052bb8003d2ab4001c2bb8003e2ab400072bb8003d2ab4001f2bb8003f2ab400212bb800402b2ab4000cb9003b02002b2ab40023b9003c02002b2ab60041b900280100b9003b02002ab60041b9002601002bb8003d2ab60041b9002a01002bb8003d2ab60041b9002a0100c700102ab60041b9002c01002bb8003db1
-
+
org/apache/geode/internal/admin/remote/RemoteCacheInfo,2
fromData,106,2a2bb80030b500032a2bb900310100b500052a2bb900320100b500072a2bb900310100b500092a2bb900310100b5000b2a2bb900310100b5000d2a2bb900310100b5000f2a2bb80033b500102a2bb80034c00020b500112a2bb80035b500122a2bb900320100b50029b1
toData,103,2ab400032bb8002a2b2ab40005b9002b02002b2ab40007b9002c02002b2ab40009b9002b02002b2ab4000bb9002b02002b2ab4000db9002b02002b2ab4000fb9002b02002ab400102bb8002d2ab400112bb8002e2ab400122bb8002f2b2ab40029b9002c0200b1
-
+
org/apache/geode/internal/admin/remote/RemoteCacheStatistics,2
fromData,51,2a2bb900100100b500032a2bb900100100b500052a2bb900100100b500072a2bb900100100b500092a2bb900110100b5000bb1
toData,51,2b2ab40003b9000e03002b2ab40005b9000e03002b2ab40007b9000e03002b2ab40009b9000e03002b2ab4000bb9000f0200b1
-
+
org/apache/geode/internal/admin/remote/RemoteDLockInfo,2
fromData,76,2a2bb80017b500022a2bb80017b500052a2bb80017b500032a2bb900180100b500062a2bb900190100b500092a2bb8001ac0001bb500072a2bb9001c0100b5000c2a2bb9001c0100b5000bb1
toData,73,2ab400022bb800122ab400052bb800122ab400032bb800122b2ab40006b9001302002b2ab40009b9001402002ab400072bb800152b2ab4000cb9001603002b2ab4000bb900160300b1
-
+
org/apache/geode/internal/admin/remote/RemoteEntrySnapshot,2
fromData,36,2a2bb80023b500052a2bb80023b500112a2bb80023c00014b500172a2bb80023b50013b1
toData,33,2ab400052bb800222ab400112bb800222ab400172bb800222ab400132bb80022b1
-
+
org/apache/geode/internal/admin/remote/RemoteObjectName,2
fromData,27,2a2bb80013b500042a2bb80013b500062a2bb900140100b50008b1
toData,27,2ab400042bb800112ab400062bb800112b2ab40008b900120200b1
-
+
org/apache/geode/internal/admin/remote/RemoteRegionAttributes,2
fromData,404,2a2bb80080b500082a2bb80080b5000a2a2bb80081b5000d2a2bb80080b5007a2a2bb80082c00083b5000f2a2bb80082c00083b500112a2bb80082c00084b500132a2bb80082c00084b500152a2bb80082c00084b500172a2bb80080b500192a2bb80082c00084b5001b2a2bb80080b5001d2a2bb80082c00085b5001f2a2bb80082c00086b500212a2bb900870100b500232a2bb900870100b500252a2bb900880100b500272a2bb900890100b5002b2a2bb900880100b5002d2a2bb900870100b5002f2a2bb900870100b500312a2bb900870100b500332a2bb900870100b500352a2bb900870100b500372a2bb80082c0008ab5003b2a2bb80082c0008bc0008bb5003d2a2bb80082c0008cc0008cb5003f2a2bb900870100b5007f2a2bb80082c0008db500412a2bb80082c0008eb500432a2bb80082c0008fb500452a2bb80082c00002b500042a2bb900870100b500472a2bb80080b500392a2bb900870100b5004b2a2bb80081b5004e2a2bb900870100b500052a2bb900870100b500292a2bb80080b500522a2bb900870100b50054b1
toData,353,2ab400082bb800782ab4000a2bb800782ab4000d2bb800792ab4007a2bb800782ab4000f2bb8007b2ab400112bb8007b2ab400132bb8007b2ab400152bb8007b2ab400172bb8007b2ab400192bb800782ab4001b2bb8007b2ab4001d2bb800782ab4001f2bb8007b2ab400212bb8007b2b2ab40023b9007c02002b2ab40025b9007c02002b2ab40027b9007d02002b2ab4002bb9007e02002b2ab4002db9007d02002b2ab4002fb9007c02002b2ab40031b9007c02002b2ab40033b9007c02002b2ab40035b9007c02002b2ab40037b9007c02002ab4003b2bb8007b2ab4003d2bb8007b2ab4003f2bb8007b2b2ab4007fb9007c02002ab400412bb8007b2ab400432bb8007b2ab400452bb8007b2ab400042bb8007b2b2ab40047b9007c02002ab400392bb800782b2ab4004bb9007c02002ab4004e2bb800792b2ab40005b9007c02002b2ab40029b9007c02002ab400522bb800782b2ab40054b9007c0200b1
-
+
org/apache/geode/internal/admin/remote/RemoteRegionSnapshot,2
fromData,59,2a2bb80029b500032a2bb8002ac00009b5000c2a2bb8002ac00005b500072a2bb9002b0100b500102a2bb9002b0100b500122a2bb8002ab5001cb1
toData,53,2ab400032bb800262ab4000c2bb800272ab400072bb800272b2ab40010b9002802002b2ab40012b9002802002ab4001c2bb80027b1
-
+
org/apache/geode/internal/admin/remote/RemoteStat,2
fromData,66,2a2bb8002ab500052a2bb9002b0100b5000e2a2bb9002c0100b500032a2bb8002ab500072a2bb8002ab5000b2a2bb8002dc0002eb500102a2bb9002f0100b50009b1
toData,63,2ab400052bb800252b2ab4000eb9002602002b2ab40003b9002702002ab400072bb800252ab4000b2bb800252ab400102bb800282b2ab40009b900290200b1
-
+
org/apache/geode/internal/admin/remote/RemoteStatResource,2
fromData,45,2a2bb9001a0100b500032a2bb9001a0100b500052a2bb8001bb500072a2bb8001bb5000a2a2bb8001bb5000cb1
toData,45,2b2ab40003b9001803002b2ab40005b9001803002ab400072bb800192ab4000a2bb800192ab4000c2bb80019b1
-
+
org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest,2
fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
toData,16,2a2bb7000b2b2ab40003b9000c0200b1
-
+
org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse,2
fromData,6,2a2bb70008b1
toData,6,2a2bb70007b1
-
+
org/apache/geode/internal/admin/remote/ResetHealthStatusRequest,2
fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
toData,16,2a2bb7000b2b2ab40003b9000c0200b1
-
+
org/apache/geode/internal/admin/remote/ResetHealthStatusResponse,2
fromData,6,2a2bb7000ab1
toData,6,2a2bb70009b1
-
+
org/apache/geode/internal/admin/remote/RevokePersistentIDRequest,2
fromData,25,2a2bb7001d2abb001e59b7001fb500022ab400022bb80020b1
toData,14,2a2bb700212ab400022bb80022b1
-
+
org/apache/geode/internal/admin/remote/RootRegionRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/RootRegionResponse,2
fromData,28,2a2bb700232a2bb80024c00019b5001a2a2bb80024c00019b5001bb1
toData,22,2a2bb700212ab4001a2bb800222ab4001b2bb80022b1
-
+
org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest,2
fromData,16,2a2bb700072a2bb900080100b50005b1
toData,16,2a2bb700092b2ab40005b9000a0200b1
-
+
org/apache/geode/internal/admin/remote/ShutdownAllRequest,2
fromData,6,2a2bb70044b1
toData,6,2a2bb70045b1
-
+
org/apache/geode/internal/admin/remote/ShutdownAllResponse,2
fromData,16,2a2bb700072a2bb900080100b50002b1
toData,16,2a2bb700052b2ab40002b900060200b1
-
+
org/apache/geode/internal/admin/remote/SnapshotResultMessage,2
fromData,27,2a2bb7000e2a2bb8000fc00010b500062a2bb900110100b50007b1
toData,24,2a2bb7000b2ab400062bb8000c2b2ab40007b9000d0200b1
-
+
org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage,2
fromData,30,2a2bb700102a2bb900110100b500052a2bb80012c00013c00013b50002b1
toData,24,2a2bb7000d2b2ab40005b9000e03002ab400022bb8000fb1
-
+
org/apache/geode/internal/admin/remote/StatListenerMessage,2
fromData,86,2a2bb700112a2bb900120100b500042a2bb900130100b500052a2ab40005bc0ab500062a2ab40005bc07b50007033d1c2ab40005a200212ab400061c2bb9001301004f2ab400071c2bb90014010052840201a7ffddb1
toData,66,2a2bb7000d2b2ab40004b9000e03002b2ab40005b9000f0200033d1c2ab40005a200212b2ab400061c2eb9000f02002b2ab400071c31b900100300840201a7ffddb1
-
+
org/apache/geode/internal/admin/remote/StoreSysCfgRequest,2
fromData,17,2a2bb7000d2a2bb8000ec0000fb50003b1
toData,14,2a2bb7000b2ab400032bb8000cb1
-
+
org/apache/geode/internal/admin/remote/StoreSysCfgResponse,2
fromData,6,2a2bb7000eb1
toData,6,2a2bb7000db1
-
+
org/apache/geode/internal/admin/remote/SubRegionRequest,2
fromData,6,2a2bb7000db1
toData,6,2a2bb7000cb1
-
+
org/apache/geode/internal/admin/remote/SubRegionResponse,2
fromData,34,2a2bb7001f2a2bb80020c00013c00013b500142a2bb80020c00013c00013b50015b1
toData,22,2a2bb7001d2ab400142bb8001e2ab400152bb8001eb1
-
+
org/apache/geode/internal/admin/remote/TailLogRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/TailLogResponse,2
fromData,22,2a2bb7001a2a2bb8001bb5000d2a2bb8001bb5000ab1
toData,22,2a2bb700182ab4000d2bb800192ab4000a2bb80019b1
-
+
org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage,2
fromData,30,2a2bb700092a2bb9000a0100b500042a2bb8000bc0000cc0000cb50003b1
toData,24,2a2bb700062b2ab40004b9000702002ab400032bb80008b1
-
+
org/apache/geode/internal/admin/remote/VersionInfoRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/VersionInfoResponse,2
fromData,14,2a2bb7000a2a2bb8000bb50006b1
toData,14,2a2bb700082ab400062bb80009b1
-
+
org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl,2
fromData,12,2a2bb8002bc0002cb50002b1
toData,9,2ab400022bb8002ab1
-
+
org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl,2
fromData,31,2a2bb900100100b500022a2bb900100100b500032a2bb900100100b50004b1
toData,31,2b2ab40002b9000f02002b2ab40003b9000f02002b2ab40004b9000f0200b1
-
+
org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl,2
fromData,14,2a2bb700212a2bb80022b50002b1
toData,14,2a2bb7001f2ab400022bb80020b1
-
+
org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl,2
fromData,28,2a2bb700252a2bb80026c00027b500032a2bb80026c00027b50004b1
toData,22,2a2bb700232ab400032bb800242ab400042bb80024b1
-
+
org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl,2
fromData,31,2a2bb8002fb500032a2bb80030b500072a2bb80031c00032c00032b50009b1
toData,25,2ab400032bb8002c2ab400072bb8002d2ab400092bb8002eb1
-
+
org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl,2
fromData,25,2a2bb700262a2bb80027c00028b500032a2bb80029b50004b1
toData,22,2a2bb700232ab400032bb800242ab400042bb80025b1
-
+
org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl,2
fromData,28,2a2bb80031b500032a2bb80032b500072a2bb80033c00020b50002b1
toData,25,2ab400032bb8002e2ab400072bb8002f2ab400022bb80030b1
-
+
org/apache/geode/internal/admin/statalerts/StatisticInfoImpl,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/internal/cache/AbstractRegion,2
fromData,11,bb017359130174b70175bf
toData,6,2a2bb80172b1
-
+
org/apache/geode/internal/cache/AbstractUpdateOperation$AbstractUpdateMessage,2
fromData,16,2a2bb700182a2bb900190100b5000cb1
toData,16,2a2bb7001a2b2ab4000cb9001b0300b1
-
+
org/apache/geode/internal/cache/AddCacheServerProfileMessage,2
fromData,16,2a2bb7002f2a2bb900300100b50008b1
toData,16,2a2bb7002d2b2ab40008b9002e0200b1
-
+
org/apache/geode/internal/cache/BucketAdvisor$BucketProfile,2
fromData,36,2a2bb700132a2bb900140100b500042a2bb900140100b500062a2bb900140100b50012b1
toData,36,2a2bb700152b2ab40004b9001602002b2ab40006b9001602002b2ab40012b900160200b1
-
+
org/apache/geode/internal/cache/BucketAdvisor$ServerBucketProfile,2
fromData,22,2a2bb700162a2bb80017b500052a2bb80018b50004b1
toData,22,2a2bb700192ab400052bb8001a2ab400042bb8001bb1
-
+
org/apache/geode/internal/cache/BucketServerLocation,2
fromData,39,2a2bb700062a2bb80007b60008b500032a2bb80009b6000ab500042a2bb8000bb6000cb50005b1
toData,39,2a2bb7000d2ab40003b8000e2bb8000f2ab40004b800102bb800112ab40005b800122bb80013b1
-
+
org/apache/geode/internal/cache/BucketServerLocation66,2
fromData,93,2a2bb7000a2a2bb8000bb6000cb500032a2bb8000db6000eb500042a2bb8000fb60010b500052a2bb900110100b500092a2ab40009bd0006b500072ab400099e001d033d1c2ab40009a200132ab400071c2bb8001253840201a7ffebb1
toData,91,2a2bb700132ab40003b800142bb800152ab40004b800162bb800172ab40005b800182bb800192b2ab40009b9001a02002ab400099e00262ab400074d2cbe3e03360415041da200152c1504323a0519052bb8001b840401a7ffebb1
-
+
org/apache/geode/internal/cache/CacheDistributionAdvisor$CacheProfile,2
fromData,113,2a2bb700692bb9006a01003d2a1cb6001e2a1cb7006b9900162abb006c59b7006db500282ab400282bb8006e2a1cb7006f99000e2a2bb80070c00071b5000e2a1cb7007299000e2a2bb80070c00071b5000f2a2bb80070c00073b500192a1cb7007499000e2a2bb80070c00075b50018b1
toData,101,2a2bb700612b2ab6001db9006202002ab40028c6000b2ab400282bb800632ab4000eb9002e01009a000c2a2ab4000e2bb700642ab4000fb9002e01009a000c2a2ab4000f2bb700642ab400192bb800652ab40018b9003201009a000b2ab400182bb80065b1
-
+
org/apache/geode/internal/cache/CacheServerAdvisor$CacheServerProfile,2
fromData,53,2a2bb700112a2bb80012b500042a2bb900130100b500062abb001459b70015b500052ab400052bb800162a2bb900170100b60018b1
toData,42,2a2bb7000b2ab400042bb8000c2b2ab40006b9000d02002ab400052bb8000e2b2ab6000fb900100300b1
-
+
org/apache/geode/internal/cache/ClientRegionEventImpl,2
fromData,14,2a2bb700142a2bb80015b60003b1
toData,14,2a2bb700122ab6000d2bb80013b1
-
+
org/apache/geode/internal/cache/CloseCacheMessage,2
fromData,16,2a2bb700172a2bb900180100b50002b1
toData,16,2a2bb700192b2ab40002b9001a0200b1
-
+
org/apache/geode/internal/cache/ControllerAdvisor$ControllerProfile,2
fromData,6,2a2bb70007b1
toData,6,2a2bb70006b1
-
+
org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionMessage,2
fromData,45,2a2bb7009f2a2bb800a0b5000a2a2bb800a1c00055b500432a2bb900a20100b500032a2bb900a30100b50065b1
toData,42,2a2bb700a52ab4000a2bb800a62ab400432bb800a72b2ab40003b900a802002b2ab40065b900a90200b1
-
+
org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionReplyMessage,2
fromData,161,2a2bb700062bb90007010099000e2a2bb80008c00009b5000a2bb9000b01003d1c9a000b2a01b5000ca700352abb000d591cb7000eb5000c033e1d1ca20022bb000f59b700103a0419042bb800112ab4000c1904b6001257840301a7ffdf2bb90007010099000c2a2b03b80013b500142bb9000701009900162abb001559b70016b500172ab400172bb800112a2bb900070100b500182a2bb900190100b50004b1
toData,191,2a2bb7001a2b2ab4000ac6000704a7000403b9001b02002ab4000ac6000b2ab4000a2bb8001c2ab4000cc7000d2b03b9001d0200a700322ab4000cb6001e3d2b1cb9001d0200033e1d1ca2001c2ab4000c1db6001fc0000f3a0419042bb80020840301a7ffe52ab40014c600192b04b9001b02002b2ab40014c0002103b80022a7000a2b03b9001b02002ab40017c600152b04b9001b02002ab400172bb80020a7000a2b03b9001b02002b2ab40018b9001b02002b2ab40004b900230300b1
-
+
org/apache/geode/internal/cache/DestroyOperation$DestroyMessage,2
fromData,45,2a2bb700322a2bb80033c00034b500022a2bb80033b500272bb800354d2cb6003699000b2a2bb80037b50005b1
toData,118,2a2bb700382ab400022bb800392ab400272bb800392ab40003b6003ac000084d2cc1003b99002e2cb6003c4e2db6003d990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fa700262cb60043990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fb1
-
+
org/apache/geode/internal/cache/DestroyOperation$DestroyWithContextMessage,2
fromData,14,2a2bb700102a2bb80011b50008b1
toData,14,2a2bb700122ab400082bb80013b1
-
+
org/apache/geode/internal/cache/DestroyPartitionedRegionMessage,2
fromData,76,2a2bb700432a2bb80044b500062a2bb900450100b80046b500082a2bb900470100b5000a2bb9004701003d2a1cbc0ab5000d033e1d1ca200152ab4000d1d2bb9004701004f840301a7ffecb1
toData,77,2a2bb700482ab400062bb800492b2ab40008b4004ab9004b02002b2ab4000ab9004c02002b2ab4000dbeb9004c0200033d1c2ab4000dbea200152b2ab4000d1c2eb9004c0200840201a7ffe8b1
-
+
org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionMessage,2
fromData,41,2a2bb700582a2bb80059c0005ab500082a2bb8005bb500112a2bb8005cb5001f2a2bb8005db50029b1
toData,38,2a2bb7005e2ab400082bb8005f2ab400112bb800602ab4001f2bb800612ab400292bb80062b1
-
+
org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionWithContextMessage,2
fromData,14,2a2bb7000e2a2bb8000fb50006b1
toData,14,2a2bb700102ab400062bb80011b1
-
+
org/apache/geode/internal/cache/DistTXCommitMessage,2
fromData,14,2a2bb700302a2bb80031b50003b1
toData,14,2a2bb700322ab400032bb80033b1
-
+
org/apache/geode/internal/cache/DistTXCommitMessage$DistTXCommitReplyMessage,2
fromData,17,2a2bb700192a2bb8001ac0001bb50004b1
toData,14,2a2bb700172ab400042bb80018b1
-
+
org/apache/geode/internal/cache/DistTXPrecommitMessage,2
fromData,14,2a2bb700332a2bb80034b5000ab1
toData,14,2a2bb700312ab4000a2bb80032b1
-
+
org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTXPrecommitReplyMessage,2
fromData,17,2a2bb700192a2bb8001ac0001bb50004b1
toData,14,2a2bb700172ab400042bb80018b1
-
+
org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTxPrecommitResponse,2
fromData,17,2a2bb80008b500032a2bb80009b50004b1
toData,17,2ab400032bb800062ab400042bb80007b1
-
+
org/apache/geode/internal/cache/DistTXRollbackMessage,2
fromData,6,2a2bb70015b1
toData,6,2a2bb70016b1
-
+
org/apache/geode/internal/cache/DistTXRollbackMessage$DistTXRollbackReplyMessage,2
fromData,14,2a2bb700192a2bb8001ab50004b1
toData,14,2a2bb700172ab400042bb80018b1
-
+
org/apache/geode/internal/cache/DistributedCacheOperation$CacheOperationMessage,2
fromData,291,2bb9009601003d2bb9009601003e2a1cb500972a1c2bb600982a2bb80099b500102a2bb9009a0100b8009bb500092a1c1100807e99000704a7000403b500042a1c10087e99000704a7000403b500581c1102007e99000b2a2bb8009cb500892a1c1104007e99000704a7000403b500072a1c10407e99000704a7000403b5001e2ab4001e9900382bb9009a0100360415049a000b2a03b5001fa7001b150404a0000b2a04b5001fa7000dbb009d59129eb7009fbf2a2bb800a0b500201c1101007e99000704a700040336042a1c1108007e99000704a7000403b500a115049900162abb00a259b700a3b5000e2ab4000e2bb800a41c1110007e99001c1c1120007e99000704a700040336052a15052bb800a5b5000a1d1104007e9900082a04b5000fb1
toData,202,033d033e2a1cb600a63d2a1db600a73e2b1cb900a802002b1db900a802002ab4000d9e000d2b2ab4000db900a902002ab400102bb800aa2b2ab40009b400abb900ac02002ab40089c6000b2ab400892bb800ad2ab4001e9900542b2ab4001f99000704a7000403b900ac02002ab4001fb800ae36042ab4001f9a001f2ab40020c10021990015013a052ab40020c00021c000213a06a7000c2ab400203a05013a061504190519062bb800af2ab4000ec6000b2ab4000e2bb800b02ab4000ac6000b2ab4000a2bb800b0b1
-
+
org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionMessage,2
fromData,53,2a2bb700212ab800222bb90023010032b500022a2bb80024c00025b500062a2bb80024c00026b500172a2bb80024c00027b50011b1
toData,43,2a2bb700282b2ab40002b60016b9002902002ab400062bb8002a2ab400172bb8002a2ab400112bb8002ab1
-
+
org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionWithContextMessage,2
fromData,14,2a2bb7000e2a2bb8000fb50006b1
toData,14,2a2bb700102ab400062bb80011b1
-
+
org/apache/geode/internal/cache/DistributedPutAllOperation$EntryVersionsList,2
fromData,268,2bb9002201003d1c077e07a0000704a70004033e1c10207e1020a0000704a70004033604b80012b20013b900140200990011b8001212231cb80016b9002403001d9900ca2bb80025883605b80012b20013b900140200990015b80012b2001312261505b80027b900280400bb0029591505b700023a0603360715071505a2008e2bb90022010036081508aa000000007b00000000000000030000001e0000002700000035000000542a01b6000757a700572a15042bb8002ab6000757a7004915042bb8002a3a0919061909b6001cb9002b0200572a1909b6000757a7002a15042bb8002a3a092bb8002588360a19091906150ab9002c0200c0002db600212a1909b6000757840701a7ff71b1
toData,289,033d033e2ab600089e003d1c07803d043e2ab6000b3a041904b9000c01009900271904b9000d0100c0000a3a051905c600131905c1001199000e1c1020803da70006a7ffd5b80012b20013b900140200990015b80012b2001312152a1cb80016b9001705002b1cb9001802001d9900b32ab60008852bb80019bb001a592ab60008b7001b3a040336052ab6000b3a061906b9000c010099008a1906b9000d0100c0000a3a071907c7000d2b03b900180200a7006c1907b6001c3a081908c700132b04b90018020019072bb8001da7005019041908b6001e360915099a00242b05b90018020084050115053609190419081509b6001f5719072bb8001da700212b06b90018020019072b03b6002019071908b6002115090464852bb80019a7ff72b1
-
+
org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllEntryData,1
toData,229,2ab4000a4d2ab4000c4e2c2bb8003d2dc1003e9a00072dc700182b03b9003f02002dc0003ec0003e2bb80040a700312dc1004199001e2dc000413a042b04b9003f02001904b9004201002bb80040a7000f2b04b9003f02002d2bb800432b2ab40012b40044b9003f02002ab4000636042ab40026c6000a150407809136042ab40017c6001d15041008809136042ab40017c1004599000b150410208091360415041080809136042b1504b9003f02002ab40026c6000b2ab400262bb8003d2ab40017c6000b2ab400172bb800462ab6002899000b2ab400142bb800462ab400082bb80047b1
-
+
org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllMessage,2
fromData,197,2a2bb700392a2bb8003ac0003bb500052a2bb8003c88b500152a2ab40015bd003db500062ab400159e00722bb8003e4dbb003f59b700404e03360415042ab40015a200202ab400061504bb003d592b2ab4000515042c2db7004153840401a7ffdd2bb9004201003604150499002f2bb800433a0503360615062ab40015a2001d2ab4000615063219051506b60044c00045b5002b840601a7ffe02ab400461140007e99000e2a2bb8003ac00047b5000b2a2ab400461180007e99000704a7000403b5001ab1
toData,165,2a2bb700482ab400052bb800492ab40015852bb8004a2ab400159e007bbb004b592ab40015b7004c4d033e03360415042ab40015a200511d9a00122ab40006150432b4002bc60005043e2ab40006150432b4002b3a052c1905b6004d572ab4000615043201b5002b2ab400061504322bb6004e2ab400061504321905b5002b840401a7ffac2b1db9004f02001d9900082c2bb800502ab4000bc6000b2ab4000b2bb80049b1
-
+
org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage,2
fromData,171,2a2bb700632bb9006401003d1c047e9900142a2bb900650100b500092ab40009b800661c077e99000d2a2bb900650100b500061c057e99000e2a2bb80067c00068b500072bb800674e2dc100699900252a03b5000e2a2dc00069b8006ab500082ab40008c7001b2a2dc00069b5004ea700102a2dc0006bb500082a04b5000e2a2bb80067c0006cb5000a2a2bb8006db5000c2a2bb8006eb5000b2a1c10407e99000704a7000403b5000db1
toData,173,2a2bb70070033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007102002ab4000999000d2b2ab40009b9007202002ab40006029f000d2b2ab40006b9007202002ab40007c6000b2ab400072bb800732ab4000e99000e2ab400082bb80073a700102ab40008b9005901002bb800732ab4000a2bb800732ab4000cc000742bb800752ab4000b2bb80076b1
-
+
org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1
toData,136,2ab4000a4d2c2bb8003f2b2ab40010b40040b9004102002ab400063e2ab40022c600081d0780913e2ab40015c600191d100880913e2ab40015c100429900091d102080913e1d108080913e2b1db9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
-
+
org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllMessage,2
fromData,197,2a2bb700382a2bb80039c0003ab500052a2bb8003b88b500152a2ab40015bd003cb500062ab400159e00722bb8003d4dbb003e59b7003f4e03360415042ab40015a200202ab400061504bb003c592b2ab4000515042c2db7004053840401a7ffdd2bb9004101003604150499002f2bb800423a0503360615062ab40015a2001d2ab4000615063219051506b60043c00044b5002b840601a7ffe02ab400451140007e99000e2a2bb80039c00046b5000b2a2ab400451180007e99000704a7000403b5001ab1
toData,165,2a2bb700472ab400052bb800482ab40015852bb800492ab400159e007bbb004a592ab40015b7004b4d033e03360415042ab40015a200511d9a00122ab40006150432b4002bc60005043e2ab40006150432b4002b3a052c1905b6004c572ab4000615043201b5002b2ab400061504322bb6004d2ab400061504321905b5002b840401a7ffac2b1db9004e02001d9900082c2bb8004f2ab4000bc6000b2ab4000b2bb80048b1
-
+
org/apache/geode/internal/cache/DistributedTombstoneOperation$TombstoneMessage,2
fromData,125,2a2bb700172ab800182bb90019010032b5001a2bb9001b01003d2abb001c591cb7001db500122bb9001e01003e03360415041ca2003e1d990019bb001f59b700203a0619062bb8002119063a05a700092bb800223a052ab4001219052bb900230100b80024b90025030057840401a7ffc22a2bb80026c00027b50004b1
toData,227,2a2bb700282b2ab4001ab60029b9002a02002b2ab40012b9002b0100b9002c0200033d122d4e2ab40012b9002e01009a00252ab40012b9002f0100b900300100b900310100c000323a041904c1001f990005043d2b1cb9003302002ab40012b900340100b9003001003a041904b9003501009900681904b900310100c000363a051905b900370100c000323a061906c1001f99001c1c9a000cbb0038592db70039bf1906c0001f2bb8003aa700191c99000cbb0038592db70039bf1906c0003b2bb6003c2b1905b9003d0100c0003eb6003fb900400300a7ff942ab400042bb80041b1
-
+
org/apache/geode/internal/cache/DynamicRegionAttributes,2
fromData,17,2a2bb80005b500022a2bb80005b50003b1
toData,17,2ab400022bb800042ab400032bb80004b1
-
+
org/apache/geode/internal/cache/EntryEventImpl,2
fromData,216,2a2bb80016c00017b500182bb800164d2bb800164e2abb0019592c2d01b7001ab5001b2a2bb9001c0100b8001db5001e2a2bb9001f0100b500082ab4001b2bb80016b600202a2bb80016c00021b500092bb900220100990013b200239a003cbb0024591225b70026bf2bb9002201009900212a2bb80027b500282a2ab40028b500062a2ab40028b80029b50005a7000b2a2bb80016b500052bb9002201009900192a2bb80027b5002a2a2ab4002ab80029b50007a7000b2a2bb80016b500072a2bb8002bb5002c2a2bb8002db5000a2a2bb8002eb50013b1
toData,279,2ab400182bb801472ab600892bb801472ab4001bb601742bb801472b2ab4001eb40175b9017602002b2ab4000811c03f7eb9017702002ab600492bb801472ab400092bb801472b03b9017802002ab6003f4d2cc100803e1d99000d2cc00080b900a901003e2b1db9017802001d99003b2ab40028c6000e2ab400282bb80179a7002e2ab40006c6000e2ab400062bb80179a7001c2cc000803a041904b900b701002bb8017aa700082c2bb801472ab700414d2cc100803e1d99000d2cc00080b900a901003e2b1db9017802001d9900292ab4002ac6000e2ab4002a2bb80179a7001c2cc000803a041904b900b701002bb8017aa700082c2bb801472ab4002cc0017b2bb8017c2ab600572bb801472ab400132bb8017db1
-
+
org/apache/geode/internal/cache/EntrySnapshot,2
fromData,50,2a03b500052bb9004201003d1c9900112abb000759b70043b50004a7000e2abb000359b70044b500042ab400042bb60045b1
toData,22,2b2ab40004c10007b9004002002ab400042bb60041b1
-
+
org/apache/geode/internal/cache/EventID,4
fromData,53,2a2bb8003db500042bb8003db8003e4d2a2cb8003fb500092a2cb8003fb5000b2a2bb900400100b5000c2a2bb900410100b50001b1
fromDataPre_GFE_8_0_0_0,33,2a2bb8003db500042bb8003db8003e4d2a2cb8003fb500092a2cb8003fb5000bb1
toData,92,2bb800354d2cb20036b600379d00242ab600384ebb0010592cb700393a042d1904b600151904b600162bb8003aa7000b2ab400042bb8003a2ab400092ab4000bb800332bb8003a2b2ab4000cb9003b02002b2ab40001b9003c0200b1
toDataPre_GFE_8_0_0_0,24,2ab400042bb8003a2ab400092ab4000bb800332bb8003ab1
-
+
org/apache/geode/internal/cache/EventTracker$EventSeqnoHolder,2
fromData,22,2a2bb9000e0100b500042a2bb8000fc00010b50005b1
toData,19,2b2ab40004b9001103002ab400052bb80012b1
-
+
org/apache/geode/internal/cache/EvictionAttributesImpl,2
fromData,33,2a2bb9001b0100b500072a2bb8001cc0001db500052a2bb8001cc0001eb50003b1
toData,27,2b2ab40007b9001902002ab400052bb8001a2ab400032bb8001ab1
-
+
org/apache/geode/internal/cache/FilterProfile,2
fromData,210,bb013159b701324d2c2bb801332a2cb500202ab4000d2bb80134b900300200572ab400052bb80135b9007802002ab400072bb80135b9007802002ab400092bb80135b9007802002ab4000e2bb80134b900300200572ab400062bb80135b9007802002ab400082bb80135b9007802002ab4000a2bb80135b9007802002bb801363e1d9e004f05b80138360403360515051da2002c2bb801393a062bb8013a3a072a1906190703b6013b2ab4000f19061907b90054030057840501a7ffd41504b8013857a7000e3a081504b80138571908bfb1
toData,181,2ab40020c001312bb8013d2ab4000d2ab40023b401182bb8013e2ab400052bb8013f2ab400072bb8013f2ab400092bb8013f2ab4000e2ab40023b401182bb8013e2ab400062bb8013f2ab400082bb8013f2ab4000a2bb8013f2ab4000f4d2cb900b901003e1d2bb801402cb900ae0100b900af01003a041904b900b001009900361904b900b10100c000b23a051905b9011b0100c0003c3a061905b900b30100c000843a0719062bb8014119072bb8013da7ffc6b1
-
+
org/apache/geode/internal/cache/FilterProfile$OperationMessage,2
fromData,129,2a2bb700522a2bb900530100b500092a2bb900540100b500412ab800552bb90056010032b500232a2bb900570100b500292a2bb900580100b5004a2ab40023b8004c99002c2a2bb900540100b500322ab40023b2004ea5000d2ab40023b2004fa600202a2bb80059b50033a700152a2bb900580100b500252a2bb8005ab50027b1
toData,133,2a2bb700452b2ab40009b9004602002b2ab40041b9004702002b2ab40023b60024b9004802002b2ab40029b9004902002b2ab4004ab9004b03002ab40023b8004c9900312b2ab40033b9004d0100b9004702002ab40023b2004ea5000d2ab40023b2004fa600202ab400332bb80050a700152b2ab40025b9004b03002ab400272bb80051b1
-
+
org/apache/geode/internal/cache/FilterRoutingInfo,4
fromData,88,014db8001e4e2dc6000a2db9001f01004d2bb900200100360403360515051504a200372bb800213a06bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffc8b1
fromDataPre_GFE_7_1_0_0,97,014db8001e4e2dc6000a2db9001f01004d2bb900200100360403360515051504a20040bb002559b700293a0619062bb80022bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffbfb1
toData,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb600261904b9001c0100c000083a0619062bb80027a7ffc8b1
toDataPre_GFE_7_1_0_0,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb800271904b9001c0100c000083a0619062bb80027a7ffc8b1
-
+
org/apache/geode/internal/cache/FilterRoutingInfo$FilterInfo,4
fromData,9,2a2bb80014b50015b1
fromDataPre_GFE_8_0_0_0,50,b800279900162a2bb80028b500292a2bb80014b50015a7001b2a2bb8002ab500012a2bb8002bb5000e2a2bb8002bb50012b1
toData,255,10093e1d2ab4000ec7000707a700112ab4000eb9001601001008680860603e1d2ab40012c7000707a700112ab40012b9001601001008680860603e1d2ab40001c7000703a7000d2ab40001b60017100c68603ebb0018591d01b700194d2ab40001c7000b2c03b6001aa7005d2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701003a041904b9000801009900351904b900090100c0000a3a051905b9000b0100c0001cb6001d2cb8001e1905b9000c0100c0001fb60020852cb8001ea7ffc72ab4000e2ab400212cb800222ab400122ab400212cb800222bc100189900102bc000232cb900240200a7000f2cb600253a0419042bb80026b1
toDataPre_GFE_8_0_0_0,213,b800279900b1bb0018591103e82bb8002cb700194d2ab40001c7000b2c03b6001aa7005a2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701004e2db9000801009900342db900090100c0000a3a041904b9000b0100c0001cb6001d2cb8001e1904b9000c0100c0001fb60020852cb8001ea7ffc92ab4000e2ab400212cb800222ab400122ab400212cb800222bc100189900102bc000232cb900240200a7000d2cb600254e2d2bb80026a700232ab400012bb8002d2ab4000e2ab400212bb800222ab400122ab400212bb80022b1
-
+
org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueMessage,2
fromData,24,2a2bb7001e2a2bb9001f0100b500052a2bb80020b50006b1
toData,24,2a2bb700212b2ab40005b9002202002ab400062bb80023b1
-
+
org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueReply,2
fromData,14,2a2bb700042a2bb80005b50002b1
toData,14,2a2bb700062ab400022bb80007b1
-
+
org/apache/geode/internal/cache/FindRemoteTXMessage,2
fromData,27,2a2bb700452a2bb80046c00047b500032a2bb900480100b50004b1
toData,24,2a2bb700422ab400032bb800432b2ab40004b900440200b1
-
+
org/apache/geode/internal/cache/FindRemoteTXMessage$FindRemoteTXMessageReply,2
fromData,46,2a2bb7000a2a2bb9000b0100b500042bb9000b01009900182a2bb9000b0100b500072a2bb8000cc0000db50006b1
toData,66,2a2bb700032b2ab40004b9000502002ab40006c6000704a70004033d2b1cb9000502001c99001d2b2ab40007b9000502002ab4000601b600082ab400062bb80009b1
-
+
org/apache/geode/internal/cache/FindVersionTagOperation$FindVersionTagMessage,2
fromData,55,2a2bb700232a2bb900240100b500032a2bb900250100b500042abb002659b70027b500052ab400052bb800282a2bb900290100b50006b1
toData,44,2a2bb7001e2b2ab40003b9001f02002b2ab40004b9002002002ab400052bb800212b2ab40006b900220200b1
-
+
org/apache/geode/internal/cache/FindVersionTagOperation$VersionTagReply,2
fromData,17,2a2bb7000c2a2bb8000dc0000eb50002b1
toData,14,2a2bb7000a2ab400022bb8000bb1
-
+
org/apache/geode/internal/cache/FixedPartitionAttributesImpl,2
fromData,39,2a2bb80007b500062a2bb900080100b500022a2bb900090100b500032a2bb900090100b50005b1
toData,39,2ab400062bb8000a2b2ab40002b9000b02002b2ab40003b9000c02002b2ab40005b9000c0200b1
-
+
org/apache/geode/internal/cache/FunctionStreamingReplyMessage,2
fromData,64,2a2bb700102a2bb900110100b5000b2a2bb900120100b5000c2a2bb900110100b500042a2bb80013b5000da700144dbb001559b700164e2d2cb60017572dbfb1
toData,90,2a2bb700182b2ab4000bb9001902002b2ab4000cb9001a02002b2ab40004b9001902002ab4000d2bb8001ba7002e4d2cc1001c99000cbb001d592cb7001ebfbb0015592ab4000db6001fb60020b700214e2d2cb60017572dbfb1
-
+
org/apache/geode/internal/cache/GridAdvisor$GridProfile,2
fromData,26,2a2bb7001e2a2bb8001fb500052a2bb80020b500062ab60007b1
toData,22,2a2bb7001b2ab400052bb8001c2ab400062bb8001db1
-
+
org/apache/geode/internal/cache/HARegion$HARegionAdvisor$HAProfile,2
fromData,47,2a2bb700032bb9000401003d2a1cb200057e99000704a7000403b500062a1cb200077e99000704a7000403b50008b1
toData,45,2a2bb70009033d2ab400069900091cb20005803d2ab400089900091cb20007803d2b1c1100ff7eb9000a0200b1
-
+
org/apache/geode/internal/cache/InitialImageFlowControl$FlowControlPermitMessage,2
fromData,16,2a2bb7000d2a2bb9000e0100b50002b1
toData,16,2a2bb7000f2b2ab40002b900100200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$Entry,2
fromData,89,2a2bb900150100b500032bb9001501003d2a2bb80016b5000f2ab40003b8001199000d2ab20017b50002a7000b2a2bb80018b500022a2bb900190100b500041c047e9900162a1c057e99000704a70004032bb8001ab5000ab1
toData,101,2b2ab40003b9000c02002ab4000ac6000704a70004033d1c2ab4000ac1000e99000705a700040380913d2b1cb9000c02002ab4000f2bb800102ab40003b800119a000b2ab400022bb800122b2ab40004b9001303002ab4000ac6000b2ab4000a2bb80014b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$FilterInfoMessage,2
fromData,230,2a2bb7008f2a2bb80090b5001f2ab4000403322bb80090b5003e2ab4000403322bb80090b500412ab4000403322bb80090b500432ab4000403322bb80090b500452ab4000403322bb80090b500472ab4000403322bb80090b500492ab4000403322bb80090b5004b2ab4000403322bb80090b5004d2ab4000404322bb80090b5003e2ab4000404322bb80090b500412ab4000404322bb80090b500432ab4000404322bb80090b500452ab4000404322bb80090b500472ab4000404322bb80090b500492ab4000404322bb80090b5004b2ab4000404322bb80090b5004d2a2bb80090b50033b1
toData,284,2a2bb7008d2ab4001fc000312bb8008e2ab400040332b4003ec000312bb8008e2ab400040332b40041c000312bb8008e2ab400040332b40043c000312bb8008e2ab400040332b40045c000312bb8008e2ab400040332b40047c000312bb8008e2ab400040332b40049c000312bb8008e2ab400040332b4004bc000312bb8008e2ab400040332b4004dc000312bb8008e2ab400040432b4003ec000312bb8008e2ab400040432b40041c000312bb8008e2ab400040432b40043c000312bb8008e2ab400040432b40045c000312bb8008e2ab400040432b40047c000312bb8008e2ab400040432b40049c000312bb8008e2ab400040432b4004bc000312bb8008e2ab400040432b4004dc000312bb8008e2ab40033c000312bb8008eb1
-
+
org/apache/geode/internal/cache/InitialImageOperation$ImageReplyMessage,2
fromData,224,2a2bb7001c2bb8001d4d014e2cc600102cb6001e9e00092c03b6001f4e2dc1002099000e2a2dc00021b5000fa700082a2cb5000f2a2bb900220100b500102a2bb900220100b500112a2bb900220100b500122a2bb900230100b500132a2bb900220100b500142a2bb80024b500042a2bb900230100b500032a2bb900230100b500152ab4001599000f2abb0025592bb70026b500022bb900270100360415049b00102abb0028591504b70029b5000103360515051504a200292bb8002ac0002b3a062bb8002c37072ab4000119061607b8002db9002e030057840501a7ffd6b1
toData,234,2a2bb7002f2ab4000fc1002099001dbb00305904b700314d2c2ab4000fb60032572c2bb80033a7000e2ab4000fc000302bb800332b2ab40010b9003402002b2ab40011b9003402002b2ab40012b9003402002b2ab40013b9003502002b2ab40014b9003402002b2ab40003b9003502002b2ab40015b9003502002ab4001599000b2ab400022bb800362b2ab40001c7000702a7000c2ab40001b900370100b9003802002ab40001c600422ab40001b900390100b9003a01004d2cb9003b010099002a2cb9003c0100c0003d4e2db9003e01002bb8003f2db900400100c00041b600422bb80043a7ffd3b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$InitialImageVersionedEntryList,2
fromData,406,b80022b20023b9002402003d2bb9003601003e1d057e05a0000704a700040336041d077e07a0000704a700040336052a1d10087e1008a0000704a7000403b500021d10207e1020a0000704a700040336061c990014b80022b2002312371db80026b900380400150499003c2bb800398836071c990015b80022b20023123a1507b80031b90038040003360815081507a200152a2bb8003bc00014b7001257840801a7ffea15059900e42bb800398836071c990015b80022b20023123c1507b80031b9003804002abb0003591507b70005b50004bb0003591507b700053a0803360915091507a200a22bb900360100360a150aaa000000008f00000000000000030000001e0000002c0000003f000000632ab4000401b90011020057a700662ab4000415062bb8003db90011020057a7005315062bb8003d3a0b1908190bb6002db900110200572ab40004190bb90011020057a7002f15062bb8003d3a0b2bb8003988360c190b1908150cb900160200c0003eb600342ab40004190bb90011020057840901a7ff5da7000e2abb000359b70001b50004b1
toData,396,033d033e0336042ab700209a00091c05803d043e2ab40004b9000d01009e00431c07803d0436042ab40004b9001a01003a051905b9001b01009900271905b9001c0100c000173a061906c600131906c1002199000e1c1020803da70006a7ffd52ab400029900081c1008803db80022b20023b900240200990015b80022b2002312252a1cb80026b9002705002b1cb9002802001d9900282ab7000e852bb8002903360515052ab7000ea200132a1505b700132bb8002a840501a7ffea15049900cd2ab40004b9000d0100852bb80029bb002b592ab40004b9000d0100b7002c3a050336062ab40004b9001a01003a071907b9001b01009900951907b9001c0100c000173a081908c7000d2b03b900280200a700771908b6002d3a091909c700132b04b90028020019082bb8002ea7005b19051909b9002f0200c000303a0a190ac700292b05b9002802001506840601b800313a0a19051909190ab9003203005719082bb8002ea700222b06b90028020019082b03b6003319081909b60034190ab60035852bb80029a7ff67b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RVVReplyMessage,2
fromData,33,2a2bb700162bb9001701003d1c9900132bb9001701003e2a1d2bb80018b50004b1
toData,51,2a2bb700092ab40004c600222b04b9000a02002b2ab40004c1000bb9000a02002ab400042bb6000ca7000a2b03b9000a0200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RegionStateMessage,2
fromData,66,2a2bb7001c2a2bb9001d0100b500052bb9001d01003d1c99000f2a2b2ab40005b8001eb500042bb9001d01003d1c9900132bb9001d01003e2a1d2bb8001fb50006b1
toData,97,2a2bb7000b2b2ab40005b9000c02002ab40004c600192b04b9000c02002b2ab400042ab40005b8000da7000a2b03b9000c02002ab40006c600222b04b9000c02002b2ab40006c1000eb9000c02002ab400062bb8000fa7000a2b03b9000c0200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RequestFilterInfoMessage,2
fromData,24,2a2bb7001e2a2bb8001fb500042a2bb900200100b50002b1
toData,24,2a2bb700212ab400042bb800222b2ab40002b900230200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RequestImageMessage,2
fromData,98,2a2bb700b42a2bb800b5b500172a2bb900b60100b500022a2bb900b70100b500552a2bb900b70100b500032a2bb900b70100b5004b2a2bb800b8c000b9b5003a2a2bb800b8c000bab500262a2bb800b8c000bbb5003b2a2bb800b8c000bcb50030b1
toData,86,2a2bb700bd2ab400172bb800be2b2ab40002b900bf02002b2ab40055b900c002002b2ab40003b900c002002b2ab4004bb900c002002ab4003a2bb800c12ab400262bb800c12ab4003b2bb800c12ab400302bb800c1b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RequestRVVMessage,2
fromData,34,2a2bb7001e2a2bb8001fb500052a2bb900200100b500022a2bb900210100b50003b1
toData,34,2a2bb700222ab400052bb800232b2ab40002b9002402002b2ab40003b900250200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RequestSyncMessage,2
fromData,73,2a2bb700222a2bb80023b500022bb9002401003d2bb9002501003e2a1dbd0026b5000a03360415041da2001f2ab4000a15041c99000a2bb80027a700072bb8002853840401a7ffe1b1
toData,77,2a2bb7001c2ab400022bb8001d2b2ab4000a0332c1001eb9001f02002b2ab4000abeb9002002002ab4000a4d2cbe3e03360415041da200172c1504323a0519052bb900210200840401a7ffe9b1
-
+
org/apache/geode/internal/cache/InterestRegistrationEventImpl,2
fromData,33,2a2bb80010b500052a2bb80011b500062a2bb80012b500072a2bb80013b50008b1
toData,36,2ab400052bb8000b2ab40006c0000c2bb8000d2ab400072bb8000e2ab400082bb8000fb1
-
+
org/apache/geode/internal/cache/InvalidateOperation$InvalidateMessage,2
fromData,25,2a2bb700282a2bb80029c0002ab500022a2bb80029b50015b1
toData,22,2a2bb7002b2ab400022bb8002c2ab400152bb8002cb1
-
+
org/apache/geode/internal/cache/InvalidateOperation$InvalidateWithContextMessage,2
fromData,14,2a2bb7000c2a2bb8000db50004b1
toData,14,2a2bb7000e2ab400042bb8000fb1
-
+
org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage,2
fromData,14,2a2bb700152a2bb80016b50004b1
toData,14,2a2bb700172ab400042bb80018b1
-
+
org/apache/geode/internal/cache/InvalidateRegionOperation$InvalidateRegionMessage,2
fromData,17,2a2bb700122a2bb80013c00014b50007b1
toData,14,2a2bb700152ab400072bb80016b1
-
+
org/apache/geode/internal/cache/JtaAfterCompletionMessage,2
fromData,26,2a2bb700232a2bb900240100b500042a2bb900240100b50002b1
toData,26,2a2bb700212b2ab40004b9002202002b2ab40002b900220200b1
-
+
org/apache/geode/internal/cache/MemberFunctionStreamingMessage,2
fromData,163,2a2bb700512bb9005201003d1c047e9900142a2bb900530100b500082ab40008b800541c077e99000d2a2bb900530100b500051c057e99000e2a2bb80055c00056b500062bb800554e2dc1002a9900252a03b5000a2a2dc0002ab80057b500072ab40007c7001b2a2dc0002ab5001aa700102a2dc00058b500072a04b5000a2a2bb80055b500092a2bb80055c00059b500102a1c10407e99000704a7000403b5000bb1
toData,162,2a2bb7005b033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000b9900091c104080933d2b1cb9005c02002ab4000899000d2b2ab40008b9005d02002ab40005029f000d2b2ab40005b9005d02002ab40006c6000b2ab400062bb8005e2ab4000a99000e2ab400072bb8005ea700102ab40007b9001f01002bb8005e2ab400092bb8005e2ab400102bb8005eb1
-
+
org/apache/geode/internal/cache/Node,2
fromData,60,2abb001c59b7001db500052ab400052bb8001e2a2bb9001f0100b500032a2bb900200100b500042a2bb900210100b500152a2bb9001f0100b50006b1
toData,49,2ab400052bb800182b2ab40003b9001902002b2ab40004b9001a02002b2ab40015b9001b02002b2ab40006b900190200b1
-
+
org/apache/geode/internal/cache/NonLocalRegionEntry,2
fromData,48,2a2bb80027b500032a2bb80027b500062a2bb900280100b5000c2a2bb900290100b5000e2a2bb80027c0002ab50011b1
toData,45,2ab400032bb800242ab400062bb800242b2ab4000cb9002503002b2ab4000eb9002602002ab400112bb80024b1
-
+
org/apache/geode/internal/cache/NonLocalRegionEntryWithStats,2
fromData,36,2a2bb700132a2bb900140100b500032a2bb900140100b500052a2bb900140100b50007b1
toData,36,2a2bb700112b2ab40003b9001203002b2ab40005b9001203002b2ab40007b900120300b1
-
+
org/apache/geode/internal/cache/PRQueryProcessor$EndOfBucket,2
fromData,11,2a2bb9000b0100b50002b1
toData,11,2b2ab40002b9000c0200b1
-
+
org/apache/geode/internal/cache/PartitionAttributesImpl,2
fromData,102,2a2bb900580100b5001b2a2bb900590100b500082a2bb900580100b5000c2a2bb900580100b500012a2bb8005ab500142a2bb8005bc0001eb5000d2a2bb8005bc0001eb500022a2bb900590100b500162a2bb900590100b500182a2bb8005bc0005cb5002fb1
toData,97,2ab7002b2b2ab4001bb9005402002b2ab40008b9005503002b2ab60047b9005402002b2ab40001b9005402002ab400142bb800562ab4000d2bb800572ab400022bb800572b2ab40016b9005503002b2ab40018b9005503002ab4002f2bb80057b1
-
+
org/apache/geode/internal/cache/PartitionRegionConfig,2
fromData,207,2a2bb900500100b500162a2bb900510100b80052b500032a2bb80053b500182a2bb900540100b500052a2bb900540100b5001f2abb001959b7001ab500042ab400042bb800552a2bb80056b500082a2bb80056b500092a2bb80056b500072a2bb80057b5000c2a2bb80058b5000e2a2bb80058b5000d2a2bb80058b500102a2bb80058b5000f2a2bb900540100b500062a2bb80059c0005ab500112ab40011c7000e2abb002159b70022b500112a2bb8005bb500142a2bb80059c0005ab500012ab40001c7000a2ab80015b50001b1
toData,178,2b2ab40016b9004702002b2ab40003b40048b9004902002ab400182bb8004a2b2ab40005b9004b02002b2ab4001fb9004b02002ab400042bb8004a2ab400082bb8004c2ab400092bb8004c2ab400072bb8004c2ab4000c2bb8004a2ab4000e2bb8004a2ab4000d2bb8004a2ab400102bb8004a2ab4000f2bb8004a2b2ab40006b9004b02002ab400112bb8004d2ab400142bb8004e2ab40001b9004f010099000b012bb8004da7000b2ab400012bb8004db1
-
+
org/apache/geode/internal/cache/PoolFactoryImpl$PoolAttributes,2
fromData,145,2a2bb80032b500032a2bb80032b500052a2bb80032b500072a2bb80032b500092a2bb80032b5000a2a2bb80032b5000b2a2bb80032b5000f2a2bb80033b5000e2a2bb80033b500122a2bb80032b500162a2bb80032b500182a2bb80034b500082a2bb80034b500142a2bb80035b5001b2a2bb80036b5001f2a2bb80036b500202a2bb80032b500132a2bb80034b5001cb1
toData,145,2ab400032bb8002d2ab400052bb8002d2ab400072bb8002d2ab400092bb8002d2ab4000a2bb8002d2ab4000b2bb8002d2ab4000f2bb8002d2ab4000e2bb8002e2ab400122bb8002e2ab400162bb8002d2ab400182bb8002d2ab400082bb8002f2ab400142bb8002f2ab4001b2bb800302ab4001f2bb800312ab400202bb800312ab400132bb8002d2ab4001c2bb8002fb1
-
+
org/apache/geode/internal/cache/PreferBytesCachedDeserializable,2
fromData,9,2a2bb8000fb50003b1
toData,9,2ab400032bb80010b1
-
+
org/apache/geode/internal/cache/QueuedOperation,1
toData,78,2b2ab40002b40035b9003602002ab400072bb800372ab40002b600319900312ab400032bb800372ab40002b600169a000d2ab40002b600159900152b2ab40006b9003602002ab400042bb80038b1
-
+
org/apache/geode/internal/cache/RegionEventImpl,2
fromData,48,2a2bb80023b500092a2bb80024b500022a2bb900250100b80026b5000a2a2bb900270100b500032a2bb80028b5000bb1
toData,51,2ab400092bb8001c2ab400022bb8001d2b2ab4000ab4001eb9001f02002b2ab40003b9002002002ab4000bc000212bb80022b1
-
+
org/apache/geode/internal/cache/ReleaseClearLockMessage,2
fromData,24,2a2bb700212a2bb80022b500022a2bb900230100b50003b1
toData,24,2a2bb700242ab400022bb800252b2ab40003b900260200b1
-
+
org/apache/geode/internal/cache/RemoteContainsKeyValueMessage,2
fromData,33,2a2bb7002e2a2bb8002fb500062a2ab4003010407e99000704a7000403b50005b1
toData,14,2a2bb700312ab400062bb80032b1
-
+
org/apache/geode/internal/cache/RemoteContainsKeyValueMessage$RemoteContainsKeyValueReplyMessage,2
fromData,16,2a2bb700152a2bb900160100b50003b1
toData,16,2a2bb700172b2ab40003b900180200b1
-
+
org/apache/geode/internal/cache/RemoteDestroyMessage,2
fromData,131,2a2bb700892a2bb8008ab7008b2a2bb8008ab5000c2a2bb9008c0100b8008db5000e2ab4008e1102007e99000e2a2bb8008ac0008fb500102ab4008e1104007e99000e2a2bb8008ac00035b500672a2bb8008ac00090b500122ab400059900122bb9008c0100572a2bb80091b700222a2bb8008ab500082a2bb8008ac00092b50017b1
toData,135,2a2bb700932ab6006a2bb800942ab4000c2bb800942b2ab4000eb40095b9009602002ab40010c6000b2ab400102bb800942ab40067c6000b2ab400672bb800942ab400122bb800942ab4000599002a2b2ab4000699000704a7000403b9009602002ab40006b800973d1c2ab700982ab6006e2bb800992ab400082bb800942ab400172bb80094b1
-
+
org/apache/geode/internal/cache/RemoteDestroyMessage$DestroyReplyMessage,2
fromData,52,2a2bb700232bb9002401003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80025b50009b1
toData,57,2a2bb7001f033d2ab40009c600081c0480913d2ab40009c100209900081c0580913d2b1cb9002102002ab40009c6000b2ab400092bb80022b1
-
+
org/apache/geode/internal/cache/RemoteFetchEntryMessage,2
fromData,14,2a2bb700312a2bb80032b50004b1
toData,14,2a2bb700332ab400042bb80034b1
-
+
org/apache/geode/internal/cache/RemoteFetchEntryMessage$FetchEntryReplyMessage,2
fromData,58,2a2bb7001e2bb9001f01003d1c9a002c2ab40002b80020
<TRUNCATED>
[26/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
index d84dc62..0dec596 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
@@ -41,26 +41,27 @@ public class CreateRegion extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
Part regionNamePart = null;
String regionName = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
// bserverStats.incLong(readDestroyRequestTimeId,
// DistributionStats.getStatTime() - start);
// bserverStats.incInt(destroyRequestsId, 1);
// start = DistributionStats.getStatTime();
// Retrieve the data from the message parts
- Part parentRegionNamePart = msg.getPart(0);
+ Part parentRegionNamePart = clientMessage.getPart(0);
String parentRegionName = parentRegionNamePart.getString();
- regionNamePart = msg.getPart(1);
+ regionNamePart = clientMessage.getPart(1);
regionName = regionNamePart.getString();
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Received create region request ({} bytes) from {} for parent region {} region {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), parentRegionName,
- regionName);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), parentRegionName, regionName);
}
// Process the create region request
@@ -69,7 +70,7 @@ public class CreateRegion extends BaseCommand {
if (parentRegionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.CreateRegion_0_THE_INPUT_PARENT_REGION_NAME_FOR_THE_CREATE_REGION_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage =
LocalizedStrings.CreateRegion_THE_INPUT_PARENT_REGION_NAME_FOR_THE_CREATE_REGION_REQUEST_IS_NULL
.toLocalizedString();
@@ -77,41 +78,42 @@ public class CreateRegion extends BaseCommand {
if (regionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.CreateRegion_0_THE_INPUT_REGION_NAME_FOR_THE_CREATE_REGION_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage =
LocalizedStrings.CreateRegion_THE_INPUT_REGION_NAME_FOR_THE_CREATE_REGION_REQUEST_IS_NULL
.toLocalizedString();
}
- writeErrorResponse(msg, MessageType.CREATE_REGION_DATA_ERROR, errMessage, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.CREATE_REGION_DATA_ERROR, errMessage,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Region parentRegion = servConn.getCache().getRegion(parentRegionName);
+ Region parentRegion = serverConnection.getCache().getRegion(parentRegionName);
if (parentRegion == null) {
String reason =
LocalizedStrings.CreateRegion__0_WAS_NOT_FOUND_DURING_SUBREGION_CREATION_REQUEST
.toLocalizedString(parentRegionName);
- writeRegionDestroyedEx(msg, parentRegionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, parentRegionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
try {
this.securityService.authorizeDataManage();
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
try {
authzRequest.createRegionAuthorize(parentRegionName + '/' + regionName);
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -121,11 +123,11 @@ public class CreateRegion extends BaseCommand {
AttributesFactory factory = new AttributesFactory(parentRegion.getAttributes());
region = parentRegion.createSubregion(regionName, factory.create());
if (logger.isDebugEnabled()) {
- logger.debug("{}: Created region {}", servConn.getName(), region);
+ logger.debug("{}: Created region {}", serverConnection.getName(), region);
}
} else {
if (logger.isDebugEnabled()) {
- logger.debug("{}: Retrieved region {}", servConn.getName(), region);
+ logger.debug("{}: Retrieved region {}", serverConnection.getName(), region);
}
}
@@ -134,11 +136,11 @@ public class CreateRegion extends BaseCommand {
// NOT USING IT
// bserverStats.incLong(processDestroyTimeId,
// DistributionStats.getStatTime() - start);
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
logger.debug("{}: Sent create region response for parent region {} region {}",
- servConn.getName(), parentRegionName, regionName);
+ serverConnection.getName(), parentRegionName, regionName);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
index 1497044..3daaec5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
@@ -37,14 +37,17 @@ public class Default extends BaseCommand {
private Default() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
// requiresResponse = true; NOT NEEDED... ALWAYS SEND ERROR RESPONSE
logger.fatal(
LocalizedMessage.create(LocalizedStrings.Default_0_UNKNOWN_MESSAGE_TYPE_1_WITH_TX_2_FROM_3,
- new Object[] {servConn.getName(), MessageType.getString(msg.getMessageType()),
- Integer.valueOf(msg.getTransactionId()), servConn.getSocketString()}));
- writeErrorResponse(msg, MessageType.UNKNOWN_MESSAGE_TYPE_ERROR, servConn);
+ new Object[] {serverConnection.getName(),
+ MessageType.getString(clientMessage.getMessageType()),
+ Integer.valueOf(clientMessage.getTransactionId()),
+ serverConnection.getSocketString()}));
+ writeErrorResponse(clientMessage, MessageType.UNKNOWN_MESSAGE_TYPE_ERROR, serverConnection);
// responded = true; NOT NEEDED... ALWAYS SEND ERROR RESPONSE
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
index 5996984..83ab394 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
@@ -48,7 +48,7 @@ public class Destroy extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long startparam)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startparam)
throws IOException, InterruptedException {
long start = startparam;
@@ -57,8 +57,8 @@ public class Destroy extends BaseCommand {
Object callbackArg = null, key = null;
Part eventPart = null;
StringBuffer errMessage = new StringBuffer();
- CacheServerStats stats = servConn.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ CacheServerStats stats = serverConnection.getCacheServerStats();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
@@ -66,17 +66,17 @@ public class Destroy extends BaseCommand {
stats.incReadDestroyRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- keyPart = msg.getPart(1);
- eventPart = msg.getPart(2);
+ regionNamePart = clientMessage.getPart(0);
+ keyPart = clientMessage.getPart(1);
+ eventPart = clientMessage.getPart(2);
// callbackArgPart = null; (redundant assignment)
- if (msg.getNumberOfParts() > 3) {
- callbackArgPart = msg.getPart(3);
+ if (clientMessage.getNumberOfParts() > 3) {
+ callbackArgPart = clientMessage.getPart(3);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -84,13 +84,14 @@ public class Destroy extends BaseCommand {
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
logger.debug("{}: Received destroy request ({} bytes) from {} for region {} key {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName, key);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key);
}
// Process the destroy request
@@ -98,29 +99,30 @@ public class Destroy extends BaseCommand {
if (key == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.Destroy_0_THE_INPUT_KEY_FOR_THE_DESTROY_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage.append(LocalizedStrings.Destroy__THE_INPUT_KEY_FOR_THE_DESTROY_REQUEST_IS_NULL
.toLocalizedString());
}
if (regionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.Destroy_0_THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage
.append(LocalizedStrings.Destroy__THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REQUEST_IS_NULL
.toLocalizedString());
}
- writeErrorResponse(msg, MessageType.DESTROY_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.DESTROY_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = LocalizedStrings.Destroy__0_WAS_NOT_FOUND_DURING_DESTROY_REQUEST
.toLocalizedString(regionName);
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -128,13 +130,14 @@ public class Destroy extends BaseCommand {
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
try {
// for integrated security
this.securityService.authorizeRegionWrite(regionName, key.toString());
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
RegionDestroyOperationContext destroyContext =
@@ -146,35 +149,35 @@ public class Destroy extends BaseCommand {
callbackArg = destroyContext.getCallbackArg();
}
}
- region.basicBridgeDestroy(key, callbackArg, servConn.getProxyID(), true,
+ region.basicBridgeDestroy(key, callbackArg, serverConnection.getProxyID(), true,
new EventIDHolder(eventId));
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
} catch (EntryNotFoundException e) {
// Don't send an exception back to the client if this
// exception happens. Just log it and continue.
logger.info(LocalizedMessage.create(
LocalizedStrings.Destroy_0_DURING_ENTRY_DESTROY_NO_ENTRY_WAS_FOUND_FOR_KEY_1,
- new Object[] {servConn.getName(), key}));
+ new Object[] {serverConnection.getName(), key}));
} catch (RegionDestroyedException rde) {
- writeException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, rde, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// If an exception occurs during the destroy, preserve the connection
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (e instanceof GemFireSecurityException) {
// Fine logging for security exceptions since these are already
// logged by the security logger
if (logger.isDebugEnabled()) {
- logger.debug("{}: Unexpected Security exception", servConn.getName(), e);
+ logger.debug("{}: Unexpected Security exception", serverConnection.getName(), e);
}
} else {
logger.warn(LocalizedMessage.create(LocalizedStrings.Destroy_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), e);
+ serverConnection.getName()), e);
}
return;
}
@@ -188,18 +191,18 @@ public class Destroy extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeReplyWithRefreshMetadata(msg, servConn, pr, pr.getNetworkHopType());
+ writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, pr.getNetworkHopType());
pr.clearNetworkHopData();
} else {
- writeReply(msg, servConn);
+ writeReply(clientMessage, serverConnection);
}
} else {
- writeReply(msg, servConn);
+ writeReply(clientMessage, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent destroy response for region {} key {}", servConn.getName(), regionName,
- key);
+ logger.debug("{}: Sent destroy response for region {} key {}", serverConnection.getName(),
+ regionName, key);
}
stats.incWriteDestroyResponseTime(DistributionStats.getStatTime() - start);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
index 585f57d..3aebbb5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
@@ -54,7 +54,7 @@ public class Destroy65 extends BaseCommand {
}
@Override
- protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection servConn,
+ protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection serverConnection,
PartitionedRegion pr, byte nwHop) throws IOException {
throw new UnsupportedOperationException();
}
@@ -72,7 +72,7 @@ public class Destroy65 extends BaseCommand {
replyMsg.addIntPart(entryNotFoundForRemove ? 1 : 0);
replyMsg.send(servConn);
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADAT tx: {}", servConn.getName(),
+ logger.trace("{}: rpl with REFRESH_METADATA tx: {}", servConn.getName(),
origMsg.getTransactionId());
}
}
@@ -84,7 +84,7 @@ public class Destroy65 extends BaseCommand {
replyMsg.setMessageType(MessageType.REPLY);
replyMsg.setNumberOfParts(2);
replyMsg.setTransactionId(origMsg.getTransactionId());
- replyMsg.addBytesPart(OK_BYTES);
+ replyMsg.addBytesPart(okBytes());
replyMsg.addIntPart(entryNotFound ? 1 : 0);
replyMsg.send(servConn);
if (logger.isTraceEnabled()) {
@@ -94,7 +94,7 @@ public class Destroy65 extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart;
Part keyPart;
@@ -108,20 +108,20 @@ public class Destroy65 extends BaseCommand {
String regionName = null;
Object callbackArg = null, key = null;
StringBuffer errMessage = new StringBuffer();
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
long now = DistributionStats.getStatTime();
stats.incReadDestroyRequestTime(now - start);
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- keyPart = msg.getPart(1);
- expectedOldValuePart = msg.getPart(2);
+ regionNamePart = clientMessage.getPart(0);
+ keyPart = clientMessage.getPart(1);
+ expectedOldValuePart = clientMessage.getPart(2);
try {
- operation = msg.getPart(3).getObject();
+ operation = clientMessage.getPart(3).getObject();
if (((operation instanceof Operation) && ((Operation) operation == Operation.REMOVE))
|| ((operation instanceof Byte) && (Byte) operation == OpType.DESTROY))
@@ -130,20 +130,20 @@ public class Destroy65 extends BaseCommand {
expectedOldValue = expectedOldValuePart.getObject();
}
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- eventPart = msg.getPart(4);
+ eventPart = clientMessage.getPart(4);
- if (msg.getNumberOfParts() > 5) {
- callbackArgPart = msg.getPart(5);
+ if (clientMessage.getNumberOfParts() > 5) {
+ callbackArgPart = clientMessage.getPart(5);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -151,16 +151,17 @@ public class Destroy65 extends BaseCommand {
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Received destroy65 request ({} bytes; op={}) from {} for region {} key {}{} txId {}",
- servConn.getName(), msg.getPayloadLength(), operation, servConn.getSocketString(),
- regionName, key, (operation == Operation.REMOVE ? " value=" + expectedOldValue : ""),
- msg.getTransactionId());
+ serverConnection.getName(), clientMessage.getPayloadLength(), operation,
+ serverConnection.getSocketString(), regionName, key,
+ (operation == Operation.REMOVE ? " value=" + expectedOldValue : ""),
+ clientMessage.getTransactionId());
}
boolean entryNotFoundForRemove = false;
@@ -169,29 +170,30 @@ public class Destroy65 extends BaseCommand {
if (key == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.Destroy_0_THE_INPUT_KEY_FOR_THE_DESTROY_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage.append(LocalizedStrings.Destroy__THE_INPUT_KEY_FOR_THE_DESTROY_REQUEST_IS_NULL
.toLocalizedString());
}
if (regionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.Destroy_0_THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage
.append(LocalizedStrings.Destroy__THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REQUEST_IS_NULL
.toLocalizedString());
}
- writeErrorResponse(msg, MessageType.DESTROY_DATA_ERROR, errMessage.toString(), servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.DESTROY_DATA_ERROR, errMessage.toString(),
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = LocalizedStrings.Destroy__0_WAS_NOT_FOUND_DURING_DESTROY_REQUEST
.toLocalizedString(regionName);
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -199,13 +201,14 @@ public class Destroy65 extends BaseCommand {
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
EventIDHolder clientEvent = new EventIDHolder(eventId);
Breadcrumbs.setEventId(eventId);
// msg.isRetry might be set by v7.0 and later clients
- if (msg.isRetry()) {
+ if (clientMessage.isRetry()) {
// if (logger.isDebugEnabled()) {
// logger.debug("DEBUG: encountered isRetry in Destroy65");
// }
@@ -223,7 +226,7 @@ public class Destroy65 extends BaseCommand {
// for integrated security
this.securityService.authorizeRegionWrite(regionName, key.toString());
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
if (DynamicRegionFactory.regionIsDynamicRegionList(regionName)) {
RegionDestroyOperationContext destroyContext =
@@ -236,14 +239,15 @@ public class Destroy65 extends BaseCommand {
}
}
if (operation == null || operation == Operation.DESTROY) {
- region.basicBridgeDestroy(key, callbackArg, servConn.getProxyID(), true, clientEvent);
+ region.basicBridgeDestroy(key, callbackArg, serverConnection.getProxyID(), true,
+ clientEvent);
} else {
// this throws exceptions if expectedOldValue checks fail
try {
if (expectedOldValue == null) {
expectedOldValue = Token.INVALID;
}
- if (operation == Operation.REMOVE && msg.isRetry()
+ if (operation == Operation.REMOVE && clientMessage.isRetry()
&& clientEvent.getVersionTag() != null) {
// the operation was successful last time it was tried, so there's
// no need to perform it again. Just return the version tag and
@@ -254,55 +258,55 @@ public class Destroy65 extends BaseCommand {
}
// try the operation anyway to ensure that it's been distributed to all servers
try {
- region.basicBridgeRemove(key, expectedOldValue, callbackArg, servConn.getProxyID(),
- true, clientEvent);
+ region.basicBridgeRemove(key, expectedOldValue, callbackArg,
+ serverConnection.getProxyID(), true, clientEvent);
} catch (EntryNotFoundException e) {
// ignore, and don't set entryNotFoundForRemove because this was a successful
// operation - bug #51664
}
} else {
- region.basicBridgeRemove(key, expectedOldValue, callbackArg, servConn.getProxyID(),
- true, clientEvent);
+ region.basicBridgeRemove(key, expectedOldValue, callbackArg,
+ serverConnection.getProxyID(), true, clientEvent);
if (logger.isDebugEnabled()) {
logger.debug("region.remove succeeded");
}
}
} catch (EntryNotFoundException e) {
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
if (logger.isDebugEnabled()) {
logger.debug("writing entryNotFound response");
}
entryNotFoundForRemove = true;
}
}
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
} catch (EntryNotFoundException e) {
// Don't send an exception back to the client if this
// exception happens. Just log it and continue.
logger.info(LocalizedMessage.create(
LocalizedStrings.Destroy_0_DURING_ENTRY_DESTROY_NO_ENTRY_WAS_FOUND_FOR_KEY_1,
- new Object[] {servConn.getName(), key}));
+ new Object[] {serverConnection.getName(), key}));
entryNotFoundForRemove = true;
} catch (RegionDestroyedException rde) {
- writeException(msg, rde, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, rde, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// If an exception occurs during the destroy, preserve the connection
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (e instanceof GemFireSecurityException) {
// Fine logging for security exceptions since these are already
// logged by the security logger
if (logger.isDebugEnabled()) {
- logger.debug("{}: Unexpected Security exception", servConn.getName(), e);
+ logger.debug("{}: Unexpected Security exception", serverConnection.getName(), e);
}
} else {
logger.warn(LocalizedMessage.create(LocalizedStrings.Destroy_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), e);
+ serverConnection.getName()), e);
}
return;
}
@@ -314,21 +318,23 @@ public class Destroy65 extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeReplyWithRefreshMetadata(msg, servConn, pr, entryNotFoundForRemove,
+ writeReplyWithRefreshMetadata(clientMessage, serverConnection, pr, entryNotFoundForRemove,
pr.getNetworkHopType(), clientEvent.getVersionTag());
pr.clearNetworkHopData();
} else {
- writeReply(msg, servConn, entryNotFoundForRemove | clientEvent.getIsRedestroyedEntry(),
+ writeReply(clientMessage, serverConnection,
+ entryNotFoundForRemove | clientEvent.getIsRedestroyedEntry(),
clientEvent.getVersionTag());
}
} else {
- writeReply(msg, servConn, entryNotFoundForRemove | clientEvent.getIsRedestroyedEntry(),
+ writeReply(clientMessage, serverConnection,
+ entryNotFoundForRemove | clientEvent.getIsRedestroyedEntry(),
clientEvent.getVersionTag());
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent destroy response for region {} key {}", servConn.getName(), regionName,
- key);
+ logger.debug("{}: Sent destroy response for region {} key {}", serverConnection.getName(),
+ regionName, key);
}
stats.incWriteDestroyResponseTime(DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
index 59a7233..7c07c72 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
@@ -67,7 +67,7 @@ public class Destroy70 extends Destroy65 {
pr.getPrStats().incPRMetaDataSentCount();
replyMsg.send(servConn);
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADAT tx: {}", servConn.getName(),
+ logger.trace("{}: rpl with REFRESH_METADATA tx: {}", servConn.getName(),
origMsg.getTransactionId());
}
}
@@ -104,7 +104,7 @@ public class Destroy70 extends Destroy65 {
// logger.fine("response has no version tag");
// }
}
- replyMsg.addBytesPart(OK_BYTES); // make old single-hop code happy by puting byte[]{0} here
+ replyMsg.addBytesPart(okBytes()); // make old single-hop code happy by puting byte[]{0} here
replyMsg.addIntPart(entryNotFound ? 1 : 0);
replyMsg.send(servConn);
if (logger.isTraceEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
index 13fef02..886994e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java
@@ -45,15 +45,15 @@ public class DestroyRegion extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, callbackArgPart = null;
String regionName = null;
Object callbackArg = null;
Part eventPart = null;
StringBuffer errMessage = new StringBuffer();
- CacheServerStats stats = servConn.getCacheServerStats();
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ CacheServerStats stats = serverConnection.getCacheServerStats();
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
{
long oldStart = start;
@@ -61,11 +61,11 @@ public class DestroyRegion extends BaseCommand {
stats.incReadDestroyRegionRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- regionNamePart = msg.getPart(0);
- eventPart = msg.getPart(1);
+ regionNamePart = clientMessage.getPart(0);
+ eventPart = clientMessage.getPart(1);
// callbackArgPart = null; (redundant assignment)
- if (msg.getNumberOfParts() > 2) {
- callbackArgPart = msg.getPart(2);
+ if (clientMessage.getNumberOfParts() > 2) {
+ callbackArgPart = clientMessage.getPart(2);
try {
callbackArg = callbackArgPart.getObject();
} catch (DistributedSystemDisconnectedException se) {
@@ -73,47 +73,48 @@ public class DestroyRegion extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"{} ignoring message of type {} from client {} because shutdown occurred during message processing.",
- servConn.getName(), MessageType.getString(msg.getMessageType()),
- servConn.getProxyID());
+ serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()),
+ serverConnection.getProxyID());
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(se);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(se);
return;
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
regionName = regionNamePart.getString();
if (logger.isDebugEnabled()) {
logger.debug("{}: Received destroy region request ({} bytes) from {} for region {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName);
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName);
}
// Process the destroy region request
if (regionName == null) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.DestroyRegion_0_THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REGION_REQUEST_IS_NULL,
- servConn.getName()));
+ serverConnection.getName()));
errMessage.append(
LocalizedStrings.DestroyRegion__THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REGION_REQUEST_IS_NULL
.toLocalizedString());
- writeErrorResponse(msg, MessageType.DESTROY_REGION_DATA_ERROR, errMessage.toString(),
- servConn);
- servConn.setAsTrue(RESPONDED);
+ writeErrorResponse(clientMessage, MessageType.DESTROY_REGION_DATA_ERROR,
+ errMessage.toString(), serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason =
LocalizedStrings.DestroyRegion_REGION_WAS_NOT_FOUND_DURING_DESTROY_REGION_REQUEST
.toLocalizedString();
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -121,45 +122,46 @@ public class DestroyRegion extends BaseCommand {
ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm());
long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer);
- EventID eventId = new EventID(servConn.getEventMemberIDByteArray(), threadId, sequenceId);
+ EventID eventId =
+ new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId);
try {
// user needs to have data:manage on all regions in order to destory a particular region
this.securityService.authorizeDataManage();
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
RegionDestroyOperationContext destroyContext =
authzRequest.destroyRegionAuthorize(regionName, callbackArg);
callbackArg = destroyContext.getCallbackArg();
}
// region.destroyRegion(callbackArg);
- region.basicBridgeDestroyRegion(callbackArg, servConn.getProxyID(),
+ region.basicBridgeDestroyRegion(callbackArg, serverConnection.getProxyID(),
true /* boolean from cache Client */, eventId);
} catch (DistributedSystemDisconnectedException e) {
// FIXME better exception hierarchy would avoid this check
- if (servConn.getCachedRegionHelper().getCache().getCancelCriterion()
+ if (serverConnection.getCachedRegionHelper().getCache().getCancelCriterion()
.cancelInProgress() != null) {
if (logger.isDebugEnabled()) {
logger.debug(
"{} ignoring message of type {} from client {} because shutdown occurred during message processing.",
- servConn.getName(), MessageType.getString(msg.getMessageType()),
- servConn.getProxyID());
+ serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()),
+ serverConnection.getProxyID());
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(e);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(e);
} else {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
return;
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// Otherwise, write an exception message and continue
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -169,10 +171,10 @@ public class DestroyRegion extends BaseCommand {
start = DistributionStats.getStatTime();
stats.incProcessDestroyRegionTime(start - oldStart);
}
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sent destroy region response for region {}", servConn.getName(),
+ logger.debug("{}: Sent destroy region response for region {}", serverConnection.getName(),
regionName);
}
stats.incWriteDestroyRegionResponseTime(DistributionStats.getStatTime() - start);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
index e63ac22..c146d27 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
@@ -64,21 +64,22 @@ public class ExecuteFunction extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ throws IOException {
Object function = null;
Object args = null;
MemberMappedArgument memberMappedArg = null;
byte hasResult = 0;
try {
- hasResult = msg.getPart(0).getSerializedForm()[0];
+ hasResult = clientMessage.getPart(0).getSerializedForm()[0];
if (hasResult == 1) {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- function = msg.getPart(1).getStringOrObject();
- args = msg.getPart(2).getObject();
+ function = clientMessage.getPart(1).getStringOrObject();
+ args = clientMessage.getPart(2).getObject();
- Part part = msg.getPart(3);
+ Part part = clientMessage.getPart(3);
if (part != null) {
memberMappedArg = (MemberMappedArgument) part.getObject();
}
@@ -87,7 +88,7 @@ public class ExecuteFunction extends BaseCommand {
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -97,7 +98,7 @@ public class ExecuteFunction extends BaseCommand {
LocalizedStrings.ExecuteFunction_THE_INPUT_FUNCTION_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString();
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -110,7 +111,7 @@ public class ExecuteFunction extends BaseCommand {
final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
} else {
@@ -129,7 +130,7 @@ public class ExecuteFunction extends BaseCommand {
args, functionObject.optimizeForWrite());
}
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
ResultSender resultSender = new ServerToClientFunctionResultSender(m,
MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -182,7 +183,7 @@ public class ExecuteFunction extends BaseCommand {
function), ioException);
String message =
LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioException);
+ sendException(hasResult, clientMessage, message, servConn, ioException);
} catch (InternalFunctionInvocationTargetException internalfunctionException) {
// Fix for #44709: User should not be aware of
// InternalFunctionInvocationTargetException. No instance of
@@ -200,20 +201,20 @@ public class ExecuteFunction extends BaseCommand {
new Object[] {function}), internalfunctionException);
}
final String message = internalfunctionException.getMessage();
- sendException(hasResult, msg, message, servConn, internalfunctionException);
+ sendException(hasResult, clientMessage, message, servConn, internalfunctionException);
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
final String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
}
}
private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
Throwable e) throws IOException {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
servConn.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
index 8fafd10..23d5b18 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
@@ -63,7 +63,8 @@ public class ExecuteFunction65 extends BaseCommand {
ExecuteFunction65() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ throws IOException {
Object function = null;
Object args = null;
MemberMappedArgument memberMappedArg = null;
@@ -71,7 +72,7 @@ public class ExecuteFunction65 extends BaseCommand {
byte functionState = 0;
boolean isReexecute = false;
try {
- functionState = msg.getPart(0).getSerializedForm()[0];
+ functionState = clientMessage.getPart(0).getSerializedForm()[0];
if (functionState == AbstractExecution.HA_HASRESULT_NO_OPTIMIZEFORWRITE_REEXECUTE) {
functionState = AbstractExecution.HA_HASRESULT_NO_OPTIMIZEFORWRITE;
@@ -90,10 +91,10 @@ public class ExecuteFunction65 extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- function = msg.getPart(1).getStringOrObject();
- args = msg.getPart(2).getObject();
+ function = clientMessage.getPart(1).getStringOrObject();
+ args = clientMessage.getPart(2).getObject();
- Part part = msg.getPart(3);
+ Part part = clientMessage.getPart(3);
if (part != null) {
memberMappedArg = (MemberMappedArgument) part.getObject();
}
@@ -102,7 +103,7 @@ public class ExecuteFunction65 extends BaseCommand {
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -112,7 +113,7 @@ public class ExecuteFunction65 extends BaseCommand {
LocalizedStrings.ExecuteFunction_THE_INPUT_FUNCTION_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString();
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -125,7 +126,7 @@ public class ExecuteFunction65 extends BaseCommand {
final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -139,7 +140,7 @@ public class ExecuteFunction65 extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -159,7 +160,7 @@ public class ExecuteFunction65 extends BaseCommand {
args, functionObject.optimizeForWrite());
}
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
ResultSender resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -193,7 +194,7 @@ public class ExecuteFunction65 extends BaseCommand {
.toLocalizedString(new Object[] {functionObject.getId(), sm}),
sm);
- sendException(hasResult, msg, e.getMessage(), servConn, e);
+ sendException(hasResult, clientMessage, e.getMessage(), servConn, e);
return;
}
functionObject.execute(context);
@@ -220,7 +221,7 @@ public class ExecuteFunction65 extends BaseCommand {
function), ioException);
String message =
LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioException);
+ sendException(hasResult, clientMessage, message, servConn, ioException);
} catch (InternalFunctionInvocationTargetException internalfunctionException) {
// Fix for #44709: User should not be aware of
// InternalFunctionInvocationTargetException. No instance of
@@ -236,20 +237,20 @@ public class ExecuteFunction65 extends BaseCommand {
new Object[] {function}), internalfunctionException);
}
final String message = internalfunctionException.getMessage();
- sendException(hasResult, msg, message, servConn, internalfunctionException);
+ sendException(hasResult, clientMessage, message, servConn, internalfunctionException);
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
final String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
}
}
private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
Throwable e) throws IOException {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
servConn.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
index d007777..46302bc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
@@ -87,7 +87,8 @@ public class ExecuteFunction66 extends BaseCommand {
ExecuteFunction66() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ throws IOException {
Object function = null;
Object args = null;
MemberMappedArgument memberMappedArg = null;
@@ -99,7 +100,7 @@ public class ExecuteFunction66 extends BaseCommand {
boolean ignoreFailedMembers = false;
int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT;
try {
- byte[] bytes = msg.getPart(0).getSerializedForm();
+ byte[] bytes = clientMessage.getPart(0).getSerializedForm();
functionState = bytes[0];
if (bytes.length >= 5
&& servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
@@ -123,25 +124,25 @@ public class ExecuteFunction66 extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- function = msg.getPart(1).getStringOrObject();
- args = msg.getPart(2).getObject();
+ function = clientMessage.getPart(1).getStringOrObject();
+ args = clientMessage.getPart(2).getObject();
- Part part = msg.getPart(3);
+ Part part = clientMessage.getPart(3);
if (part != null) {
memberMappedArg = (MemberMappedArgument) part.getObject();
}
- groups = getGroups(msg);
- allMembers = getAllMembers(msg);
- ignoreFailedMembers = getIgnoreFailedMembers(msg);
+ groups = getGroups(clientMessage);
+ allMembers = getAllMembers(clientMessage);
+ ignoreFailedMembers = getIgnoreFailedMembers(clientMessage);
} catch (ClassNotFoundException exception) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
} else {
- writeException(msg, exception, false, servConn);
+ writeException(clientMessage, exception, false, servConn);
}
servConn.setAsTrue(RESPONDED);
return;
@@ -153,7 +154,7 @@ public class ExecuteFunction66 extends BaseCommand {
.toLocalizedString();
logger.warn(LocalizedMessage.create(LocalizedStrings.TWO_ARG_COLON,
new Object[] {servConn.getName(), message}));
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -166,7 +167,7 @@ public class ExecuteFunction66 extends BaseCommand {
final String message = LocalizedStrings.ExecuteFunction_FUNCTION_NAMED_0_IS_NOT_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -180,7 +181,7 @@ public class ExecuteFunction66 extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -200,7 +201,7 @@ public class ExecuteFunction66 extends BaseCommand {
args, functionObject.optimizeForWrite());
}
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
ServerToClientFunctionResultSender resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -232,7 +233,7 @@ public class ExecuteFunction66 extends BaseCommand {
.toLocalizedString(new Object[] {functionObject.getId(), sm}),
sm);
- sendException(hasResult, msg, e.getMessage(), servConn, e);
+ sendException(hasResult, clientMessage, e.getMessage(), servConn, e);
return;
}
/**
@@ -252,7 +253,7 @@ public class ExecuteFunction66 extends BaseCommand {
}
if (!functionObject.hasResult()) {
- writeReply(msg, servConn);
+ writeReply(clientMessage, servConn);
}
} catch (FunctionException functionException) {
stats.endFunctionExecutionWithException(functionObject.hasResult());
@@ -269,7 +270,7 @@ public class ExecuteFunction66 extends BaseCommand {
function), ioException);
String message =
LocalizedStrings.ExecuteFunction_SERVER_COULD_NOT_SEND_THE_REPLY.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioException);
+ sendException(hasResult, clientMessage, message, servConn, ioException);
} catch (InternalFunctionInvocationTargetException internalfunctionException) {
// Fix for #44709: User should not be aware of
// InternalFunctionInvocationTargetException. No instance of
@@ -287,13 +288,13 @@ public class ExecuteFunction66 extends BaseCommand {
new Object[] {function}), internalfunctionException);
}
final String message = internalfunctionException.getMessage();
- sendException(hasResult, msg, message, servConn, internalfunctionException);
+ sendException(hasResult, clientMessage, message, servConn, internalfunctionException);
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
final String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
}
}
@@ -399,7 +400,7 @@ public class ExecuteFunction66 extends BaseCommand {
private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
Throwable e) throws IOException {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
} else {
writeException(msg, e, false, servConn);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
index 957b423..09fe20e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
@@ -51,8 +51,9 @@ public class ExecuteFunction70 extends ExecuteFunction66 {
private ExecuteFunction70() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
- super.cmdExecute(msg, servConn, start);
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ throws IOException {
+ super.cmdExecute(clientMessage, serverConnection, start);
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
index 0007dab..82a378d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
@@ -63,7 +63,8 @@ public class ExecuteRegionFunction extends BaseCommand {
private ExecuteRegionFunction() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ throws IOException {
String regionName = null;
Object function = null;
Object args = null;
@@ -73,27 +74,27 @@ public class ExecuteRegionFunction extends BaseCommand {
int filterSize = 0, partNumber = 0;
CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
try {
- hasResult = msg.getPart(0).getSerializedForm()[0];
+ hasResult = clientMessage.getPart(0).getSerializedForm()[0];
if (hasResult == 1) {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- filterSize = msg.getPart(5).getInt();
+ filterSize = clientMessage.getPart(5).getInt();
if (filterSize != 0) {
filter = new HashSet();
partNumber = 6;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -102,7 +103,7 @@ public class ExecuteRegionFunction extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -120,7 +121,7 @@ public class ExecuteRegionFunction extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -130,7 +131,7 @@ public class ExecuteRegionFunction extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -147,7 +148,7 @@ public class ExecuteRegionFunction extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
} else {
@@ -169,7 +170,7 @@ public class ExecuteRegionFunction extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -204,7 +205,7 @@ public class ExecuteRegionFunction extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (InternalFunctionInvocationTargetException internalfunctionException) {
// Fix for #44709: User should not be aware of
// InternalFunctionInvocationTargetException. No instance of
@@ -222,20 +223,20 @@ public class ExecuteRegionFunction extends BaseCommand {
new Object[] {function}), internalfunctionException);
}
final String message = internalfunctionException.getMessage();
- sendException(hasResult, msg, message, servConn, internalfunctionException);
+ sendException(hasResult, clientMessage, message, servConn, internalfunctionException);
} catch (FunctionException fe) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
String message = fe.getMessage();
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
}
@@ -245,7 +246,7 @@ public class ExecuteRegionFunction extends BaseCommand {
Throwable e) throws IOException {
synchronized (msg) {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
servConn.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
index b1d3d4e..12919d0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
@@ -63,7 +63,8 @@ public class ExecuteRegionFunction61 extends BaseCommand {
private ExecuteRegionFunction61() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ throws IOException {
String regionName = null;
Object function = null;
Object args = null;
@@ -76,40 +77,40 @@ public class ExecuteRegionFunction61 extends BaseCommand {
int filterSize = 0, partNumber = 0;
CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
try {
- hasResult = msg.getPart(0).getSerializedForm()[0];
+ hasResult = clientMessage.getPart(0).getSerializedForm()[0];
if (hasResult == 1) {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- isReExecute = msg.getPart(5).getSerializedForm()[0];
- filterSize = msg.getPart(6).getInt();
+ isReExecute = clientMessage.getPart(5).getSerializedForm()[0];
+ filterSize = clientMessage.getPart(6).getInt();
if (filterSize != 0) {
filter = new HashSet();
partNumber = 7;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
partNumber = 7 + filterSize;
- removedNodesSize = msg.getPart(partNumber).getInt();
+ removedNodesSize = clientMessage.getPart(partNumber).getInt();
if (removedNodesSize != 0) {
removedNodesSet = new HashSet();
partNumber = partNumber + 1;
for (int i = 0; i < removedNodesSize; i++) {
- removedNodesSet.add(msg.getPart(partNumber + i).getStringOrObject());
+ removedNodesSet.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -118,7 +119,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -136,7 +137,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
Region region = crHelper.getRegion(regionName);
@@ -145,7 +146,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
HandShake handShake = (HandShake) servConn.getHandshake();
@@ -161,7 +162,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
} else {
@@ -180,7 +181,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -220,7 +221,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
final String message =
LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
@@ -255,7 +256,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
}
} catch (Exception e) {
@@ -263,7 +264,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
}
finally {
@@ -275,7 +276,7 @@ public class ExecuteRegionFunction61 extends BaseCommand {
private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
Throwable e) throws IOException {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, servConn, e);
servConn.setAsTrue(RESPONDED);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
index 57bc869..3be907b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
@@ -60,7 +60,8 @@ public class ExecuteRegionFunction65 extends BaseCommand {
private ExecuteRegionFunction65() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ throws IOException {
String regionName = null;
Object function = null;
Object args = null;
@@ -74,7 +75,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
byte functionState = 0;
try {
- functionState = msg.getPart(0).getSerializedForm()[0];
+ functionState = clientMessage.getPart(0).getSerializedForm()[0];
if (functionState != 1) {
hasResult = (byte) ((functionState & 2) - 1);
} else {
@@ -84,35 +85,35 @@ public class ExecuteRegionFunction65 extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- isReExecute = msg.getPart(5).getSerializedForm()[0];
- filterSize = msg.getPart(6).getInt();
+ isReExecute = clientMessage.getPart(5).getSerializedForm()[0];
+ filterSize = clientMessage.getPart(6).getInt();
if (filterSize != 0) {
filter = new HashSet<Object>();
partNumber = 7;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
partNumber = 7 + filterSize;
- removedNodesSize = msg.getPart(partNumber).getInt();
+ removedNodesSize = clientMessage.getPart(partNumber).getInt();
if (removedNodesSize != 0) {
removedNodesSet = new HashSet<Object>();
partNumber = partNumber + 1;
for (int i = 0; i < removedNodesSize; i++) {
- removedNodesSet.add(msg.getPart(partNumber + i).getStringOrObject());
+ removedNodesSet.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -121,7 +122,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -139,7 +140,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -149,7 +150,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -166,7 +167,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -180,7 +181,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -203,7 +204,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -262,7 +263,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
@@ -298,7 +299,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
}
} catch (Exception e) {
@@ -306,7 +307,7 @@ public class ExecuteRegionFunction65 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
}
[09/35] geode git commit: GEODE-2957 gfsh create lucene index "null"
becomes "DEFAULT"
Posted by kl...@apache.org.
GEODE-2957 gfsh create lucene index "null" becomes "DEFAULT"
This closes #543
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/80675180
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/80675180
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/80675180
Branch: refs/heads/feature/GEODE-2632-19
Commit: 806751805cb47877b609ee35cbfa21b362a3d7b3
Parents: 3197140
Author: Karen Miller <km...@pivotal.io>
Authored: Fri May 26 11:57:49 2017 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Tue May 30 15:44:48 2017 -0700
----------------------------------------------------------------------
.../gfsh/command-pages/create.html.md.erb | 21 ++++++++++++--------
.../lucene_integration.html.md.erb | 4 ++--
2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/80675180/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
index 1398352..ef68f90 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
@@ -683,26 +683,31 @@ create lucene index --name=value --region=value --field=value(,value)* [--analyz
|----------------------------------------------------|----------------------------------------------------------------------------------------|---------|
| <span class="keyword parmname">\\-\\-name</span> | *Required.* Name of the index to create. | Â |
| <span class="keyword parmname">\\-\\-region</span> | *Required.* Name/Path of the region which corresponds to the "from" clause in a query. | Â |
-| <span class="keyword parmname">\\-\\-field</span> | *Required.* Field of the region values that are referenced by the index. To treat the entire value as a single field, specify `__REGION_VALUE_FIELD`. | Â |
-| <span class="keyword parmname">‑‑analyzer</span> | Analyzer to extract terms from text | Â |
+| <span class="keyword parmname">\\-\\-field</span> | *Required.* Field of the region values that are referenced by the index. To treat the entire value as a single field, specify `__REGION_VALUE_FIELD`. | Â |
+| <span class="keyword parmname">‑‑analyzer</span> | Analyzer to extract terms from text. Use `DEFAULT` to specify the default analyzer. | Â |
| <span class="keyword parmname">\\-\\-group</span> | The index will be created on all the members in the specified member groups. | Â |
**Example Commands:**
``` pre
-create region --name=Person --type=PARTITION_REDUNDANT_PERSISTENT
-create lucene index --name=customerIndex --region=/Customer --field=symbol,revenue,SSN,name,email,address,__REGION_VALUE_FIELD
-create lucene index --name=analyzerIndex --region=/Person --field=name,email,address,revenue --analyzer=null,org.apache.lucene.analysis.core.KeywordAnalyzer,examples.MyCharacterAnalyzer,null
+gfsh>create region --name=Person --type=PARTITION_REDUNDANT_PERSISTENT
+
+gfsh>create lucene index --name=customerIndex --region=/Customer
+ --field=symbol,revenue,SSN,name,email,address,__REGION_VALUE_FIELD
+
+gfsh>create lucene index --name=analyzerIndex --region=/Person
+ --field=name,email,address,revenue
+ --analyzer=DEFAULT,org.apache.lucene.analysis.core.KeywordAnalyzer,examples.MyCharacterAnalyzer,DEFAULT
```
**Sample Output:**
``` pre
gfsh>create lucene index --name=testIndex --region=testRegion --field=__REGION_VALUE_FIELD
- Member | Status
----------------------------------------- | ---------------------------------
-192.168.1.23(server50505:17200)<v1>:1025 | Successfully created lucene index
+ Member | Status
+-------------------------------------- | ---------------------------------
+192.168.1.23(server505:17200)<v1>:1025 | Successfully created lucene index
```
## <a id="topic_54B0985FEC5241CA9D26B0CE0A5EA863" class="no-quick-link"></a>create region
http://git-wip-us.apache.org/repos/asf/geode/blob/80675180/geode-docs/tools_modules/lucene_integration.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/lucene_integration.html.md.erb b/geode-docs/tools_modules/lucene_integration.html.md.erb
index 7f5afdc..41d429b 100644
--- a/geode-docs/tools_modules/lucene_integration.html.md.erb
+++ b/geode-docs/tools_modules/lucene_integration.html.md.erb
@@ -89,10 +89,10 @@ gfsh>create lucene index --name=indexName --region=/orders --field=customer,tags
``` pre
// Create an index, specifying a custom analyzer for the second field
-// Note: "null" in the first analyzer position uses the default analyzer
+// Note: "DEFAULT" in the first analyzer position uses the default analyzer
// for the first field
gfsh>create lucene index --name=indexName --region=/orders
- --field=customer,tags --analyzer=null,org.apache.lucene.analysis.bg.BulgarianAnalyzer
+ --field=customer,tags --analyzer=DEFAULT,org.apache.lucene.analysis.bg.BulgarianAnalyzer
```
To use the entire value as a single field set the required `--field`
option to be `__REGION_VALUE_FIELD`.
[04/35] geode git commit: GEODE-2957: Create Lucene index analyzer
help updated to include keyword DEFAULT
Posted by kl...@apache.org.
GEODE-2957: Create Lucene index analyzer help updated to include keyword DEFAULT
This closes #547
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/1ee19c75
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/1ee19c75
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/1ee19c75
Branch: refs/heads/feature/GEODE-2632-19
Commit: 1ee19c759c4bdd4133f7dcf7df648f3437234a7d
Parents: 5b2cdf8
Author: David Anuta <da...@gmail.com>
Authored: Tue May 30 09:27:11 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Tue May 30 12:16:12 2017 -0700
----------------------------------------------------------------------
.../apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/1ee19c75/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
index db9f7b9..8104b3f 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
@@ -43,7 +43,7 @@ public class LuceneCliStrings {
"Fields on the region values which are stored in the lucene index.\nUse __REGION_VALUE_FIELD if the entire region value should be indexed.\n__REGION_VALUE_FIELD is valid only if the region values are strings or numbers.";
public static final String LUCENE_CREATE_INDEX__ANALYZER = "analyzer";
public static final String LUCENE_CREATE_INDEX__ANALYZER_HELP =
- "Type of the analyzer for each field.";
+ "Type of the analyzer for each field.\nUse the case sensitive keyword DEFAULT or leave an analyzer blank to use the default standard analyzer.";
public static final String CREATE_INDEX__SUCCESS__MSG =
"Index successfully created with following details";
public static final String CREATE_INDEX__FAILURE__MSG =
[12/35] geode git commit: GEODE-3000: do not have jetty log at debug
level
Posted by kl...@apache.org.
GEODE-3000: do not have jetty log at debug level
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5f4a797a
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5f4a797a
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5f4a797a
Branch: refs/heads/feature/GEODE-2632-19
Commit: 5f4a797ab00d9c77567b30f09b94cfe1d8c68ba7
Parents: b89d2fb
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Tue May 30 11:03:05 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed May 31 10:47:51 2017 -0700
----------------------------------------------------------------------
geode-core/src/main/resources/log4j2.xml | 1 +
.../internal/security/LogNoPasswordTest.java | 75 ++++++++++++++++++++
2 files changed, 76 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/5f4a797a/geode-core/src/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/main/resources/log4j2.xml b/geode-core/src/main/resources/log4j2.xml
index cdb932b..49773a2 100755
--- a/geode-core/src/main/resources/log4j2.xml
+++ b/geode-core/src/main/resources/log4j2.xml
@@ -17,6 +17,7 @@
</filters>
</Logger>
<Logger name="org.jgroups" level="FATAL" additivity="true"/>
+ <Logger name="org.eclipse.jetty" level="FATAL" additivity="true"/>
<Root level="INFO">
<AppenderRef ref="STDOUT"/>
</Root>
http://git-wip-us.apache.org/repos/asf/geode/blob/5f4a797a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
new file mode 100644
index 0000000..688af78
--- /dev/null
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.management.internal.security;
+
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.security.SecurityManager;
+import org.apache.geode.test.dunit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.dunit.rules.LocatorStarterRule;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.util.Properties;
+import java.util.Scanner;
+
+@Category(IntegrationTest.class)
+public class LogNoPasswordTest {
+
+ private static String PASSWORD = "abcdefghijklmn";
+ @Rule
+ public LocatorStarterRule locator = new LocatorStarterRule().withProperty(LOG_LEVEL, "DEBUG")
+ .withSecurityManager(MySecurityManager.class);
+
+ @Rule
+ public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+
+ @Test
+ public void testPasswordInLogs() throws Exception {
+ locator.startLocator();
+ gfsh.secureConnectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http, "any",
+ PASSWORD);
+ gfsh.executeAndVerifyCommand("list members");
+
+ // scan all log files to find any occurrences of password
+ File[] logFiles = locator.getWorkingDir().listFiles(file -> file.toString().endsWith(".log"));
+ for (File logFile : logFiles) {
+ Scanner scanner = new Scanner(logFile);
+ while (scanner.hasNextLine()) {
+ String line = scanner.nextLine();
+ assertThat(line).doesNotContain(PASSWORD);
+ }
+ }
+ }
+
+ public static class MySecurityManager implements SecurityManager {
+ @Override
+ public Object authenticate(Properties credentials) throws AuthenticationFailedException {
+ String user = credentials.getProperty("security-username");
+ String password = credentials.getProperty("security-password");
+ if (PASSWORD.equals(password)) {
+ return user;
+ }
+
+ throw new AuthenticationFailedException("Not authenticated.");
+ }
+ }
+}
[02/35] geode git commit: GEODE-2957: Create Lucene index analyzer
help updated to include keyword DEFAULT
Posted by kl...@apache.org.
GEODE-2957: Create Lucene index analyzer help updated to include keyword DEFAULT
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/96665faf
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/96665faf
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/96665faf
Branch: refs/heads/feature/GEODE-2632-19
Commit: 96665fafbcc06948b7152ca9ad7344ab938f27ff
Parents: d50489c
Author: David Anuta <da...@gmail.com>
Authored: Tue May 30 09:27:11 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Tue May 30 12:02:37 2017 -0700
----------------------------------------------------------------------
.../apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/96665faf/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
index db9f7b9..8104b3f 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
@@ -43,7 +43,7 @@ public class LuceneCliStrings {
"Fields on the region values which are stored in the lucene index.\nUse __REGION_VALUE_FIELD if the entire region value should be indexed.\n__REGION_VALUE_FIELD is valid only if the region values are strings or numbers.";
public static final String LUCENE_CREATE_INDEX__ANALYZER = "analyzer";
public static final String LUCENE_CREATE_INDEX__ANALYZER_HELP =
- "Type of the analyzer for each field.";
+ "Type of the analyzer for each field.\nUse the case sensitive keyword DEFAULT or leave an analyzer blank to use the default standard analyzer.";
public static final String CREATE_INDEX__SUCCESS__MSG =
"Index successfully created with following details";
public static final String CREATE_INDEX__FAILURE__MSG =
[03/35] geode git commit: Revert "GEODE-2957: Create Lucene index
analyzer help updated to include keyword DEFAULT"
Posted by kl...@apache.org.
Revert "GEODE-2957: Create Lucene index analyzer help updated to include keyword DEFAULT"
This reverts commit 96665fafbcc06948b7152ca9ad7344ab938f27ff.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5b2cdf8c
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5b2cdf8c
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5b2cdf8c
Branch: refs/heads/feature/GEODE-2632-19
Commit: 5b2cdf8c1499c8fdc1f76ad9351c30876f6623b2
Parents: 96665fa
Author: nabarun <nn...@pivotal.io>
Authored: Tue May 30 12:14:24 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Tue May 30 12:14:24 2017 -0700
----------------------------------------------------------------------
.../apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/5b2cdf8c/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
index 8104b3f..db9f7b9 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneCliStrings.java
@@ -43,7 +43,7 @@ public class LuceneCliStrings {
"Fields on the region values which are stored in the lucene index.\nUse __REGION_VALUE_FIELD if the entire region value should be indexed.\n__REGION_VALUE_FIELD is valid only if the region values are strings or numbers.";
public static final String LUCENE_CREATE_INDEX__ANALYZER = "analyzer";
public static final String LUCENE_CREATE_INDEX__ANALYZER_HELP =
- "Type of the analyzer for each field.\nUse the case sensitive keyword DEFAULT or leave an analyzer blank to use the default standard analyzer.";
+ "Type of the analyzer for each field.";
public static final String CREATE_INDEX__SUCCESS__MSG =
"Index successfully created with following details";
public static final String CREATE_INDEX__FAILURE__MSG =
[05/35] geode git commit: GEODE-2941 Update Pulse documentation:
logging info
Posted by kl...@apache.org.
GEODE-2941 Update Pulse documentation: logging info
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/fa808acd
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/fa808acd
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/fa808acd
Branch: refs/heads/feature/GEODE-2632-19
Commit: fa808acd41caa9cb76b1a5c66dd304925f31c0a2
Parents: 1ee19c7
Author: Dave Barnes <db...@pivotal.io>
Authored: Tue May 30 12:14:58 2017 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Tue May 30 13:41:43 2017 -0700
----------------------------------------------------------------------
geode-docs/tools_modules/pulse/pulse-hosted.html.md.erb | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/fa808acd/geode-docs/tools_modules/pulse/pulse-hosted.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/pulse/pulse-hosted.html.md.erb b/geode-docs/tools_modules/pulse/pulse-hosted.html.md.erb
index af9b1f5..4ce25e9 100644
--- a/geode-docs/tools_modules/pulse/pulse-hosted.html.md.erb
+++ b/geode-docs/tools_modules/pulse/pulse-hosted.html.md.erb
@@ -94,6 +94,11 @@ of your Geode installation directory. Depending on your application server, you
Substitute the appropriate paths and passwords for the bracketed placeholders.
+6. To change Pulse logging behavior, edit `log4j2.xml` in the same directory.
+ The default configuration sets the logging level to `INFO` and specifies a message pattern that
+ includes the date, name of the reporting logger, error level, name of the reporting thread, and the error message.
+ Refer to the [Apache Log4j documentation](https://logging.apache.org/log4j/2.x/manual/configuration.html#XML) for details on how to specify `log4j2.xml` content and syntax.
+
7. Restart the Web application server.
8. Access the Pulse application using the address, port, and application URL that you configured in
[25/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
index 0ed7235..674082c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
@@ -64,7 +64,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
private ExecuteRegionFunction66() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ throws IOException {
String regionName = null;
Object function = null;
Object args = null;
@@ -80,7 +81,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
byte functionState = 0;
int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT;
try {
- byte[] bytes = msg.getPart(0).getSerializedForm();
+ byte[] bytes = clientMessage.getPart(0).getSerializedForm();
functionState = bytes[0];
if (bytes.length >= 5
&& servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
@@ -95,17 +96,17 @@ public class ExecuteRegionFunction66 extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- byte[] flags = msg.getPart(5).getSerializedForm();
+ byte[] flags = clientMessage.getPart(5).getSerializedForm();
if (servConn.getClientVersion().ordinal() > Version.GFE_81.ordinal()) {
isBucketsAsFilter = (flags[0] & ExecuteFunctionHelper.BUCKETS_AS_FILTER_MASK) != 0;
isReExecute = (flags[0] & ExecuteFunctionHelper.IS_REXECUTE_MASK) != 0 ? (byte) 1 : 0;
@@ -113,24 +114,24 @@ public class ExecuteRegionFunction66 extends BaseCommand {
isReExecute = flags[0];
isBucketsAsFilter = false;
}
- filterSize = msg.getPart(6).getInt();
+ filterSize = clientMessage.getPart(6).getInt();
if (filterSize != 0) {
filter = new HashSet<Object>();
partNumber = 7;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
partNumber = 7 + filterSize;
- removedNodesSize = msg.getPart(partNumber).getInt();
+ removedNodesSize = clientMessage.getPart(partNumber).getInt();
if (removedNodesSize != 0) {
removedNodesSet = new HashSet<Object>();
partNumber = partNumber + 1;
for (int i = 0; i < removedNodesSize; i++) {
- removedNodesSet.add(msg.getPart(partNumber + i).getStringOrObject());
+ removedNodesSet.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -139,9 +140,9 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
} else {
- writeException(msg, exception, false, servConn);
+ writeException(clientMessage, exception, false, servConn);
}
servConn.setAsTrue(RESPONDED);
return;
@@ -159,7 +160,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -169,7 +170,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
HandShake handShake = (HandShake) servConn.getHandshake();
@@ -185,7 +186,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -199,7 +200,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -222,7 +223,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -276,7 +277,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
} else {
execution.execute(functionObject);
}
- writeReply(msg, servConn);
+ writeReply(clientMessage, servConn);
}
} catch (IOException ioe) {
logger.warn(LocalizedMessage.create(
@@ -284,7 +285,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
Object cause = fe.getCause();
@@ -321,7 +322,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
}
} catch (Exception e) {
@@ -329,7 +330,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
index 8b2cf75..cf96137 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
@@ -62,7 +62,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
private ExecuteRegionFunctionSingleHop() {}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start) throws IOException {
+ public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
+ throws IOException {
String regionName = null;
Object function = null;
@@ -79,7 +80,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT;
try {
- byte[] bytes = msg.getPart(0).getSerializedForm();
+ byte[] bytes = clientMessage.getPart(0).getSerializedForm();
functionState = bytes[0];
if (bytes.length >= 5
&& servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
@@ -94,49 +95,49 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
servConn.setAsTrue(REQUIRES_RESPONSE);
servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
- regionName = msg.getPart(1).getString();
- function = msg.getPart(2).getStringOrObject();
- args = msg.getPart(3).getObject();
- Part part = msg.getPart(4);
+ regionName = clientMessage.getPart(1).getString();
+ function = clientMessage.getPart(2).getStringOrObject();
+ args = clientMessage.getPart(3).getObject();
+ Part part = clientMessage.getPart(4);
if (part != null) {
Object obj = part.getObject();
if (obj instanceof MemberMappedArgument) {
memberMappedArg = (MemberMappedArgument) obj;
}
}
- isExecuteOnAllBuckets = msg.getPart(5).getSerializedForm()[0];
+ isExecuteOnAllBuckets = clientMessage.getPart(5).getSerializedForm()[0];
if (isExecuteOnAllBuckets == 1) {
filter = new HashSet();
- bucketIdsSize = msg.getPart(6).getInt();
+ bucketIdsSize = clientMessage.getPart(6).getInt();
if (bucketIdsSize != 0) {
buckets = new HashSet<Integer>();
partNumber = 7;
for (int i = 0; i < bucketIdsSize; i++) {
- buckets.add(msg.getPart(partNumber + i).getInt());
+ buckets.add(clientMessage.getPart(partNumber + i).getInt());
}
}
partNumber = 7 + bucketIdsSize;
} else {
- filterSize = msg.getPart(6).getInt();
+ filterSize = clientMessage.getPart(6).getInt();
if (filterSize != 0) {
filter = new HashSet<Object>();
partNumber = 7;
for (int i = 0; i < filterSize; i++) {
- filter.add(msg.getPart(partNumber + i).getStringOrObject());
+ filter.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
partNumber = 7 + filterSize;
}
- removedNodesSize = msg.getPart(partNumber).getInt();
+ removedNodesSize = clientMessage.getPart(partNumber).getInt();
if (removedNodesSize != 0) {
removedNodesSet = new HashSet<Object>();
partNumber = partNumber + 1;
for (int i = 0; i < removedNodesSize; i++) {
- removedNodesSet.add(msg.getPart(partNumber + i).getStringOrObject());
+ removedNodesSet.add(clientMessage.getPart(partNumber + i).getStringOrObject());
}
}
@@ -145,7 +146,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(msg, exception, false, servConn);
+ writeChunkedException(clientMessage, exception, servConn);
servConn.setAsTrue(RESPONDED);
return;
}
@@ -163,7 +164,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
.toLocalizedString("region");
}
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
@@ -173,7 +174,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST
.toLocalizedString(regionName);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
HandShake handShake = (HandShake) servConn.getHandshake();
@@ -189,7 +190,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
} else {
byte functionStateOnServer = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -199,7 +200,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, msg, message, servConn);
+ sendError(hasResult, clientMessage, message, servConn);
return;
}
}
@@ -222,7 +223,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
ChunkedMessage m = servConn.getFunctionResponseMessage();
- m.setTransactionId(msg.getTransactionId());
+ m.setTransactionId(clientMessage.getTransactionId());
resultSender = new ServerToClientFunctionResultSender65(m,
MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
@@ -290,7 +291,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, msg, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, servConn, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
@@ -301,21 +302,21 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
logger.debug("Exception on server while executing function: {}: {}", function, message,
fe);
}
- synchronized (msg) {
+ synchronized (clientMessage) {
resultSender.setException(fe);
}
} else {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), fe);
- sendException(hasResult, msg, message, servConn, fe);
+ sendException(hasResult, clientMessage, message, servConn, fe);
}
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, msg, message, servConn, e);
+ sendException(hasResult, clientMessage, message, servConn, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
index d44a4ad..d489b88 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
@@ -79,14 +79,14 @@ public class GatewayReceiverCommand extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null;
String regionName = null;
Object callbackArg = null, key = null;
int partNumber = 0;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- GatewayReceiverStats stats = (GatewayReceiverStats) servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ GatewayReceiverStats stats = (GatewayReceiverStats) serverConnection.getCacheServerStats();
EventID eventId = null;
LocalRegion region = null;
List<BatchException70> exceptions = new ArrayList<BatchException70>();
@@ -102,20 +102,20 @@ public class GatewayReceiverCommand extends BaseCommand {
// statement so that all messages can take advantage of it.
boolean earlyAck = false;// msg.getEarlyAck();
- stats.incBatchSize(msg.getPayloadLength());
+ stats.incBatchSize(clientMessage.getPayloadLength());
// Retrieve the number of events
- Part numberOfEventsPart = msg.getPart(0);
+ Part numberOfEventsPart = clientMessage.getPart(0);
int numberOfEvents = numberOfEventsPart.getInt();
stats.incEventsReceived(numberOfEvents);
// Retrieve the batch id
- Part batchIdPart = msg.getPart(1);
+ Part batchIdPart = clientMessage.getPart(1);
int batchId = batchIdPart.getInt();
// If this batch has already been seen, do not reply.
// Instead, drop the batch and continue.
- if (batchId <= servConn.getLatestBatchIdReplied()) {
+ if (batchId <= serverConnection.getLatestBatchIdReplied()) {
if (GatewayReceiver.APPLY_RETRIES) {
// Do nothing!!!
logger.warn(LocalizedMessage.create(
@@ -125,17 +125,17 @@ public class GatewayReceiverCommand extends BaseCommand {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_RECEIVED_PROCESS_BATCH_REQUEST_0_THAT_HAS_ALREADY_BEEN_OR_IS_BEING_PROCESSED__THIS_PROCESS_BATCH_REQUEST_IS_BEING_IGNORED,
batchId));
- writeReply(msg, servConn, batchId, numberOfEvents);
+ writeReply(clientMessage, serverConnection, batchId, numberOfEvents);
return;
}
stats.incDuplicateBatchesReceived();
}
// Verify the batches arrive in order
- if (batchId != servConn.getLatestBatchIdReplied() + 1) {
+ if (batchId != serverConnection.getLatestBatchIdReplied() + 1) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_RECEIVED_PROCESS_BATCH_REQUEST_0_OUT_OF_ORDER_THE_ID_OF_THE_LAST_BATCH_PROCESSED_WAS_1_THIS_BATCH_REQUEST_WILL_BE_PROCESSED_BUT_SOME_MESSAGES_MAY_HAVE_BEEN_LOST,
- new Object[] {batchId, servConn.getLatestBatchIdReplied()}));
+ new Object[] {batchId, serverConnection.getLatestBatchIdReplied()}));
stats.incOutoforderBatchesReceived();
}
@@ -146,7 +146,7 @@ public class GatewayReceiverCommand extends BaseCommand {
// If early ack mode, acknowledge right away
// Not sure if earlyAck makes sense with sliding window
if (earlyAck) {
- servConn.incrementLatestBatchIdReplied(batchId);
+ serverConnection.incrementLatestBatchIdReplied(batchId);
// writeReply(msg, servConn);
// servConn.setAsTrue(RESPONDED);
@@ -162,13 +162,13 @@ public class GatewayReceiverCommand extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Received process batch request {} containing {} events ({} bytes) with {} acknowledgement on {}",
- servConn.getName(), batchId, numberOfEvents, msg.getPayloadLength(),
- (earlyAck ? "early" : "normal"), servConn.getSocketString());
+ serverConnection.getName(), batchId, numberOfEvents, clientMessage.getPayloadLength(),
+ (earlyAck ? "early" : "normal"), serverConnection.getSocketString());
if (earlyAck) {
logger.debug(
"{}: Sent process batch early response for batch {} containing {} events ({} bytes) with {} acknowledgement on {}",
- servConn.getName(), batchId, numberOfEvents, msg.getPayloadLength(),
- (earlyAck ? "early" : "normal"), servConn.getSocketString());
+ serverConnection.getName(), batchId, numberOfEvents, clientMessage.getPayloadLength(),
+ (earlyAck ? "early" : "normal"), serverConnection.getSocketString());
}
}
// logger.warn("Received process batch request " + batchId + " containing
@@ -185,10 +185,10 @@ public class GatewayReceiverCommand extends BaseCommand {
// Retrieve the events from the message parts. The '2' below
// represents the number of events (part0) and the batchId (part1)
partNumber = 2;
- int dsid = msg.getPart(partNumber++).getInt();
+ int dsid = clientMessage.getPart(partNumber++).getInt();
boolean removeOnException =
- msg.getPart(partNumber++).getSerializedForm()[0] == 1 ? true : false;
+ clientMessage.getPart(partNumber++).getSerializedForm()[0] == 1 ? true : false;
// Keep track of whether a response has been written for
// exceptions
@@ -202,7 +202,7 @@ public class GatewayReceiverCommand extends BaseCommand {
indexWithoutPDXEvent++;
// System.out.println("Processing event " + i + " in batch " + batchId + "
// starting with part number " + partNumber);
- Part actionTypePart = msg.getPart(partNumber);
+ Part actionTypePart = clientMessage.getPart(partNumber);
int actionType = actionTypePart.getInt();
long versionTimeStamp = VersionTag.ILLEGAL_VERSION_TIMESTAMP;
@@ -211,14 +211,14 @@ public class GatewayReceiverCommand extends BaseCommand {
boolean callbackArgExists = false;
try {
- Part possibleDuplicatePart = msg.getPart(partNumber + 1);
+ Part possibleDuplicatePart = clientMessage.getPart(partNumber + 1);
byte[] possibleDuplicatePartBytes;
try {
possibleDuplicatePartBytes = (byte[]) possibleDuplicatePart.getObject();
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_REQUEST_1_CONTAINING_2_EVENTS,
- new Object[] {servConn.getName(), Integer.valueOf(batchId),
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId),
Integer.valueOf(numberOfEvents)}),
e);
throw e;
@@ -231,7 +231,7 @@ public class GatewayReceiverCommand extends BaseCommand {
callbackArg = null;
// Retrieve the region name from the message parts
- regionNamePart = msg.getPart(partNumber + 2);
+ regionNamePart = clientMessage.getPart(partNumber + 2);
regionName = regionNamePart.getString();
if (regionName.equals(PeerTypeRegistration.REGION_FULL_PATH)) {
indexWithoutPDXEvent--;
@@ -243,28 +243,28 @@ public class GatewayReceiverCommand extends BaseCommand {
// duplication of events, but it is unused now. In
// fact the event id is overridden by the FROM_GATEWAY
// token.
- Part eventIdPart = msg.getPart(partNumber + 3);
- eventIdPart.setVersion(servConn.getClientVersion());
+ Part eventIdPart = clientMessage.getPart(partNumber + 3);
+ eventIdPart.setVersion(serverConnection.getClientVersion());
// String eventId = eventIdPart.getString();
try {
eventId = (EventID) eventIdPart.getObject();
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_REQUEST_1_CONTAINING_2_EVENTS,
- new Object[] {servConn.getName(), Integer.valueOf(batchId),
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId),
Integer.valueOf(numberOfEvents)}),
e);
throw e;
}
// Retrieve the key from the message parts
- keyPart = msg.getPart(partNumber + 4);
+ keyPart = clientMessage.getPart(partNumber + 4);
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_REQUEST_1_CONTAINING_2_EVENTS,
- new Object[] {servConn.getName(), Integer.valueOf(batchId),
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId),
Integer.valueOf(numberOfEvents)}),
e);
throw e;
@@ -281,7 +281,7 @@ public class GatewayReceiverCommand extends BaseCommand {
*/
// Retrieve the value from the message parts (do not deserialize it)
- valuePart = msg.getPart(partNumber + 5);
+ valuePart = clientMessage.getPart(partNumber + 5);
// try {
// logger.warn(getName() + ": Creating key " + key + " value " +
// valuePart.getObject());
@@ -289,18 +289,18 @@ public class GatewayReceiverCommand extends BaseCommand {
// Retrieve the callbackArg from the message parts if necessary
int index = partNumber + 6;
- callbackArgExistsPart = msg.getPart(index++); {
+ callbackArgExistsPart = clientMessage.getPart(index++); {
byte[] partBytes = (byte[]) callbackArgExistsPart.getObject();
callbackArgExists = partBytes[0] == 0x01;
}
if (callbackArgExists) {
- callbackArgPart = msg.getPart(index++);
+ callbackArgPart = clientMessage.getPart(index++);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_CREATE_REQUEST_1_FOR_2_EVENTS,
- new Object[] {servConn.getName(), Integer.valueOf(batchId),
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId),
Integer.valueOf(numberOfEvents)}),
e);
throw e;
@@ -309,14 +309,15 @@ public class GatewayReceiverCommand extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Processing batch create request {} on {} for region {} key {} value {} callbackArg {}, eventId={}",
- servConn.getName(), batchId, servConn.getSocketString(), regionName, key,
- valuePart, callbackArg, eventId);
+ serverConnection.getName(), batchId, serverConnection.getSocketString(),
+ regionName, key, valuePart, callbackArg, eventId);
}
- versionTimeStamp = msg.getPart(index++).getLong();
+ versionTimeStamp = clientMessage.getPart(index++).getLong();
// Process the create request
if (key == null || regionName == null) {
StringId message = null;
- Object[] messageArgs = new Object[] {servConn.getName(), Integer.valueOf(batchId)};
+ Object[] messageArgs =
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId)};
if (key == null) {
message =
LocalizedStrings.ProcessBatch_0_THE_INPUT_REGION_NAME_FOR_THE_BATCH_CREATE_REQUEST_1_IS_NULL;
@@ -331,7 +332,7 @@ public class GatewayReceiverCommand extends BaseCommand {
}
region = (LocalRegion) crHelper.getRegion(regionName);
if (region == null) {
- handleRegionNull(servConn, regionName, batchId);
+ handleRegionNull(serverConnection, regionName, batchId);
} else {
clientEvent = new EventIDHolder(eventId);
if (versionTimeStamp > 0) {
@@ -348,7 +349,7 @@ public class GatewayReceiverCommand extends BaseCommand {
boolean isObject = valuePart.isObject();
// [sumedh] This should be done on client while sending
// since that is the WAN gateway
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
PutOperationContext putContext =
authzRequest.putAuthorize(regionName, key, value, isObject, callbackArg);
@@ -361,29 +362,29 @@ public class GatewayReceiverCommand extends BaseCommand {
result = addPdxType(crHelper, key, value);
} else {
result = region.basicBridgeCreate(key, value, isObject, callbackArg,
- servConn.getProxyID(), false, clientEvent, false);
+ serverConnection.getProxyID(), false, clientEvent, false);
// If the create fails (presumably because it already exists),
// attempt to update the entry
if (!result) {
result = region.basicBridgePut(key, value, null, isObject, callbackArg,
- servConn.getProxyID(), false, clientEvent);
+ serverConnection.getProxyID(), false, clientEvent);
}
}
if (result || clientEvent.isConcurrencyConflict()) {
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
stats.incCreateRequest();
} else {
// This exception will be logged in the catch block below
throw new Exception(
LocalizedStrings.ProcessBatch_0_FAILED_TO_CREATE_OR_UPDATE_ENTRY_FOR_REGION_1_KEY_2_VALUE_3_CALLBACKARG_4
- .toLocalizedString(new Object[] {servConn.getName(), regionName, key,
- valuePart, callbackArg}));
+ .toLocalizedString(new Object[] {serverConnection.getName(), regionName,
+ key, valuePart, callbackArg}));
}
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_CREATE_REQUEST_1_FOR_2_EVENTS,
- new Object[] {servConn.getName(), Integer.valueOf(batchId),
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId),
Integer.valueOf(numberOfEvents)}),
e);
throw e;
@@ -400,7 +401,7 @@ public class GatewayReceiverCommand extends BaseCommand {
*/
// Retrieve the value from the message parts (do not deserialize it)
- valuePart = msg.getPart(partNumber + 5);
+ valuePart = clientMessage.getPart(partNumber + 5);
// try {
// logger.warn(getName() + ": Updating key " + key + " value " +
// valuePart.getObject());
@@ -408,34 +409,35 @@ public class GatewayReceiverCommand extends BaseCommand {
// Retrieve the callbackArg from the message parts if necessary
index = partNumber + 6;
- callbackArgExistsPart = msg.getPart(index++); {
+ callbackArgExistsPart = clientMessage.getPart(index++); {
byte[] partBytes = (byte[]) callbackArgExistsPart.getObject();
callbackArgExists = partBytes[0] == 0x01;
}
if (callbackArgExists) {
- callbackArgPart = msg.getPart(index++);
+ callbackArgPart = clientMessage.getPart(index++);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_UPDATE_REQUEST_1_CONTAINING_2_EVENTS,
- new Object[] {servConn.getName(), Integer.valueOf(batchId),
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId),
Integer.valueOf(numberOfEvents)}),
e);
throw e;
}
}
- versionTimeStamp = msg.getPart(index++).getLong();
+ versionTimeStamp = clientMessage.getPart(index++).getLong();
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Processing batch update request {} on {} for region {} key {} value {} callbackArg {}",
- servConn.getName(), batchId, servConn.getSocketString(), regionName, key,
- valuePart, callbackArg);
+ serverConnection.getName(), batchId, serverConnection.getSocketString(),
+ regionName, key, valuePart, callbackArg);
}
// Process the update request
if (key == null || regionName == null) {
StringId message = null;
- Object[] messageArgs = new Object[] {servConn.getName(), Integer.valueOf(batchId)};
+ Object[] messageArgs =
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId)};
if (key == null) {
message =
LocalizedStrings.ProcessBatch_0_THE_INPUT_KEY_FOR_THE_BATCH_UPDATE_REQUEST_1_IS_NULL;
@@ -450,7 +452,7 @@ public class GatewayReceiverCommand extends BaseCommand {
}
region = (LocalRegion) crHelper.getRegion(regionName);
if (region == null) {
- handleRegionNull(servConn, regionName, batchId);
+ handleRegionNull(serverConnection, regionName, batchId);
} else {
clientEvent = new EventIDHolder(eventId);
if (versionTimeStamp > 0) {
@@ -465,7 +467,7 @@ public class GatewayReceiverCommand extends BaseCommand {
try {
byte[] value = valuePart.getSerializedForm();
boolean isObject = valuePart.isObject();
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
PutOperationContext putContext = authzRequest.putAuthorize(regionName, key, value,
isObject, callbackArg, PutOperationContext.UPDATE);
@@ -477,14 +479,14 @@ public class GatewayReceiverCommand extends BaseCommand {
result = addPdxType(crHelper, key, value);
} else {
result = region.basicBridgePut(key, value, null, isObject, callbackArg,
- servConn.getProxyID(), false, clientEvent);
+ serverConnection.getProxyID(), false, clientEvent);
}
if (result || clientEvent.isConcurrencyConflict()) {
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
stats.incUpdateRequest();
} else {
- final Object[] msgArgs =
- new Object[] {servConn.getName(), regionName, key, valuePart, callbackArg};
+ final Object[] msgArgs = new Object[] {serverConnection.getName(), regionName,
+ key, valuePart, callbackArg};
final StringId message =
LocalizedStrings.ProcessBatch_0_FAILED_TO_UPDATE_ENTRY_FOR_REGION_1_KEY_2_VALUE_3_AND_CALLBACKARG_4;
String s = message.toLocalizedString(msgArgs);
@@ -493,16 +495,17 @@ public class GatewayReceiverCommand extends BaseCommand {
}
} catch (CancelException e) {
// FIXME better exception hierarchy would avoid this check
- if (servConn.getCachedRegionHelper().getCache().getCancelCriterion()
+ if (serverConnection.getCachedRegionHelper().getCache().getCancelCriterion()
.isCancelInProgress()) {
if (logger.isDebugEnabled()) {
logger.debug(
"{} ignoring message of type {} from client {} because shutdown occurred during message processing.",
- servConn.getName(), MessageType.getString(msg.getMessageType()),
- servConn.getProxyID());
+ serverConnection.getName(),
+ MessageType.getString(clientMessage.getMessageType()),
+ serverConnection.getProxyID());
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(e);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(e);
} else {
throw e;
}
@@ -511,7 +514,7 @@ public class GatewayReceiverCommand extends BaseCommand {
// Preserve the connection under all circumstances
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_UPDATE_REQUEST_1_CONTAINING_2_EVENTS,
- new Object[] {servConn.getName(), Integer.valueOf(batchId),
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId),
Integer.valueOf(numberOfEvents)}),
e);
throw e;
@@ -521,28 +524,29 @@ public class GatewayReceiverCommand extends BaseCommand {
case 2: // Destroy
// Retrieve the callbackArg from the message parts if necessary
index = partNumber + 5;
- callbackArgExistsPart = msg.getPart(index++); {
+ callbackArgExistsPart = clientMessage.getPart(index++); {
byte[] partBytes = (byte[]) callbackArgExistsPart.getObject();
callbackArgExists = partBytes[0] == 0x01;
}
if (callbackArgExists) {
- callbackArgPart = msg.getPart(index++);
+ callbackArgPart = clientMessage.getPart(index++);
try {
callbackArg = callbackArgPart.getObject();
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_DESTROY_REQUEST_1_CONTAINING_2_EVENTS,
- new Object[] {servConn.getName(), Integer.valueOf(batchId),
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId),
Integer.valueOf(numberOfEvents)}),
e);
throw e;
}
}
- versionTimeStamp = msg.getPart(index++).getLong();
+ versionTimeStamp = clientMessage.getPart(index++).getLong();
if (logger.isDebugEnabled()) {
logger.debug("{}: Processing batch destroy request {} on {} for region {} key {}",
- servConn.getName(), batchId, servConn.getSocketString(), regionName, key);
+ serverConnection.getName(), batchId, serverConnection.getSocketString(),
+ regionName, key);
}
// Process the destroy request
@@ -556,14 +560,15 @@ public class GatewayReceiverCommand extends BaseCommand {
message =
LocalizedStrings.ProcessBatch_0_THE_INPUT_REGION_NAME_FOR_THE_BATCH_DESTROY_REQUEST_1_IS_NULL;
}
- Object[] messageArgs = new Object[] {servConn.getName(), Integer.valueOf(batchId)};
+ Object[] messageArgs =
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId)};
String s = message.toLocalizedString(messageArgs);
logger.warn(s);
throw new Exception(s);
}
region = (LocalRegion) crHelper.getRegion(regionName);
if (region == null) {
- handleRegionNull(servConn, regionName, batchId);
+ handleRegionNull(serverConnection, regionName, batchId);
} else {
clientEvent = new EventIDHolder(eventId);
if (versionTimeStamp > 0) {
@@ -576,20 +581,20 @@ public class GatewayReceiverCommand extends BaseCommand {
handleMessageRetry(region, clientEvent);
// Destroy the entry
try {
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
DestroyOperationContext destroyContext =
authzRequest.destroyAuthorize(regionName, key, callbackArg);
callbackArg = destroyContext.getCallbackArg();
}
- region.basicBridgeDestroy(key, callbackArg, servConn.getProxyID(), false,
+ region.basicBridgeDestroy(key, callbackArg, serverConnection.getProxyID(), false,
clientEvent);
- servConn.setModificationInfo(true, regionName, key);
+ serverConnection.setModificationInfo(true, regionName, key);
stats.incDestroyRequest();
} catch (EntryNotFoundException e) {
logger.info(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_DURING_BATCH_DESTROY_NO_ENTRY_WAS_FOUND_FOR_KEY_1,
- new Object[] {servConn.getName(), key}));
+ new Object[] {serverConnection.getName(), key}));
// throw new Exception(e);
}
}
@@ -598,52 +603,52 @@ public class GatewayReceiverCommand extends BaseCommand {
try {
// Region name
- regionNamePart = msg.getPart(partNumber + 2);
+ regionNamePart = clientMessage.getPart(partNumber + 2);
regionName = regionNamePart.getString();
// Retrieve the event id from the message parts
- eventIdPart = msg.getPart(partNumber + 3);
+ eventIdPart = clientMessage.getPart(partNumber + 3);
eventId = (EventID) eventIdPart.getObject();
// Retrieve the key from the message parts
- keyPart = msg.getPart(partNumber + 4);
+ keyPart = clientMessage.getPart(partNumber + 4);
key = keyPart.getStringOrObject();
// Retrieve the callbackArg from the message parts if necessary
index = partNumber + 5;
- callbackArgExistsPart = msg.getPart(index++);
+ callbackArgExistsPart = clientMessage.getPart(index++);
byte[] partBytes = (byte[]) callbackArgExistsPart.getObject();
callbackArgExists = partBytes[0] == 0x01;
if (callbackArgExists) {
- callbackArgPart = msg.getPart(index++);
+ callbackArgPart = clientMessage.getPart(index++);
callbackArg = callbackArgPart.getObject();
}
} catch (Exception e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_UPDATE_VERSION_REQUEST_1_CONTAINING_2_EVENTS,
- new Object[] {servConn.getName(), Integer.valueOf(batchId),
+ new Object[] {serverConnection.getName(), Integer.valueOf(batchId),
Integer.valueOf(numberOfEvents)}),
e);
throw e;
}
- versionTimeStamp = msg.getPart(index++).getLong();
+ versionTimeStamp = clientMessage.getPart(index++).getLong();
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Processing batch update-version request {} on {} for region {} key {} value {} callbackArg {}",
- servConn.getName(), batchId, servConn.getSocketString(), regionName, key,
- valuePart, callbackArg);
+ serverConnection.getName(), batchId, serverConnection.getSocketString(),
+ regionName, key, valuePart, callbackArg);
}
// Process the update time-stamp request
if (key == null || regionName == null) {
StringId message =
LocalizedStrings.ProcessBatch_0_CAUGHT_EXCEPTION_PROCESSING_BATCH_UPDATE_VERSION_REQUEST_1_CONTAINING_2_EVENTS;
- Object[] messageArgs = new Object[] {servConn.getName(), Integer.valueOf(batchId),
- Integer.valueOf(numberOfEvents)};
+ Object[] messageArgs = new Object[] {serverConnection.getName(),
+ Integer.valueOf(batchId), Integer.valueOf(numberOfEvents)};
String s = message.toLocalizedString(messageArgs);
logger.warn(s);
throw new Exception(s);
@@ -652,7 +657,7 @@ public class GatewayReceiverCommand extends BaseCommand {
region = (LocalRegion) crHelper.getRegion(regionName);
if (region == null) {
- handleRegionNull(servConn, regionName, batchId);
+ handleRegionNull(serverConnection, regionName, batchId);
} else {
clientEvent = new EventIDHolder(eventId);
@@ -668,13 +673,13 @@ public class GatewayReceiverCommand extends BaseCommand {
// Update the version tag
try {
- region.basicBridgeUpdateVersionStamp(key, callbackArg, servConn.getProxyID(),
- false, clientEvent);
+ region.basicBridgeUpdateVersionStamp(key, callbackArg,
+ serverConnection.getProxyID(), false, clientEvent);
} catch (EntryNotFoundException e) {
logger.info(LocalizedMessage.create(
LocalizedStrings.ProcessBatch_0_DURING_BATCH_UPDATE_VERSION_NO_ENTRY_WAS_FOUND_FOR_KEY_1,
- new Object[] {servConn.getName(), key}));
+ new Object[] {serverConnection.getName(), key}));
// throw new Exception(e);
}
}
@@ -684,29 +689,29 @@ public class GatewayReceiverCommand extends BaseCommand {
default:
logger.fatal(LocalizedMessage.create(
LocalizedStrings.Processbatch_0_UNKNOWN_ACTION_TYPE_1_FOR_BATCH_FROM_2,
- new Object[] {servConn.getName(), Integer.valueOf(actionType),
- servConn.getSocketString()}));
+ new Object[] {serverConnection.getName(), Integer.valueOf(actionType),
+ serverConnection.getSocketString()}));
stats.incUnknowsOperationsReceived();
}
} catch (CancelException e) {
if (logger.isDebugEnabled()) {
logger.debug(
"{} ignoring message of type {} from client {} because shutdown occurred during message processing.",
- servConn.getName(), MessageType.getString(msg.getMessageType()),
- servConn.getProxyID());
+ serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()),
+ serverConnection.getProxyID());
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(e);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(e);
return;
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// If we have an issue with the PDX registry, stop processing more data
if (e.getCause() instanceof PdxRegistryMismatchException) {
fatalException = e.getCause();
logger.fatal(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_PDX_CONFIGURATION,
- new Object[] {servConn.getMembershipID()}), e.getCause());
+ new Object[] {serverConnection.getMembershipID()}), e.getCause());
break;
}
@@ -772,26 +777,26 @@ public class GatewayReceiverCommand extends BaseCommand {
stats.incProcessBatchTime(start - oldStart);
}
if (fatalException != null) {
- servConn.incrementLatestBatchIdReplied(batchId);
- writeFatalException(msg, fatalException, servConn, batchId);
- servConn.setAsTrue(RESPONDED);
+ serverConnection.incrementLatestBatchIdReplied(batchId);
+ writeFatalException(clientMessage, fatalException, serverConnection, batchId);
+ serverConnection.setAsTrue(RESPONDED);
} else if (!exceptions.isEmpty()) {
- servConn.incrementLatestBatchIdReplied(batchId);
- writeBatchException(msg, exceptions, servConn, batchId);
- servConn.setAsTrue(RESPONDED);
+ serverConnection.incrementLatestBatchIdReplied(batchId);
+ writeBatchException(clientMessage, exceptions, serverConnection, batchId);
+ serverConnection.setAsTrue(RESPONDED);
} else if (!wroteResponse) {
// Increment the batch id unless the received batch id is -1 (a failover
// batch)
- servConn.incrementLatestBatchIdReplied(batchId);
+ serverConnection.incrementLatestBatchIdReplied(batchId);
- writeReply(msg, servConn, batchId, numberOfEvents);
- servConn.setAsTrue(RESPONDED);
+ writeReply(clientMessage, serverConnection, batchId, numberOfEvents);
+ serverConnection.setAsTrue(RESPONDED);
stats.incWriteProcessBatchResponseTime(DistributionStats.getStatTime() - start);
if (logger.isDebugEnabled()) {
logger.debug(
"{}: Sent process batch normal response for batch {} containing {} events ({} bytes) with {} acknowledgement on {}",
- servConn.getName(), batchId, numberOfEvents, msg.getPayloadLength(),
- (earlyAck ? "early" : "normal"), servConn.getSocketString());
+ serverConnection.getName(), batchId, numberOfEvents, clientMessage.getPayloadLength(),
+ (earlyAck ? "early" : "normal"), serverConnection.getSocketString());
}
// logger.warn("Sent process batch normal response for batch " +
// batchId + " containing " + numberOfEvents + " events (" +
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
index 5cb1e41..2ca8804 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java
@@ -54,17 +54,17 @@ public class Get70 extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long startparam)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startparam)
throws IOException {
long start = startparam;
Part regionNamePart = null, keyPart = null, valuePart = null;
String regionName = null;
Object callbackArg = null, key = null;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
StringId errMessage = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
// requiresResponse = true;
{
long oldStart = start;
@@ -72,18 +72,18 @@ public class Get70 extends BaseCommand {
stats.incReadGetRequestTime(start - oldStart);
}
// Retrieve the data from the message parts
- int parts = msg.getNumberOfParts();
- regionNamePart = msg.getPart(0);
- keyPart = msg.getPart(1);
+ int parts = clientMessage.getNumberOfParts();
+ regionNamePart = clientMessage.getPart(0);
+ keyPart = clientMessage.getPart(1);
// valuePart = null; (redundant assignment)
if (parts > 2) {
- valuePart = msg.getPart(2);
+ valuePart = clientMessage.getPart(2);
try {
callbackArg = valuePart.getObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
// responded = true;
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -91,15 +91,15 @@ public class Get70 extends BaseCommand {
try {
key = keyPart.getStringOrObject();
} catch (Exception e) {
- writeException(msg, e, false, servConn);
+ writeException(clientMessage, e, false, serverConnection);
// responded = true;
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
logger.debug("{}: Received 7.0 get request ({} bytes) from {} for region {} key {} txId {}",
- servConn.getName(), msg.getPayloadLength(), servConn.getSocketString(), regionName, key,
- msg.getTransactionId());
+ serverConnection.getName(), clientMessage.getPayloadLength(),
+ serverConnection.getSocketString(), regionName, key, clientMessage.getTransactionId());
}
// Process the get request
@@ -113,18 +113,18 @@ public class Get70 extends BaseCommand {
errMessage = LocalizedStrings.Request_THE_INPUT_REGION_NAME_FOR_THE_GET_REQUEST_IS_NULL;
}
String s = errMessage.toLocalizedString();
- logger.warn("{}: {}", servConn.getName(), s);
- writeErrorResponse(msg, MessageType.REQUESTDATAERROR, s, servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), s);
+ writeErrorResponse(clientMessage, MessageType.REQUESTDATAERROR, s, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- Region region = servConn.getCache().getRegion(regionName);
+ Region region = serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = LocalizedStrings.Request__0_WAS_NOT_FOUND_DURING_GET_REQUEST
.toLocalizedString(regionName);
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -133,14 +133,14 @@ public class Get70 extends BaseCommand {
// for integrated security
this.securityService.authorizeRegionRead(regionName, key.toString());
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
getContext = authzRequest.getAuthorize(regionName, key, callbackArg);
callbackArg = getContext.getCallbackArg();
}
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -148,10 +148,10 @@ public class Get70 extends BaseCommand {
// the value if it is a byte[].
Entry entry;
try {
- entry = getEntry(region, key, callbackArg, servConn);
+ entry = getEntry(region, key, callbackArg, serverConnection);
} catch (Exception e) {
- writeException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, e, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -164,7 +164,7 @@ public class Get70 extends BaseCommand {
boolean keyNotPresent = entry.keyNotPresent;
try {
- AuthorizeRequestPP postAuthzRequest = servConn.getPostAuthzRequest();
+ AuthorizeRequestPP postAuthzRequest = serverConnection.getPostAuthzRequest();
if (postAuthzRequest != null) {
try {
getContext = postAuthzRequest.getAuthorize(regionName, key, data, isObject, getContext);
@@ -182,8 +182,8 @@ public class Get70 extends BaseCommand {
}
}
} catch (NotAuthorizedException ex) {
- writeException(msg, ex, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeException(clientMessage, ex, false, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -197,23 +197,25 @@ public class Get70 extends BaseCommand {
if (region instanceof PartitionedRegion) {
PartitionedRegion pr = (PartitionedRegion) region;
if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) {
- writeResponseWithRefreshMetadata(data, callbackArg, msg, isObject, servConn, pr,
- pr.getNetworkHopType(), versionTag, keyNotPresent);
+ writeResponseWithRefreshMetadata(data, callbackArg, clientMessage, isObject,
+ serverConnection, pr, pr.getNetworkHopType(), versionTag, keyNotPresent);
pr.clearNetworkHopData();
} else {
- writeResponse(data, callbackArg, msg, isObject, versionTag, keyNotPresent, servConn);
+ writeResponse(data, callbackArg, clientMessage, isObject, versionTag, keyNotPresent,
+ serverConnection);
}
} else {
- writeResponse(data, callbackArg, msg, isObject, versionTag, keyNotPresent, servConn);
+ writeResponse(data, callbackArg, clientMessage, isObject, versionTag, keyNotPresent,
+ serverConnection);
}
} finally {
OffHeapHelper.release(originalData);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Wrote get response back to {} for region {} {}", servConn.getName(),
- servConn.getSocketString(), regionName, entry);
+ logger.debug("{}: Wrote get response back to {} for region {} {}", serverConnection.getName(),
+ serverConnection.getSocketString(), regionName, entry);
}
stats.incWriteGetResponseTime(DistributionStats.getStatTime() - start);
@@ -379,12 +381,12 @@ public class Get70 extends BaseCommand {
}
@Override
- protected void writeReply(Message origMsg, ServerConnection servConn) throws IOException {
+ protected void writeReply(Message origMsg, ServerConnection serverConnection) throws IOException {
throw new UnsupportedOperationException();
}
@Override
- protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection servConn,
+ protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection serverConnection,
PartitionedRegion pr, byte nwHop) throws IOException {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
index 22e63c6..01c5c9c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java
@@ -44,33 +44,34 @@ public class GetAll extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null;
String regionName = null;
Object[] keys = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
// Retrieve the region name from the message parts
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
// Retrieve the keys array from the message parts
- keysPart = msg.getPart(1);
+ keysPart = clientMessage.getPart(1);
try {
keys = (Object[]) keysPart.getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
StringBuffer buffer = new StringBuffer();
- buffer.append(servConn.getName()).append(": Received getAll request (")
- .append(msg.getPayloadLength()).append(" bytes) from ").append(servConn.getSocketString())
- .append(" for region ").append(regionName).append(" keys ");
+ buffer.append(serverConnection.getName()).append(": Received getAll request (")
+ .append(clientMessage.getPayloadLength()).append(" bytes) from ")
+ .append(serverConnection.getSocketString()).append(" for region ").append(regionName)
+ .append(" keys ");
if (keys != null) {
for (int i = 0; i < keys.length; i++) {
buffer.append(keys[i]).append(" ");
@@ -91,37 +92,38 @@ public class GetAll extends BaseCommand {
message = LocalizedStrings.GetAll_THE_INPUT_REGION_NAME_FOR_THE_GETALL_REQUEST_IS_NULL
.toLocalizedString();
}
- logger.warn("{}: {}", servConn.getName(), message);
- writeChunkedErrorResponse(msg, MessageType.GET_ALL_DATA_ERROR, message, servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = " was not found during getAll request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// Send header
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, servConn);
- servConn.setAsTrue(RESPONDED);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -142,14 +144,14 @@ public class GetAll extends BaseCommand {
numKeys = allKeys.size();
}
- ObjectPartList values = new ObjectPartList(maximumChunkSize, keys == null);
+ ObjectPartList values = new ObjectPartList(MAXIMUM_CHUNK_SIZE, keys == null);
AuthorizeRequest authzRequest = servConn.getAuthzRequest();
AuthorizeRequestPP postAuthzRequest = servConn.getPostAuthzRequest();
Request request = (Request) Request.getCommand();
Object[] valueAndIsObject = new Object[3];
for (int i = 0; i < numKeys; i++) {
// Send the intermediate chunk if necessary
- if (values.size() == maximumChunkSize) {
+ if (values.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
sendGetAllResponseChunk(region, values, false, servConn);
values.clear();
@@ -246,7 +248,7 @@ public class GetAll extends BaseCommand {
ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
chunkedResponseMsg.setNumberOfParts(1);
chunkedResponseMsg.setLastChunk(lastChunk);
- chunkedResponseMsg.addObjPart(list, zipValues);
+ chunkedResponseMsg.addObjPart(list, false);
if (logger.isDebugEnabled()) {
logger.debug("{}: Sending {} getAll response chunk for region={} values={} chunk=<{}>",
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
index a19d540..ad8ef49 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java
@@ -21,7 +21,6 @@ import java.util.Set;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -45,33 +44,34 @@ public class GetAll651 extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null;
String regionName = null;
Object[] keys = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
// Retrieve the region name from the message parts
- regionNamePart = msg.getPart(0);
+ regionNamePart = clientMessage.getPart(0);
regionName = regionNamePart.getString();
// Retrieve the keys array from the message parts
- keysPart = msg.getPart(1);
+ keysPart = clientMessage.getPart(1);
try {
keys = (Object[]) keysPart.getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (logger.isDebugEnabled()) {
StringBuffer buffer = new StringBuffer();
- buffer.append(servConn.getName()).append(": Received getAll request (")
- .append(msg.getPayloadLength()).append(" bytes) from ").append(servConn.getSocketString())
- .append(" for region ").append(regionName).append(" keys ");
+ buffer.append(serverConnection.getName()).append(": Received getAll request (")
+ .append(clientMessage.getPayloadLength()).append(" bytes) from ")
+ .append(serverConnection.getSocketString()).append(" for region ").append(regionName)
+ .append(" keys ");
if (keys != null) {
for (int i = 0; i < keys.length; i++) {
buffer.append(keys[i]).append(" ");
@@ -90,37 +90,38 @@ public class GetAll651 extends BaseCommand {
message = LocalizedStrings.GetAll_THE_INPUT_REGION_NAME_FOR_THE_GETALL_REQUEST_IS_NULL
.toLocalizedString();
}
- logger.warn("{}: {}", servConn.getName(), message);
- writeChunkedErrorResponse(msg, MessageType.GET_ALL_DATA_ERROR, message, servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = " was not found during getAll request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// Send header
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, servConn);
- servConn.setAsTrue(RESPONDED);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -148,7 +149,7 @@ public class GetAll651 extends BaseCommand {
final boolean isDebugEnabled = logger.isDebugEnabled();
for (int i = 0; i < numKeys; i++) {
// Send the intermediate chunk if necessary
- if (values.size() == maximumChunkSize) {
+ if (values.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
sendGetAllResponseChunk(region, values, false, servConn);
values.clear();
@@ -253,7 +254,7 @@ public class GetAll651 extends BaseCommand {
* @param includeKeys if the part list should include the keys
*/
protected ObjectPartList651 getObjectPartsList(boolean includeKeys) {
- ObjectPartList651 values = new ObjectPartList651(maximumChunkSize, includeKeys);
+ ObjectPartList651 values = new ObjectPartList651(MAXIMUM_CHUNK_SIZE, includeKeys);
return values;
}
@@ -262,7 +263,7 @@ public class GetAll651 extends BaseCommand {
ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
chunkedResponseMsg.setNumberOfParts(1);
chunkedResponseMsg.setLastChunk(lastChunk);
- chunkedResponseMsg.addObjPart(list, zipValues);
+ chunkedResponseMsg.addObjPart(list, false);
if (logger.isDebugEnabled()) {
logger.debug("{}: Sending {} getAll response chunk for region={} values={} chunk=<{}>",
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
index 154e800..267a5b2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java
@@ -23,7 +23,6 @@ import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.cache.operations.internal.GetOperationContextImpl;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -40,7 +39,6 @@ import org.apache.geode.internal.offheap.OffHeapHelper;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.AuthorizeRequestPP;
-import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
public class GetAll70 extends BaseCommand {
@@ -52,36 +50,37 @@ public class GetAll70 extends BaseCommand {
}
@Override
- public void cmdExecute(Message msg, ServerConnection servConn, long start)
+ public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null;
String regionName = null;
Object[] keys = null;
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
int partIdx = 0;
// Retrieve the region name from the message parts
- regionNamePart = msg.getPart(partIdx++);
+ regionNamePart = clientMessage.getPart(partIdx++);
regionName = regionNamePart.getString();
// Retrieve the keys array from the message parts
- keysPart = msg.getPart(partIdx++);
+ keysPart = clientMessage.getPart(partIdx++);
try {
keys = (Object[]) keysPart.getObject();
} catch (Exception e) {
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
boolean requestSerializedValues;
- requestSerializedValues = msg.getPart(partIdx++).getInt() == 1;
+ requestSerializedValues = clientMessage.getPart(partIdx++).getInt() == 1;
if (logger.isDebugEnabled()) {
StringBuffer buffer = new StringBuffer();
- buffer.append(servConn.getName()).append(": Received getAll request (")
- .append(msg.getPayloadLength()).append(" bytes) from ").append(servConn.getSocketString())
- .append(" for region ").append(regionName).append(" keys ");
+ buffer.append(serverConnection.getName()).append(": Received getAll request (")
+ .append(clientMessage.getPayloadLength()).append(" bytes) from ")
+ .append(serverConnection.getSocketString()).append(" for region ").append(regionName)
+ .append(" keys ");
if (keys != null) {
for (int i = 0; i < keys.length; i++) {
buffer.append(keys[i]).append(" ");
@@ -100,37 +99,39 @@ public class GetAll70 extends BaseCommand {
message = LocalizedStrings.GetAll_THE_INPUT_REGION_NAME_FOR_THE_GETALL_REQUEST_IS_NULL
.toLocalizedString();
}
- logger.warn("{}: {}", servConn.getName(), message);
- writeChunkedErrorResponse(msg, MessageType.GET_ALL_DATA_ERROR, message, servConn);
- servConn.setAsTrue(RESPONDED);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ writeChunkedErrorResponse(clientMessage, MessageType.GET_ALL_DATA_ERROR, message,
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
- LocalRegion region = (LocalRegion) servConn.getCache().getRegion(regionName);
+ LocalRegion region = (LocalRegion) serverConnection.getCache().getRegion(regionName);
if (region == null) {
String reason = " was not found during getAll request";
- writeRegionDestroyedEx(msg, regionName, reason, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeRegionDestroyedEx(clientMessage, regionName, reason, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
// Send header
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
- chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+ chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId());
chunkedResponseMsg.sendHeader();
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, servConn, requestSerializedValues);
- servConn.setAsTrue(RESPONDED);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection,
+ requestSerializedValues);
+ serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
- checkForInterrupt(servConn, e);
+ checkForInterrupt(serverConnection, e);
// Otherwise, write an exception message and continue
- writeChunkedException(msg, e, false, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, e, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -163,7 +164,7 @@ public class GetAll70 extends BaseCommand {
// in the old mode (which may be impossible since we only used that mode pre 7.0) in which the
// client told us
// to get and return all the keys and values. I think this was used for register interest.
- VersionedObjectList values = new VersionedObjectList(maximumChunkSize, keys == null,
+ VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, keys == null,
region.getAttributes().getConcurrencyChecksEnabled(), requestSerializedValues);
try {
AuthorizeRequest authzRequest = servConn.getAuthzRequest();
@@ -172,7 +173,7 @@ public class GetAll70 extends BaseCommand {
final boolean isDebugEnabled = logger.isDebugEnabled();
for (int i = 0; i < numKeys; i++) {
// Send the intermediate chunk if necessary
- if (values.size() == maximumChunkSize) {
+ if (values.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
values.setKeys(null);
sendGetAllResponseChunk(region, values, false, servConn);
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllForRI.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllForRI.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllForRI.java
index d380beb..43d3348 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllForRI.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllForRI.java
@@ -38,7 +38,7 @@ public class GetAllForRI extends GetAll651 {
@Override
protected ObjectPartList651 getObjectPartsList(boolean includeKeys) {
- return new SerializedObjectPartList(maximumChunkSize, includeKeys);
+ return new SerializedObjectPartList(MAXIMUM_CHUNK_SIZE, includeKeys);
}
[11/35] geode git commit: GEODE-2975: Change the location of the
lucene xsd
Posted by kl...@apache.org.
GEODE-2975: Change the location of the lucene xsd
The lucene xsd was not in the right location on disk, which resulted in
a failure to validate lucene elements in the xml file.
Adding tests and validation for cases where lucene elements show up in the
wrong place, which we were unable to catch with the xsd validation.
This closes #538
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b89d2fb8
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b89d2fb8
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b89d2fb8
Branch: refs/heads/feature/GEODE-2632-19
Commit: b89d2fb867b7f2b3aa157574bea52f53c2ae3934
Parents: 76ff506
Author: Dan Smith <up...@apache.org>
Authored: Thu May 25 13:05:23 2017 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed May 31 10:19:36 2017 -0700
----------------------------------------------------------------------
.../lucene/internal/xml/LuceneXmlParser.java | 8 +++
.../geode.apache.org/lucene/lucene-1.0.xsd | 58 --------------------
.../schema/lucene/lucene-1.0.xsd | 58 ++++++++++++++++++++
...uceneIndexXmlParserIntegrationJUnitTest.java | 25 +++++++++
...neElementShouldThrowParseException.cache.xml | 39 +++++++++++++
...lLocationShouldThrowParseException.cache.xml | 40 ++++++++++++++
...nvalidXmlShouldThrowParseException.cache.xml | 39 +++++++++++++
7 files changed, 209 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/b89d2fb8/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
index 5eae743..07a3c2a 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
@@ -56,6 +56,11 @@ public class LuceneXmlParser extends AbstractXmlParser {
if (stack.peek() instanceof StringBuffer) {
stack.pop();
}
+
+ if (!(stack.peek() instanceof LuceneIndexCreation)) {
+ throw new CacheXmlException(
+ "lucene <field> elements must occur within lucene <index> elements");
+ }
LuceneIndexCreation creation = (LuceneIndexCreation) stack.peek();
String name = atts.getValue(NAME);
String className = atts.getValue(ANALYZER);
@@ -68,6 +73,9 @@ public class LuceneXmlParser extends AbstractXmlParser {
}
private void startIndex(Attributes atts) {
+ if (!(stack.peek() instanceof RegionCreation)) {
+ throw new CacheXmlException("lucene <index> elements must occur within <region> elements");
+ }
final RegionCreation region = (RegionCreation) stack.peek();
String name = atts.getValue(NAME);
LuceneIndexCreation indexCreation = new LuceneIndexCreation();
http://git-wip-us.apache.org/repos/asf/geode/blob/b89d2fb8/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd b/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
deleted file mode 100644
index ec82c2f..0000000
--- a/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<xsd:schema
- targetNamespace="http://geode.apache.org/schema/lucene"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
-
- <xsd:import
- namespace="http://geode.apache.org/schema/cache"
- schemaLocation="http://geode.apache.org/schema/cache/cache-1.0.xsd"/>
-
- <xsd:annotation>
- <xsd:documentation><![CDATA[
-XML schema for Lucene indexes in Geode.
-
- <cache
- xmlns="http://geode.apache.org/schema/cache"
- xmlns:lucene="http://geode.apache.org/schema/lucene"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://geode.apache.org/schema/cache
- http://geode.apache.org/schema/cache/cache-1.0.xsd
- http://geode.apache.org/schema/lucene
- http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
- version="1.0">
-
- ]]></xsd:documentation>
- </xsd:annotation>
- <xsd:element name="index">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="field" maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="analyzer" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
http://git-wip-us.apache.org/repos/asf/geode/blob/b89d2fb8/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/schema/lucene/lucene-1.0.xsd
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/schema/lucene/lucene-1.0.xsd b/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/schema/lucene/lucene-1.0.xsd
new file mode 100644
index 0000000..ec82c2f
--- /dev/null
+++ b/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/schema/lucene/lucene-1.0.xsd
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<xsd:schema
+ targetNamespace="http://geode.apache.org/schema/lucene"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <xsd:import
+ namespace="http://geode.apache.org/schema/cache"
+ schemaLocation="http://geode.apache.org/schema/cache/cache-1.0.xsd"/>
+
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+XML schema for Lucene indexes in Geode.
+
+ <cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ ]]></xsd:documentation>
+ </xsd:annotation>
+ <xsd:element name="index">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="field" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="analyzer" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
http://git-wip-us.apache.org/repos/asf/geode/blob/b89d2fb8/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
index 5fecf2e..fef0684 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.cache.lucene.internal.xml;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheXmlException;
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
@@ -73,6 +74,30 @@ public class LuceneIndexXmlParserIntegrationJUnitTest {
validateExpectedIndexes(region, expectedIndexes);
}
+ /**
+ * Test that we parse the index fields correctly
+ */
+ @Test(expected = CacheXmlException.class)
+ public void invalidXmlShouldThrowParseException() throws FileNotFoundException {
+ RegionCreation region = createRegionCreation("region");
+ }
+
+ /**
+ * Test that we parse the index fields correctly
+ */
+ @Test(expected = CacheXmlException.class)
+ public void invalidLuceneElementShouldThrowParseException() throws FileNotFoundException {
+ RegionCreation region = createRegionCreation("region");
+ }
+
+ /**
+ * Test that we parse the index fields correctly
+ */
+ @Test(expected = CacheXmlException.class)
+ public void invalidXmlLocationShouldThrowParseException() throws FileNotFoundException {
+ RegionCreation region = createRegionCreation("region");
+ }
+
@Test
public void parseIndexWithAnalyzers() throws FileNotFoundException {
RegionCreation region = createRegionCreation("region");
http://git-wip-us.apache.org/repos/asf/geode/blob/b89d2fb8/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidLuceneElementShouldThrowParseException.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidLuceneElementShouldThrowParseException.cache.xml b/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidLuceneElementShouldThrowParseException.cache.xml
new file mode 100644
index 0000000..3ce66c1
--- /dev/null
+++ b/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidLuceneElementShouldThrowParseException.cache.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION">
+ <lucene:index name="index1">
+ <lucene:field name="a"/>
+ </lucene:index>
+
+ <lucene:indexxx name="index2">
+ <lucene:field name="a"/>
+ <lucene:field name="b"/>
+ </lucene:indexxx>
+ </region>
+</cache>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/b89d2fb8/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidXmlLocationShouldThrowParseException.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidXmlLocationShouldThrowParseException.cache.xml b/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidXmlLocationShouldThrowParseException.cache.xml
new file mode 100644
index 0000000..b267535
--- /dev/null
+++ b/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidXmlLocationShouldThrowParseException.cache.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION">
+ <lucene:index name="index1">
+ <lucene:field name="a"/>
+ </lucene:index>
+
+ </region>
+
+ <lucene:index name="index2">
+ <lucene:field name="a"/>
+ <lucene:field name="b"/>
+ </lucene:index>
+</cache>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/b89d2fb8/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidXmlShouldThrowParseException.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidXmlShouldThrowParseException.cache.xml b/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidXmlShouldThrowParseException.cache.xml
new file mode 100644
index 0000000..5d5dca7
--- /dev/null
+++ b/geode-lucene/src/test/resources/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.invalidXmlShouldThrowParseException.cache.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION">
+ <lucene:index name="index1">
+ <lucene:field name="a"/>
+ </lucene:index>
+
+ <lucene:index namexx="index2">
+ <lucene:field name="a"/>
+ <lucene:field name="b"/>
+ </lucene:index>
+ </region>
+</cache>
\ No newline at end of file
[29/35] geode git commit: GEODE-2632: refactoring preparations for
SecurityService and BaseCommand changes
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
index 9ed00be..1fb8c8c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
@@ -23,21 +23,20 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Semaphore;
import java.util.regex.Pattern;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.CancelException;
import org.apache.geode.CopyException;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.SerializationException;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.InterestResultPolicy;
@@ -86,24 +85,13 @@ import org.apache.geode.security.GemFireSecurityException;
public abstract class BaseCommand implements Command {
protected static final Logger logger = LogService.getLogger();
- /**
- * Whether zipped values are being passed to/from the client. Can be modified using the system
- * property Message.ZIP_VALUES ? This does not appear to happen anywhere
- */
- protected static final boolean zipValues = false;
-
- protected static final boolean APPLY_RETRIES =
- Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "gateway.ApplyRetries");
-
- public static final byte[] OK_BYTES = new byte[] {0};
-
- public static final int maximumChunkSize =
- Integer.getInteger("BridgeServer.MAXIMUM_CHUNK_SIZE", 100).intValue();
+ private static final byte[] OK_BYTES = new byte[] {0};
- /** Maximum number of entries in each chunked response chunk */
+ public static final int MAXIMUM_CHUNK_SIZE =
+ Integer.getInteger("BridgeServer.MAXIMUM_CHUNK_SIZE", 100);
/** Whether to suppress logging of IOExceptions */
- private static boolean suppressIOExceptionLogging =
+ private static final boolean SUPPRESS_IO_EXCEPTION_LOGGING =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "bridge.suppressIOExceptionLogging");
/**
@@ -113,85 +101,89 @@ public abstract class BaseCommand implements Command {
* header.
*/
private static final int MAX_INCOMING_DATA =
- Integer.getInteger("BridgeServer.MAX_INCOMING_DATA", -1).intValue();
+ Integer.getInteger("BridgeServer.MAX_INCOMING_DATA", -1);
/**
* Maximum number of concurrent incoming client messages that a bridge server will allow. Once a
* server is working on this number additional incoming client messages will wait until one of
* them completes or fails.
*/
- private static final int MAX_INCOMING_MSGS =
- Integer.getInteger("BridgeServer.MAX_INCOMING_MSGS", -1).intValue();
+ private static final int MAX_INCOMING_MESSAGES =
+ Integer.getInteger("BridgeServer.MAX_INCOMING_MSGS", -1);
- private static final Semaphore incomingDataLimiter;
+ private static final Semaphore INCOMING_DATA_LIMITER;
+
+ private static final Semaphore INCOMING_MSG_LIMITER;
+
+ protected SecurityService securityService = IntegratedSecurityService.getSecurityService();
- private static final Semaphore incomingMsgLimiter;
static {
- Semaphore tmp;
+ Semaphore semaphore;
if (MAX_INCOMING_DATA > 0) {
// backport requires that this is fair since we inc by values > 1
- tmp = new Semaphore(MAX_INCOMING_DATA, true);
+ semaphore = new Semaphore(MAX_INCOMING_DATA, true);
} else {
- tmp = null;
+ semaphore = null;
}
- incomingDataLimiter = tmp;
- if (MAX_INCOMING_MSGS > 0) {
- tmp = new Semaphore(MAX_INCOMING_MSGS, false); // unfair for best
- // performance
+ INCOMING_DATA_LIMITER = semaphore;
+ if (MAX_INCOMING_MESSAGES > 0) {
+ // unfair for best performance
+ semaphore = new Semaphore(MAX_INCOMING_MESSAGES, false);
} else {
- tmp = null;
+ semaphore = null;
}
- incomingMsgLimiter = tmp;
-
+ INCOMING_MSG_LIMITER = semaphore;
}
- protected SecurityService securityService = IntegratedSecurityService.getSecurityService();
+ protected static byte[] okBytes() {
+ return OK_BYTES;
+ }
- public void execute(Message msg, ServerConnection servConn) {
+ @Override
+ public void execute(Message clientMessage, ServerConnection serverConnection) {
// Read the request and update the statistics
long start = DistributionStats.getStatTime();
- // servConn.resetTransientData();
- if (EntryLogger.isEnabled() && servConn != null) {
- EntryLogger.setSource(servConn.getMembershipID(), "c2s");
+ if (EntryLogger.isEnabled() && serverConnection != null) {
+ EntryLogger.setSource(serverConnection.getMembershipID(), "c2s");
}
- boolean shouldMasquerade = shouldMasqueradeForTx(msg, servConn);
+ boolean shouldMasquerade = shouldMasqueradeForTx(clientMessage, serverConnection);
try {
if (shouldMasquerade) {
- InternalCache cache = servConn.getCache();
+ InternalCache cache = serverConnection.getCache();
InternalDistributedMember member =
- (InternalDistributedMember) servConn.getProxyID().getDistributedMember();
+ (InternalDistributedMember) serverConnection.getProxyID().getDistributedMember();
TXManagerImpl txMgr = cache.getTxManager();
TXStateProxy tx = null;
try {
- tx = txMgr.masqueradeAs(msg, member, false);
- cmdExecute(msg, servConn, start);
+ tx = txMgr.masqueradeAs(clientMessage, member, false);
+ cmdExecute(clientMessage, serverConnection, start);
tx.updateProxyServer(txMgr.getMemberId());
} finally {
txMgr.unmasquerade(tx);
}
} else {
- cmdExecute(msg, servConn, start);
+ cmdExecute(clientMessage, serverConnection, start);
}
} catch (TransactionException | CopyException | SerializationException | CacheWriterException
| CacheLoaderException | GemFireSecurityException | PartitionOfflineException
| MessageTooLargeException e) {
- handleExceptionNoDisconnect(msg, servConn, e);
+ handleExceptionNoDisconnect(clientMessage, serverConnection, e);
} catch (EOFException eof) {
- BaseCommand.handleEOFException(msg, servConn, eof);
+ BaseCommand.handleEOFException(clientMessage, serverConnection, eof);
} catch (InterruptedIOException e) { // Solaris only
- BaseCommand.handleInterruptedIOException(msg, servConn, e);
+ BaseCommand.handleInterruptedIOException(serverConnection, e);
} catch (IOException e) {
- BaseCommand.handleIOException(msg, servConn, e);
+ BaseCommand.handleIOException(clientMessage, serverConnection, e);
} catch (DistributedSystemDisconnectedException e) {
- BaseCommand.handleShutdownException(msg, servConn, e);
+ BaseCommand.handleShutdownException(clientMessage, serverConnection, e);
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
// If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (Throwable e) {
- BaseCommand.handleThrowable(msg, servConn, e);
+ BaseCommand.handleThrowable(clientMessage, serverConnection, e);
} finally {
EntryLogger.clearSource();
}
@@ -201,16 +193,12 @@ public abstract class BaseCommand implements Command {
* checks to see if this thread needs to masquerade as a transactional thread. clients after
* GFE_66 should be able to start a transaction.
*
- * @param msg
- * @param servConn
* @return true if thread should masquerade as a transactional thread.
*/
- protected boolean shouldMasqueradeForTx(Message msg, ServerConnection servConn) {
- if (servConn.getClientVersion().compareTo(Version.GFE_66) >= 0
- && msg.getTransactionId() > TXManagerImpl.NOTX) {
- return true;
- }
- return false;
+ protected boolean shouldMasqueradeForTx(Message clientMessage,
+ ServerConnection serverConnection) {
+ return serverConnection.getClientVersion().compareTo(Version.GFE_66) >= 0
+ && clientMessage.getTransactionId() > TXManagerImpl.NOTX;
}
/**
@@ -221,13 +209,11 @@ public abstract class BaseCommand implements Command {
* <p>
* The client event should have the event identifier from the client and the region affected by
* the operation.
- *
- * @param clientEvent
*/
public boolean recoverVersionTagForRetriedOperation(EntryEventImpl clientEvent) {
LocalRegion r = clientEvent.getRegion();
- VersionTag tag = null;
- if ((clientEvent.getVersionTag() != null) && (clientEvent.getVersionTag().isGatewayTag())) {
+ VersionTag tag;
+ if (clientEvent.getVersionTag() != null && clientEvent.getVersionTag().isGatewayTag()) {
tag = r.findVersionTagForGatewayEvent(clientEvent.getEventId());
} else {
tag = r.findVersionTagForClientEvent(clientEvent.getEventId());
@@ -246,7 +232,7 @@ public abstract class BaseCommand implements Command {
}
clientEvent.setVersionTag(tag);
}
- return (tag != null);
+ return tag != null;
}
/**
@@ -258,18 +244,18 @@ public abstract class BaseCommand implements Command {
* The client event should have the event identifier from the client and the region affected by
* the operation.
*/
- protected VersionTag findVersionTagsForRetriedBulkOp(LocalRegion r, EventID eventID) {
- VersionTag tag = r.findVersionTagForClientBulkOp(eventID);
+ protected VersionTag findVersionTagsForRetriedBulkOp(LocalRegion region, EventID eventID) {
+ VersionTag tag = region.findVersionTagForClientBulkOp(eventID);
if (tag != null) {
if (logger.isDebugEnabled()) {
logger.debug("recovered version tag {} for replayed bulk operation {}", tag, eventID);
}
return tag;
}
- if (r instanceof DistributedRegion || r instanceof PartitionedRegion) {
+ if (region instanceof DistributedRegion || region instanceof PartitionedRegion) {
// TODO this could be optimized for partitioned regions by sending the key
// so that the PR could look at an individual bucket for the event
- tag = FindVersionTagOperation.findVersionTag(r, eventID, true);
+ tag = FindVersionTagOperation.findVersionTag(region, eventID, true);
}
if (tag != null) {
if (logger.isDebugEnabled()) {
@@ -279,285 +265,249 @@ public abstract class BaseCommand implements Command {
return tag;
}
- abstract public void cmdExecute(Message msg, ServerConnection servConn, long start)
- throws IOException, ClassNotFoundException, InterruptedException;
+ public abstract void cmdExecute(Message clientMessage, ServerConnection serverConnection,
+ long start) throws IOException, ClassNotFoundException, InterruptedException;
- protected void writeReply(Message origMsg, ServerConnection servConn) throws IOException {
- Message replyMsg = servConn.getReplyMessage();
- servConn.getCache().getCancelCriterion().checkCancelInProgress(null);
+ protected void writeReply(Message origMsg, ServerConnection serverConnection) throws IOException {
+ Message replyMsg = serverConnection.getReplyMessage();
+ serverConnection.getCache().getCancelCriterion().checkCancelInProgress(null);
replyMsg.setMessageType(MessageType.REPLY);
replyMsg.setNumberOfParts(1);
replyMsg.setTransactionId(origMsg.getTransactionId());
- replyMsg.addBytesPart(OK_BYTES);
- replyMsg.send(servConn);
+ replyMsg.addBytesPart(okBytes());
+ replyMsg.send(serverConnection);
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl tx: {}", servConn.getName(), origMsg.getTransactionId());
+ logger.trace("{}: rpl tx: {}", serverConnection.getName(), origMsg.getTransactionId());
}
}
- protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection servConn,
+ protected void writeReplyWithRefreshMetadata(Message origMsg, ServerConnection serverConnection,
PartitionedRegion pr, byte nwHop) throws IOException {
- Message replyMsg = servConn.getReplyMessage();
- servConn.getCache().getCancelCriterion().checkCancelInProgress(null);
+ Message replyMsg = serverConnection.getReplyMessage();
+ serverConnection.getCache().getCancelCriterion().checkCancelInProgress(null);
replyMsg.setMessageType(MessageType.REPLY);
replyMsg.setNumberOfParts(1);
replyMsg.setTransactionId(origMsg.getTransactionId());
replyMsg.addBytesPart(new byte[] {pr.getMetadataVersion(), nwHop});
- replyMsg.send(servConn);
+ replyMsg.send(serverConnection);
pr.getPrStats().incPRMetaDataSentCount();
if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADAT tx: {}", servConn.getName(),
+ logger.trace("{}: rpl with REFRESH_METADATA tx: {}", serverConnection.getName(),
origMsg.getTransactionId());
}
}
- private static void handleEOFException(Message msg, ServerConnection servConn, Exception eof) {
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- CacheServerStats stats = servConn.getCacheServerStats();
- boolean potentialModification = servConn.getPotentialModification();
+ private static void handleEOFException(Message msg, ServerConnection serverConnection,
+ Exception eof) {
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ CacheServerStats stats = serverConnection.getCacheServerStats();
+ boolean potentialModification = serverConnection.getPotentialModification();
if (!crHelper.isShutdown()) {
if (potentialModification) {
stats.incAbandonedWriteRequests();
} else {
stats.incAbandonedReadRequests();
}
- if (!suppressIOExceptionLogging) {
+ if (!SUPPRESS_IO_EXCEPTION_LOGGING) {
if (potentialModification) {
- int transId = (msg != null) ? msg.getTransactionId() : Integer.MIN_VALUE;
+ int transId = msg != null ? msg.getTransactionId() : Integer.MIN_VALUE;
logger.warn(LocalizedMessage.create(
LocalizedStrings.BaseCommand_0_EOFEXCEPTION_DURING_A_WRITE_OPERATION_ON_REGION__1_KEY_2_MESSAGEID_3,
- new Object[] {servConn.getName(), servConn.getModRegion(), servConn.getModKey(),
- Integer.valueOf(transId)}));
+ new Object[] {serverConnection.getName(), serverConnection.getModRegion(),
+ serverConnection.getModKey(), transId}));
} else {
logger.debug("EOF exception", eof);
logger.info(LocalizedMessage.create(
LocalizedStrings.BaseCommand_0_CONNECTION_DISCONNECT_DETECTED_BY_EOF,
- servConn.getName()));
+ serverConnection.getName()));
}
}
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(eof);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(eof);
}
- private static void handleInterruptedIOException(Message msg, ServerConnection servConn,
- Exception e) {
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- if (!crHelper.isShutdown() && servConn.isOpen()) {
- if (!suppressIOExceptionLogging) {
+ private static void handleInterruptedIOException(ServerConnection serverConnection, Exception e) {
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ if (!crHelper.isShutdown() && serverConnection.isOpen()) {
+ if (!SUPPRESS_IO_EXCEPTION_LOGGING) {
if (logger.isDebugEnabled())
logger.debug("Aborted message due to interrupt: {}", e.getMessage(), e);
}
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(e);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(e);
}
- private static void handleIOException(Message msg, ServerConnection servConn, Exception e) {
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- boolean potentialModification = servConn.getPotentialModification();
+ private static void handleIOException(Message msg, ServerConnection serverConnection,
+ Exception e) {
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ boolean potentialModification = serverConnection.getPotentialModification();
- if (!crHelper.isShutdown() && servConn.isOpen()) {
- if (!suppressIOExceptionLogging) {
+ if (!crHelper.isShutdown() && serverConnection.isOpen()) {
+ if (!SUPPRESS_IO_EXCEPTION_LOGGING) {
if (potentialModification) {
- int transId = (msg != null) ? msg.getTransactionId() : Integer.MIN_VALUE;
+ int transId = msg != null ? msg.getTransactionId() : Integer.MIN_VALUE;
logger.warn(LocalizedMessage.create(
LocalizedStrings.BaseCommand_0_UNEXPECTED_IOEXCEPTION_DURING_OPERATION_FOR_REGION_1_KEY_2_MESSID_3,
- new Object[] {servConn.getName(), servConn.getModRegion(), servConn.getModKey(),
- Integer.valueOf(transId)}),
+ new Object[] {serverConnection.getName(), serverConnection.getModRegion(),
+ serverConnection.getModKey(), transId}),
e);
} else {
logger.warn(LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_IOEXCEPTION,
- servConn.getName()), e);
+ serverConnection.getName()), e);
}
}
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(e);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(e);
}
- private static void handleShutdownException(Message msg, ServerConnection servConn, Exception e) {
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
- boolean potentialModification = servConn.getPotentialModification();
+ private static void handleShutdownException(Message msg, ServerConnection serverConnection,
+ Exception e) {
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
+ boolean potentialModification = serverConnection.getPotentialModification();
if (!crHelper.isShutdown()) {
if (potentialModification) {
- int transId = (msg != null) ? msg.getTransactionId() : Integer.MIN_VALUE;
+ int transId = msg != null ? msg.getTransactionId() : Integer.MIN_VALUE;
logger.warn(LocalizedMessage.create(
LocalizedStrings.BaseCommand_0_UNEXPECTED_SHUTDOWNEXCEPTION_DURING_OPERATION_ON_REGION_1_KEY_2_MESSAGEID_3,
- new Object[] {servConn.getName(), servConn.getModRegion(), servConn.getModKey(),
- Integer.valueOf(transId)}),
+ new Object[] {serverConnection.getName(), serverConnection.getModRegion(),
+ serverConnection.getModKey(), transId}),
e);
} else {
- logger.warn(LocalizedMessage.create(
- LocalizedStrings.BaseCommand_0_UNEXPECTED_SHUTDOWNEXCEPTION, servConn.getName()), e);
+ logger.warn(
+ LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_SHUTDOWNEXCEPTION,
+ serverConnection.getName()),
+ e);
}
}
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(e);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(e);
}
- // Handle GemfireSecurityExceptions separately since the connection should not
- // be terminated (by setting processMessages to false) unlike in
- // handleThrowable. Fixes bugs #38384 and #39392.
- // private static void handleGemfireSecurityException(Message msg,
- // ServerConnection servConn, GemFireSecurityException e) {
- //
- // boolean requiresResponse = servConn.getTransientFlag(REQUIRES_RESPONSE);
- // boolean responded = servConn.getTransientFlag(RESPONDED);
- // boolean requiresChunkedResponse = servConn
- // .getTransientFlag(REQUIRES_CHUNKED_RESPONSE);
- // boolean potentialModification = servConn.getPotentialModification();
- //
- // try {
- // try {
- // if (requiresResponse && !responded) {
- // if (requiresChunkedResponse) {
- // writeChunkedException(msg, e, false, servConn);
- // }
- // else {
- // writeException(msg, e, false, servConn);
- // }
- // servConn.setAsTrue(RESPONDED);
- // }
- // }
- // finally { // inner try-finally to ensure proper ordering of logging
- // if (potentialModification) {
- // int transId = (msg != null) ? msg.getTransactionId()
- // : Integer.MIN_VALUE;
- // }
- // }
- // }
- // catch (IOException ioe) {
- // if (logger.isDebugEnabled()) {
- // logger.fine(servConn.getName()
- // + ": Unexpected IOException writing security exception: ", ioe);
- // }
- // }
- // }
-
- private static void handleExceptionNoDisconnect(Message msg, ServerConnection servConn,
+ private static void handleExceptionNoDisconnect(Message msg, ServerConnection serverConnection,
Exception e) {
- boolean requiresResponse = servConn.getTransientFlag(REQUIRES_RESPONSE);
- boolean responded = servConn.getTransientFlag(RESPONDED);
- boolean requiresChunkedResponse = servConn.getTransientFlag(REQUIRES_CHUNKED_RESPONSE);
- boolean potentialModification = servConn.getPotentialModification();
- boolean wroteExceptionResponse = false;
+ boolean requiresResponse = serverConnection.getTransientFlag(REQUIRES_RESPONSE);
+ boolean responded = serverConnection.getTransientFlag(RESPONDED);
+ boolean requiresChunkedResponse = serverConnection.getTransientFlag(REQUIRES_CHUNKED_RESPONSE);
+ boolean potentialModification = serverConnection.getPotentialModification();
try {
+ boolean wroteExceptionResponse = false;
try {
if (requiresResponse && !responded) {
if (requiresChunkedResponse) {
- writeChunkedException(msg, e, false, servConn);
+ writeChunkedException(msg, e, serverConnection);
} else {
- writeException(msg, e, false, servConn);
+ writeException(msg, e, false, serverConnection);
}
wroteExceptionResponse = true;
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
} finally { // inner try-finally to ensure proper ordering of logging
if (potentialModification) {
- int transId = (msg != null) ? msg.getTransactionId() : Integer.MIN_VALUE;
+ int transId = msg != null ? msg.getTransactionId() : Integer.MIN_VALUE;
if (!wroteExceptionResponse) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.BaseCommand_0_UNEXPECTED_EXCEPTION_DURING_OPERATION_ON_REGION_1_KEY_2_MESSAGEID_3,
- new Object[] {servConn.getName(), servConn.getModRegion(), servConn.getModKey(),
- Integer.valueOf(transId)}),
+ new Object[] {serverConnection.getName(), serverConnection.getModRegion(),
+ serverConnection.getModKey(), transId}),
e);
} else {
if (logger.isDebugEnabled()) {
logger.debug("{}: Exception during operation on region: {} key: {} messageId: {}",
- servConn.getName(), servConn.getModRegion(), servConn.getModKey(), transId, e);
+ serverConnection.getName(), serverConnection.getModRegion(),
+ serverConnection.getModKey(), transId, e);
}
}
} else {
if (!wroteExceptionResponse) {
logger.warn(LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), e);
+ serverConnection.getName()), e);
} else {
if (logger.isDebugEnabled()) {
- logger.debug("{}: Exception: {}", servConn.getName(), e.getMessage(), e);
+ logger.debug("{}: Exception: {}", serverConnection.getName(), e.getMessage(), e);
}
}
}
}
} catch (IOException ioe) {
if (logger.isDebugEnabled()) {
- logger.debug("{}: Unexpected IOException writing exception: {}", servConn.getName(),
+ logger.debug("{}: Unexpected IOException writing exception: {}", serverConnection.getName(),
ioe.getMessage(), ioe);
}
}
}
- private static void handleThrowable(Message msg, ServerConnection servConn, Throwable th) {
- boolean requiresResponse = servConn.getTransientFlag(REQUIRES_RESPONSE);
- boolean responded = servConn.getTransientFlag(RESPONDED);
- boolean requiresChunkedResponse = servConn.getTransientFlag(REQUIRES_CHUNKED_RESPONSE);
- boolean potentialModification = servConn.getPotentialModification();
+ private static void handleThrowable(Message msg, ServerConnection serverConnection,
+ Throwable th) {
+ boolean requiresResponse = serverConnection.getTransientFlag(REQUIRES_RESPONSE);
+ boolean responded = serverConnection.getTransientFlag(RESPONDED);
+ boolean requiresChunkedResponse = serverConnection.getTransientFlag(REQUIRES_CHUNKED_RESPONSE);
+ boolean potentialModification = serverConnection.getPotentialModification();
try {
try {
if (th instanceof Error) {
- logger.fatal(LocalizedMessage.create(
- LocalizedStrings.BaseCommand_0_UNEXPECTED_ERROR_ON_SERVER, servConn.getName()), th);
+ logger.fatal(
+ LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_ERROR_ON_SERVER,
+ serverConnection.getName()),
+ th);
}
if (requiresResponse && !responded) {
if (requiresChunkedResponse) {
- writeChunkedException(msg, th, false, servConn);
+ writeChunkedException(msg, th, serverConnection);
} else {
- writeException(msg, th, false, servConn);
+ writeException(msg, th, false, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
} finally { // inner try-finally to ensure proper ordering of logging
- if (th instanceof Error) {
- // log nothing
- } else if (th instanceof CancelException) {
- // log nothing
- } else {
+ if (!(th instanceof Error || th instanceof CacheLoaderException)) {
if (potentialModification) {
- int transId = (msg != null) ? msg.getTransactionId() : Integer.MIN_VALUE;
+ int transId = msg != null ? msg.getTransactionId() : Integer.MIN_VALUE;
logger.warn(LocalizedMessage.create(
LocalizedStrings.BaseCommand_0_UNEXPECTED_EXCEPTION_DURING_OPERATION_ON_REGION_1_KEY_2_MESSAGEID_3,
- new Object[] {servConn.getName(), servConn.getModRegion(), servConn.getModKey(),
- Integer.valueOf(transId)}),
+ new Object[] {serverConnection.getName(), serverConnection.getModRegion(),
+ serverConnection.getModKey(), transId}),
th);
} else {
logger.warn(LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_EXCEPTION,
- servConn.getName()), th);
+ serverConnection.getName()), th);
}
}
}
} catch (IOException ioe) {
if (logger.isDebugEnabled()) {
- logger.debug("{}: Unexpected IOException writing exception: {}", servConn.getName(),
+ logger.debug("{}: Unexpected IOException writing exception: {}", serverConnection.getName(),
ioe.getMessage(), ioe);
}
} finally {
- servConn.setFlagProcessMessagesAsFalse();
- servConn.setClientDisconnectedException(th);
+ serverConnection.setFlagProcessMessagesAsFalse();
+ serverConnection.setClientDisconnectedException(th);
}
}
- protected static void writeChunkedException(Message origMsg, Throwable e, boolean isSevere,
- ServerConnection servConn) throws IOException {
- writeChunkedException(origMsg, e, isSevere, servConn, servConn.getChunkedResponseMessage());
+ protected static void writeChunkedException(Message origMsg, Throwable e,
+ ServerConnection serverConnection) throws IOException {
+ writeChunkedException(origMsg, e, serverConnection,
+ serverConnection.getChunkedResponseMessage());
}
- protected static void writeChunkedException(Message origMsg, Throwable e, boolean isSevere,
- ServerConnection servConn, ChunkedMessage originalReponse) throws IOException {
- writeChunkedException(origMsg, e, isSevere, servConn, originalReponse, 2);
+ protected static void writeChunkedException(Message origMsg, Throwable e,
+ ServerConnection serverConnection, ChunkedMessage originalResponse) throws IOException {
+ writeChunkedException(origMsg, e, serverConnection, originalResponse, 2);
}
- protected static void writeChunkedException(Message origMsg, Throwable exception,
- boolean isSevere, ServerConnection servConn, ChunkedMessage originalReponse, int numOfParts)
+ private static void writeChunkedException(Message origMsg, Throwable exception,
+ ServerConnection serverConnection, ChunkedMessage originalResponse, int numOfParts)
throws IOException {
- Throwable e = getClientException(servConn, exception);
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
- chunkedResponseMsg.setServerConnection(servConn);
- if (originalReponse.headerHasBeenSent()) {
- // chunkedResponseMsg = originalReponse;
- // fix for bug 35442
+ Throwable e = getClientException(serverConnection, exception);
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
+ chunkedResponseMsg.setServerConnection(serverConnection);
+ if (originalResponse.headerHasBeenSent()) {
chunkedResponseMsg.setNumberOfParts(numOfParts);
chunkedResponseMsg.setLastChunkAndNumParts(true, numOfParts);
chunkedResponseMsg.addObjPart(e);
@@ -565,8 +515,8 @@ public abstract class BaseCommand implements Command {
chunkedResponseMsg.addStringPart(getExceptionTrace(e));
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk while reply in progress: {}", servConn.getName(),
- e.getMessage(), e);
+ logger.debug("{}: Sending exception chunk while reply in progress: {}",
+ serverConnection.getName(), e.getMessage(), e);
}
} else {
chunkedResponseMsg.setMessageType(MessageType.EXCEPTION);
@@ -579,10 +529,11 @@ public abstract class BaseCommand implements Command {
chunkedResponseMsg.addStringPart(getExceptionTrace(e));
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk: {}", servConn.getName(), e.getMessage(), e);
+ logger.debug("{}: Sending exception chunk: {}", serverConnection.getName(), e.getMessage(),
+ e);
}
}
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
}
// Get the exception stacktrace for native clients
@@ -595,26 +546,25 @@ public abstract class BaseCommand implements Command {
}
protected static void writeException(Message origMsg, Throwable e, boolean isSevere,
- ServerConnection servConn) throws IOException {
- writeException(origMsg, MessageType.EXCEPTION, e, isSevere, servConn);
+ ServerConnection serverConnection) throws IOException {
+ writeException(origMsg, MessageType.EXCEPTION, e, isSevere, serverConnection);
}
- private static Throwable getClientException(ServerConnection servConn, Throwable e) {
- Cache cache = servConn.getCache();
- if (cache instanceof InternalCache) {
- InternalCache icache = (InternalCache) servConn.getCache();
- OldClientSupportService svc = icache.getService(OldClientSupportService.class);
+ private static Throwable getClientException(ServerConnection serverConnection, Throwable e) {
+ InternalCache cache = serverConnection.getCache();
+ if (cache != null) {
+ OldClientSupportService svc = cache.getService(OldClientSupportService.class);
if (svc != null) {
- return svc.getThrowable(e, servConn.getClientVersion());
+ return svc.getThrowable(e, serverConnection.getClientVersion());
}
}
return e;
}
protected static void writeException(Message origMsg, int msgType, Throwable e, boolean isSevere,
- ServerConnection servConn) throws IOException {
- Throwable theException = getClientException(servConn, e);
- Message errorMsg = servConn.getErrorResponseMessage();
+ ServerConnection serverConnection) throws IOException {
+ Throwable theException = getClientException(serverConnection, e);
+ Message errorMsg = serverConnection.getErrorResponseMessage();
errorMsg.setMessageType(msgType);
errorMsg.setNumberOfParts(2);
errorMsg.setTransactionId(origMsg.getTransactionId());
@@ -628,9 +578,9 @@ public abstract class BaseCommand implements Command {
}
errorMsg.addObjPart(theException);
errorMsg.addStringPart(getExceptionTrace(theException));
- errorMsg.send(servConn);
+ errorMsg.send(serverConnection);
if (logger.isDebugEnabled()) {
- logger.debug("{}: Wrote exception: {}", servConn.getName(), e.getMessage(), e);
+ logger.debug("{}: Wrote exception: {}", serverConnection.getName(), e.getMessage(), e);
}
if (e instanceof MessageTooLargeException) {
throw (IOException) e;
@@ -638,41 +588,41 @@ public abstract class BaseCommand implements Command {
}
protected static void writeErrorResponse(Message origMsg, int messageType,
- ServerConnection servConn) throws IOException {
- Message errorMsg = servConn.getErrorResponseMessage();
+ ServerConnection serverConnection) throws IOException {
+ Message errorMsg = serverConnection.getErrorResponseMessage();
errorMsg.setMessageType(messageType);
errorMsg.setNumberOfParts(1);
errorMsg.setTransactionId(origMsg.getTransactionId());
errorMsg.addStringPart(
LocalizedStrings.BaseCommand_INVALID_DATA_RECEIVED_PLEASE_SEE_THE_CACHE_SERVER_LOG_FILE_FOR_ADDITIONAL_DETAILS
.toLocalizedString());
- errorMsg.send(servConn);
+ errorMsg.send(serverConnection);
}
protected static void writeErrorResponse(Message origMsg, int messageType, String msg,
- ServerConnection servConn) throws IOException {
- Message errorMsg = servConn.getErrorResponseMessage();
+ ServerConnection serverConnection) throws IOException {
+ Message errorMsg = serverConnection.getErrorResponseMessage();
errorMsg.setMessageType(messageType);
errorMsg.setNumberOfParts(1);
errorMsg.setTransactionId(origMsg.getTransactionId());
errorMsg.addStringPart(msg);
- errorMsg.send(servConn);
+ errorMsg.send(serverConnection);
}
protected static void writeRegionDestroyedEx(Message msg, String regionName, String title,
- ServerConnection servConn) throws IOException {
- String reason = servConn.getName() + ": Region named " + regionName + title;
+ ServerConnection serverConnection) throws IOException {
+ String reason = serverConnection.getName() + ": Region named " + regionName + title;
RegionDestroyedException ex = new RegionDestroyedException(reason, regionName);
- if (servConn.getTransientFlag(REQUIRES_CHUNKED_RESPONSE)) {
- writeChunkedException(msg, ex, false, servConn);
+ if (serverConnection.getTransientFlag(REQUIRES_CHUNKED_RESPONSE)) {
+ writeChunkedException(msg, ex, serverConnection);
} else {
- writeException(msg, ex, false, servConn);
+ writeException(msg, ex, false, serverConnection);
}
}
protected static void writeResponse(Object data, Object callbackArg, Message origMsg,
- boolean isObject, ServerConnection servConn) throws IOException {
- Message responseMsg = servConn.getResponseMessage();
+ boolean isObject, ServerConnection serverConnection) throws IOException {
+ Message responseMsg = serverConnection.getResponseMessage();
responseMsg.setMessageType(MessageType.RESPONSE);
responseMsg.setTransactionId(origMsg.getTransactionId());
@@ -686,20 +636,20 @@ public abstract class BaseCommand implements Command {
responseMsg.addRawPart((byte[]) data, isObject);
} else {
Assert.assertTrue(isObject, "isObject should be true when value is not a byte[]");
- responseMsg.addObjPart(data, zipValues);
+ responseMsg.addObjPart(data, false);
}
if (callbackArg != null) {
responseMsg.addObjPart(callbackArg);
}
- servConn.getCache().getCancelCriterion().checkCancelInProgress(null);
- responseMsg.send(servConn);
+ serverConnection.getCache().getCancelCriterion().checkCancelInProgress(null);
+ responseMsg.send(serverConnection);
origMsg.clearParts();
}
protected static void writeResponseWithRefreshMetadata(Object data, Object callbackArg,
- Message origMsg, boolean isObject, ServerConnection servConn, PartitionedRegion pr,
+ Message origMsg, boolean isObject, ServerConnection serverConnection, PartitionedRegion pr,
byte nwHop) throws IOException {
- Message responseMsg = servConn.getResponseMessage();
+ Message responseMsg = serverConnection.getResponseMessage();
responseMsg.setMessageType(MessageType.RESPONSE);
responseMsg.setTransactionId(origMsg.getTransactionId());
@@ -713,32 +663,32 @@ public abstract class BaseCommand implements Command {
responseMsg.addRawPart((byte[]) data, isObject);
} else {
Assert.assertTrue(isObject, "isObject should be true when value is not a byte[]");
- responseMsg.addObjPart(data, zipValues);
+ responseMsg.addObjPart(data, false);
}
if (callbackArg != null) {
responseMsg.addObjPart(callbackArg);
}
responseMsg.addBytesPart(new byte[] {pr.getMetadataVersion(), nwHop});
- servConn.getCache().getCancelCriterion().checkCancelInProgress(null);
- responseMsg.send(servConn);
+ serverConnection.getCache().getCancelCriterion().checkCancelInProgress(null);
+ responseMsg.send(serverConnection);
origMsg.clearParts();
}
protected static void writeResponseWithFunctionAttribute(byte[] data, Message origMsg,
- ServerConnection servConn) throws IOException {
- Message responseMsg = servConn.getResponseMessage();
+ ServerConnection serverConnection) throws IOException {
+ Message responseMsg = serverConnection.getResponseMessage();
responseMsg.setMessageType(MessageType.RESPONSE);
responseMsg.setTransactionId(origMsg.getTransactionId());
responseMsg.setNumberOfParts(1);
responseMsg.addBytesPart(data);
- servConn.getCache().getCancelCriterion().checkCancelInProgress(null);
- responseMsg.send(servConn);
+ serverConnection.getCache().getCancelCriterion().checkCancelInProgress(null);
+ responseMsg.send(serverConnection);
origMsg.clearParts();
}
- static protected void checkForInterrupt(ServerConnection servConn, Exception e)
+ protected static void checkForInterrupt(ServerConnection serverConnection, Exception e)
throws InterruptedException, InterruptedIOException {
- servConn.getCachedRegionHelper().checkCancelInProgress(e);
+ serverConnection.getCachedRegionHelper().checkCancelInProgress(e);
if (e instanceof InterruptedException) {
throw (InterruptedException) e;
}
@@ -747,37 +697,36 @@ public abstract class BaseCommand implements Command {
}
}
- protected static void writeQueryResponseChunk(Object queryResponseChunk,
- CollectionType collectionType, boolean lastChunk, ServerConnection servConn)
- throws IOException {
- ChunkedMessage queryResponseMsg = servConn.getQueryResponseMessage();
+ static void writeQueryResponseChunk(Object queryResponseChunk, CollectionType collectionType,
+ boolean lastChunk, ServerConnection serverConnection) throws IOException {
+ ChunkedMessage queryResponseMsg = serverConnection.getQueryResponseMessage();
queryResponseMsg.setNumberOfParts(2);
queryResponseMsg.setLastChunk(lastChunk);
- queryResponseMsg.addObjPart(collectionType, zipValues);
- queryResponseMsg.addObjPart(queryResponseChunk, zipValues);
- queryResponseMsg.sendChunk(servConn);
+ queryResponseMsg.addObjPart(collectionType, false);
+ queryResponseMsg.addObjPart(queryResponseChunk, false);
+ queryResponseMsg.sendChunk(serverConnection);
}
protected static void writeQueryResponseException(Message origMsg, Throwable exception,
- boolean isSevere, ServerConnection servConn) throws IOException {
- Throwable e = getClientException(servConn, exception);
- ChunkedMessage queryResponseMsg = servConn.getQueryResponseMessage();
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ ServerConnection serverConnection) throws IOException {
+ Throwable e = getClientException(serverConnection, exception);
+ ChunkedMessage queryResponseMsg = serverConnection.getQueryResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
if (queryResponseMsg.headerHasBeenSent()) {
// fix for bug 35442
// This client is expecting 2 parts in this message so send 2 parts
- queryResponseMsg.setServerConnection(servConn);
+ queryResponseMsg.setServerConnection(serverConnection);
queryResponseMsg.setNumberOfParts(2);
queryResponseMsg.setLastChunkAndNumParts(true, 2);
queryResponseMsg.addObjPart(e);
queryResponseMsg.addStringPart(getExceptionTrace(e));
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk while reply in progress: {}", servConn.getName(),
- e.getMessage(), e);
+ logger.debug("{}: Sending exception chunk while reply in progress: {}",
+ serverConnection.getName(), e.getMessage(), e);
}
- queryResponseMsg.sendChunk(servConn);
+ queryResponseMsg.sendChunk(serverConnection);
} else {
- chunkedResponseMsg.setServerConnection(servConn);
+ chunkedResponseMsg.setServerConnection(serverConnection);
chunkedResponseMsg.setMessageType(MessageType.EXCEPTION);
chunkedResponseMsg.setNumberOfParts(2);
chunkedResponseMsg.setLastChunkAndNumParts(true, 2);
@@ -786,19 +735,20 @@ public abstract class BaseCommand implements Command {
chunkedResponseMsg.addObjPart(e);
chunkedResponseMsg.addStringPart(getExceptionTrace(e));
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk: {}", servConn.getName(), e.getMessage(), e);
+ logger.debug("{}: Sending exception chunk: {}", serverConnection.getName(), e.getMessage(),
+ e);
}
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
}
}
protected static void writeChunkedErrorResponse(Message origMsg, int messageType, String message,
- ServerConnection servConn) throws IOException {
+ ServerConnection serverConnection) throws IOException {
// Send chunked response header identifying error message
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
if (logger.isDebugEnabled()) {
- logger.debug(servConn.getName() + ": Sending error message header type: " + messageType
- + " transaction: " + origMsg.getTransactionId());
+ logger.debug("{}: Sending error message header type: {} transaction: {}",
+ serverConnection.getName(), messageType, origMsg.getTransactionId());
}
chunkedResponseMsg.setMessageType(messageType);
chunkedResponseMsg.setTransactionId(origMsg.getTransactionId());
@@ -806,32 +756,32 @@ public abstract class BaseCommand implements Command {
// Send actual error
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending error message chunk: {}", servConn.getName(), message);
+ logger.debug("{}: Sending error message chunk: {}", serverConnection.getName(), message);
}
chunkedResponseMsg.setNumberOfParts(1);
chunkedResponseMsg.setLastChunk(true);
chunkedResponseMsg.addStringPart(message);
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
}
protected static void writeFunctionResponseException(Message origMsg, int messageType,
- String message, ServerConnection servConn, Throwable exception) throws IOException {
- Throwable e = getClientException(servConn, exception);
- ChunkedMessage functionResponseMsg = servConn.getFunctionResponseMessage();
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ ServerConnection serverConnection, Throwable exception) throws IOException {
+ Throwable e = getClientException(serverConnection, exception);
+ ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
if (functionResponseMsg.headerHasBeenSent()) {
- functionResponseMsg.setServerConnection(servConn);
+ functionResponseMsg.setServerConnection(serverConnection);
functionResponseMsg.setNumberOfParts(2);
functionResponseMsg.setLastChunkAndNumParts(true, 2);
functionResponseMsg.addObjPart(e);
functionResponseMsg.addStringPart(getExceptionTrace(e));
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk while reply in progress: {}", servConn.getName(),
- e.getMessage(), e);
+ logger.debug("{}: Sending exception chunk while reply in progress: {}",
+ serverConnection.getName(), e.getMessage(), e);
}
- functionResponseMsg.sendChunk(servConn);
+ functionResponseMsg.sendChunk(serverConnection);
} else {
- chunkedResponseMsg.setServerConnection(servConn);
+ chunkedResponseMsg.setServerConnection(serverConnection);
chunkedResponseMsg.setMessageType(messageType);
chunkedResponseMsg.setNumberOfParts(2);
chunkedResponseMsg.setLastChunkAndNumParts(true, 2);
@@ -840,9 +790,10 @@ public abstract class BaseCommand implements Command {
chunkedResponseMsg.addObjPart(e);
chunkedResponseMsg.addStringPart(getExceptionTrace(e));
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk: {}", servConn.getName(), e.getMessage(), e);
+ logger.debug("{}: Sending exception chunk: {}", serverConnection.getName(), e.getMessage(),
+ e);
}
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
}
}
@@ -898,14 +849,14 @@ public abstract class BaseCommand implements Command {
Message requestMsg = null;
try {
requestMsg = servConn.getRequestMessage();
- requestMsg.recv(servConn, MAX_INCOMING_DATA, incomingDataLimiter, incomingMsgLimiter);
+ requestMsg.recv(servConn, MAX_INCOMING_DATA, INCOMING_DATA_LIMITER, INCOMING_MSG_LIMITER);
return requestMsg;
} catch (EOFException eof) {
handleEOFException(null, servConn, eof);
- // TODO:Asif: Check if there is any need for explicitly returning
+ // TODO: Check if there is any need for explicitly returning
} catch (InterruptedIOException e) { // Solaris only
- handleInterruptedIOException(null, servConn, e);
+ handleInterruptedIOException(servConn, e);
} catch (IOException e) {
handleIOException(null, servConn, e);
@@ -930,7 +881,7 @@ public abstract class BaseCommand implements Command {
fillAndSendRegisterInterestResponseChunks(region, riKey, interestType, false, policy, servConn);
}
- /*
+ /**
* serializeValues is unused for clients < GFE_80
*/
protected static void fillAndSendRegisterInterestResponseChunks(LocalRegion region, Object riKey,
@@ -959,20 +910,20 @@ public abstract class BaseCommand implements Command {
// Not supported yet
throw new InternalGemFireError(
LocalizedStrings.BaseCommand_NOT_YET_SUPPORTED.toLocalizedString());
+
case InterestType.FILTER_CLASS:
throw new InternalGemFireError(
LocalizedStrings.BaseCommand_NOT_YET_SUPPORTED.toLocalizedString());
- // handleFilter(region, (String)riKey, policy);
- // break;
- case InterestType.REGULAR_EXPRESSION: {
+
+ case InterestType.REGULAR_EXPRESSION:
String regEx = (String) riKey;
if (regEx.equals(".*")) {
handleAllKeys(region, policy, servConn);
} else {
handleRegEx(region, regEx, policy, servConn);
}
- }
break;
+
case InterestType.KEY:
if (riKey.equals("ALL_KEYS")) {
handleAllKeys(region, policy, servConn);
@@ -980,13 +931,13 @@ public abstract class BaseCommand implements Command {
handleSingleton(region, riKey, policy, servConn);
}
break;
+
default:
throw new InternalGemFireError(
LocalizedStrings.BaseCommand_UNKNOWN_INTEREST_TYPE.toLocalizedString());
}
}
- @SuppressWarnings("rawtypes")
private static void handleKeysValuesPolicy(LocalRegion region, Object riKey, int interestType,
boolean serializeValues, ServerConnection servConn) throws IOException {
if (riKey instanceof List) {
@@ -1002,9 +953,11 @@ public abstract class BaseCommand implements Command {
case InterestType.OQL_QUERY:
throw new InternalGemFireError(
LocalizedStrings.BaseCommand_NOT_YET_SUPPORTED.toLocalizedString());
+
case InterestType.FILTER_CLASS:
throw new InternalGemFireError(
LocalizedStrings.BaseCommand_NOT_YET_SUPPORTED.toLocalizedString());
+
case InterestType.REGULAR_EXPRESSION:
String regEx = (String) riKey;
if (regEx.equals(".*")) {
@@ -1013,6 +966,7 @@ public abstract class BaseCommand implements Command {
handleKVAllKeys(region, regEx, serializeValues, servConn);
}
break;
+
case InterestType.KEY:
if (riKey.equals("ALL_KEYS")) {
handleKVAllKeys(region, null, serializeValues, servConn);
@@ -1020,6 +974,7 @@ public abstract class BaseCommand implements Command {
handleKVSingleton(region, riKey, serializeValues, servConn);
}
break;
+
default:
throw new InternalGemFireError(
LocalizedStrings.BaseCommand_UNKNOWN_INTEREST_TYPE.toLocalizedString());
@@ -1029,18 +984,17 @@ public abstract class BaseCommand implements Command {
/**
* @param list is a List of entry keys
*/
- protected static void sendRegisterInterestResponseChunk(Region region, Object riKey,
- ArrayList list, boolean lastChunk, ServerConnection servConn) throws IOException {
+ private static void sendRegisterInterestResponseChunk(Region region, Object riKey, List list,
+ boolean lastChunk, ServerConnection servConn) throws IOException {
ChunkedMessage chunkedResponseMsg = servConn.getRegisterInterestResponseMessage();
chunkedResponseMsg.setNumberOfParts(1);
chunkedResponseMsg.setLastChunk(lastChunk);
- chunkedResponseMsg.addObjPart(list, zipValues);
- String regionName = (region == null) ? " null " : region.getFullPath();
+ chunkedResponseMsg.addObjPart(list, false);
+ String regionName = region == null ? " null " : region.getFullPath();
if (logger.isDebugEnabled()) {
- String str = servConn.getName() + ": Sending" + (lastChunk ? " last " : " ")
- + "register interest response chunk for region: " + regionName + " for keys: " + riKey
- + " chunk=<" + chunkedResponseMsg + ">";
- logger.debug(str);
+ logger.debug(
+ "{}: Sending{}register interest response chunk for region: {} for keys: {} chunk=<{}>",
+ servConn.getName(), lastChunk ? " last " : " ", regionName, riKey, chunkedResponseMsg);
}
chunkedResponseMsg.sendChunk(servConn);
@@ -1050,14 +1004,12 @@ public abstract class BaseCommand implements Command {
* Determines whether keys for destroyed entries (tombstones) should be sent to clients in
* register-interest results.
*
- * @param servConn
- * @param policy
* @return true if tombstones should be sent to the client
*/
private static boolean sendTombstonesInRIResults(ServerConnection servConn,
InterestResultPolicy policy) {
- return (policy == InterestResultPolicy.KEYS_VALUES)
- && (servConn.getClientVersion().compareTo(Version.GFE_80) >= 0);
+ return policy == InterestResultPolicy.KEYS_VALUES
+ && servConn.getClientVersion().compareTo(Version.GFE_80) >= 0;
}
/**
@@ -1066,7 +1018,6 @@ public abstract class BaseCommand implements Command {
* @param region the region
* @param keyList the list of keys
* @param policy the policy
- * @throws IOException
*/
private static void handleList(LocalRegion region, List keyList, InterestResultPolicy policy,
ServerConnection servConn) throws IOException {
@@ -1075,15 +1026,14 @@ public abstract class BaseCommand implements Command {
handleListPR((PartitionedRegion) region, keyList, policy, servConn);
return;
}
- ArrayList newKeyList = new ArrayList(maximumChunkSize);
+ List newKeyList = new ArrayList(MAXIMUM_CHUNK_SIZE);
// Handle list of keys
if (region != null) {
- for (Iterator it = keyList.iterator(); it.hasNext();) {
- Object entryKey = it.next();
- if (region.containsKey(entryKey) || (sendTombstonesInRIResults(servConn, policy)
- && region.containsTombstone(entryKey))) {
+ for (Object entryKey : keyList) {
+ if (region.containsKey(entryKey)
+ || sendTombstonesInRIResults(servConn, policy) && region.containsTombstone(entryKey)) {
- appendInterestResponseKey(region, keyList, entryKey, newKeyList, "list", servConn);
+ appendInterestResponseKey(region, keyList, entryKey, newKeyList, servConn);
}
}
}
@@ -1095,14 +1045,12 @@ public abstract class BaseCommand implements Command {
/**
* Handles both RR and PR cases
*/
- @SuppressWarnings("rawtypes")
- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NP_NULL_PARAM_DEREF",
+ @SuppressWarnings(value = "NP_NULL_PARAM_DEREF",
justification = "Null value handled in sendNewRegisterInterestResponseChunk()")
private static void handleKVSingleton(LocalRegion region, Object entryKey,
boolean serializeValues, ServerConnection servConn) throws IOException {
- VersionedObjectList values = new VersionedObjectList(maximumChunkSize, true,
- region == null ? true : region.getAttributes().getConcurrencyChecksEnabled(),
- serializeValues);
+ VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true,
+ region == null || region.getAttributes().getConcurrencyChecksEnabled(), serializeValues);
if (region != null) {
if (region.containsKey(entryKey) || region.containsTombstone(entryKey)) {
@@ -1126,15 +1074,14 @@ public abstract class BaseCommand implements Command {
* @param region the region
* @param entryKey the key
* @param policy the policy
- * @throws IOException
*/
private static void handleSingleton(LocalRegion region, Object entryKey,
InterestResultPolicy policy, ServerConnection servConn) throws IOException {
- ArrayList keyList = new ArrayList(1);
+ List keyList = new ArrayList(1);
if (region != null) {
if (region.containsKey(entryKey)
- || (sendTombstonesInRIResults(servConn, policy) && region.containsTombstone(entryKey))) {
- appendInterestResponseKey(region, entryKey, entryKey, keyList, "individual", servConn);
+ || sendTombstonesInRIResults(servConn, policy) && region.containsTombstone(entryKey)) {
+ appendInterestResponseKey(region, entryKey, entryKey, keyList, servConn);
}
}
// Send the last chunk (the only chunk for individual and list keys)
@@ -1147,15 +1094,13 @@ public abstract class BaseCommand implements Command {
*
* @param region the region
* @param policy the policy
- * @throws IOException
*/
private static void handleAllKeys(LocalRegion region, InterestResultPolicy policy,
ServerConnection servConn) throws IOException {
- ArrayList keyList = new ArrayList(maximumChunkSize);
+ List keyList = new ArrayList(MAXIMUM_CHUNK_SIZE);
if (region != null) {
- for (Iterator it = region.keySet(sendTombstonesInRIResults(servConn, policy)).iterator(); it
- .hasNext();) {
- appendInterestResponseKey(region, "ALL_KEYS", it.next(), keyList, "ALL_KEYS", servConn);
+ for (Object entryKey : region.keySet(sendTombstonesInRIResults(servConn, policy))) {
+ appendInterestResponseKey(region, "ALL_KEYS", entryKey, keyList, servConn);
}
}
// Send the last chunk (the only chunk for individual and list keys)
@@ -1163,30 +1108,19 @@ public abstract class BaseCommand implements Command {
sendRegisterInterestResponseChunk(region, "ALL_KEYS", keyList, true, servConn);
}
- /**
- * @param region
- * @param regex
- * @param serializeValues
- * @param servConn
- * @throws IOException
- */
private static void handleKVAllKeys(LocalRegion region, String regex, boolean serializeValues,
ServerConnection servConn) throws IOException {
- if (region != null && region instanceof PartitionedRegion) {
+ if (region instanceof PartitionedRegion) {
handleKVKeysPR((PartitionedRegion) region, regex, serializeValues, servConn);
return;
}
- VersionedObjectList values = new VersionedObjectList(maximumChunkSize, true,
- region == null ? true : region.getAttributes().getConcurrencyChecksEnabled(),
- serializeValues);
+ VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true,
+ region == null || region.getAttributes().getConcurrencyChecksEnabled(), serializeValues);
if (region != null) {
- VersionTag versionTag = null;
- Object data = null;
-
Pattern keyPattern = null;
if (regex != null) {
keyPattern = Pattern.compile(regex);
@@ -1207,11 +1141,11 @@ public abstract class BaseCommand implements Command {
}
ClientProxyMembershipID id = servConn == null ? null : servConn.getProxyID();
- data = region.get(key, null, true, true, true, id, versionHolder, true);
- versionTag = versionHolder.getVersionTag();
+ Object data = region.get(key, null, true, true, true, id, versionHolder, true);
+ VersionTag versionTag = versionHolder.getVersionTag();
updateValues(values, key, data, versionTag);
- if (values.size() == maximumChunkSize) {
+ if (values.size() == MAXIMUM_CHUNK_SIZE) {
sendNewRegisterInterestResponseChunk(region, regex != null ? regex : "ALL_KEYS", values,
false, servConn);
values.clear();
@@ -1227,20 +1161,18 @@ public abstract class BaseCommand implements Command {
private static void handleKVKeysPR(PartitionedRegion region, Object keyInfo,
boolean serializeValues, ServerConnection servConn) throws IOException {
- int id = 0;
- HashMap<Integer, HashSet> bucketKeys = null;
- VersionedObjectList values = new VersionedObjectList(maximumChunkSize, true,
+ VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true,
region.getConcurrencyChecksEnabled(), serializeValues);
- if (keyInfo != null && keyInfo instanceof List) {
- bucketKeys = new HashMap<Integer, HashSet>();
+ if (keyInfo instanceof List) {
+ HashMap<Integer, HashSet> bucketKeys = new HashMap<>();
for (Object key : (List) keyInfo) {
- id = PartitionedRegionHelper.getHashKey(region, null, key, null, null);
+ int id = PartitionedRegionHelper.getHashKey(region, null, key, null, null);
if (bucketKeys.containsKey(id)) {
bucketKeys.get(id).add(key);
} else {
- HashSet<Object> keys = new HashSet<Object>();
+ HashSet<Object> keys = new HashSet<>();
keys.add(key);
bucketKeys.put(id, keys);
}
@@ -1259,8 +1191,6 @@ public abstract class BaseCommand implements Command {
/**
* Copied from Get70.getValueAndIsObject(), except a minor change. (Make the method static instead
* of copying it here?)
- *
- * @param value
*/
private static void updateValues(VersionedObjectList values, Object key, Object value,
VersionTag versionTag) {
@@ -1274,8 +1204,7 @@ public abstract class BaseCommand implements Command {
boolean wasInvalid = false;
if (value instanceof CachedDeserializable) {
value = ((CachedDeserializable) value).getValue();
- } else if (value == Token.REMOVED_PHASE1 || value == Token.REMOVED_PHASE2
- || value == Token.DESTROYED || value == Token.TOMBSTONE) {
+ } else if (isRemovalToken(value)) {
value = null;
} else if (value == Token.INVALID || value == Token.LOCAL_INVALID) {
value = null; // fix for bug 35884
@@ -1292,19 +1221,23 @@ public abstract class BaseCommand implements Command {
}
}
+ private static boolean isRemovalToken(final Object value) {
+ return value == Token.REMOVED_PHASE1 || value == Token.REMOVED_PHASE2
+ || value == Token.DESTROYED || value == Token.TOMBSTONE;
+ }
+
public static void appendNewRegisterInterestResponseChunkFromLocal(LocalRegion region,
VersionedObjectList values, Object riKeys, Set keySet, ServerConnection servConn)
throws IOException {
ClientProxyMembershipID requestingClient = servConn == null ? null : servConn.getProxyID();
- for (Iterator it = keySet.iterator(); it.hasNext();) {
- Object key = it.next();
+ for (Object key : keySet) {
VersionTagHolder versionHolder = createVersionTagHolder();
Object value = region.get(key, null, true, true, true, requestingClient, versionHolder, true);
updateValues(values, key, value, versionHolder.getVersionTag());
- if (values.size() == maximumChunkSize) {
+ if (values.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
// values.setKeys(null); // Now we need to send keys too.
sendNewRegisterInterestResponseChunk(region, riKeys != null ? riKeys : "ALL_KEYS", values,
@@ -1314,24 +1247,14 @@ public abstract class BaseCommand implements Command {
} // for
}
- /**
- *
- * @param region
- * @param values {@link VersionedObjectList}
- * @param riKeys
- * @param set set of entries
- * @param servConn
- * @throws IOException
- */
public static void appendNewRegisterInterestResponseChunk(LocalRegion region,
- VersionedObjectList values, Object riKeys, Set set, ServerConnection servConn)
+ VersionedObjectList values, Object riKeys, Set<Map.Entry> set, ServerConnection servConn)
throws IOException {
- for (Iterator<Map.Entry> it = set.iterator(); it.hasNext();) {
- Map.Entry entry = it.next(); // Region.Entry or Map.Entry
+ for (Entry entry : set) {
if (entry instanceof Region.Entry) { // local entries
- VersionTag vt = null;
- Object key = null;
- Object value = null;
+ VersionTag vt;
+ Object key;
+ Object value;
if (entry instanceof EntrySnapshot) {
vt = ((EntrySnapshot) entry).getVersionTag();
key = ((EntrySnapshot) entry).getRegionEntry().getKey();
@@ -1349,14 +1272,13 @@ public abstract class BaseCommand implements Command {
}
}
} else { // Map.Entry (remote entries)
- ArrayList list = (ArrayList) entry.getValue();
+ List list = (List) entry.getValue();
Object value = list.get(0);
VersionTag tag = (VersionTag) list.get(1);
updateValues(values, entry.getKey(), value, tag);
}
- if (values.size() == maximumChunkSize) {
+ if (values.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
- // values.setKeys(null); // Now we need to send keys too.
sendNewRegisterInterestResponseChunk(region, riKeys != null ? riKeys : "ALL_KEYS", values,
false, servConn);
values.clear();
@@ -1369,25 +1291,18 @@ public abstract class BaseCommand implements Command {
ChunkedMessage chunkedResponseMsg = servConn.getRegisterInterestResponseMessage();
chunkedResponseMsg.setNumberOfParts(1);
chunkedResponseMsg.setLastChunk(lastChunk);
- chunkedResponseMsg.addObjPart(list, zipValues);
- String regionName = (region == null) ? " null " : region.getFullPath();
+ chunkedResponseMsg.addObjPart(list, false);
+ String regionName = region == null ? " null " : region.getFullPath();
if (logger.isDebugEnabled()) {
- String str = servConn.getName() + ": Sending" + (lastChunk ? " last " : " ")
- + "register interest response chunk for region: " + regionName + " for keys: " + riKey
- + " chunk=<" + chunkedResponseMsg + ">";
- logger.debug(str);
+ logger.debug(
+ "{}: Sending{}register interest response chunk for region: {} for keys: {} chunk=<{}>",
+ servConn.getName(), lastChunk ? " last " : " ", regionName, riKey, chunkedResponseMsg);
}
-
chunkedResponseMsg.sendChunk(servConn);
}
/**
* Process an interest request of type {@link InterestType#REGULAR_EXPRESSION}
- *
- * @param region the region
- * @param regex the regex
- * @param policy the policy
- * @throws IOException
*/
private static void handleRegEx(LocalRegion region, String regex, InterestResultPolicy policy,
ServerConnection servConn) throws IOException {
@@ -1396,13 +1311,11 @@ public abstract class BaseCommand implements Command {
handleRegExPR((PartitionedRegion) region, regex, policy, servConn);
return;
}
- ArrayList keyList = new ArrayList(maximumChunkSize);
+ List keyList = new ArrayList(MAXIMUM_CHUNK_SIZE);
// Handle the regex pattern
- Pattern keyPattern = Pattern.compile(regex);
if (region != null) {
- for (Iterator it = region.keySet(sendTombstonesInRIResults(servConn, policy)).iterator(); it
- .hasNext();) {
- Object entryKey = it.next();
+ Pattern keyPattern = Pattern.compile(regex);
+ for (Object entryKey : region.keySet(sendTombstonesInRIResults(servConn, policy))) {
if (!(entryKey instanceof String)) {
// key is not a String, cannot apply regex to this entry
continue;
@@ -1412,7 +1325,7 @@ public abstract class BaseCommand implements Command {
continue;
}
- appendInterestResponseKey(region, regex, entryKey, keyList, "regex", servConn);
+ appendInterestResponseKey(region, regex, entryKey, keyList, servConn);
}
}
// Send the last chunk (the only chunk for individual and list keys)
@@ -1422,19 +1335,15 @@ public abstract class BaseCommand implements Command {
/**
* Process an interest request of type {@link InterestType#REGULAR_EXPRESSION}
- *
- * @param region the region
- * @param regex the regex
- * @param policy the policy
- * @throws IOException
*/
private static void handleRegExPR(final PartitionedRegion region, final String regex,
final InterestResultPolicy policy, final ServerConnection servConn) throws IOException {
- final ArrayList keyList = new ArrayList(maximumChunkSize);
+ final List keyList = new ArrayList(MAXIMUM_CHUNK_SIZE);
region.getKeysWithRegEx(regex, sendTombstonesInRIResults(servConn, policy),
new PartitionedRegion.SetCollector() {
+ @Override
public void receiveSet(Set theSet) throws IOException {
- appendInterestResponseKeys(region, regex, theSet, keyList, "regex", servConn);
+ appendInterestResponseKeys(region, regex, theSet, keyList, servConn);
}
});
// Send the last chunk (the only chunk for individual and list keys)
@@ -1444,19 +1353,15 @@ public abstract class BaseCommand implements Command {
/**
* Process an interest request involving a list of keys
- *
- * @param region the region
- * @param keyList the list of keys
- * @param policy the policy
- * @throws IOException
*/
private static void handleListPR(final PartitionedRegion region, final List keyList,
final InterestResultPolicy policy, final ServerConnection servConn) throws IOException {
- final ArrayList newKeyList = new ArrayList(maximumChunkSize);
+ final List newKeyList = new ArrayList(MAXIMUM_CHUNK_SIZE);
region.getKeysWithList(keyList, sendTombstonesInRIResults(servConn, policy),
new PartitionedRegion.SetCollector() {
+ @Override
public void receiveSet(Set theSet) throws IOException {
- appendInterestResponseKeys(region, keyList, theSet, newKeyList, "list", servConn);
+ appendInterestResponseKeys(region, keyList, theSet, newKeyList, servConn);
}
});
// Send the last chunk (the only chunk for individual and list keys)
@@ -1464,34 +1369,29 @@ public abstract class BaseCommand implements Command {
sendRegisterInterestResponseChunk(region, keyList, newKeyList, true, servConn);
}
- @SuppressWarnings("rawtypes")
private static void handleKVList(final LocalRegion region, final List keyList,
boolean serializeValues, final ServerConnection servConn) throws IOException {
- if (region != null && region instanceof PartitionedRegion) {
+ if (region instanceof PartitionedRegion) {
handleKVKeysPR((PartitionedRegion) region, keyList, serializeValues, servConn);
return;
}
- VersionedObjectList values = new VersionedObjectList(maximumChunkSize, true,
- region == null ? true : region.getAttributes().getConcurrencyChecksEnabled(),
- serializeValues);
+ VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true,
+ region == null || region.getAttributes().getConcurrencyChecksEnabled(), serializeValues);
// Handle list of keys
if (region != null) {
- VersionTag versionTag = null;
- Object data = null;
- for (Iterator it = keyList.iterator(); it.hasNext();) {
- Object key = it.next();
+ for (Object key : keyList) {
if (region.containsKey(key) || region.containsTombstone(key)) {
VersionTagHolder versionHolder = createVersionTagHolder();
ClientProxyMembershipID id = servConn == null ? null : servConn.getProxyID();
- data = region.get(key, null, true, true, true, id, versionHolder, true);
- versionTag = versionHolder.getVersionTag();
+ Object data = region.get(key, null, true, true, true, id, versionHolder, true);
+ VersionTag versionTag = versionHolder.getVersionTag();
updateValues(values, key, data, versionTag);
- if (values.size() == maximumChunkSize) {
+ if (values.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
// values.setKeys(null); // Now we need to send keys too.
sendNewRegisterInterestResponseChunk(region, keyList, values, false, servConn);
@@ -1518,27 +1418,25 @@ public abstract class BaseCommand implements Command {
* @param riKey the registerInterest "key" (what the client is interested in)
* @param entryKey key we're responding to
* @param list list to append to
- * @param kind for debugging
*/
private static void appendInterestResponseKey(LocalRegion region, Object riKey, Object entryKey,
- ArrayList list, String kind, ServerConnection servConn) throws IOException {
+ List list, ServerConnection servConn) throws IOException {
list.add(entryKey);
if (logger.isDebugEnabled()) {
logger.debug("{}: appendInterestResponseKey <{}>; list size was {}; region: {}",
servConn.getName(), entryKey, list.size(), region.getFullPath());
}
- if (list.size() == maximumChunkSize) {
+ if (list.size() == MAXIMUM_CHUNK_SIZE) {
// Send the chunk and clear the list
sendRegisterInterestResponseChunk(region, riKey, list, false, servConn);
list.clear();
}
}
- protected static void appendInterestResponseKeys(LocalRegion region, Object riKey,
- Collection entryKeys, ArrayList collector, String riDescr, ServerConnection servConn)
- throws IOException {
- for (Iterator it = entryKeys.iterator(); it.hasNext();) {
- appendInterestResponseKey(region, riKey, it.next(), collector, riDescr, servConn);
+ private static void appendInterestResponseKeys(LocalRegion region, Object riKey,
+ Collection entryKeys, List collector, ServerConnection servConn) throws IOException {
+ for (final Object entryKey : entryKeys) {
+ appendInterestResponseKey(region, riKey, entryKey, collector, servConn);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
index 5f7a8ef..adf702a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
@@ -193,11 +193,11 @@ public abstract class BaseCommandQuery extends BaseCommand {
}
}
- int numberOfChunks = (int) Math.ceil(selectResults.size() * 1.0 / maximumChunkSize);
+ int numberOfChunks = (int) Math.ceil(selectResults.size() * 1.0 / MAXIMUM_CHUNK_SIZE);
if (logger.isTraceEnabled()) {
logger.trace("{}: Query results size: {}: Entries in chunk: {}: Number of chunks: {}",
- servConn.getName(), selectResults.size(), maximumChunkSize, numberOfChunks);
+ servConn.getName(), selectResults.size(), MAXIMUM_CHUNK_SIZE, numberOfChunks);
}
long oldStart = start;
@@ -262,7 +262,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
QueryInvalidException qie =
new QueryInvalidException(LocalizedStrings.BaseCommand_0_QUERYSTRING_IS_1
.toLocalizedString(new Object[] {e.getLocalizedMessage(), queryString}));
- writeQueryResponseException(msg, qie, false, servConn);
+ writeQueryResponseException(msg, qie, servConn);
return false;
} catch (DistributedSystemDisconnectedException se) {
if (msg != null && logger.isDebugEnabled()) {
@@ -282,7 +282,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
if ((defaultQuery).isCanceled()) {
e = new QueryException(defaultQuery.getQueryCanceledException().getMessage(), e.getCause());
}
- writeQueryResponseException(msg, e, false, servConn);
+ writeQueryResponseException(msg, e, servConn);
return false;
} finally {
// Since the query object is being shared in case of bind queries,
@@ -375,8 +375,8 @@ public abstract class BaseCommandQuery extends BaseCommand {
if (logger.isTraceEnabled()) {
logger.trace("{}: Creating chunk: {}", servConn.getName(), j);
}
- Object[] results = new Object[maximumChunkSize];
- for (int i = 0; i < maximumChunkSize; i++) {
+ Object[] results = new Object[MAXIMUM_CHUNK_SIZE];
+ for (int i = 0; i < MAXIMUM_CHUNK_SIZE; i++) {
if ((resultIndex) == selectResults.size()) {
incompleteArray = true;
break;
@@ -427,9 +427,9 @@ public abstract class BaseCommandQuery extends BaseCommand {
if (incompleteArray) {
Object[] newResults;
if (cqQuery != null) {
- newResults = new Object[cqResultIndex % maximumChunkSize];
+ newResults = new Object[cqResultIndex % MAXIMUM_CHUNK_SIZE];
} else {
- newResults = new Object[resultIndex % maximumChunkSize];
+ newResults = new Object[resultIndex % MAXIMUM_CHUNK_SIZE];
}
for (int i = 0; i < newResults.length; i++) {
newResults[i] = results[i];
@@ -463,8 +463,8 @@ public abstract class BaseCommandQuery extends BaseCommand {
if (logger.isTraceEnabled()) {
logger.trace("{}: Creating chunk: {}", servConn.getName(), j);
}
- ObjectPartList serializedObjs = new ObjectPartList(maximumChunkSize, false);
- for (int i = 0; i < maximumChunkSize; i++) {
+ ObjectPartList serializedObjs = new ObjectPartList(MAXIMUM_CHUNK_SIZE, false);
+ for (int i = 0; i < MAXIMUM_CHUNK_SIZE; i++) {
if ((resultIndex) == objs.size()) {
break;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
index e79bfbd..fd5154f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -245,7 +245,7 @@ public class CacheClientNotifier {
public void registerClient(Socket socket, boolean isPrimary, long acceptorId,
boolean notifyBySubscription) throws IOException {
// Since no remote ports were specified in the message, wait for them.
- long startTime = this._statistics.startTime();
+ long startTime = this.statistics.startTime();
DataInputStream dis = new DataInputStream(socket.getInputStream());
DataOutputStream dos = new DataOutputStream(socket.getOutputStream());
@@ -402,7 +402,7 @@ public class CacheClientNotifier {
return;
}
- this._statistics.endClientRegistration(startTime);
+ this.statistics.endClientRegistration(startTime);
}
/**
@@ -481,7 +481,7 @@ public class CacheClientNotifier {
"CacheClientNotifier: A proxy exists for durable client with id {}. This proxy will be reinitialized: {}",
proxyId.getDurableId(), l_proxy);
}
- this._statistics.incDurableReconnectionCount();
+ this.statistics.incDurableReconnectionCount();
l_proxy.getProxyID().updateDurableTimeout(proxyId.getDurableTimeout());
l_proxy.reinitialize(socket, proxyId, this.getCache(), isPrimary, clientConflation,
clientVersion);
@@ -796,7 +796,7 @@ public class CacheClientNotifier {
return;
}
- long startTime = this._statistics.startTime();
+ long startTime = this.statistics.startTime();
ClientUpdateMessageImpl clientMessage;
if (cmsg == null) {
@@ -893,7 +893,7 @@ public class CacheClientNotifier {
singletonRouteClientMessage(conflatable, filterClients);
- this._statistics.endEvent(startTime);
+ this.statistics.endEvent(startTime);
// Cleanup destroyed events in CQ result cache.
// While maintaining the CQ results key caching. the destroy event
@@ -1491,7 +1491,7 @@ public class CacheClientNotifier {
this.clientPingTask.cancel();
// Close the statistics
- this._statistics.close();
+ this.statistics.close();
this.socketCloser.close();
}
@@ -1836,7 +1836,7 @@ public class CacheClientNotifier {
* @return the statistics for the notifier
*/
public CacheClientNotifierStats getStats() {
- return this._statistics;
+ return this.statistics;
}
/**
@@ -1911,7 +1911,7 @@ public class CacheClientNotifier {
} else {
factory = this.getCache().getDistributedSystem();
}
- this._statistics = new CacheClientNotifierStats(factory);
+ this.statistics = new CacheClientNotifierStats(factory);
try {
this.logFrequency = Long.valueOf(System.getProperty(MAX_QUEUE_LOG_FREQUENCY));
@@ -1932,88 +1932,6 @@ public class CacheClientNotifier {
scheduleClientPingTask();
}
- /**
- * this message is used to send interest registration to another server. Since interest
- * registration performs a state-flush operation this message must not transmitted on an ordered
- * socket
- */
- public static class ServerInterestRegistrationMessage extends HighPriorityDistributionMessage
- implements MessageWithReply {
- ClientProxyMembershipID clientId;
- ClientInterestMessageImpl clientMessage;
- int processorId;
-
- ServerInterestRegistrationMessage(ClientProxyMembershipID clientID,
- ClientInterestMessageImpl msg) {
- this.clientId = clientID;
- this.clientMessage = msg;
- }
-
- public ServerInterestRegistrationMessage() {}
-
- static void sendInterestChange(DM dm, ClientProxyMembershipID clientID,
- ClientInterestMessageImpl msg) {
- ServerInterestRegistrationMessage smsg = new ServerInterestRegistrationMessage(clientID, msg);
- Set recipients = dm.getOtherDistributionManagerIds();
- smsg.setRecipients(recipients);
- ReplyProcessor21 rp = new ReplyProcessor21(dm, recipients);
- smsg.processorId = rp.getProcessorId();
- dm.putOutgoing(smsg);
- try {
- rp.waitForReplies();
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- }
- }
-
- @Override
- protected void process(DistributionManager dm) {
- // Get the proxy for the proxy id
- try {
- CacheClientNotifier ccn = CacheClientNotifier.getInstance();
- if (ccn != null) {
- CacheClientProxy proxy = ccn.getClientProxy(clientId);
- // If this VM contains a proxy for the requested proxy id, forward the
- // message on to the proxy for processing
- if (proxy != null) {
- proxy.processInterestMessage(this.clientMessage);
- }
- }
- } finally {
- ReplyMessage reply = new ReplyMessage();
- reply.setProcessorId(this.processorId);
- reply.setRecipient(getSender());
- try {
- dm.putOutgoing(reply);
- } catch (CancelException e) {
- // can't send a reply, so ignore the exception
- }
- }
- }
-
- public int getDSFID() {
- return SERVER_INTEREST_REGISTRATION_MESSAGE;
- }
-
- @Override
- public void toData(DataOutput out) throws IOException {
- super.toData(out);
- out.writeInt(this.processorId);
- InternalDataSerializer.invokeToData(this.clientId, out);
- InternalDataSerializer.invokeToData(this.clientMessage, out);
- }
-
- @Override
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- super.fromData(in);
- this.processorId = in.readInt();
- this.clientId = new ClientProxyMembershipID();
- InternalDataSerializer.invokeFromData(this.clientId, in);
- this.clientMessage = new ClientInterestMessageImpl();
- InternalDataSerializer.invokeFromData(this.clientMessage, in);
- }
- }
-
protected void deliverInterestChange(ClientProxyMembershipID proxyID,
ClientInterestMessageImpl message) {
DM dm = ((InternalDistributedSystem) this.getCache().getDistributedSystem())
@@ -2032,11 +1950,11 @@ public class CacheClientNotifier {
public void addCompiledQuery(DefaultQuery query) {
if (this.compiledQueries.putIfAbsent(query.getQueryString(), query) == null) {
// Added successfully.
- this._statistics.incCompiledQueryCount(1);
+ this.statistics.incCompiledQueryCount(1);
if (logger.isDebugEnabled()) {
logger.debug(
"Added compiled query into ccn.compliedQueries list. Query: {}. Total compiled queries: {}",
- query.getQueryString(), this._statistics.getCompiledQueryCount());
+ query.getQueryString(), this.statistics.getCompiledQueryCount());
}
// Start the clearIdleCompiledQueries thread.
startCompiledQueryCleanupThread();
@@ -2049,12 +1967,12 @@ public class CacheClientNotifier {
private void clearCompiledQueries() {
if (this.compiledQueries.size() > 0) {
- this._statistics.incCompiledQueryCount(-(this.compiledQueries.size()));
+ this.statistics.incCompiledQueryCount(-(this.compiledQueries.size()));
this.compiledQueries.clear();
if (logger.isDebugEnabled()) {
logger.debug(
"Removed all compiled queries from ccn.compliedQueries list. Total compiled queries: {}",
- this._statistics.getCompiledQueryCount());
+ this.statistics.getCompiledQueryCount());
}
}
}
@@ -2082,11 +2000,11 @@ public class CacheClientNotifier {
} else {
if (compiledQueries.remove(e.getKey()) != null) {
// If successfully removed decrement the counter.
- _statistics.incCompiledQueryCount(-1);
+ statistics.incCompiledQueryCount(-1);
if (isDebugEnabled) {
logger.debug("Removed compiled query from ccn.compliedQueries list. Query: "
+ q.getQueryString() + ". Total compiled queries are : "
- + _statistics.getCompiledQueryCount());
+ + statistics.getCompiledQueryCount());
}
}
}
@@ -2224,7 +2142,7 @@ public class CacheClientNotifier {
/**
* The statistics for this notifier
*/
- protected final CacheClientNotifierStats _statistics;
+ protected final CacheClientNotifierStats statistics;
/**
* The <code>InterestRegistrationListener</code> instances registered in this VM. This is used
http://git-wip-us.apache.org/repos/asf/geode/blob/d1ec508e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 75c89ab..8450db9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -1951,7 +1951,7 @@ public class CacheClientProxy implements ClientSession {
// Close the proxy
terminateDispatching(false);
- _cacheClientNotifier._statistics.incQueueDroppedCount();
+ _cacheClientNotifier.statistics.incQueueDroppedCount();
/**
* Setting the expiration task to null again and cancelling existing one, if any. See
@@ -2850,7 +2850,7 @@ public class CacheClientProxy implements ClientSession {
try {
this._messageQueue.put(clientMessage);
if (this._proxy.isPaused() && this._proxy.isDurable()) {
- this._proxy._cacheClientNotifier._statistics.incEventEnqueuedWhileClientAwayCount();
+ this._proxy._cacheClientNotifier.statistics.incEventEnqueuedWhileClientAwayCount();
if (logger.isDebugEnabled()) {
logger.debug("{}: Queued message while Durable Client is away {}", this, clientMessage);
}