Return-Path: 
 <commits-return-2886-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 62CBCEA9F
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue, 19 Feb 2013 17:43:17 +0000 (UTC)
Received: (qmail 17140 invoked by uid 500); 19 Feb 2013 17:43:16 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 17105 invoked by uid 500); 19 Feb 2013 17:43:16 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 17097 invoked by uid 99); 19 Feb 2013 17:43:16 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2013 17:43:16 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2013 17:43:15 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 133412388A5E;
	Tue, 19 Feb 2013 17:42:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1447845 -
 /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java
Date: Tue, 19 Feb 2013 17:42:57 -0000
To: commits@accumulo.apache.org
From: ecn@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130219174257.133412388A5E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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);