You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2014/03/05 19:58:34 UTC
[1/2] git commit: ACCUMULO-1390 made mini accumulo runner self
documenting
Repository: accumulo
Updated Branches:
refs/heads/master 5a7674566 -> 4ec78981c
ACCUMULO-1390 made mini accumulo runner self documenting
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4fd8686e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4fd8686e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4fd8686e
Branch: refs/heads/master
Commit: 4fd8686e4c48a2bcac85f365097c00cc841f6bdc
Parents: 4e499f3
Author: Keith Turner <kt...@apache.org>
Authored: Wed Mar 5 13:51:37 2014 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Mar 5 13:52:01 2014 -0500
----------------------------------------------------------------------
.../minicluster/MiniAccumuloRunner.java | 103 ++++++++++++++-----
1 file changed, 79 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4fd8686e/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
index b777cd3..f7070dc 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
@@ -59,6 +59,43 @@ import com.google.common.io.Files;
* @since 1.6.0
*/
public class MiniAccumuloRunner {
+ private static final String ROOT_PASSWORD_PROP = "rootPassword";
+ private static final String SHUTDOWN_PORT_PROP = "shutdownPort";
+ private static final String DEFAULT_MEMORY_PROP = "defaultMemory";
+ private static final String MASTER_MEMORY_PROP = "masterMemory";
+ private static final String TSERVER_MEMORY_PROP = "tserverMemory";
+ private static final String ZOO_KEEPER_MEMORY_PROP = "zooKeeperMemory";
+ private static final String JDWP_ENABLED_PROP = "jdwpEnabled";
+ private static final String ZOO_KEEPER_PORT_PROP = "zooKeeperPort";
+ private static final String NUM_T_SERVERS_PROP = "numTServers";
+ private static final String DIRECTORY_PROP = "directory";
+ private static final String INSTANCE_NAME_PROP = "instanceName";
+
+ private static void printProperties() {
+ System.out.println("#mini Accumulo cluster runner properties.");
+ System.out.println("#");
+ System.out.println("#uncomment following propeties to use, propeties not set will use default or random value");
+ System.out.println();
+ System.out.println("#" + INSTANCE_NAME_PROP + "=devTest");
+ System.out.println("#" + DIRECTORY_PROP + "=/tmp/mac1");
+ System.out.println("#" + ROOT_PASSWORD_PROP + "=secret");
+ System.out.println("#" + NUM_T_SERVERS_PROP + "=2");
+ System.out.println("#" + ZOO_KEEPER_PORT_PROP + "=40404");
+ System.out.println("#" + SHUTDOWN_PORT_PROP + "=41414");
+ System.out.println("#" + DEFAULT_MEMORY_PROP + "=128M");
+ System.out.println("#" + MASTER_MEMORY_PROP + "=128M");
+ System.out.println("#" + TSERVER_MEMORY_PROP + "=128M");
+ System.out.println("#" + ZOO_KEEPER_MEMORY_PROP + "=128M");
+ System.out.println("#" + JDWP_ENABLED_PROP + "=false");
+
+ System.out.println();
+ System.out.println("# Configuration normally placed in accumulo-site.xml can be added using a site. prefix.");
+ System.out.println("# For example the following line will set tserver.compaction.major.concurrent.max");
+ System.out.println();
+ System.out.println("#site.tserver.compaction.major.concurrent.max=4");
+
+ }
+
public static class PropertiesConverter implements IStringConverter<Properties> {
@Override
public Properties convert(String fileName) {
@@ -83,6 +120,9 @@ public class MiniAccumuloRunner {
public static class Opts extends Help {
@Parameter(names = "-p", required = false, description = "properties file name", converter = PropertiesConverter.class)
Properties prop = new Properties();
+
+ @Parameter(names = {"-c", "--printProperties"}, required = false, description = "prints an example propeties file, redirect to file to use")
+ boolean printProps = false;
}
/**
@@ -97,31 +137,42 @@ public class MiniAccumuloRunner {
Opts opts = new Opts();
opts.parseArgs(MiniAccumuloRunner.class.getName(), args);
+ if (opts.printProps) {
+ printProperties();
+ System.exit(0);
+ }
+
int shutdownPort = 4445;
- final File tempDir = Files.createTempDir();
- String rootPass = opts.prop.containsKey("rootPassword") ? opts.prop.getProperty("rootPassword") : "secret";
-
- MiniAccumuloConfig config = new MiniAccumuloConfig(tempDir, rootPass);
-
- if (opts.prop.containsKey("instanceName"))
- config.setInstanceName(opts.prop.getProperty("instanceName"));
- if (opts.prop.containsKey("numTServers"))
- config.setNumTservers(Integer.parseInt(opts.prop.getProperty("numTServers")));
- if (opts.prop.containsKey("zooKeeperPort"))
- config.setZooKeeperPort(Integer.parseInt(opts.prop.getProperty("zooKeeperPort")));
- if (opts.prop.containsKey("jdwpEnabled"))
- config.setJDWPEnabled(Boolean.parseBoolean(opts.prop.getProperty("jdwpEnabled")));
- if (opts.prop.containsKey("zooKeeperMemory"))
- setMemoryOnConfig(config, opts.prop.getProperty("zooKeeperMemory"), ServerType.ZOOKEEPER);
- if (opts.prop.containsKey("tserverMemory"))
- setMemoryOnConfig(config, opts.prop.getProperty("tserverMemory"), ServerType.TABLET_SERVER);
- if (opts.prop.containsKey("masterMemory"))
- setMemoryOnConfig(config, opts.prop.getProperty("masterMemory"), ServerType.MASTER);
- if (opts.prop.containsKey("defaultMemory"))
- setMemoryOnConfig(config, opts.prop.getProperty("defaultMemory"));
- if (opts.prop.containsKey("shutdownPort"))
- shutdownPort = Integer.parseInt(opts.prop.getProperty("shutdownPort"));
+ final File miniDir;
+
+ if (opts.prop.containsKey(DIRECTORY_PROP))
+ miniDir = new File(opts.prop.getProperty(DIRECTORY_PROP));
+ else
+ miniDir = Files.createTempDir();
+
+ String rootPass = opts.prop.containsKey(ROOT_PASSWORD_PROP) ? opts.prop.getProperty(ROOT_PASSWORD_PROP) : "secret";
+
+ MiniAccumuloConfig config = new MiniAccumuloConfig(miniDir, rootPass);
+
+ if (opts.prop.containsKey(INSTANCE_NAME_PROP))
+ config.setInstanceName(opts.prop.getProperty(INSTANCE_NAME_PROP));
+ if (opts.prop.containsKey(NUM_T_SERVERS_PROP))
+ config.setNumTservers(Integer.parseInt(opts.prop.getProperty(NUM_T_SERVERS_PROP)));
+ if (opts.prop.containsKey(ZOO_KEEPER_PORT_PROP))
+ config.setZooKeeperPort(Integer.parseInt(opts.prop.getProperty(ZOO_KEEPER_PORT_PROP)));
+ if (opts.prop.containsKey(JDWP_ENABLED_PROP))
+ config.setJDWPEnabled(Boolean.parseBoolean(opts.prop.getProperty(JDWP_ENABLED_PROP)));
+ if (opts.prop.containsKey(ZOO_KEEPER_MEMORY_PROP))
+ setMemoryOnConfig(config, opts.prop.getProperty(ZOO_KEEPER_MEMORY_PROP), ServerType.ZOOKEEPER);
+ if (opts.prop.containsKey(TSERVER_MEMORY_PROP))
+ setMemoryOnConfig(config, opts.prop.getProperty(TSERVER_MEMORY_PROP), ServerType.TABLET_SERVER);
+ if (opts.prop.containsKey(MASTER_MEMORY_PROP))
+ setMemoryOnConfig(config, opts.prop.getProperty(MASTER_MEMORY_PROP), ServerType.MASTER);
+ if (opts.prop.containsKey(DEFAULT_MEMORY_PROP))
+ setMemoryOnConfig(config, opts.prop.getProperty(DEFAULT_MEMORY_PROP));
+ if (opts.prop.containsKey(SHUTDOWN_PORT_PROP))
+ shutdownPort = Integer.parseInt(opts.prop.getProperty(SHUTDOWN_PORT_PROP));
Map<String,String> siteConfig = new HashMap<String,String>();
for (Map.Entry<Object,Object> entry : opts.prop.entrySet()) {
@@ -139,7 +190,7 @@ public class MiniAccumuloRunner {
public void run() {
try {
accumulo.stop();
- FileUtils.deleteDirectory(tempDir);
+ FileUtils.deleteDirectory(miniDir);
System.out.println("\nShut down gracefully on " + new Date());
} catch (IOException e) {
e.printStackTrace();
@@ -204,6 +255,10 @@ public class MiniAccumuloRunner {
System.out.println(String.format(FORMAT_STRING, "Shutdown Port:", shutdownPort));
+ System.out.println();
+ System.out.println(" To connect with shell, use the following command : ");
+ System.out.println(" accumulo shell -zh " + accumulo.getZooKeepers() + " -zi " + accumulo.getConfig().getInstanceName() + " -u root ");
+
System.out.println("\n\nSuccessfully started on " + new Date());
}
}
[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by kt...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4ec78981
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ec78981
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ec78981
Branch: refs/heads/master
Commit: 4ec78981c199851779863071bc3acea9d2dd039c
Parents: 5a76745 4fd8686
Author: Keith Turner <kt...@apache.org>
Authored: Wed Mar 5 14:03:59 2014 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Mar 5 14:03:59 2014 -0500
----------------------------------------------------------------------
.../minicluster/MiniAccumuloRunner.java | 103 ++++++++++++++-----
1 file changed, 79 insertions(+), 24 deletions(-)
----------------------------------------------------------------------