hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1089322 - in /hadoop/hdfs/branches/yahoo-merge: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java src/java/org/apache/hadoop/hdfs/util/DaemonFactory.java
Date Wed, 06 Apr 2011 06:22:51 GMT
Author: omalley
Date: Wed Apr  6 06:22:51 2011
New Revision: 1089322

URL: http://svn.apache.org/viewvc?rev=1089322&view=rev
Log:
commit c2e5fdba3cf91b99542b09892f385baa9aca0f00
Author: Owen O'Malley <omalley@apache.org>
Date:   Tue Apr 5 16:22:47 2011 -0700

    HDFS-1730. Move DaemonFactory from HDFS to Common (Erik Steffl)
    
    Conflicts:
    
    	YAHOO-CHANGES.txt

Removed:
    hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/util/DaemonFactory.java
Modified:
    hadoop/hdfs/branches/yahoo-merge/CHANGES.txt
    hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java

Modified: hadoop/hdfs/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/CHANGES.txt?rev=1089322&r1=1089321&r2=1089322&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/hdfs/branches/yahoo-merge/CHANGES.txt Wed Apr  6 06:22:51 2011
@@ -263,6 +263,8 @@ Trunk (unreleased changes)
 
     HDFS-1602. Fix testStorageRestore (boryas)
 
+    HDFS-1730. Move DaemonFactory from HDFS to Common (Erik Steffl)
+
 Release 0.22.0 - Unreleased
 
   NEW FEATURES

Modified: hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java?rev=1089322&r1=1089321&r2=1089322&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
(original)
+++ hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
Wed Apr  6 06:22:51 2011
@@ -42,7 +42,7 @@ import org.apache.hadoop.hdfs.DFSConfigK
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.server.common.GenerationStamp;
 import org.apache.hadoop.hdfs.server.datanode.FSDataset.FSVolume;
-import org.apache.hadoop.hdfs.util.DaemonFactory;
+import org.apache.hadoop.util.Daemon;
 
 /**
  * Periodically scans the data directories for block and block metadata files.
@@ -228,8 +228,9 @@ public class DirectoryScanner implements
                     DFSConfigKeys.DFS_DATANODE_DIRECTORYSCAN_THREADS_DEFAULT);
 
     reportCompileThreadPool = Executors.newFixedThreadPool(threads, 
-        new DaemonFactory());
-    masterThread = new ScheduledThreadPoolExecutor(1, new DaemonFactory());
+        new Daemon.DaemonFactory());
+    masterThread = new ScheduledThreadPoolExecutor(1,
+        new Daemon.DaemonFactory());
   }
 
   void start() {



Mime
View raw message