Return-Path: 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 9C3BA176C1 for ; Tue, 24 Feb 2015 21:14:15 +0000 (UTC) Received: (qmail 86844 invoked by uid 500); 24 Feb 2015 21:14:15 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 86812 invoked by uid 500); 24 Feb 2015 21:14:15 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 86802 invoked by uid 99); 24 Feb 2015 21:14:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2015 21:14:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 69D99E03F7; Tue, 24 Feb 2015 21:14:15 +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: Tue, 24 Feb 2015 21:14:15 -0000 Message-Id: <2b11a86e182b4587aa1d157a8d46e8f1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] accumulo git commit: ACCUMULO-3580 ACCUMULO-3618 disable metadata table scanning optimizations Repository: accumulo Updated Branches: refs/heads/1.5 c59b115ba -> 0c300de23 ACCUMULO-3580 ACCUMULO-3618 disable metadata table scanning optimizations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/517757fe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/517757fe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/517757fe Branch: refs/heads/1.5 Commit: 517757fed365a19c2d5633779e70f9617fd481a3 Parents: c92c3c4 Author: Eric C. Newton Authored: Tue Feb 24 14:24:56 2015 -0500 Committer: Eric C. Newton Committed: Tue Feb 24 14:24:56 2015 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/master/Master.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/517757fe/server/src/main/java/org/apache/accumulo/server/master/Master.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java index abf7468..8e072e9 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/Master.java +++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java @@ -2308,8 +2308,12 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt }); TCredentials systemAuths = SecurityConstants.getSystemCredentials(); - final TabletStateStore stores[] = {new ZooTabletStateStore(new ZooStore(zroot)), new RootTabletStateStore(instance, systemAuths, this), - new MetaDataStateStore(instance, systemAuths, this)}; + final TabletStateStore stores[] = { + new ZooTabletStateStore(new ZooStore(zroot)), + new RootTabletStateStore(instance, systemAuths, this), + // ACCUMULO-3580 ACCUMULO-3618 disable metadata table scanning optimizations + new MetaDataStateStore(instance, systemAuths, null) + }; watchers.add(new TabletGroupWatcher(stores[2], null)); watchers.add(new TabletGroupWatcher(stores[1], watchers.get(0))); watchers.add(new TabletGroupWatcher(stores[0], watchers.get(1)));