accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1458822 - in /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery: HadoopLogCloser.java RecoveryManager.java
Date Wed, 20 Mar 2013 13:35:51 GMT
Author: ecn
Date: Wed Mar 20 13:35:50 2013
New Revision: 1458822

URL: http://svn.apache.org/r1458822
Log:
ACCUMULO-804 another FileNotFoundException being thrown: going to keep it, though

Modified:
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java?rev=1458822&r1=1458821&r2=1458822&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
(original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
Wed Mar 20 13:35:50 2013
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.server.master.recovery;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 
 import org.apache.hadoop.fs.FileSystem;
@@ -40,6 +41,8 @@ public class HadoopLogCloser implements 
         }
         log.info("Recovered lease on " + source.toString());
         return 0;
+      } catch (FileNotFoundException ex) {
+        throw ex;
       } catch (Exception ex) {
         log.warn("Error recovery lease on " + source.toString(), ex);
       }

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java?rev=1458822&r1=1458821&r2=1458822&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java
(original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java
Wed Mar 20 13:35:50 2013
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.server.master.recovery;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.HashMap;
@@ -92,7 +93,8 @@ public class RecoveryManager {
         } else {
           initiateSort(host, filename);
         }
-        
+      } catch (FileNotFoundException e) {
+        log.debug("Unable to initate log sort for " + filename + ": " + e);
       } catch (Exception e) {
         log.warn("Failed to initiate log sort " + filename, e);
       } finally {



Mime
View raw message