svn commit: r1574256 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project: ./ hadoop-hdfs/ hadoop-hdfs/CHANGES.txt hadoop-hdfs/src/main/java/ hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java

[cmccabe]

Author: cmccabe
Date: Tue Mar  4 23:41:28 2014
New Revision: 1574256

URL: http://svn.apache.org/r1574256
Log:
HDFS-6051. HDFS cannot run on Windows since short-circuit memory segment 
changes (cmccabe)

Modified:
    hadoop/common/branches/branch-2/hadoop-hdfs-project/   (props changed)
    hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/   (props 
changed)
    hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/  
 (props changed)
    
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java

Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-hdfs-project:r1574246

Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1574246

Modified: 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1574256&r1=1574255&r2=1574256&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
Tue Mar  4 23:41:28 2014
@@ -284,6 +284,9 @@ Release 2.4.0 - UNRELEASED
     HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange
     (stack)
 
+    HDFS-6051. HDFS cannot run on Windows since short-circuit shared memory
+    segment changes. (cmccabe)
+
   BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
 
     HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

Propchange: 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1574246

Modified: 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java?rev=1574256&r1=1574255&r2=1574256&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java
 Tue Mar  4 23:41:28 2014
@@ -149,23 +149,29 @@ public class ShortCircuitRegistry {
     SharedFileDescriptorFactory shmFactory = null;
     DomainSocketWatcher watcher = null;
     try {
-      if (!NativeIO.isAvailable()) {
-        LOG.debug("Disabling ShortCircuitRegistry because NativeIO is " +
-            "not available.");
+      String loadingFailureReason =
+          SharedFileDescriptorFactory.getLoadingFailureReason();
+      if (loadingFailureReason != null) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Disabling ShortCircuitRegistry because " +
+                    loadingFailureReason);
+        }
         return;
       }
       String shmPath = conf.get(DFS_DATANODE_SHARED_FILE_DESCRIPTOR_PATH,
           DFS_DATANODE_SHARED_FILE_DESCRIPTOR_PATH_DEFAULT);
       if (shmPath.isEmpty()) {
-        LOG.info("Disabling ShortCircuitRegistry because shmPath was not 
set.");
+        LOG.debug("Disabling ShortCircuitRegistry because shmPath was not 
set.");
         return;
       }
       int interruptCheck = conf.getInt(
           DFS_SHORT_CIRCUIT_SHARED_MEMORY_WATCHER_INTERRUPT_CHECK_MS,
           DFS_SHORT_CIRCUIT_SHARED_MEMORY_WATCHER_INTERRUPT_CHECK_MS_DEFAULT);
       if (interruptCheck <= 0) {
-        LOG.info("Disabling ShortCircuitRegistry because interruptCheckMs " +
-            "was set to " + interruptCheck);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Disabling ShortCircuitRegistry because " +
+                    "interruptCheckMs was set to " + interruptCheck);
+        }
         return;
       }
       shmFactory = 
@@ -174,7 +180,7 @@ public class ShortCircuitRegistry {
       enabled = true;
       if (LOG.isDebugEnabled()) {
         LOG.debug("created new ShortCircuitRegistry with interruptCheck=" +
-          interruptCheck + ", shmPath=" + shmPath);
+                  interruptCheck + ", shmPath=" + shmPath);
       }
     } finally {
       this.enabled = enabled;