svn commit: r239215 - in /lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs: DataNode.java FSConstants.java NDFSClient.java

[mc]

Author: mc
Date: Mon Aug 22 11:33:31 2005
New Revision: 239215

URL: http://svn.apache.org/viewcvs?rev=239215&view=rev
Log:

  Apply read timeout to sockets on client and datanode.


Modified:
    lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/DataNode.java
    lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/FSConstants.java
    lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/DataNode.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/DataNode.java?rev=239215&r1=239214&r2=239215&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/DataNode.java 
(original)
+++ lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/DataNode.java 
Mon Aug 22 11:33:31 2005
@@ -242,6 +242,7 @@
             try {
                 while (shouldListen) {
                     Socket s = ss.accept();
+                    s.setSoTimeout(READ_TIMEOUT);
                     new Daemon(new DataXceiver(s)).start();
                 }
                 ss.close();
@@ -318,6 +319,7 @@
                                     mirrorTarget = 
createSocketAddr(targets[1].getName().toString());
                                     try {
                                         Socket s = new 
Socket(mirrorTarget.getAddress(), mirrorTarget.getPort());
+                                        s.setSoTimeout(READ_TIMEOUT);
                                         out2 = new DataOutputStream(new 
BufferedOutputStream(s.getOutputStream()));
                                         in2 = new DataInputStream(new 
BufferedInputStream(s.getInputStream()));
 

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=239215&r1=239214&r2=239215&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 22 11:33:31 2005
@@ -104,4 +104,5 @@
     public static long OBSOLETE_INTERVAL = 10 * 60 * 1000;
     public static long DATANODE_STARTUP_PERIOD = 120 * 1000;
     public static long LEASE_PERIOD = 16 * 1000;
+    public static int READ_TIMEOUT = 20 * 1000;
 }

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java?rev=239215&r1=239214&r2=239215&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java 
(original)
+++ lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java 
Mon Aug 22 11:33:31 2005
@@ -33,7 +33,6 @@
  ********************************************************/
 public class NDFSClient implements FSConstants {
     public static final Logger LOG = 
LogFormatter.getLogger("org.apache.nutch.fs.NDFSClient");
-    static int READ_TIMEOUT = 20 * 1000;
     static int BUFFER_SIZE = 4096;
     static int MAX_BLOCK_ACQUIRE_FAILURES = 10;
     ClientProtocol namenode;