Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C3DA8200CA8 for ; Thu, 1 Jun 2017 01:12:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C28FF160BDB; Wed, 31 May 2017 23:12:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1ECC4160BE6 for ; Thu, 1 Jun 2017 01:12:50 +0200 (CEST) Received: (qmail 78939 invoked by uid 500); 31 May 2017 23:12:50 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 78784 invoked by uid 99); 31 May 2017 23:12:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2017 23:12:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB01CE382D; Wed, 31 May 2017 23:12:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.apache.org Date: Wed, 31 May 2017 23:12:58 -0000 Message-Id: <9e4b9ac0e9ef496880c573f70e07c547@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/14] geode git commit: GEODE-2632: refactoring preparations for SecurityService and BaseCommand changes archived-at: Wed, 31 May 2017 23:12:53 -0000 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(); 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()); } } @@ -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); }