From bf3275dbaa99105d49520e25f5a6eadd6fd5b7ed Mon Sep 17 00:00:00 2001 From: Colin Patrick Mccabe Date: Mon, 16 Mar 2015 12:02:10 -0700 Subject: [PATCH] HADOOP-11714. Add more trace log4j messages to SpanReceiverHost (cmccabe) --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../org/apache/hadoop/tracing/SpanReceiverHost.java | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index a43a153ccb..aa17841e0f 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -692,6 +692,8 @@ Release 2.7.0 - UNRELEASED HADOOP-11642. Upgrade azure sdk version from 0.6.0 to 2.0.0. (Shashank Khandelwal and Ivan Mitic via cnauroth) + HADOOP-11714. Add more trace log4j messages to SpanReceiverHost (cmccabe) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/SpanReceiverHost.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/SpanReceiverHost.java index 01ba76d849..f2de0a0ff9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/SpanReceiverHost.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/SpanReceiverHost.java @@ -134,20 +134,27 @@ public synchronized void loadSpanReceivers(Configuration conf) { String[] receiverNames = config.getTrimmedStrings(SPAN_RECEIVERS_CONF_KEY); if (receiverNames == null || receiverNames.length == 0) { + if (LOG.isTraceEnabled()) { + LOG.trace("No span receiver names found in " + + SPAN_RECEIVERS_CONF_KEY + "."); + } return; } // It's convenient to have each daemon log to a random trace file when // testing. if (config.get(LOCAL_FILE_SPAN_RECEIVER_PATH) == null) { - config.set(LOCAL_FILE_SPAN_RECEIVER_PATH, - getUniqueLocalTraceFileName()); + String uniqueFile = getUniqueLocalTraceFileName(); + config.set(LOCAL_FILE_SPAN_RECEIVER_PATH, uniqueFile); + if (LOG.isTraceEnabled()) { + LOG.trace("Set " + LOCAL_FILE_SPAN_RECEIVER_PATH + " to " + uniqueFile); + } } for (String className : receiverNames) { try { SpanReceiver rcvr = loadInstance(className, EMPTY); Trace.addReceiver(rcvr); receivers.put(highestId++, rcvr); - LOG.info("SpanReceiver " + className + " was loaded successfully."); + LOG.info("Loaded SpanReceiver " + className + " successfully."); } catch (IOException e) { LOG.error("Failed to load SpanReceiver", e); }