Return-Path: 
 <commits-return-5666-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 4F68610359
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Mon, 28 Oct 2013 20:04:07 +0000 (UTC)
Received: (qmail 95980 invoked by uid 500); 28 Oct 2013 20:04:05 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 95874 invoked by uid 500); 28 Oct 2013 20:04:04 -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 95799 invoked by uid 99); 28 Oct 2013 20:04:02 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Oct 2013 20:04:02 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 79FBD886A01; Mon, 28 Oct 2013 20:04:02 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ecn@apache.org
To: commits@accumulo.apache.org
Date: Mon, 28 Oct 2013 20:04:06 -0000
Message-Id: <b97af8bb9c8c43788c2d43389f2dc926@git.apache.org>
In-Reply-To: <4b63c3badd2c45ae99faaed54d8debfe@git.apache.org>
References: <4b63c3badd2c45ae99faaed54d8debfe@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [5/5] git commit: ACCUMULO-1821 don't record log events if the tablet
 is not online

ACCUMULO-1821 don't record log events if the tablet is not online


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8683295f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8683295f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8683295f

Branch: refs/heads/master
Commit: 8683295fcf4e8732e8dc7625f97725cfe0662e1f
Parents: 73b39a0
Author: Eric Newton <eric.newton@gmail.com>
Authored: Mon Oct 28 16:04:15 2013 -0400
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Mon Oct 28 16:04:15 2013 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/server/tabletserver/TabletServer.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8683295f/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index bd31c15..92aabf3 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -2978,7 +2978,12 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
 
   public void addLoggersToMetadata(List<DfsLogger> logs, KeyExtent extent, int id) {
     log.info("Adding " + logs.size() + " logs for extent " + extent + " as alias " + id);
-
+    if (!this.onlineTablets.containsKey(extent)) {
+      // minor compaction due to recovery... don't make updates... if it finishes, there will be no WALs,
+      // if it doesn't, we'll need to do the same recovery with the old files.
+      return;
+    }
+    
     long now = RelativeTime.currentTimeMillis();
     List<String> logSet = new ArrayList<String>();
     for (DfsLogger log : logs)