accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject accumulo git commit: ACCUMULO-4134 Add check-server-config keyword
Date Wed, 03 Feb 2016 22:48:11 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 03246da49 -> 860ee35eb


ACCUMULO-4134 Add check-server-config keyword


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

Branch: refs/heads/master
Commit: 860ee35eb285d4355ac557ac0f95a15a7c0db253
Parents: 03246da
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Feb 3 17:46:38 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Feb 3 17:46:38 2016 -0500

----------------------------------------------------------------------
 .../accumulo/server/conf/ConfigSanityCheck.java     | 16 +++++++++++++++-
 .../apache/accumulo/test/start/KeywordStartIT.java  |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/860ee35e/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java
b/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java
index 658d249..942cabf 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java
@@ -17,11 +17,25 @@
 package org.apache.accumulo.server.conf;
 
 import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.start.spi.KeywordExecutable;
 
-public class ConfigSanityCheck {
+import com.google.auto.service.AutoService;
+
+@AutoService(KeywordExecutable.class)
+public class ConfigSanityCheck implements KeywordExecutable {
 
   public static void main(String[] args) {
     new ServerConfigurationFactory(HdfsZooInstance.getInstance()).getConfiguration();
   }
 
+  @Override
+  public String keyword() {
+    return "check-server-config";
+  }
+
+  @Override
+  public void execute(String[] args) throws Exception {
+    main(args);
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/860ee35e/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java b/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
index 40f6822..9fc8927 100644
--- a/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
@@ -48,6 +48,7 @@ import org.apache.accumulo.minicluster.impl.MiniClusterExecutable;
 import org.apache.accumulo.monitor.Monitor;
 import org.apache.accumulo.monitor.MonitorExecutable;
 import org.apache.accumulo.proxy.Proxy;
+import org.apache.accumulo.server.conf.ConfigSanityCheck;
 import org.apache.accumulo.server.init.Initialize;
 import org.apache.accumulo.server.util.Admin;
 import org.apache.accumulo.server.util.Info;
@@ -97,6 +98,7 @@ public class KeywordStartIT {
     assumeTrue(new File(System.getProperty("user.dir") + "/src").exists());
     TreeMap<String,Class<? extends KeywordExecutable>> expectSet = new TreeMap<>();
     expectSet.put("admin", Admin.class);
+    expectSet.put("check-server-config", ConfigSanityCheck.class);
     expectSet.put("classpath", Classpath.class);
     expectSet.put("create-token", CreateToken.class);
     expectSet.put("gc", GCExecutable.class);


Mime
View raw message