You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cm...@apache.org on 2014/03/04 07:35:58 UTC
svn commit: r1573885 - in
/hadoop/common/branches/branch-2/hadoop-common-project: ./ hadoop-common/
hadoop-common/src/ hadoop-common/src/main/java/
hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
Author: cmccabe
Date: Tue Mar 4 06:35:57 2014
New Revision: 1573885
URL: http://svn.apache.org/r1573885
Log:
HDFS-6040. fix DFSClient issue without libhadoop.so and some other ShortCircuitShm cleanups (cmccabe)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ (props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ (props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project:r1573883
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1573883
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1573883
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1573883
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java?rev=1573885&r1=1573884&r2=1573885&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java Tue Mar 4 06:35:57 2014
@@ -81,6 +81,10 @@ public final class DomainSocketWatcher i
*/
private static native void anchorNative();
+ public static String getLoadingFailureReason() {
+ return loadingFailureReason;
+ }
+
public interface Handler {
/**
* Handles an event on a socket. An event may be the socket becoming
@@ -244,7 +248,9 @@ public final class DomainSocketWatcher i
lock.lock();
try {
if (closed) return;
- LOG.info(this + ": closing");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(this + ": closing");
+ }
closed = true;
} finally {
lock.unlock();
@@ -390,8 +396,10 @@ public final class DomainSocketWatcher i
final Thread watcherThread = new Thread(new Runnable() {
@Override
public void run() {
- LOG.info(this + ": starting with interruptCheckPeriodMs = " +
- interruptCheckPeriodMs);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(this + ": starting with interruptCheckPeriodMs = " +
+ interruptCheckPeriodMs);
+ }
final TreeMap<Integer, Entry> entries = new TreeMap<Integer, Entry>();
FdSet fdSet = new FdSet();
addNotificationSocket(entries, fdSet);
@@ -431,7 +439,9 @@ public final class DomainSocketWatcher i
// toRemove are now empty and processedCond has been notified if it
// needed to be.
if (closed) {
- LOG.info(toString() + " thread terminating.");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(toString() + " thread terminating.");
+ }
return;
}
// Check if someone sent our thread an InterruptedException while we