You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ss...@apache.org on 2016/04/05 00:37:48 UTC
[04/24] hive git commit: HIVE-13379 : HIVE-12851 args do not work
(slider-keytab-dir, etc.) (Sergey Shelukhin, reviewed by Siddharth Seth)
HIVE-13379 : HIVE-12851 args do not work (slider-keytab-dir, etc.) (Sergey Shelukhin, reviewed by Siddharth Seth)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f41cbea8
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f41cbea8
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f41cbea8
Branch: refs/heads/llap
Commit: f41cbea80dc8ca8765b02c19e6aeba772323895c
Parents: 8225cb6
Author: Sergey Shelukhin <se...@apache.org>
Authored: Thu Mar 31 11:53:39 2016 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Thu Mar 31 11:53:39 2016 -0700
----------------------------------------------------------------------
.../hive/llap/cli/LlapOptionsProcessor.java | 25 +++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/f41cbea8/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java
index b7f019c..cdc919e 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java
@@ -39,9 +39,6 @@ public class LlapOptionsProcessor {
public static final String OPTION_INSTANCES = "instances"; //forward as arg
public static final String OPTION_NAME = "name"; // forward as arg
public static final String OPTION_DIRECTORY = "directory"; // work-dir
- public static final String OPTION_ARGS = "args"; // forward as arg
- public static final String OPTION_LOGLEVEL = "loglevel"; // forward as arg
- public static final String OPTION_CHAOS_MONKEY = "chaosmonkey"; // forward as arg
public static final String OPTION_EXECUTORS = "executors"; // llap-daemon-site
public static final String OPTION_CACHE = "cache"; // llap-daemon-site
public static final String OPTION_SIZE = "size"; // forward via config.json
@@ -54,6 +51,16 @@ public class LlapOptionsProcessor {
public static final String OPTION_LLAP_QUEUE = "queue"; // forward via config.json
public static final String OPTION_IO_THREADS = "iothreads"; // llap-daemon-site
+ // Options for the pythin script that are here because our option parser cannot ignore the unknown ones
+ public static final String OPTION_ARGS = "args"; // forward as arg
+ public static final String OPTION_LOGLEVEL = "loglevel"; // forward as arg
+ public static final String OPTION_CHAOS_MONKEY = "chaosmonkey"; // forward as arg
+ public static final String OPTION_SLIDER_KEYTAB_DIR = "slider-keytab-dir";
+ public static final String OPTION_SLIDER_KEYTAB = "slider-keytab";
+ public static final String OPTION_SLIDER_PRINCIPAL = "slider-principal";
+ public static final String OPTION_SLIDER_DEFAULT_KEYTAB = "slider-default-keytab";
+
+
public class LlapOptions {
private final int instances;
private final String directory;
@@ -171,6 +178,18 @@ public class LlapOptionsProcessor {
options.addOption(OptionBuilder.hasArg().withArgName(OPTION_CHAOS_MONKEY).withLongOpt(OPTION_CHAOS_MONKEY)
.withDescription("chaosmonkey interval").create('m'));
+ options.addOption(OptionBuilder.hasArg(false).withArgName(OPTION_SLIDER_DEFAULT_KEYTAB).withLongOpt(OPTION_SLIDER_DEFAULT_KEYTAB)
+ .withDescription("try to set default settings for Slider AM keytab; mostly for dev testing").create());
+
+ options.addOption(OptionBuilder.hasArg().withArgName(OPTION_SLIDER_KEYTAB_DIR).withLongOpt(OPTION_SLIDER_KEYTAB_DIR)
+ .withDescription("Slider AM keytab directory on HDFS (where the headless user keytab is stored by Slider keytab installation, e.g. .slider/keytabs/llap)").create());
+
+ options.addOption(OptionBuilder.hasArg().withArgName(OPTION_SLIDER_KEYTAB).withLongOpt(OPTION_SLIDER_KEYTAB)
+ .withDescription("Slider AM keytab file name inside " + OPTION_SLIDER_KEYTAB_DIR).create());
+
+ options.addOption(OptionBuilder.hasArg().withArgName(OPTION_SLIDER_PRINCIPAL).withLongOpt(OPTION_SLIDER_PRINCIPAL)
+ .withDescription("Slider AM principal; should be the user running the cluster, e.g. hive@EXAMPLE.COM").create());
+
options.addOption(OptionBuilder.hasArg().withArgName(OPTION_EXECUTORS).withLongOpt(OPTION_EXECUTORS)
.withDescription("executor per instance").create('e'));