From commits-return-21780-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Thu Apr 26 22:29:40 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id DB295180679 for ; Thu, 26 Apr 2018 22:29:39 +0200 (CEST) Received: (qmail 69020 invoked by uid 500); 26 Apr 2018 20:29:39 -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 69011 invoked by uid 99); 26 Apr 2018 20:29:39 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2018 20:29:39 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 24EF4852F2; Thu, 26 Apr 2018 20:29:38 +0000 (UTC) Date: Thu, 26 Apr 2018 20:29:38 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch master updated: Remove unused WAL props (#447) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152477457807.26413.10518912017441708411@gitbox.apache.org> From: ctubbsii@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9b74ba74da69ab7e942da34453eb8ae5757d0af1 X-Git-Newrev: 88d987fed2ab5ca678319e327e9b0488ad99fca7 X-Git-Rev: 88d987fed2ab5ca678319e327e9b0488ad99fca7 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new 88d987f Remove unused WAL props (#447) 88d987f is described below commit 88d987fed2ab5ca678319e327e9b0488ad99fca7 Author: Keith Turner AuthorDate: Thu Apr 26 16:29:36 2018 -0400 Remove unused WAL props (#447) --- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 ---- .../java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java | 8 -------- 2 files changed, 12 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java index e6ebf20..b902752 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@ -315,10 +315,6 @@ public enum Property { "org.apache.accumulo.server.master.balancer.TableLoadBalancer", PropertyType.CLASSNAME, "The balancer class that accumulo will use to make tablet assignment and " + "migration decisions."), - MASTER_RECOVERY_MAXAGE("master.recovery.max.age", "60m", PropertyType.TIMEDURATION, - "Recovery files older than this age will be removed."), - MASTER_RECOVERY_MAXTIME("master.recovery.time.max", "30m", PropertyType.TIMEDURATION, - "The maximum time to attempt recovery before giving up"), MASTER_BULK_RETRIES("master.bulk.retries", "3", PropertyType.COUNT, "The number of attempts to bulk import a RFile before giving up."), MASTER_BULK_THREADPOOL_SIZE("master.bulk.threadpool.size", "5", PropertyType.COUNT, diff --git a/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java b/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java index 1841d80..9ae175b 100644 --- a/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java +++ b/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java @@ -41,7 +41,6 @@ public class ConfigSanityCheckTest { m.put(Property.MASTER_CLIENTPORT.getKey(), "9999"); m.put(Property.MASTER_TABLET_BALANCER.getKey(), "org.apache.accumulo.server.master.balancer.TableLoadBalancer"); - m.put(Property.MASTER_RECOVERY_MAXAGE.getKey(), "60m"); m.put(Property.MASTER_BULK_RETRIES.getKey(), "3"); ConfigSanityCheck.validate(m.entrySet()); } @@ -73,13 +72,6 @@ public class ConfigSanityCheckTest { } @Test(expected = SanityCheckException.class) - public void testFail_InvalidFormat() { - m.put(Property.MASTER_CLIENTPORT.getKey(), "9999"); - m.put(Property.MASTER_RECOVERY_MAXAGE.getKey(), "60breem"); - ConfigSanityCheck.validate(m.entrySet()); - } - - @Test(expected = SanityCheckException.class) public void testFail_InstanceZkTimeoutOutOfRange() { m.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "10ms"); ConfigSanityCheck.validate(m.entrySet()); -- To stop receiving notification emails like this one, please contact ctubbsii@apache.org.