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 92954b65b0..6846d342ec 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 @@ TaskCommunicator createUberTaskCommunicator(TaskCommunicatorContext taskCommunic 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 taskCommClazz = (Class) 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 6f2082adea..131302a03a 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 @@ private void handleReuseContainerWhenIdle(HeldContainer hc, boolean isSession) { } 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 89d59aa104..0bf62afbc3 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 void reportError(int taskSchedulerIndex, ServicePluginError servicePlugin 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 e7fc161ddc..bc5c7ea4da 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 void evaluate() throws Throwable { .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 583cc0099a..ac67789e4e 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 void cleanup() throws InterruptedException { 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 215e63af58..8f8a0f7d0b 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 boolean connect() throws IOException, InterruptedException { 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 boolean connect() throws IOException, InterruptedException { //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 3416bcedf2..f68ab948ba 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 @@ protected Void callInternal() throws InterruptedException { } 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.