From 1139c12ec12eb19c7490a830ce5787007dff70c2 Mon Sep 17 00:00:00 2001 From: Yang Yang Date: Sat, 21 Aug 2021 15:48:28 +0800 Subject: [PATCH 1/2] Support specifying bookie http port as a command argument --- .../src/main/java/org/apache/bookkeeper/server/Main.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java index d44e25b23d9..054f576884e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java @@ -76,6 +76,7 @@ public class Main { BK_OPTS.addOption("z", "zkserver", true, "Zookeeper Server"); BK_OPTS.addOption("m", "zkledgerpath", true, "Zookeeper ledgers root path"); BK_OPTS.addOption("p", "bookieport", true, "bookie port exported"); + BK_OPTS.addOption("httpport", true, "bookie http port exported"); BK_OPTS.addOption("j", "journal", true, "bookie journal directory"); Option indexDirs = new Option ("i", "indexdirs", true, "bookie index directories"); indexDirs.setArgs(10); @@ -173,6 +174,13 @@ private static ServerConfiguration parseArgs(String[] args) conf.setBookiePort(iPort.intValue()); } + if (cmdLine.hasOption("httpport")) { + String sPort = cmdLine.getOptionValue("httpport"); + log.info("Get cmdline http port: {}", sPort); + Integer iPort = Integer.parseInt(sPort); + conf.setHttpServerPort(iPort.intValue()); + } + if (cmdLine.hasOption('j')) { String sJournalDir = cmdLine.getOptionValue('j'); log.info("Get cmdline journal dir: {}", sJournalDir); From fdb992ec6a4548b759d4fa1d4f035d4a162aaf7d Mon Sep 17 00:00:00 2001 From: Yang Yang Date: Tue, 24 Aug 2021 11:24:51 +0800 Subject: [PATCH 2/2] Added a short-hand option name 'hp' for 'httpport' --- .../src/main/java/org/apache/bookkeeper/server/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java index 054f576884e..64efd9e2ef4 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java @@ -76,7 +76,7 @@ public class Main { BK_OPTS.addOption("z", "zkserver", true, "Zookeeper Server"); BK_OPTS.addOption("m", "zkledgerpath", true, "Zookeeper ledgers root path"); BK_OPTS.addOption("p", "bookieport", true, "bookie port exported"); - BK_OPTS.addOption("httpport", true, "bookie http port exported"); + BK_OPTS.addOption("hp", "httpport", true, "bookie http port exported"); BK_OPTS.addOption("j", "journal", true, "bookie journal directory"); Option indexDirs = new Option ("i", "indexdirs", true, "bookie index directories"); indexDirs.setArgs(10);