Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

change the bookieServer cmdline to make conf-file and option co-exist #5

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

change the bookieServer cmdline to make conf-file and option co-exist #5

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b487a55
Merge pull request #1 from twitter/master
jiazhai Oct 24, 2016
1830079
tmp version that could work
Nov 4, 2016
e689d66
add more configurable parameter in bookie start commandline
Nov 4, 2016
3867d9a
print usage well
Nov 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 49 additions & 20 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.ParseException;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.lang3.tuple.Pair;
Expand All @@ -51,6 +52,7 @@

import com.google.common.annotations.VisibleForTesting;

import static java.lang.Integer.*;
import static org.apache.bookkeeper.bookie.BookKeeperServerStats.*;
import static org.apache.bookkeeper.replication.ReplicationStats.*;

Expand Down Expand Up @@ -249,8 +251,14 @@ public void run() {
static {
bkOpts.addOption("c", "conf", true, "Configuration for Bookie Server");
bkOpts.addOption("r", "readonly", false, "Running Bookie Server in ReadOnly mode");
bkOpts.addOption("withAutoRecovery", false,
"Start Autorecovery service Bookie server");
bkOpts.addOption("withAutoRecovery", false, "Start Autorecovery service Bookie server");
bkOpts.addOption("z", "zkserver", true, "Zookeeper Server");
bkOpts.addOption("m", "zkledgerpath", true, "Zookeeper ledgers root path");
bkOpts.addOption("p", "bookieport", true, "bookie port exported");
bkOpts.addOption("j", "journal", true, "bookie journal directory");
Option ledgerDirs = new Option ("l", "ledgerdirs", true, "bookie ledgers directories");
ledgerDirs.setArgs(10);
bkOpts.addOption(ledgerDirs);
bkOpts.addOption("h", "help", false, "Print help message");
}

Expand All @@ -259,8 +267,14 @@ public void run() {
*/
private static void printUsage() {
HelpFormatter hf = new HelpFormatter();
hf.printHelp("BookieServer [options]\n\tor\n"
+ "BookieServer <bookie_port> <zk_servers> <journal_dir> <ledger_dir [ledger_dir]>", bkOpts);
String header = "\n"
+ "BookieServer provide an interface to start a bookie with configuration file and/or arguments."
+ "The settings in configuration file will be overwrite by provided arguments.\n"
+ "Options including:\n";
String footer = "Here is an example:\n" +
"\tBookieServer -c bookie.conf -z localhost:2181 -m /bookkeeper/ledgers " +
"-p 3181 -j /mnt/journal -l \"/mnt/ledger1 /mnt/ledger2 /mnt/ledger3\"\n";
hf.printHelp("BookieServer [options]\n", header, bkOpts, footer, true);
}

private static void loadConfFile(ServerConfiguration conf, String confFile)
Expand Down Expand Up @@ -292,33 +306,48 @@ private static Pair<ServerConfiguration, CommandLine> parseArgs(String[] args)
String[] leftArgs = cmdLine.getArgs();

if (cmdLine.hasOption('c')) {
if (null != leftArgs && leftArgs.length > 0) {
throw new IllegalArgumentException();
}
String confFile = cmdLine.getOptionValue("c");
String confFile = cmdLine.getOptionValue('c');
loadConfFile(conf, confFile);
return Pair.of(conf, cmdLine);
}

// command line arguments overwrite settings in configuration file
if (cmdLine.hasOption("withAutoRecovery")) {
conf.setAutoRecoveryDaemonEnabled(true);
}

if (cmdLine.hasOption("withAutoRecovery")) {
conf.setAutoRecoveryDaemonEnabled(true);
if (cmdLine.hasOption('z')) {
String sZK = cmdLine.getOptionValue('z');
LOG.info("Get cmdline zookeeper instance: " + sZK);
conf.setZkServers(sZK);
}

if (leftArgs.length < 4) {
throw new IllegalArgumentException();
if (cmdLine.hasOption('m')) {
String sZkLedgersRootPath = cmdLine.getOptionValue('m');
LOG.info("Get cmdline zookeeper ledger path: " + sZkLedgersRootPath);
conf.setZkLedgersRootPath(sZkLedgersRootPath);
}

// command line arguments overwrite settings in configuration file
conf.setBookiePort(Integer.parseInt(leftArgs[0]));
conf.setZkServers(leftArgs[1]);
conf.setJournalDirName(leftArgs[2]);
String[] ledgerDirNames = new String[leftArgs.length - 3];
System.arraycopy(leftArgs, 3, ledgerDirNames, 0, ledgerDirNames.length);
conf.setLedgerDirNames(ledgerDirNames);
if (cmdLine.hasOption('p')) {
String sPort = cmdLine.getOptionValue('p');
LOG.info("Get cmdline bookie port: " + sPort);
Integer iPort = parseInt(sPort);
conf.setBookiePort(iPort.intValue());
}

if (cmdLine.hasOption('j')) {
String sJournalDir = cmdLine.getOptionValue('j');
LOG.info("Get cmdline journal dir: " + sJournalDir);
conf.setJournalDirName(sJournalDir);
}

if (cmdLine.hasOption('l')) {
String[] sLedgerDirs = cmdLine.getOptionValues('l');
LOG.info("Get cmdline ledger dirs: ");
for(String ledger : sLedgerDirs) {
LOG.info("ledgerdir : " + ledger);
}
conf.setLedgerDirNames(sLedgerDirs);
}

return Pair.of(conf, cmdLine);
} catch (ParseException e) {
Expand Down