This is an automated email from the ASF dual-hosted git repository.
abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tez.git
The following commit(s) were added to refs/heads/master by this push:
new 5bba1fffd TEZ-4516: Fix log lines with incorrect placeholders. (#310)
(Ayush Saxena reviewed by Laszlo Bodor)
5bba1fffd is described below
commit 5bba1fffdd290ae3242615c23ab3b75c24f15e88
Author: Ayush Saxena <ayushsax...@apache.org>
AuthorDate: Thu Oct 5 07:26:24 2023 +0530
TEZ-4516: Fix log lines with incorrect placeholders. (#310) (Ayush Saxena
reviewed by Laszlo Bodor)
---
.../src/main/java/org/apache/tez/dag/app/TaskCommunicatorManager.java | 3 +--
.../java/org/apache/tez/dag/app/rm/DagAwareYarnTaskScheduler.java | 2 +-
.../src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerManager.java | 3 +--
tez-dag/src/test/java/org/apache/tez/dag/app/TestSpeculation.java | 4 +---
.../java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java | 3 +--
.../java/org/apache/tez/http/async/netty/AsyncHttpConnection.java | 4 ++--
.../library/common/shuffle/orderedgrouped/ShuffleScheduler.java | 2 +-
7 files changed, 8 insertions(+), 13 deletions(-)
diff --git
a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskCommunicatorManager.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskCommunicatorManager.java
index 92954b65b..6846d342e 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskCommunicatorManager.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskCommunicatorManager.java
@@ -202,8 +202,7 @@ public class TaskCommunicatorManager extends
AbstractService implements
TaskCommunicator createCustomTaskCommunicator(TaskCommunicatorContext
taskCommunicatorContext,
NamedEntityDescriptor
taskCommDescriptor)
throws TezException {
- LOG.info("Creating TaskCommunicator {}:{} " +
taskCommDescriptor.getEntityName(),
- taskCommDescriptor.getClassName());
+ LOG.info("Creating TaskCommunicator {}:{} ",
taskCommDescriptor.getEntityName(), taskCommDescriptor.getClassName());
Class<? extends TaskCommunicator> taskCommClazz =
(Class<? extends TaskCommunicator>) ReflectionUtils
.getClazz(taskCommDescriptor.getClassName());
diff --git
a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/DagAwareYarnTaskScheduler.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/DagAwareYarnTaskScheduler.java
index 6f2082ade..131302a03 100644
---
a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/DagAwareYarnTaskScheduler.java
+++
b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/DagAwareYarnTaskScheduler.java
@@ -460,7 +460,7 @@ public class DagAwareYarnTaskScheduler extends TaskScheduler
}
if (sessionContainers.contains(hc)) {
- LOG.info("Retaining container {} since it is a session container");
+ LOG.info("Retaining container {} since it is a session container", hc);
hc.resetMatchingLevel();
} else {
long now = now();
diff --git
a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerManager.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerManager.java
index 89d59aa10..0bf62afbc 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerManager.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerManager.java
@@ -908,8 +908,7 @@ public class TaskSchedulerManager extends AbstractService
implements
DagInfo dagInfo) {
if (servicePluginError ==
YarnTaskSchedulerServiceError.RESOURCEMANAGER_ERROR) {
LOG.info("Error reported by scheduler {} - {}",
- Utils.getTaskSchedulerIdentifierString(taskSchedulerIndex,
appContext) + ": " +
- diagnostics);
+ Utils.getTaskSchedulerIdentifierString(taskSchedulerIndex,
appContext), diagnostics);
if (taskSchedulerDescriptors[taskSchedulerIndex].getEntityName()
.equals(TezConstants.getTezYarnServicePluginName())) {
LOG.warn(
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/TestSpeculation.java
b/tez-dag/src/test/java/org/apache/tez/dag/app/TestSpeculation.java
index e7fc161dd..bc5c7ea4d 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/TestSpeculation.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/TestSpeculation.java
@@ -153,9 +153,7 @@ public class TestSpeculation {
.contains(UNIT_EXCEPTION_MESSAGE)))) {
throw caughtThrowable;
}
- LOG.warn("{} : Failed. Retries remaining: ",
- description.getDisplayName(),
- retryCount.toString());
+ LOG.warn("{} : Failed. Retries remaining: {}",
description.getDisplayName(), retryCount.toString());
} else {
throw caughtThrowable;
}
diff --git
a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
index 583cc0099..ac67789e4 100644
---
a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
+++
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
@@ -953,8 +953,7 @@ public class LogicalIOProcessorRuntimeTask extends
RuntimeTask {
LOG.info("Resetting interrupt for processor");
Thread.currentThread().interrupt();
} catch (Throwable e) {
- LOG.warn(
- "Ignoring Exception when closing processor(cleanup). Exception
class={}, message={}" +
+ LOG.warn("Ignoring Exception when closing processor(cleanup).
Exception class={}, message={}",
e.getClass().getName(), e.getMessage());
}
}
diff --git
a/tez-runtime-library/src/main/java/org/apache/tez/http/async/netty/AsyncHttpConnection.java
b/tez-runtime-library/src/main/java/org/apache/tez/http/async/netty/AsyncHttpConnection.java
index 215e63af5..8f8a0f7d0 100644
---
a/tez-runtime-library/src/main/java/org/apache/tez/http/async/netty/AsyncHttpConnection.java
+++
b/tez-runtime-library/src/main/java/org/apache/tez/http/async/netty/AsyncHttpConnection.java
@@ -156,7 +156,7 @@ public class AsyncHttpConnection extends BaseHttpConnection
{
Request request = rb.setUrl(url.toString()).build();
//for debugging
- LOG.debug("Request url={}, encHash={}, id={}", url, encHash);
+ LOG.debug("Request url={}, encHash={}", url, encHash);
try {
//Blocks calling thread until it receives headers, but have the option
to defer response body
@@ -176,7 +176,7 @@ public class AsyncHttpConnection extends BaseHttpConnection
{
//verify the response
int rc = response.getStatusCode();
if (rc != HttpURLConnection.HTTP_OK) {
- LOG.debug("Request url={}, id={}", response.getUri());
+ LOG.debug("Request url={}", response.getUri());
throw new IOException("Got invalid response code " + rc + " from "
+ url + ": " + response.getStatusText());
}
diff --git
a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/ShuffleScheduler.java
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/ShuffleScheduler.java
index 3416bcedf..f68ab948b 100644
---
a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/ShuffleScheduler.java
+++
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/ShuffleScheduler.java
@@ -1396,7 +1396,7 @@ class ShuffleScheduler {
}
if (LOG.isDebugEnabled()) {
- LOG.debug(srcNameTrimmed + ": " + "NumCompletedInputs: {}" +
(numInputs - remainingMaps.get()));
+ LOG.debug("{}: NumCompletedInputs: {}", srcNameTrimmed, (numInputs -
remainingMaps.get()));
}
// Ensure there's memory available before scheduling the next Fetcher.
