accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] branch master updated: Remove unused WAL props (#447)
Date Thu, 26 Apr 2018 20:29:38 GMT
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 <keith@deenlo.com>
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.

Mime
View raw message