Author: cutting Date: Fri Jun 9 11:38:31 2006 New Revision: 413122 URL: http://svn.apache.org/viewvc?rev=413122&view=rev Log: HADOOP-294. Fix a bug where the conditions for retrying after errors in the DFS client were reversed. Contributed by Owen.
Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DFSClient.java lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=413122&r1=413121&r2=413122&view=diff ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Fri Jun 9 11:38:31 2006 @@ -30,6 +30,9 @@ rather than standard output, so that it can be distinguished from application output. (omalley via cutting) + 9. HADOOP-294. Fixed bug where conditions for retrying after errors + in the DFS client were reversed. (omalley via cutting) + Release 0.3.1 - 2006-06-05 Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DFSClient.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DFSClient.java?rev=413122&r1=413121&r2=413122&view=diff ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DFSClient.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DFSClient.java Fri Jun 9 11:38:31 2006 @@ -808,7 +808,7 @@ localName, overwrite, replication, blockSize); } catch (RemoteException e) { if (--retries == 0 || - AlreadyBeingCreatedException.class.getName(). + !AlreadyBeingCreatedException.class.getName(). equals(e.getClassName())) { throw e; } else { @@ -838,7 +838,7 @@ clientName.toString()); } catch (RemoteException e) { if (--retries == 0 || - NotReplicatedYetException.class.getName(). + !NotReplicatedYetException.class.getName(). equals(e.getClassName())) { throw e; } else { Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java?rev=413122&r1=413121&r2=413122&view=diff ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java Fri Jun 9 11:38:31 2006 @@ -179,7 +179,8 @@ } catch( ConnectException se ) { // namenode has not been started LOG.info("Namenode not available yet, Zzzzz..."); } catch( SocketTimeoutException te ) { // namenode is busy - LOG.info("Namenode " + te.getLocalizedMessage() ); + LOG.info("Problem connecting to Namenode: " + + StringUtils.stringifyException(te)); } try { Thread.sleep(10 * 1000); @@ -338,7 +339,8 @@ } catch( RemoteException re ) { String reClass = re.getClassName(); if( UnregisteredDatanodeException.class.getName().equals( reClass )) { - LOG.warn( "DataNode is shutting down.\n" + re ); + LOG.warn( "DataNode is shutting down: " + + StringUtils.stringifyException(re)); shutdown(); return; }