This is an automated email from the ASF dual-hosted git repository. boglesby pushed a commit to branch feature/GEM-1772 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9147b1e25d2398a63f175e2c273e731d749ef39a Author: Barry Oglesby <[email protected]> AuthorDate: Wed Jun 20 13:01:11 2018 -0700 GEM-1772: Added additional debugging --- .../distributed/internal/ReplyProcessor21.java | 6 ++-- .../distributed/internal/direct/DirectChannel.java | 8 ++--- .../internal/cache/DistributedCacheOperation.java | 14 +++++--- .../internal/cache/DistributedPutAllOperation.java | 14 +++++--- .../internal/cache/InitialImageOperation.java | 37 ++++++++++++---------- .../cache/partitioned/PutAllPRMessage.java | 16 +++++----- 6 files changed, 54 insertions(+), 41 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java index d3cf1ad..fecfa41 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java @@ -396,9 +396,9 @@ public class ReplyProcessor21 implements MembershipListener { protected void process(DistributionMessage msg, boolean warn) { if (msg instanceof PutAllPRMessage.PutAllReplyMessage) { - //if (logger.isDebugEnabled()) { - logger.warn("XXX {} got process({}) from {}", this, msg, msg.getSender()); - //} + // if (logger.isDebugEnabled()) { + logger.warn("XXX {} got process({}) from {}", this, msg, msg.getSender()); + // } } if (msg instanceof ReplyMessage) { ReplyException ex = ((ReplyMessage) msg).getException(); diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java index eaa062e..664b600 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java @@ -317,10 +317,10 @@ public class DirectChannel { directMsg.registerProcessor(); } if (msg instanceof DistributedPutAllOperation.PutAllMessage) { - //if (logger.isDebugEnabled()) { - logger.warn("XXX DirectChannel sendToMany Sending ({}) to {} peers ({}) via tcp/ip", - msg, p_destinations.length, Arrays.toString(p_destinations)); - //} + // if (logger.isDebugEnabled()) { + logger.warn("XXX DirectChannel sendToMany Sending ({}) to {} peers ({}) via tcp/ip", + msg, p_destinations.length, Arrays.toString(p_destinations)); + // } } try { diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java index 35dca1d..86ad5e0 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java @@ -453,10 +453,12 @@ public abstract class DistributedCacheOperation { } if (this instanceof DistributedPutAllOperation) { - //if (logger.isDebugEnabled()) { - logger.warn("XXX DistributedPutAllOperation _distribute recipients for {}: {} with adjunct messages to: {}", this, recipients, - adjunctRecipients); - //} + // if (logger.isDebugEnabled()) { + logger.warn( + "XXX DistributedPutAllOperation _distribute recipients for {}: {} with adjunct messages to: {}", + this, recipients, + adjunctRecipients); + // } } if (shouldAck) { @@ -607,7 +609,9 @@ public abstract class DistributedCacheOperation { } if (failures != null && !failures.isEmpty()) { - logger.warn("XXX DistributedPutAllOperation _distribute Failed sending ({}) to {} while processing event:{}", msg, failures, event); + logger.warn( + "XXX DistributedPutAllOperation _distribute Failed sending ({}) to {} while processing event:{}", + msg, failures, event); } Set<InternalDistributedMember> adjunctRecipientsWithNoCacheServer = diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java index 29c38af..70a97eb 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java @@ -1175,13 +1175,17 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation { public void run() { final boolean isDebugEnabled = logger.isDebugEnabled(); for (int i = 0; i < putAllDataSize; ++i) { - //if (isDebugEnabled) { - logger.warn("XXX PutAllMessage basicOperateOnRegion putAll processing {} with {} sender={}", putAllData[i], - putAllData[i].versionTag, sender); - //} + // if (isDebugEnabled) { + logger.warn( + "XXX PutAllMessage basicOperateOnRegion putAll processing {} with {} sender={}", + putAllData[i], + putAllData[i].versionTag, sender); + // } putAllData[i].setSender(sender); doEntryPut(putAllData[i], rgn); - logger.warn("XXX PutAllMessage basicOperateOnRegion putAll done processing {} with {} sender={}", putAllData[i], + logger.warn( + "XXX PutAllMessage basicOperateOnRegion putAll done processing {} with {} sender={}", + putAllData[i], putAllData[i].versionTag, sender); } } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java index a265cdd..5621090 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java @@ -563,7 +563,8 @@ public class InitialImageOperation { } if (this.gotImage) { // TODO add localizedString - logger.info("XXX {} is done getting image from {}. isDeltaGII is {}", this.region.getName(), + logger.info("XXX {} is done getting image from {}. isDeltaGII is {}", + this.region.getName(), recipient, this.isDeltaGII); } else { // TODO add localizedString @@ -1304,9 +1305,11 @@ public class InitialImageOperation { // bug 37461: don't allow abort flag to be reset boolean isAborted = this.abort; // volatile fetch if (!isAborted) { - logger.warn("XXX ImageProcessor.process about to process chunk entries=" + m.entries); + logger + .warn("XXX ImageProcessor.process about to process chunk entries=" + m.entries); isAborted = !processChunk(m.entries, m.getSender(), m.remoteVersion); - logger.warn("XXX ImageProcessor.process processed chunk entries isAborted=" + isAborted); + logger.warn( + "XXX ImageProcessor.process processed chunk entries isAborted=" + isAborted); if (isAborted) { this.abort = true; // volatile store } else { @@ -1672,9 +1675,9 @@ public class InitialImageOperation { final int seriesNum = 0; // chunkEntries returns false if didn't finish - //if (isGiiDebugEnabled) { - logger.warn("XXX RequestImageMessage: Starting chunkEntries for {}", rgn.getFullPath()); - //} + // if (isGiiDebugEnabled) { + logger.warn("XXX RequestImageMessage: Starting chunkEntries for {}", rgn.getFullPath()); + // } final InitialImageFlowControl flowControl = InitialImageFlowControl.register(dm, getSender()); @@ -1732,17 +1735,17 @@ public class InitialImageOperation { && rgn.getConcurrencyChecksEnabled()) { synchronized (rgn.getCache().getTombstoneService().getBlockGCLock()) { if (goWithFullGII(rgn, this.versionVector)) { - //if (isGiiDebugEnabled) { - logger.warn("XXX Doing full GII for {}", rgn.getFullPath()); - //} + // if (isGiiDebugEnabled) { + logger.warn("XXX Doing full GII for {}", rgn.getFullPath()); + // } this.versionVector = null; // full GII } else { // lock GIILock only for deltaGII int count = rgn.getCache().getTombstoneService().incrementGCBlockCount(); markedOngoingGII = true; - //if (isGiiDebugEnabled) { + // if (isGiiDebugEnabled) { logger.warn("XX Doing delta GII for {}", rgn.getFullPath()); - //} + // } } } } @@ -1780,7 +1783,8 @@ public class InitialImageOperation { if (this.last && rgn.getVersionVector() != null) { gcVersions = rgn.getVersionVector().getMemberToGCVersion(); } - logger.warn("XXX RequestImageMessage.executeWith about to send chunk " + (msgNum+1)); + logger.warn("XXX RequestImageMessage.executeWith about to send chunk " + + (msgNum + 1)); replyWithData(dm, entries, seriesNum, msgNum++, numSeries, this.last, flowControlId, versionVector != null, holderToSend, gcVersions); @@ -1794,10 +1798,11 @@ public class InitialImageOperation { }); - //if (isGiiDebugEnabled) { - logger.warn("XXX RequestImageMessage: ended chunkEntries for {}; finished = {}", rgn.getFullPath(), - finished); - //} + // if (isGiiDebugEnabled) { + logger.warn("XXX RequestImageMessage: ended chunkEntries for {}; finished = {}", + rgn.getFullPath(), + finished); + // } // Call to chunkEntries above will have sent at least one // reply with last==true for the last message. (unless doing abortTest or diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java index cca7891..aae61a2 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutAllPRMessage.java @@ -194,9 +194,9 @@ public class PutAllPRMessage extends PartitionMessageWithDirectReply { PutAllResponse p = new PutAllResponse(r.getSystem(), recipients); initMessage(r, recipients, false, p); setTransactionDistributed(r.getCache().getTxManager().isDistributed()); - //if (logger.isDebugEnabled()) { - logger.warn("XXX PutAllPRMessage.send: recipient is {}, msg is {}", recipient, this); - //} + // if (logger.isDebugEnabled()) { + logger.warn("XXX PutAllPRMessage.send: recipient is {}, msg is {}", recipient, this); + // } Set failures = r.getDistributionManager().putOutgoing(this); if (failures != null && failures.size() > 0) { @@ -402,11 +402,11 @@ public class PutAllPRMessage extends PartitionMessageWithDirectReply { baseEvent.setContext(this.bridgeContext); } baseEvent.setPossibleDuplicate(this.posDup); - //if (logger.isDebugEnabled()) { - logger.warn( - "XXX PutAllPRMessage.doLocalPutAll: eventSender is {}, baseEvent is {}, msg is {}", - eventSender, baseEvent, this); - //} + // if (logger.isDebugEnabled()) { + logger.warn( + "XXX PutAllPRMessage.doLocalPutAll: eventSender is {}, baseEvent is {}, msg is {}", + eventSender, baseEvent, this); + // } dpao = new DistributedPutAllOperation(baseEvent, putAllPRDataSize, false); }
