svn commit: r226891 - in /lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs: FSConstants.java FSNamesystem.java NameNode.java

[cutting]

Author: cutting
Date: Mon Aug  1 14:48:53 2005
New Revision: 226891

URL: http://svn.apache.org/viewcvs?rev=226891&view=rev
Log:
Increase timeout before heartbeats are lost to allow for runs of queued 
blockreports.  Also stop logging every block in the blockreport, to make these 
a bit speedier.  Long-term we should probably limit the size of blockreports.

Modified:
    lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSConstants.java
    
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSNamesystem.java
    lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NameNode.java

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSConstants.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSConstants.java?rev=226891&r1=226890&r2=226891&view=diff
==============================================================================
--- 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSConstants.java 
(original)
+++ 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSConstants.java 
Mon Aug  1 14:48:53 2005
@@ -99,7 +99,7 @@
     // Timeouts, constants
     //
     public static long HEARTBEAT_INTERVAL = 3 * 1000;
-    public static long EXPIRE_INTERVAL = 4 * HEARTBEAT_INTERVAL;
+    public static long EXPIRE_INTERVAL = 60 * 1000;
     public static long BLOCKREPORT_INTERVAL = 9 * 60 * 1000;
     public static long OBSOLETE_INTERVAL = 10 * 60 * 1000;
     public static long DATANODE_STARTUP_PERIOD = 120 * 1000;

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSNamesystem.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSNamesystem.java?rev=226891&r1=226890&r2=226891&view=diff
==============================================================================
--- 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSNamesystem.java 
(original)
+++ 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSNamesystem.java 
Mon Aug  1 14:48:53 2005
@@ -879,7 +879,7 @@
 
         synchronized (neededReplications) {
             if (dir.isValidBlock(block)) {
-                LOG.info("Node " + node + " is reporting stored block " + 
block);
+              //LOG.info("Node " + node + " is reporting stored block " + 
block);
                 if (containingNodes.size() >= DESIRED_REPLICATION) {
                     neededReplications.remove(block);
                     pendingReplications.remove(block);

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NameNode.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NameNode.java?rev=226891&r1=226890&r2=226891&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NameNode.java 
(original)
+++ lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NameNode.java 
Mon Aug  1 14:48:53 2005
@@ -36,6 +36,8 @@
  * @author Mike Cafarella
  **********************************************************/
 public class NameNode implements ClientProtocol, DatanodeProtocol, FSConstants 
{
+    public static final Logger LOG = 
LogFormatter.getLogger("org.apache.nutch.ndfs.NameNode");
+
     FSNamesystem namesystem;
     Server server;
 
@@ -381,6 +383,7 @@
     }
 
     public void blockReport(String sender, Block blocks[]) {
+        LOG.info("Block report from "+sender+": "+blocks.length+" blocks.");
         long start = System.currentTimeMillis();
         namesystem.processReport(blocks, new UTF8(sender));
         long end = System.currentTimeMillis();