You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2022/06/01 19:36:41 UTC
[geode] branch develop updated: GEODE-6588: Fixed mismatch of placeholders and arguments (#7375)
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 992208e76e GEODE-6588: Fixed mismatch of placeholders and arguments (#7375)
992208e76e is described below
commit 992208e76e9c84ac16bdf6fec167d4cd6c257e0e
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Wed Jun 1 12:36:36 2022 -0700
GEODE-6588: Fixed mismatch of placeholders and arguments (#7375)
---
.../geode/internal/jta/dunit/LoginTimeOutDUnitTest.java | 8 ++++----
.../apache/geode/cache/client/internal/QueueStateImpl.java | 2 +-
.../org/apache/geode/cache/client/internal/RemoveAllOp.java | 2 +-
.../geode/cache/client/internal/SingleHopClientExecutor.java | 8 ++++----
.../geode/distributed/internal/locks/DLockGrantor.java | 4 ++--
.../org/apache/geode/internal/cache/BucketRegionQueue.java | 6 +++---
.../org/apache/geode/internal/cache/EntryExpiryTask.java | 5 ++---
.../org/apache/geode/internal/cache/PartitionedRegion.java | 8 ++++----
.../geode/internal/cache/PartitionedRegionDataStore.java | 12 ++++++------
.../geode/internal/cache/UpdateAttributesProcessor.java | 4 ++--
.../cache/execute/ServerToClientFunctionResultSender.java | 10 +++++-----
.../cache/execute/ServerToClientFunctionResultSender65.java | 2 +-
.../geode/internal/cache/locks/TXLessorDepartureHandler.java | 5 +++--
.../internal/cache/partitioned/ContainsKeyValueMessage.java | 2 +-
.../PartitionedRegionFunctionStreamingMessage.java | 2 +-
.../geode/internal/cache/tier/sockets/AcceptorImpl.java | 2 +-
.../geode/internal/cache/tier/sockets/command/Size.java | 2 +-
.../apache/geode/internal/cache/tx/RemoteSizeMessage.java | 2 +-
.../apache/geode/internal/datasource/DataSourceFactory.java | 2 +-
.../management/internal/MonitoringRegionCacheListener.java | 2 +-
.../geode/management/internal/SystemManagementService.java | 12 ++++++------
.../management/internal/cli/functions/DeployFunction.java | 2 +-
.../internal/membership/gms/messenger/JGroupsMessenger.java | 4 ++--
23 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
index 1e622c84bc..694017b67b 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
@@ -263,7 +263,7 @@ public class LoginTimeOutDUnitTest extends JUnit4DistributedTestCase {
logger.debug("Naming Exception caught in lookup: " + e);
fail("failed in naming lookup: " + e);
} catch (Exception e) {
- logger.debug("Exception caught during naming lookup: {}", e);
+ logger.debug("Exception caught during naming lookup:", e);
fail("failed in naming lookup: " + e);
}
try {
@@ -271,7 +271,7 @@ public class LoginTimeOutDUnitTest extends JUnit4DistributedTestCase {
ds.getConnection();
}
} catch (Exception e) {
- logger.debug("Exception caught in runTest1: {}", e);
+ logger.debug("Exception caught in runTest1:", e);
fail("Exception caught in runTest1: " + e);
}
} finally {
@@ -325,11 +325,11 @@ public class LoginTimeOutDUnitTest extends JUnit4DistributedTestCase {
fail("expected a Login time-out exceeded");
} catch (SQLException sqle) {
if (sqle.getMessage().indexOf("Login time-out exceeded") == -1) {
- logger.debug("Exception caught in runTest2: {}", sqle);
+ logger.debug("Exception caught in runTest2:", sqle);
fail("failed because of unhandled exception : " + sqle);
}
} catch (Exception e) {
- logger.debug("Exception caught in runTest2: {}", e);
+ logger.debug("Exception caught in runTest2:", e);
fail("failed because of unhandled exception : " + e);
}
} finally {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
index 8710da832c..cf130113a7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
@@ -310,7 +310,7 @@ public class QueueStateImpl implements QueueState {
success = true;
} catch (Exception ex) {
if (logger.isDebugEnabled()) {
- logger.debug("Exception while sending an ack to the primary server: {}", ex);
+ logger.debug("Exception while sending an ack to the primary server:", ex);
}
} finally {
if (!success) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
index a378107938..4f0496212e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
@@ -130,7 +130,7 @@ public class RemoveAllOp {
}
}
} catch (RuntimeException ex) {
- logger.debug("single-hop removeAll encountered unexpected exception: {}", ex);
+ logger.debug("single-hop removeAll encountered unexpected exception:", ex);
throw ex;
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
index 5b549c8fb3..7f7f5b44e0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
@@ -123,7 +123,7 @@ public class SingleHopClientExecutor {
if (ee.getCause() instanceof InternalFunctionInvocationTargetException) {
if (isDebugEnabled) {
logger.debug(
- "ExecuteRegionFunctionSingleHopOp#ExecutionException.InternalFunctionInvocationTargetException : Caused by :{}",
+ "ExecuteRegionFunctionSingleHopOp#ExecutionException.InternalFunctionInvocationTargetException: Caused by:",
ee.getCause());
}
try {
@@ -152,7 +152,7 @@ public class SingleHopClientExecutor {
} else if (ee.getCause() instanceof FunctionException) {
if (isDebugEnabled) {
logger.debug(
- "ExecuteRegionFunctionSingleHopOp#ExecutionException.FunctionException : Caused by :{}",
+ "ExecuteRegionFunctionSingleHopOp#ExecutionException.FunctionException: Caused by:",
ee.getCause());
}
FunctionException fe = (FunctionException) ee.getCause();
@@ -164,7 +164,7 @@ public class SingleHopClientExecutor {
} else if (ee.getCause() instanceof ServerOperationException) {
if (isDebugEnabled) {
logger.debug(
- "ExecuteRegionFunctionSingleHopOp#ExecutionException.ServerOperationException : Caused by :{}",
+ "ExecuteRegionFunctionSingleHopOp#ExecutionException.ServerOperationException: Caused by:",
ee.getCause());
}
ServerOperationException soe = (ServerOperationException) ee.getCause();
@@ -335,7 +335,7 @@ public class SingleHopClientExecutor {
} catch (ExecutionException ee) {
if (ee.getCause() instanceof ServerOperationException) {
if (logger.isDebugEnabled()) {
- logger.debug("GetAllOp#ExecutionException.ServerOperationException : Caused by :{}",
+ logger.debug("GetAllOp#ExecutionException.ServerOperationException: Caused by:",
ee.getCause());
}
throw (ServerOperationException) ee.getCause();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
index 199e5286ee..40c030f4e7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
@@ -909,7 +909,7 @@ public class DLockGrantor {
// skipping because member is no longer in view
if (isDebugEnabled_DLS) {
logger.trace(LogMarker.DLS_VERBOSE,
- "Initialization of held locks is skipping {} because owner {} is not in view: ",
+ "Initialization of held locks is skipping {} because owner {} is not in view: {}",
token, owner, members);
}
continue;
@@ -2234,7 +2234,7 @@ public class DLockGrantor {
synchronized (suspendLock) {
checkDestroyed();
if (!dm.isCurrentMember(request.getSender())) {
- logger.info(LogMarker.DLS_MARKER, "Ignoring lock request from non-member: %s", request);
+ logger.info(LogMarker.DLS_MARKER, "Ignoring lock request from non-member: {}", request);
return false;
}
Integer integer = (Integer) readLockCountMap.get(rThread);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
index 71be25a4e8..aba62d4d2a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
@@ -145,7 +145,7 @@ public class BucketRegionQueue extends AbstractBucketRegionQueue {
if (logger.isDebugEnabled()) {
logger.debug(
- "For bucket {} ,total keys recovered are : {} last key recovered is : {} and the seqNo is ",
+ "For bucket:{}, total keys recovered are:{} last key recovered is:{} and the seqNo is:{}",
getId(), eventSeqNumDeque.size(), lastKeyRecovered, getEventSeqNum());
}
}
@@ -188,11 +188,11 @@ public class BucketRegionQueue extends AbstractBucketRegionQueue {
// EntryNotFoundException to be thrown.
destroyKey(key, true);
if (isDebugEnabled) {
- logger.debug("Destroyed {} from bucket: ", key, getId());
+ logger.debug("Destroyed {} from bucket: {}", key, getId());
}
} catch (ForceReattemptException fe) {
if (isDebugEnabled) {
- logger.debug("Bucket :{} moved to other member", getId());
+ logger.debug("Bucket: {} moved to other member", getId());
}
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
index 073c5d31b2..14e960ec63 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
@@ -326,10 +326,9 @@ public class EntryExpiryTask extends ExpiryTask {
}
if (hasExpired(getNow(), expTime)) {
if (logger.isTraceEnabled()) {
- // NOTE: original finer message used this.toString() twice
logger.trace(
- "{}.performTimeout().getExpirationTime() is {}; {}.expire({}). ttlExpiration: {}, idleExpiration: {}, ttlAttrs: {}, idleAttrs: {} action is: {}",
- this, expTime, this, action, ttl, idle, getTTLAttributes(), getIdleAttributes());
+ "{}.performTimeout().getExpirationTime() is {}; ttlExpiration:{}, idleExpiration:{}, ttlAttrs:{}, idleAttrs:{} action is:{}",
+ this, expTime, ttl, idle, getTTLAttributes(), getIdleAttributes(), action);
}
expire(action, isPending);
return;
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 f75ad9d2c2..03dd3de027 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
@@ -5148,12 +5148,12 @@ public class PartitionedRegion extends LocalRegion
PartitionedRegion pr = (PartitionedRegion) o;
if (pr.getPRId() == prId) {
if (!pr.getRegionIdentifier().equals(regionId)) {
- logger.warn("{} is using PRID {} for {} but this process maps that PRID to {}",
- new Object[] {sender.toString(), prId, pr.getRegionIdentifier()});
+ logger.warn("{} is using PRID {} for regionId {} but this process maps that PRID to {}",
+ sender, prId, regionId, pr.getRegionIdentifier());
}
} else if (pr.getRegionIdentifier().equals(regionId)) {
logger.warn("{} is using PRID {} for {} but this process is using PRID {}",
- new Object[] {sender, prId, pr.getRegionIdentifier(), pr.getPRId()});
+ sender, prId, pr.getRegionIdentifier(), pr.getPRId());
}
}
}
@@ -5635,7 +5635,7 @@ public class PartitionedRegion extends LocalRegion
}
if (savedFirstRuntimeException != null
&& savedFirstRuntimeException instanceof DistributedSystemDisconnectedException) {
- logger.warn("cleanupFailedInitialization originally failed with {}",
+ logger.warn("cleanupFailedInitialization originally failed with:",
savedFirstRuntimeException);
throw (DistributedSystemDisconnectedException) savedFirstRuntimeException;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
index 3cfa9b09b0..7bfb4f17f1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
@@ -597,7 +597,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
ProxyBucketRegion buk = partitionedRegion.getRegionAdvisor().getProxyBucketArray()[bucketId];
if (!buk.checkBucketRedundancyBeforeGrab(moveSource, replaceOffineData)) {
if (logger.isDebugEnabled()) {
- logger.debug("Redundancy already satisfied. current owners=",
+ logger.debug("Redundancy already satisfied. current owners:{}",
partitionedRegion.getRegionAdvisor().getBucketOwners(bucketId));
}
throw new RedundancyAlreadyMetException();
@@ -1257,7 +1257,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
final long curBytes = bytesInUse.get();
if (isDebugEnabled) {
logger.debug(
- "canAccomodateMoreBytes: bytes = {} allocatedMemory = {} newAllocatedSize = {} thresholdSize = ",
+ "canAccomodateMoreBytes: bytes = {} allocatedMemory = {} newAllocatedSize = {} thresholdSize = {}",
bytes, curBytes, (curBytes + bytes), maximumLocalBytes);
}
if ((curBytes + bytes) < maximumLocalBytes) {
@@ -2953,14 +2953,14 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
long start = stats.startFunctionExecution(function.hasResult());
try {
if (logger.isDebugEnabled()) {
- logger.debug("Executing Function: {} on Remote Node with context: ", function.getId(),
+ logger.debug("Executing Function:{} on Remote Node with context:{}", function.getId(),
prContext);
}
function.execute(prContext);
stats.endFunctionExecution(start, function.hasResult());
} catch (FunctionException functionException) {
if (logger.isDebugEnabled()) {
- logger.debug("FunctionException occurred on remote node while executing Function: {}",
+ logger.debug("FunctionException occurred on remote node while executing Function:{}",
function.getId(), functionException);
}
stats.endFunctionExecutionWithException(start, function.hasResult());
@@ -3022,7 +3022,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
// If this is a registration event, add interest for this key
if (isRegister) {
if (logger.isDebugEnabled()) {
- logger.debug("PartitionedRegionDataStore for {} adding interest for: ",
+ logger.debug("PartitionedRegionDataStore for {} adding interest for: {}",
partitionedRegion.getFullPath(), key);
}
if (references == null) {
@@ -3033,7 +3033,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
} else {
// If this is an unregistration event, remove interest for this key
if (logger.isDebugEnabled()) {
- logger.debug("PartitionedRegionDataStore for {} removing interest for: ",
+ logger.debug("PartitionedRegionDataStore for {} removing interest for: {}",
partitionedRegion.getFullPath(), key);
}
if (references != null) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
index 6635b1aac7..5b4299e884 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
@@ -393,7 +393,7 @@ public class UpdateAttributesProcessor {
if (exception != null) {
m.setException(exception);
if (logger.isDebugEnabled()) {
- logger.debug("Replying with exception: {}" + m, exception);
+ logger.debug("Replying with exception:" + m, exception);
}
}
m.setRecipient(recipient);
@@ -462,7 +462,7 @@ public class UpdateAttributesProcessor {
if (exception != null) {
m.setException(exception);
if (logger.isDebugEnabled()) {
- logger.debug("Replying with exception: {}" + m, exception);
+ logger.debug("Replying with exception:" + m, exception);
}
}
m.setRecipient(recipient);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java
index 8f49951fb9..d07434be7a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java
@@ -98,7 +98,7 @@ public class ServerToClientFunctionResultSender implements ResultSender {
}
if (logger.isDebugEnabled()) {
- logger.debug("ServerToClientFunctionResultSender sending last result1 {} " + oneResult);
+ logger.debug("ServerToClientFunctionResultSender sending last result1 {}", oneResult);
}
try {
authorizeResult(oneResult);
@@ -145,7 +145,7 @@ public class ServerToClientFunctionResultSender implements ResultSender {
return;
}
if (logger.isDebugEnabled()) {
- logger.debug("ServerToClientFunctionResultSender sending last result2 {} " + oneResult);
+ logger.debug("ServerToClientFunctionResultSender sending last result2 {}", oneResult);
}
try {
authorizeResult(oneResult);
@@ -192,7 +192,7 @@ public class ServerToClientFunctionResultSender implements ResultSender {
return;
}
if (logger.isDebugEnabled()) {
- logger.debug("ServerToClientFunctionResultSender sending result1 {} " + oneResult);
+ logger.debug("ServerToClientFunctionResultSender sending result1 {}", oneResult);
}
try {
authorizeResult(oneResult);
@@ -234,7 +234,7 @@ public class ServerToClientFunctionResultSender implements ResultSender {
return;
}
if (logger.isDebugEnabled()) {
- logger.debug("ServerToClientFunctionResultSender sending result2 {} " + oneResult);
+ logger.debug("ServerToClientFunctionResultSender sending result2 {}", oneResult);
}
try {
authorizeResult(oneResult);
@@ -310,7 +310,7 @@ public class ServerToClientFunctionResultSender implements ResultSender {
return;
}
if (logger.isDebugEnabled()) {
- logger.debug("ServerToClientFunctionResultSender setting exception {} ", exception);
+ logger.debug("ServerToClientFunctionResultSender setting exception:", exception);
}
synchronized (msg) {
if (!sc.getTransientFlag(Command.RESPONDED)) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender65.java
index 5021375eca..55dbe28dc1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender65.java
@@ -120,7 +120,7 @@ public class ServerToClientFunctionResultSender65 extends ServerToClientFunction
}
try {
if (logger.isDebugEnabled()) {
- logger.debug("ServerToClientFunctionResultSender sending last result2 {} " + oneResult);
+ logger.debug("ServerToClientFunctionResultSender sending last result2 {}", oneResult);
}
authorizeResult(oneResult);
if (!fn.hasResult()) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLessorDepartureHandler.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLessorDepartureHandler.java
index 698c75ac74..208b5acd05 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLessorDepartureHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLessorDepartureHandler.java
@@ -108,8 +108,9 @@ public class TXLessorDepartureHandler implements DLockLessorDepartureHandler {
// this shouldn't happen unless we're shutting down or someone has set a size constraint
// on the waiting-pool using a system property
if (!dm.getCancelCriterion().isCancelInProgress()) {
- logger.warn("Unable to schedule background cleanup of transactions for departed member {}."
- + " Performing in-line cleanup of the transactions.");
+ logger.warn(
+ "Unable to schedule background cleanup of transactions for departed member {}. Performing in-line cleanup of the transactions.",
+ owner);
recoverTx.run();
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
index 10a7e303ff..48df9bdd28 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
@@ -127,7 +127,7 @@ public class ContainsKeyValueMessage extends PartitionMessageWithDirectReply {
ContainsKeyValueReplyMessage.send(getSender(), getProcessorId(), getReplySender(dm),
replyVal);
} else {
- logger.fatal("Partitioned Region <> is not configured to store data",
+ logger.fatal("Partitioned Region {} is not configured to store data",
r.getFullPath());
ForceReattemptException fre = new ForceReattemptException(
String.format("Partitioned Region %s on %s is not configured to store data",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
index 2f777af1ad..d3a15b6cf6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
@@ -140,7 +140,7 @@ public class PartitionedRegionFunctionStreamingMessage extends PartitionMessage
sendResultsInOrder);
if (logger.isDebugEnabled()) {
- logger.debug("Sending reply message count: {} to co-ordinating node");
+ logger.debug("Sending reply message count: {} to co-ordinating node", msgNum);
}
replyMsgNum++;
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 145f082eb6..f7e55b4e7f 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
@@ -1304,7 +1304,7 @@ public class AcceptorImpl implements Acceptor, Runnable {
closeSocket(socket);
if (isRunning()) {
if (logger.isDebugEnabled()) {
- logger.debug("Aborted due to interrupt: {}", e);
+ logger.debug("Aborted due to interrupt:", e);
}
}
} catch (IOException e) {
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 e5a7996d0c..7abacff2ec 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
@@ -71,7 +71,7 @@ public class Size extends BaseCommand {
String regionName = regionNamePart.getCachedString();
if (regionName == null) {
- logger.warn("The input region name for the %s request is null", "size");
+ logger.warn("The input region name for the size request is null");
writeErrorResponse(clientMessage, MessageType.SIZE_ERROR,
"The input region name for the size request is null",
serverConnection);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteSizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteSizeMessage.java
index b3f3bdc7ff..578821463a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteSizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteSizeMessage.java
@@ -161,7 +161,7 @@ public class RemoteSizeMessage extends RemoteOperationMessage {
final long startTime = getTimestamp();
if (logger.isTraceEnabled(LogMarker.DM_VERBOSE)) {
logger.trace(LogMarker.DM_VERBOSE,
- "{}: process invoking reply processor with processorId: {}", processorId);
+ "{}: process invoking reply processor with processorId: {}", this, processorId);
}
if (processor == null) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
index 6cbce6568a..88ab90c755 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
@@ -131,7 +131,7 @@ public class DataSourceFactory {
cf = mcf.createConnectionFactory((ConnectionManager) cm);
} catch (Exception ex) {
logger.error(
- "DataSourceFactory::getManagedDataSource: Exception in creating managed connection factory. Exception string, %s",
+ "DataSourceFactory::getManagedDataSource: Exception in creating managed connection factory. Exception string:{}",
ex.toString());
throw new DataSourceCreateException(
String.format(
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MonitoringRegionCacheListener.java b/geode-core/src/main/java/org/apache/geode/management/internal/MonitoringRegionCacheListener.java
index 8f4ca471cb..037d1f11f1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MonitoringRegionCacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MonitoringRegionCacheListener.java
@@ -72,7 +72,7 @@ public class MonitoringRegionCacheListener extends CacheListenerAdapter<String,
} catch (Exception e) {
if (logger.isDebugEnabled()) {
- logger.debug("Aggregation Failed failed for {} with exception {}", e);
+ logger.debug("Aggregation Failed failed for " + objectName + " with exception", e);
}
}
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 7d117faa0c..74a6d9bd35 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
@@ -769,8 +769,8 @@ public class SystemManagementService extends BaseManagementService {
try {
listener.memberJoined(event);
} catch (Exception e) {
- logger.error("Could not invoke listener event memberJoined for listener[{}] due to ",
- listener.getClass(), e.getMessage(), e);
+ logger.error("Could not invoke listener event memberJoined for listener["
+ + listener.getClass() + "] due to " + e.getMessage(), e);
}
}
}
@@ -782,8 +782,8 @@ public class SystemManagementService extends BaseManagementService {
try {
listener.memberCrashed(event);
} catch (Exception e) {
- logger.error("Could not invoke listener event memberCrashed for listener[{}] due to ",
- listener.getClass(), e.getMessage(), e);
+ logger.error("Could not invoke listener event memberCrashed for listener["
+ + listener.getClass() + "] due to " + e.getMessage(), e);
}
}
} else {
@@ -791,8 +791,8 @@ public class SystemManagementService extends BaseManagementService {
try {
listener.memberLeft(event);
} catch (Exception e) {
- logger.error("Could not invoke listener event memberLeft for listener[{}] due to ",
- listener.getClass(), e.getMessage(), e);
+ logger.error("Could not invoke listener event memberLeft for listener["
+ + listener.getClass() + "] due to " + e.getMessage(), e);
}
}
}
diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
index dea54b5ef7..6939bfd06a 100644
--- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
+++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
@@ -91,7 +91,7 @@ public class DeployFunction implements InternalFunction<Object[]> {
functionResult.forEach(entry -> {
if (entry != null) {
if (entry instanceof Throwable) {
- logger.warn("Error executing CacheRealizationFunction.", entry);
+ logger.warn("Error executing CacheRealizationFunction.", (Throwable) entry);
} else if (entry instanceof RealizationResult) {
RealizationResult realizationResult = (RealizationResult) entry;
results.add(new DeploymentInfo(memberId,
diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index ee5ffbb03a..c9df3e2255 100644
--- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -337,7 +337,7 @@ public class JGroupsMessenger<ID extends MemberIdentifier> implements Messenger<
Object oldDSMembershipInfo = services.getConfig().getOldMembershipInfo();
if (oldDSMembershipInfo != null) {
if (logger.isDebugEnabled()) {
- logger.debug("Reusing JGroups channel from previous system", properties);
+ logger.debug("Reusing JGroups channel from previous system {}", properties);
}
MembershipInformationImpl oldInfo = (MembershipInformationImpl) oldDSMembershipInfo;
myChannel = oldInfo.getChannel();
@@ -600,7 +600,7 @@ public class JGroupsMessenger<ID extends MemberIdentifier> implements Messenger<
// noinspection ConstantConditions
pingPonger.sendPingMessage(myChannel, jgAddress, dest);
} catch (Exception e) {
- logger.warn("unable to send multicast message: {}",
+ logger.warn("unable to send multicast message: {} because of: {}",
(jgAddress == null ? "multicast recipients" : jgAddress), e.getMessage());
return false;
}