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/01/25 23:51:46 UTC
[2/2] hive git commit: HIVE-12851 : Add slider security setting
support to LLAP packager (Sergey Shelukhin, reviewed by Gopal V)
HIVE-12851 : Add slider security setting support to LLAP packager (Sergey Shelukhin, reviewed by Gopal V)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9bf8d00c
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9bf8d00c
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9bf8d00c
Branch: refs/heads/branch-2.0
Commit: 9bf8d00cf71d940ba80d9c4d094a5df0fd218241
Parents: d3954f7
Author: Sergey Shelukhin <se...@apache.org>
Authored: Mon Jan 25 14:50:53 2016 -0800
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Mon Jan 25 14:51:02 2016 -0800
----------------------------------------------------------------------
llap-server/src/main/resources/package.py | 23 +++++++++++++++++++++--
llap-server/src/main/resources/templates.py | 5 ++++-
2 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/9bf8d00c/llap-server/src/main/resources/package.py
----------------------------------------------------------------------
diff --git a/llap-server/src/main/resources/package.py b/llap-server/src/main/resources/package.py
index 20a2510..0204b7b 100644
--- a/llap-server/src/main/resources/package.py
+++ b/llap-server/src/main/resources/package.py
@@ -60,12 +60,28 @@ def main(args):
parser.add_argument("--args", default="")
parser.add_argument("--name", default="llap0")
parser.add_argument("--loglevel", default="INFO")
- parser.add_argument("--chaosmonkey", type=int, default="0")
+ parser.add_argument("--chaosmonkey", type=int, default=0)
+ parser.add_argument("--slider-keytab-dir", default="")
+ parser.add_argument("--slider-keytab", default="")
+ parser.add_argument("--slider-principal", default="")
+ parser.add_argument("--slider-default-keytab", dest='slider_default_keytab', action='store_true')
+ parser.set_defaults(slider_default_keytab=False)
# Unneeded here for now: parser.add_argument("--hiveconf", action='append')
#parser.add_argument("--size") parser.add_argument("--xmx") parser.add_argument("--cache") parser.add_argument("--executors")
(args, unknown_args) = parser.parse_known_args(args)
input = args.input
output = args.output
+ slider_keytab_dir = args.slider_keytab_dir
+ slider_keytab = args.slider_keytab
+ slider_principal = args.slider_principal
+ # set the defaults only if the defaults are enabled
+ if args.slider_default_keytab:
+ if not slider_keytab_dir:
+ slider_keytab_dir = ".slider/keytabs/llap"
+ if not slider_keytab:
+ slider_keytab = "llap.keytab"
+ if not slider_principal:
+ slider_principal = "llap@EXAMPLE.COM"
if not input:
print "Cannot find input files"
sys.exit(1)
@@ -89,7 +105,10 @@ def main(args):
"daemon_loglevel" : args.loglevel,
"monkey_interval" : args.chaosmonkey,
"monkey_percentage" : monkey_percentage,
- "monkey_enabled" : args.chaosmonkey > 0
+ "monkey_enabled" : args.chaosmonkey > 0,
+ "slider_keytab_dir" : slider_keytab_dir,
+ "slider_keytab" : slider_keytab,
+ "slider_principal" : slider_principal
}
if not exists(output):
http://git-wip-us.apache.org/repos/asf/hive/blob/9bf8d00c/llap-server/src/main/resources/templates.py
----------------------------------------------------------------------
diff --git a/llap-server/src/main/resources/templates.py b/llap-server/src/main/resources/templates.py
index ed8584b..277a49c 100644
--- a/llap-server/src/main/resources/templates.py
+++ b/llap-server/src/main/resources/templates.py
@@ -88,7 +88,10 @@ appConfig = """
},
"components": {
"slider-appmaster": {
- "jvm.heapsize": "1024M"
+ "jvm.heapsize": "1024M",
+ "slider.hdfs.keytab.dir": "%(slider_keytab_dir)s",
+ "slider.am.login.keytab.name": "%(slider_keytab)s",
+ "slider.keytab.principal.name": "%(slider_principal)s"
}
}
}