You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2016/03/31 21:17:05 UTC
[2/2] 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)
Conflicts:
llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapOptionsProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/bae499c9
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/bae499c9
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/bae499c9
Branch: refs/heads/branch-2.0
Commit: bae499c91741ca7397ba441c3dcddaa32e76d56d
Parents: 75513fc
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 12:16:01 2016 -0700
----------------------------------------------------------------------
.../hive/llap/cli/LlapOptionsProcessor.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/bae499c9/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 6d25384..97f1707 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
@@ -36,6 +36,12 @@ import org.apache.hadoop.util.StringUtils;
public class LlapOptionsProcessor {
+ 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;
@@ -138,6 +144,18 @@ public class LlapOptionsProcessor {
options.addOption(OptionBuilder.hasArg().withArgName("executors").withLongOpt("executors")
.withDescription("executor per instance").create('e'));
+ 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("cache").withLongOpt("cache")
.withDescription("cache size per instance").create('c'));