diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java index 8b98aee..347d333 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java @@ -52,6 +52,7 @@ public static final String OPTION_JAVA_HOME = "javaHome"; // forward via config.json public static final String OPTION_HIVECONF = "hiveconf"; // llap-daemon-site if relevant parameter public static final String OPTION_SLIDER_AM_CONTAINER_MB = "slider-am-container-mb"; // forward as arg + public static final String OPTION_SLIDER_SITE_GLOBAL_APPEND = "slider-site-global-append"; // forward as arg public static final String OPTION_LLAP_QUEUE = "queue"; // forward via config.json public static final String OPTION_IO_THREADS = "iothreads"; // llap-daemon-site @@ -256,6 +257,12 @@ public LlapOptionsProcessor() { .withLongOpt(OPTION_SLIDER_AM_CONTAINER_MB) .withDescription("The size of the slider AppMaster container in MB").create('b')); + options.addOption(OptionBuilder.hasArg().withArgName("b") + .withLongOpt(OPTION_SLIDER_SITE_GLOBAL_APPEND) + .withDescription( + "Additional string to append to the slider appConfig.global section. e.g. to set AM ports.") + .create()); + options.addOption(OptionBuilder.hasArg().withArgName(OPTION_IO_THREADS) .withLongOpt(OPTION_IO_THREADS).withDescription("executor per instance").create('t')); diff --git llap-server/src/main/resources/package.py llap-server/src/main/resources/package.py index 9d61058..d89c137 100644 --- llap-server/src/main/resources/package.py +++ llap-server/src/main/resources/package.py @@ -74,6 +74,7 @@ def main(args): parser.add_argument("--logger", default="RFA") parser.add_argument("--chaosmonkey", type=int, default=0) parser.add_argument("--slider-am-container-mb", type=int, default=1024) + parser.add_argument("--slider-site-global-append", default="") parser.add_argument("--slider-keytab-dir", default="") parser.add_argument("--slider-keytab", default="") parser.add_argument("--slider-principal", default="") @@ -128,6 +129,7 @@ def main(args): "monkey_percentage" : monkey_percentage, "monkey_enabled" : args.chaosmonkey > 0, "slider.am.container.mb" : args.slider_am_container_mb, + "slider_site_global_append": args.slider_site_global_append, "slider_am_jvm_heapsize" : slider_am_jvm_heapsize, "slider_keytab_dir" : slider_keytab_dir, "slider_keytab" : slider_keytab, diff --git llap-server/src/main/resources/templates.py llap-server/src/main/resources/templates.py index 5684f33..229d2d0 100644 --- llap-server/src/main/resources/templates.py +++ llap-server/src/main/resources/templates.py @@ -84,7 +84,8 @@ "internal.chaos.monkey.probability.amlaunchfailure": "0", "internal.chaos.monkey.probability.containerfailure": "%(monkey_percentage)d", "internal.chaos.monkey.interval.seconds": "%(monkey_interval)d", - "internal.chaos.monkey.enabled": "%(monkey_enabled)s" + "internal.chaos.monkey.enabled": "%(monkey_enabled)s", + %(slider_site_global_append)s }, "components": { "slider-appmaster": {