accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1452496 - /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
Date Mon, 04 Mar 2013 20:38:36 GMT
Author: ecn
Date: Mon Mar  4 20:38:35 2013
New Revision: 1452496

URL: http://svn.apache.org/r1452496
Log:
ACCUMULO-1147 remove missing file warning

Modified:
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1452496&r1=1452495&r2=1452496&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
(original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
Mon Mar  4 20:38:35 2013
@@ -2095,9 +2095,13 @@ public class TabletServer extends Abstra
             Path sourcePath = new Path(source);
             if (!trash.moveToTrash(sourcePath) && !fs.delete(sourcePath, true))
               log.warn("Failed to delete walog " + source);
-            Path recoveryPath = new Path(Constants.getRecoveryDir(acuConf), filename); 
-            if (trash.moveToTrash(recoveryPath) || fs.delete(recoveryPath, true))
-              log.info("Deleted any recovery log " + filename);
+            Path recoveryPath = new Path(Constants.getRecoveryDir(acuConf), filename);
+            try {
+              if (trash.moveToTrash(recoveryPath) || fs.delete(recoveryPath, true))
+                log.info("Deleted any recovery log " + filename);
+            } catch (FileNotFoundException ex) {
+              // ignore
+            }
             
           }
         } catch (IOException e) {



Mime
View raw message