You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/02/19 18:42:57 UTC
svn commit: r1447845 -
/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java
Author: ecn
Date: Tue Feb 19 17:42:56 2013
New Revision: 1447845
URL: http://svn.apache.org/r1447845
Log:
ACCUMULO-1053 let file-not-found errors propagate and fail the FATE operation
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java
Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java?rev=1447845&r1=1447844&r2=1447845&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java (original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java Tue Feb 19 17:42:56 2013
@@ -65,19 +65,11 @@ public class RecoverLease extends Master
long diff = System.currentTimeMillis() - start;
if (diff < master.getSystemConfiguration().getTimeInMillis(Property.MASTER_RECOVERY_DELAY))
return Math.max(diff, 0);
- FileSystem fs = master.getFileSystem();
- if (fs.exists(getSource(master))) {
- return recoverLease(master);
- }
- log.warn("Unable to locate file " + file + " wal for server " + server);
- return 1000;
- }
-
- private long recoverLease(Master master) {
Path source = getSource(master);
FileSystem fs = master.getFileSystem();
if (fs instanceof TraceFileSystem)
fs = ((TraceFileSystem) fs).getImplementation();
+
try {
if (fs instanceof DistributedFileSystem) {
DistributedFileSystem dfs = (DistributedFileSystem) fs;
@@ -100,7 +92,7 @@ public class RecoverLease extends Master
return 1000;
}
}
-
+
@Override
public Repo<Master> call(long tid, Master master) throws Exception {
return new SubmitFileForRecovery(server, file);