Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11741. Add LOG.isDebugEnabled() guard for some LOG.debug(). Contributed by Walter Su.

This commit is contained in:
Tsuyoshi Ozawa 2015-03-25 16:36:10 +09:00
parent 80278a5f85
commit 5582b0f1d4
8 changed files with 90 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -459,6 +459,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11737. mockito's version in hadoop-nfs’ pom.xml shouldn't be HADOOP-11737. mockito's version in hadoop-nfs’ pom.xml shouldn't be
specified. (Kengo Seki via ozawa) specified. (Kengo Seki via ozawa)
HADOOP-11741. Add LOG.isDebugEnabled() guard for some LOG.debug().
(Walter Su via ozawa)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -2479,7 +2479,9 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
private Document parse(DocumentBuilder builder, URL url) private Document parse(DocumentBuilder builder, URL url)
throws IOException, SAXException { throws IOException, SAXException {
if (!quietmode) { if (!quietmode) {
LOG.debug("parsing URL " + url); if (LOG.isDebugEnabled()) {
LOG.debug("parsing URL " + url);
}
} }
if (url == null) { if (url == null) {
return null; return null;

14
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
View File

@ -214,9 +214,11 @@ public class JavaKeyStoreProvider extends KeyProvider {
renameOrFail(path, new Path(path.toString() + "_CORRUPTED_" renameOrFail(path, new Path(path.toString() + "_CORRUPTED_"
+ System.currentTimeMillis())); + System.currentTimeMillis()));
renameOrFail(backupPath, path); renameOrFail(backupPath, path);
LOG.debug(String.format( if (LOG.isDebugEnabled()) {
"KeyStore loaded successfully from '%s' since '%s'" LOG.debug(String.format(
+ "was corrupted !!", backupPath, path)); "KeyStore loaded successfully from '%s' since '%s'"
+ "was corrupted !!", backupPath, path));
}
} else { } else {
throw ioe; throw ioe;
} }
@ -265,8 +267,10 @@ public class JavaKeyStoreProvider extends KeyProvider {
try { try {
perm = loadFromPath(pathToLoad, password); perm = loadFromPath(pathToLoad, password);
renameOrFail(pathToLoad, path); renameOrFail(pathToLoad, path);
LOG.debug(String.format("KeyStore loaded successfully from '%s'!!", if (LOG.isDebugEnabled()) {
pathToLoad)); LOG.debug(String.format("KeyStore loaded successfully from '%s'!!",
pathToLoad));
}
if (fs.exists(pathToDelete)) { if (fs.exists(pathToDelete)) {
fs.delete(pathToDelete, true); fs.delete(pathToDelete, true);
} }

65
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
View File

@ -256,7 +256,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
appData = new byte[data.length]; appData = new byte[data.length];
System.arraycopy(data, 0, appData, 0, data.length); System.arraycopy(data, 0, appData, 0, data.length);
LOG.debug("Attempting active election for " + this); if (LOG.isDebugEnabled()) {
LOG.debug("Attempting active election for " + this);
}
joinElectionInternal(); joinElectionInternal();
} }
@ -406,9 +408,11 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
public synchronized void processResult(int rc, String path, Object ctx, public synchronized void processResult(int rc, String path, Object ctx,
String name) { String name) {
if (isStaleClient(ctx)) return; if (isStaleClient(ctx)) return;
LOG.debug("CreateNode result: " + rc + " for path: " + path if (LOG.isDebugEnabled()) {
+ " connectionState: " + zkConnectionState + LOG.debug("CreateNode result: " + rc + " for path: " + path
" for " + this); + " connectionState: " + zkConnectionState +
" for " + this);
}
Code code = Code.get(rc); Code code = Code.get(rc);
if (isSuccess(code)) { if (isSuccess(code)) {
@ -467,10 +471,11 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
assert wantToBeInElection : assert wantToBeInElection :
"Got a StatNode result after quitting election"; "Got a StatNode result after quitting election";
LOG.debug("StatNode result: " + rc + " for path: " + path if (LOG.isDebugEnabled()) {
+ " connectionState: " + zkConnectionState + " for " + this); LOG.debug("StatNode result: " + rc + " for path: " + path
+ " connectionState: " + zkConnectionState + " for " + this);
}
Code code = Code.get(rc); Code code = Code.get(rc);
if (isSuccess(code)) { if (isSuccess(code)) {
@ -535,10 +540,12 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
synchronized void processWatchEvent(ZooKeeper zk, WatchedEvent event) { synchronized void processWatchEvent(ZooKeeper zk, WatchedEvent event) {
Event.EventType eventType = event.getType(); Event.EventType eventType = event.getType();
if (isStaleClient(zk)) return; if (isStaleClient(zk)) return;
LOG.debug("Watcher event type: " + eventType + " with state:" if (LOG.isDebugEnabled()) {
+ event.getState() + " for path:" + event.getPath() LOG.debug("Watcher event type: " + eventType + " with state:"
+ " connectionState: " + zkConnectionState + event.getState() + " for path:" + event.getPath()
+ " for " + this); + " connectionState: " + zkConnectionState
+ " for " + this);
}
if (eventType == Event.EventType.None) { if (eventType == Event.EventType.None) {
// the connection state has changed // the connection state has changed
@ -597,7 +604,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
monitorActiveStatus(); monitorActiveStatus();
break; break;
default: default:
LOG.debug("Unexpected node event: " + eventType + " for path: " + path); if (LOG.isDebugEnabled()) {
LOG.debug("Unexpected node event: " + eventType + " for path: " + path);
}
monitorActiveStatus(); monitorActiveStatus();
} }
@ -646,7 +655,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
private void monitorActiveStatus() { private void monitorActiveStatus() {
assert wantToBeInElection; assert wantToBeInElection;
LOG.debug("Monitoring active leader for " + this); if (LOG.isDebugEnabled()) {
LOG.debug("Monitoring active leader for " + this);
}
statRetryCount = 0; statRetryCount = 0;
monitorLockNodeAsync(); monitorLockNodeAsync();
} }
@ -737,7 +748,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
int connectionRetryCount = 0; int connectionRetryCount = 0;
boolean success = false; boolean success = false;
while(!success && connectionRetryCount < maxRetryNum) { while(!success && connectionRetryCount < maxRetryNum) {
LOG.debug("Establishing zookeeper connection for " + this); if (LOG.isDebugEnabled()) {
LOG.debug("Establishing zookeeper connection for " + this);
}
try { try {
createConnection(); createConnection();
success = true; success = true;
@ -765,7 +778,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
watcher = null; watcher = null;
} }
zkClient = getNewZooKeeper(); zkClient = getNewZooKeeper();
LOG.debug("Created new connection for " + this); if (LOG.isDebugEnabled()) {
LOG.debug("Created new connection for " + this);
}
} }
@InterfaceAudience.Private @InterfaceAudience.Private
@ -773,7 +788,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
if (zkClient == null) { if (zkClient == null) {
return; return;
} }
LOG.debug("Terminating ZK connection for " + this); if (LOG.isDebugEnabled()) {
LOG.debug("Terminating ZK connection for " + this);
}
ZooKeeper tempZk = zkClient; ZooKeeper tempZk = zkClient;
zkClient = null; zkClient = null;
watcher = null; watcher = null;
@ -800,8 +817,10 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
try { try {
Stat oldBreadcrumbStat = fenceOldActive(); Stat oldBreadcrumbStat = fenceOldActive();
writeBreadCrumbNode(oldBreadcrumbStat); writeBreadCrumbNode(oldBreadcrumbStat);
LOG.debug("Becoming active for " + this); if (LOG.isDebugEnabled()) {
LOG.debug("Becoming active for " + this);
}
appClient.becomeActive(); appClient.becomeActive();
state = State.ACTIVE; state = State.ACTIVE;
return true; return true;
@ -906,7 +925,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
private void becomeStandby() { private void becomeStandby() {
if (state != State.STANDBY) { if (state != State.STANDBY) {
LOG.debug("Becoming standby for " + this); if (LOG.isDebugEnabled()) {
LOG.debug("Becoming standby for " + this);
}
state = State.STANDBY; state = State.STANDBY;
appClient.becomeStandby(); appClient.becomeStandby();
} }
@ -914,7 +935,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
private void enterNeutralMode() { private void enterNeutralMode() {
if (state != State.NEUTRAL) { if (state != State.NEUTRAL) {
LOG.debug("Entering neutral mode for " + this); if (LOG.isDebugEnabled()) {
LOG.debug("Entering neutral mode for " + this);
}
state = State.NEUTRAL; state = State.NEUTRAL;
appClient.enterNeutralMode(); appClient.enterNeutralMode();
} }

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
View File

@ -876,9 +876,12 @@ public class RPC {
getProtocolImplMap(rpcKind).put(new ProtoNameVer(protocolName, version), getProtocolImplMap(rpcKind).put(new ProtoNameVer(protocolName, version),
new ProtoClassProtoImpl(protocolClass, protocolImpl)); new ProtoClassProtoImpl(protocolClass, protocolImpl));
LOG.debug("RpcKind = " + rpcKind + " Protocol Name = " + protocolName + " version=" + version + if (LOG.isDebugEnabled()) {
" ProtocolImpl=" + protocolImpl.getClass().getName() + LOG.debug("RpcKind = " + rpcKind + " Protocol Name = " + protocolName +
" protocolClass=" + protocolClass.getName()); " version=" + version +
" ProtocolImpl=" + protocolImpl.getClass().getName() +
" protocolClass=" + protocolClass.getName());
}
} }
static class VerProtocolImpl { static class VerProtocolImpl {

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
View File

@ -234,9 +234,11 @@ public abstract class Server {
throw new IllegalArgumentException("ReRegistration of rpcKind: " + throw new IllegalArgumentException("ReRegistration of rpcKind: " +
rpcKind); rpcKind);
} }
LOG.debug("rpcKind=" + rpcKind + if (LOG.isDebugEnabled()) {
", rpcRequestWrapperClass=" + rpcRequestWrapperClass + LOG.debug("rpcKind=" + rpcKind +
", rpcInvoker=" + rpcInvoker); ", rpcRequestWrapperClass=" + rpcRequestWrapperClass +
", rpcInvoker=" + rpcInvoker);
}
} }
public Class<? extends Writable> getRpcRequestWrapper( public Class<? extends Writable> getRpcRequestWrapper(

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext31.java
View File

@ -82,8 +82,10 @@ public class GangliaContext31 extends GangliaContext {
return; return;
} }
LOG.debug("Emitting metric " + name + ", type " + type + ", value " + if (LOG.isDebugEnabled()) {
value + " from hostname" + hostName); LOG.debug("Emitting metric " + name + ", type " + type + ", value " +
value + " from hostname" + hostName);
}
String units = getUnits(name); String units = getUnits(name);
int slope = getSlope(name); int slope = getSlope(name);

22
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java
View File

@ -164,7 +164,9 @@ public class FileBasedKeyStoresFactory implements KeyStoresFactory {
// configuration property for key password. // configuration property for key password.
keystoreKeyPassword = getPassword( keystoreKeyPassword = getPassword(
conf, keyPasswordProperty, keystorePassword); conf, keyPasswordProperty, keystorePassword);
LOG.debug(mode.toString() + " KeyStore: " + keystoreLocation); if (LOG.isDebugEnabled()) {
LOG.debug(mode.toString() + " KeyStore: " + keystoreLocation);
}
InputStream is = new FileInputStream(keystoreLocation); InputStream is = new FileInputStream(keystoreLocation);
try { try {
@ -172,7 +174,9 @@ public class FileBasedKeyStoresFactory implements KeyStoresFactory {
} finally { } finally {
is.close(); is.close();
} }
LOG.debug(mode.toString() + " Loaded KeyStore: " + keystoreLocation); if (LOG.isDebugEnabled()) {
LOG.debug(mode.toString() + " Loaded KeyStore: " + keystoreLocation);
}
} else { } else {
keystore.load(null, null); keystore.load(null, null);
} }
@ -204,18 +208,24 @@ public class FileBasedKeyStoresFactory implements KeyStoresFactory {
resolvePropertyName(mode, SSL_TRUSTSTORE_RELOAD_INTERVAL_TPL_KEY), resolvePropertyName(mode, SSL_TRUSTSTORE_RELOAD_INTERVAL_TPL_KEY),
DEFAULT_SSL_TRUSTSTORE_RELOAD_INTERVAL); DEFAULT_SSL_TRUSTSTORE_RELOAD_INTERVAL);
LOG.debug(mode.toString() + " TrustStore: " + truststoreLocation); if (LOG.isDebugEnabled()) {
LOG.debug(mode.toString() + " TrustStore: " + truststoreLocation);
}
trustManager = new ReloadingX509TrustManager(truststoreType, trustManager = new ReloadingX509TrustManager(truststoreType,
truststoreLocation, truststoreLocation,
truststorePassword, truststorePassword,
truststoreReloadInterval); truststoreReloadInterval);
trustManager.init(); trustManager.init();
LOG.debug(mode.toString() + " Loaded TrustStore: " + truststoreLocation); if (LOG.isDebugEnabled()) {
LOG.debug(mode.toString() + " Loaded TrustStore: " + truststoreLocation);
}
trustManagers = new TrustManager[]{trustManager}; trustManagers = new TrustManager[]{trustManager};
} else { } else {
LOG.debug("The property '" + locationProperty + "' has not been set, " + if (LOG.isDebugEnabled()) {
"no TrustStore will be loaded"); LOG.debug("The property '" + locationProperty + "' has not been set, " +
"no TrustStore will be loaded");
}
trustManagers = null; trustManagers = null;
} }
} }