You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by jm...@apache.org on 2014/09/08 15:42:15 UTC
[1/6] git commit: Temporary Storm package with Security
Repository: incubator-slider
Updated Branches:
refs/heads/develop 8da150363 -> f66c0cbc0
Temporary Storm package with Security
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/eb6620e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/eb6620e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/eb6620e7
Branch: refs/heads/develop
Commit: eb6620e77a1e8c97c5b65f8d098040d03594e478
Parents: 8bfd66e
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Aug 28 18:21:18 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Aug 28 18:21:18 2014 -0700
----------------------------------------------------------------------
app-packages/storm/README.txt | 4 +--
app-packages/storm/appConfig.json | 11 ++++----
app-packages/storm/configuration/storm-env.xml | 25 ++++++++++++++++++
app-packages/storm/metainfo.xml | 2 +-
...pache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE | 16 ------------
...pache-storm-0.9.3.0.2.5.0-100.tar.gz.REPLACE | 16 ++++++++++++
app-packages/storm/package/scripts/params.py | 11 +++++---
app-packages/storm/package/scripts/service.py | 8 ++++++
.../storm/package/templates/storm_jaas.conf.j2 | 27 +++++++++++++++++---
app-packages/storm/resources.json | 2 +-
10 files changed, 91 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/README.txt
----------------------------------------------------------------------
diff --git a/app-packages/storm/README.txt b/app-packages/storm/README.txt
index 971cf14..77474f1 100644
--- a/app-packages/storm/README.txt
+++ b/app-packages/storm/README.txt
@@ -26,10 +26,10 @@ Replace the placeholder tarball for Storm.
rm package/files/apache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE
Create a zip package at the root of the package (<slider enlistment>/app-packages/storm-v0_91/)
- zip -r storm_v091.zip .
+ zip -r Apache_Storm_v_0_9_3.zip .
Verify the content using
- unzip -l "$@" storm_v091.zip
+ unzip -l "$@" Apache_Storm_v_0_9_3.zip
While appConfig.json and resources.json are not required for the package they work
well as the default configuration for Slider apps. So its advisable that when you
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig.json b/app-packages/storm/appConfig.json
index b8454f9..d6dee84 100644
--- a/app-packages/storm/appConfig.json
+++ b/app-packages/storm/appConfig.json
@@ -3,12 +3,12 @@
"metadata": {
},
"global": {
- "application.def": "storm_v091.zip",
+ "application.def": "Apache_Storm_v_0_9_3.zip",
"java_home": "/usr/jdk64/jdk1.7.0_45",
"create.default.zookeeper.node": "true",
"site.global.app_user": "yarn",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.1.2.1.1.0-237",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100",
"site.global.user_group": "hadoop",
"site.global.security_enabled": "false",
"site.global.ganglia_server_host": "${NN_HOST}",
@@ -18,13 +18,14 @@
"site.global.rest_api_port": "${STORM_REST_API.ALLOCATED_PORT}",
"site.global.rest_api_admin_port": "${STORM_REST_API.ALLOCATED_PORT}",
+ "site.storm-site.storm.log.dir" : "${AGENT_LOG_ROOT}",
"site.storm-site.storm.zookeeper.servers": "['${ZK_HOST}']",
"site.storm-site.nimbus.thrift.port": "${NIMBUS.ALLOCATED_PORT}",
"site.storm-site.storm.local.dir": "${AGENT_WORK_ROOT}/app/tmp/storm",
"site.storm-site.transactional.zookeeper.root": "/transactional",
"site.storm-site.storm.zookeeper.port": "2181",
- "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.1.2.1.1.0-237/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.1.2.1.1.0-237/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
- "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.1.2.1.1.0-237/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.1.2.1.1.0-237/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
+ "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
+ "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
"site.storm-site.dev.zookeeper.path": "${AGENT_WORK_ROOT}/app/tmp/dev-storm-zookeeper",
"site.storm-site.drpc.invocations.port": "0",
"site.storm-site.storm.zookeeper.root": "${DEF_ZK_PATH}",
@@ -32,7 +33,7 @@
"site.storm-site.nimbus.host": "${NIMBUS_HOST}",
"site.storm-site.ui.port": "${STORM_UI_SERVER.ALLOCATED_PORT}",
"site.storm-site.supervisor.slots.ports": "[${SUPERVISOR.ALLOCATED_PORT}{DO_NOT_PROPAGATE},${SUPERVISOR.ALLOCATED_PORT}{DO_NOT_PROPAGATE}]",
- "site.storm-site.supervisor.childopts": "-Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=0 -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.1.2.1.1.0-237/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.1.2.1.1.0-237/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
+ "site.storm-site.supervisor.childopts": "-Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=0 -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
"site.storm-site.drpc.port": "0",
"site.storm-site.logviewer.port": "${SUPERVISOR.ALLOCATED_PORT}{DO_NOT_PROPAGATE}"
},
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/configuration/storm-env.xml b/app-packages/storm/configuration/storm-env.xml
index f315eb3..091c08d 100644
--- a/app-packages/storm/configuration/storm-env.xml
+++ b/app-packages/storm/configuration/storm-env.xml
@@ -22,6 +22,31 @@
<configuration>
+ <property>
+ <name>kerberos_domain</name>
+ <value></value>
+ <description>The kerberos domain to be used for this Storm cluster</description>
+ </property>
+ <property>
+ <name>storm_client_principal_name</name>
+ <value></value>
+ <description>The principal name for the Storm client to be used to communicate with Nimbus and Zookeeper</description>
+ </property>
+ <property>
+ <name>storm_server_principal_name</name>
+ <value></value>
+ <description>The principal name for the Storm server to be used by Nimbus</description>
+ </property>
+ <property>
+ <name>storm_client_keytab</name>
+ <value></value>
+ <description>The keytab file path for Storm client</description>
+ </property>
+ <property>
+ <name>storm_server_keytab</name>
+ <value></value>
+ <description>The keytab file path for Storm server</description>
+ </property>
<!-- storm-env.sh -->
<property>
<name>content</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/metainfo.xml b/app-packages/storm/metainfo.xml
index 70d369c..89ee01e 100644
--- a/app-packages/storm/metainfo.xml
+++ b/app-packages/storm/metainfo.xml
@@ -150,7 +150,7 @@
<packages>
<package>
<type>tarball</type>
- <name>files/apache-storm-0.9.1.2.1.1.0-237.tar.gz</name>
+ <name>files/apache-storm-0.9.3.0.2.5.0-100.tar.gz</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/package/files/apache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/files/apache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE b/app-packages/storm/package/files/apache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE
deleted file mode 100644
index dd934d5..0000000
--- a/app-packages/storm/package/files/apache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Replace with the actual storm package.
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/package/files/apache-storm-0.9.3.0.2.5.0-100.tar.gz.REPLACE
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/files/apache-storm-0.9.3.0.2.5.0-100.tar.gz.REPLACE b/app-packages/storm/package/files/apache-storm-0.9.3.0.2.5.0-100.tar.gz.REPLACE
new file mode 100644
index 0000000..dd934d5
--- /dev/null
+++ b/app-packages/storm/package/files/apache-storm-0.9.3.0.2.5.0-100.tar.gz.REPLACE
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Replace with the actual storm package.
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/params.py b/app-packages/storm/package/scripts/params.py
index 3e1620b..93c6018 100644
--- a/app-packages/storm/package/scripts/params.py
+++ b/app-packages/storm/package/scripts/params.py
@@ -53,6 +53,11 @@ security_enabled = ( not is_empty(_authentication) and _authentication == 'kerbe
if security_enabled:
_hostname_lowercase = config['hostname'].lower()
_kerberos_domain = config['configurations']['storm-env']['kerberos_domain']
- _storm_principal_name = config['configurations']['storm-env']['storm_principal_name']
- storm_jaas_principal = _storm_principal_name.replace('_HOST', _hostname_lowercase)
- storm_keytab_path = config['configurations']['storm-env']['storm_keytab']
+ _storm_client_principal_name = config['configurations']['storm-env']['storm_client_principal_name']
+ _storm_server_principal_name = config['configurations']['storm-env']['storm_server_principal_name']
+
+ storm_jaas_client_principal = _storm_client_principal_name.replace('_HOST', _hostname_lowercase)
+ storm_client_keytab_path = config['configurations']['storm-env']['storm_client_keytab']
+ storm_jaas_server_principal = _storm_server_principal_name.replace('_HOST', _hostname_lowercase)
+ storm_server_keytab_path = config['configurations']['storm-env']['storm_server_keytab']
+ kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/package/scripts/service.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/service.py b/app-packages/storm/package/scripts/service.py
index 13fcef2..dc3c733 100644
--- a/app-packages/storm/package/scripts/service.py
+++ b/app-packages/storm/package/scripts/service.py
@@ -52,6 +52,14 @@ def service(
else:
cmd = format("env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin STORM_BASE_DIR={app_root} STORM_CONF_DIR={conf_dir} {storm_bin} {name} > {log_dir}/{name}.out 2>&1")
+ if params.security_enabled:
+ if name == "nimbus":
+ Execute(format("{kinit_path_local} -kt {storm_server_keytab_path} {storm_user}"),
+ user=params.storm_user)
+ else:
+ Execute(format("{kinit_path_local} -kt {storm_client_keytab_path} {storm_user}"),
+ user=params.storm_user)
+
Execute(cmd,
not_if=no_op_test,
user=params.storm_user,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/package/templates/storm_jaas.conf.j2
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/templates/storm_jaas.conf.j2 b/app-packages/storm/package/templates/storm_jaas.conf.j2
index 4031d22..e68cd57 100644
--- a/app-packages/storm/package/templates/storm_jaas.conf.j2
+++ b/app-packages/storm/package/templates/storm_jaas.conf.j2
@@ -15,12 +15,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+StormServer {
+ com.sun.security.auth.module.Krb5LoginModule required
+ useKeyTab=true
+ keyTab="{{storm_server_keytab_path}}"
+ storeKey=true
+ useTicketCache=true
+ renewTGT=true
+ principal="{{storm_jaas_server_principal}}";
+};
+StormClient {
+ com.sun.security.auth.module.Krb5LoginModule required
+ useKeyTab=true
+ keyTab="{{storm_client_keytab_path}}"
+ storeKey=true
+ useTicketCache=true
+ renewTGT=true
+ serviceName="nimbus"
+ debug=true
+ principal="{{storm_jaas_client_principal}}";
+};
Client {
com.sun.security.auth.module.Krb5LoginModule required
useKeyTab=true
- keyTab="{{storm_keytab_path}}"
+ keyTab="{{storm_client_keytab_path}}"
storeKey=true
- useTicketCache=false
+ useTicketCache=true
+ renewTGT=true
serviceName="zookeeper"
- principal="{{storm_jaas_principal}}";
+ principal="{{storm_jaas_client_principal}}";
};
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/eb6620e7/app-packages/storm/resources.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/resources.json b/app-packages/storm/resources.json
index b184a40..606dc39 100644
--- a/app-packages/storm/resources.json
+++ b/app-packages/storm/resources.json
@@ -13,7 +13,7 @@
},
"STORM_REST_API": {
"yarn.role.priority": "2",
- "yarn.component.instances": "1"
+ "yarn.component.instances": "0"
},
"STORM_UI_SERVER": {
"yarn.role.priority": "3",
[3/6] git commit: cheanges for secure deployment
Posted by jm...@apache.org.
cheanges for secure deployment
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f4871c6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f4871c6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f4871c6f
Branch: refs/heads/develop
Commit: f4871c6fcd2f093a313933de63107bd7e5c372b3
Parents: 0878e52
Author: Jon Maron <jm...@hortonworks.com>
Authored: Tue Sep 2 19:22:27 2014 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Tue Sep 2 19:22:27 2014 -0400
----------------------------------------------------------------------
app-packages/storm/package/scripts/params.py | 9 ++++-----
app-packages/storm/package/scripts/service.py | 4 ++--
app-packages/storm/package/scripts/storm.py | 9 ++++++---
app-packages/storm/package/scripts/yaml_config.py | 10 +++++++++-
4 files changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f4871c6f/app-packages/storm/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/params.py b/app-packages/storm/package/scripts/params.py
index 93c6018..a8e36b9 100644
--- a/app-packages/storm/package/scripts/params.py
+++ b/app-packages/storm/package/scripts/params.py
@@ -47,17 +47,16 @@ if ganglia_installed:
ganglia_server = config['configurations']['global']['ganglia_server_host']
ganglia_port = config['configurations']['global']['ganglia_server_port']
-_authentication = config['configurations']['core-site']['hadoop.security.authentication']
-security_enabled = ( not is_empty(_authentication) and _authentication == 'kerberos')
+security_enabled = config['configurations']['global']['security_enabled']
+hostname_lowercase = config['hostname'].lower()
if security_enabled:
- _hostname_lowercase = config['hostname'].lower()
_kerberos_domain = config['configurations']['storm-env']['kerberos_domain']
_storm_client_principal_name = config['configurations']['storm-env']['storm_client_principal_name']
_storm_server_principal_name = config['configurations']['storm-env']['storm_server_principal_name']
- storm_jaas_client_principal = _storm_client_principal_name.replace('_HOST', _hostname_lowercase)
+ storm_jaas_client_principal = _storm_client_principal_name.replace('_HOST', hostname_lowercase)
storm_client_keytab_path = config['configurations']['storm-env']['storm_client_keytab']
- storm_jaas_server_principal = _storm_server_principal_name.replace('_HOST', _hostname_lowercase)
+ storm_jaas_server_principal = _storm_server_principal_name.replace('_HOST', hostname_lowercase)
storm_server_keytab_path = config['configurations']['storm-env']['storm_server_keytab']
kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f4871c6f/app-packages/storm/package/scripts/service.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/service.py b/app-packages/storm/package/scripts/service.py
index dc3c733..50ac44c 100644
--- a/app-packages/storm/package/scripts/service.py
+++ b/app-packages/storm/package/scripts/service.py
@@ -54,10 +54,10 @@ def service(
if params.security_enabled:
if name == "nimbus":
- Execute(format("{kinit_path_local} -kt {storm_server_keytab_path} {storm_user}"),
+ Execute(format("{kinit_path_local} -kt {storm_server_keytab_path} {storm_jaas_server_principal}"),
user=params.storm_user)
else:
- Execute(format("{kinit_path_local} -kt {storm_client_keytab_path} {storm_user}"),
+ Execute(format("{kinit_path_local} -kt {storm_client_keytab_path} {storm_jaas_client_principal}"),
user=params.storm_user)
Execute(cmd,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f4871c6f/app-packages/storm/package/scripts/storm.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/storm.py b/app-packages/storm/package/scripts/storm.py
index efca073..8ecb3a1 100644
--- a/app-packages/storm/package/scripts/storm.py
+++ b/app-packages/storm/package/scripts/storm.py
@@ -50,6 +50,9 @@ def storm():
)
if params.security_enabled:
- TemplateConfig( format("{conf_dir}/storm_jaas.conf"),
- owner = params.storm_user
- )
\ No newline at end of file
+ File(format("{conf_dir}/storm_jaas.conf"),
+ content=Template("storm_jaas.conf.j2"),
+ owner = params.storm_user,
+ group = params.user_group
+ )
+
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f4871c6f/app-packages/storm/package/scripts/yaml_config.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/yaml_config.py b/app-packages/storm/package/scripts/yaml_config.py
index d25089c..0a1ffa9 100644
--- a/app-packages/storm/package/scripts/yaml_config.py
+++ b/app-packages/storm/package/scripts/yaml_config.py
@@ -19,9 +19,13 @@ limitations under the License.
"""
import re
+import socket
from resource_management import *
def escape_yaml_propetry(value):
+ # pre-process value for any "_HOST" tokens
+ value = value.replace('_HOST', socket.getfqdn())
+
unquouted = False
unquouted_values = ["null","Null","NULL","true","True","TRUE","false","False","FALSE","YES","Yes","yes","NO","No","no","ON","On","on","OFF","Off","off"]
@@ -31,7 +35,11 @@ def escape_yaml_propetry(value):
# if is list [a,b,c]
if re.match('^\w*\[.+\]\w*$', value):
unquouted = True
-
+
+ # if is map {'a':'b'}
+ if re.match('^\w*\{.+\}\w*$', value):
+ unquouted = True
+
try:
int(value)
unquouted = True
[6/6] git commit: Merge branch 'feature/update_storm_for_93' into
develop
Posted by jm...@apache.org.
Merge branch 'feature/update_storm_for_93' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f66c0cbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f66c0cbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f66c0cbc
Branch: refs/heads/develop
Commit: f66c0cbc0f211da1ea52acf7cad8a20480a1f5ea
Parents: 8da1503 4b2f8aa
Author: Jon Maron <jm...@hortonworks.com>
Authored: Mon Sep 8 09:41:14 2014 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Mon Sep 8 09:41:14 2014 -0400
----------------------------------------------------------------------
app-packages/storm/README.txt | 19 +++++++++++--------
app-packages/storm/appConfig.json | 4 ++--
app-packages/storm/metainfo.xml | 2 +-
app-packages/storm/package/scripts/params.py | 6 +++---
app-packages/storm/package/scripts/service.py | 6 +++---
app-packages/storm/package/scripts/storm.py | 9 ++++++---
.../storm/package/scripts/yaml_config.py | 10 +++++++++-
.../storm/package/templates/storm_jaas.conf.j2 | 11 ++++-------
app-packages/storm/resources.json | 4 ++--
9 files changed, 41 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
[4/6] git commit: more security changes
Posted by jm...@apache.org.
more security changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b2f2d796
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b2f2d796
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b2f2d796
Branch: refs/heads/develop
Commit: b2f2d796b92455bba0dae9bcc1d8dc8fd6a6e7db
Parents: f4871c6
Author: Jon Maron <jm...@hortonworks.com>
Authored: Sun Sep 7 13:53:16 2014 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Sun Sep 7 13:53:16 2014 -0400
----------------------------------------------------------------------
app-packages/storm/package/scripts/params.py | 7 ++++---
app-packages/storm/package/scripts/service.py | 2 +-
app-packages/storm/package/scripts/yaml_config.py | 2 +-
app-packages/storm/package/templates/storm_jaas.conf.j2 | 11 ++++-------
4 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b2f2d796/app-packages/storm/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/params.py b/app-packages/storm/package/scripts/params.py
index a8e36b9..e0bf9e4 100644
--- a/app-packages/storm/package/scripts/params.py
+++ b/app-packages/storm/package/scripts/params.py
@@ -48,15 +48,16 @@ if ganglia_installed:
ganglia_port = config['configurations']['global']['ganglia_server_port']
security_enabled = config['configurations']['global']['security_enabled']
-hostname_lowercase = config['hostname'].lower()
if security_enabled:
+ _hostname_lowercase = config['hostname'].lower()
_kerberos_domain = config['configurations']['storm-env']['kerberos_domain']
_storm_client_principal_name = config['configurations']['storm-env']['storm_client_principal_name']
_storm_server_principal_name = config['configurations']['storm-env']['storm_server_principal_name']
- storm_jaas_client_principal = _storm_client_principal_name.replace('_HOST', hostname_lowercase)
+ storm_jaas_client_principal = _storm_client_principal_name.replace('_HOST', _hostname_lowercase)
storm_client_keytab_path = config['configurations']['storm-env']['storm_client_keytab']
- storm_jaas_server_principal = _storm_server_principal_name.replace('_HOST', hostname_lowercase)
+ storm_jaas_server_principal = _storm_server_principal_name.replace('_HOST', _hostname_lowercase)
+ storm_jaas_stormclient_servicename = storm_jaas_server_principal.split("/")[0]
storm_server_keytab_path = config['configurations']['storm-env']['storm_server_keytab']
kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b2f2d796/app-packages/storm/package/scripts/service.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/service.py b/app-packages/storm/package/scripts/service.py
index 50ac44c..0ec6413 100644
--- a/app-packages/storm/package/scripts/service.py
+++ b/app-packages/storm/package/scripts/service.py
@@ -50,7 +50,7 @@ def service(
if name == "rest_api":
cmd = format("{rest_process_cmd} {rest_api_conf_file} > {log_dir}/restapi.log")
else:
- cmd = format("env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin STORM_BASE_DIR={app_root} STORM_CONF_DIR={conf_dir} {storm_bin} {name} > {log_dir}/{name}.out 2>&1")
+ cmd = format("env JAVA_HOME={java64_home} PATH={java64_home}/bin:$PATH STORM_BASE_DIR={app_root} STORM_CONF_DIR={conf_dir} {storm_bin} {name} > {log_dir}/{name}.out 2>&1")
if params.security_enabled:
if name == "nimbus":
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b2f2d796/app-packages/storm/package/scripts/yaml_config.py
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/scripts/yaml_config.py b/app-packages/storm/package/scripts/yaml_config.py
index 0a1ffa9..5f763cc 100644
--- a/app-packages/storm/package/scripts/yaml_config.py
+++ b/app-packages/storm/package/scripts/yaml_config.py
@@ -38,7 +38,7 @@ def escape_yaml_propetry(value):
# if is map {'a':'b'}
if re.match('^\w*\{.+\}\w*$', value):
- unquouted = True
+ unquouted = True
try:
int(value)
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b2f2d796/app-packages/storm/package/templates/storm_jaas.conf.j2
----------------------------------------------------------------------
diff --git a/app-packages/storm/package/templates/storm_jaas.conf.j2 b/app-packages/storm/package/templates/storm_jaas.conf.j2
index e68cd57..a1ba6ea 100644
--- a/app-packages/storm/package/templates/storm_jaas.conf.j2
+++ b/app-packages/storm/package/templates/storm_jaas.conf.j2
@@ -20,8 +20,7 @@ StormServer {
useKeyTab=true
keyTab="{{storm_server_keytab_path}}"
storeKey=true
- useTicketCache=true
- renewTGT=true
+ useTicketCache=false
principal="{{storm_jaas_server_principal}}";
};
StormClient {
@@ -29,9 +28,8 @@ StormClient {
useKeyTab=true
keyTab="{{storm_client_keytab_path}}"
storeKey=true
- useTicketCache=true
- renewTGT=true
- serviceName="nimbus"
+ useTicketCache=false
+ serviceName="{{storm_jaas_stormclient_servicename}}"
debug=true
principal="{{storm_jaas_client_principal}}";
};
@@ -40,8 +38,7 @@ Client {
useKeyTab=true
keyTab="{{storm_client_keytab_path}}"
storeKey=true
- useTicketCache=true
- renewTGT=true
+ useTicketCache=false
serviceName="zookeeper"
principal="{{storm_jaas_client_principal}}";
};
[5/6] git commit: jaas fix for StormServer
Posted by jm...@apache.org.
jaas fix for StormServer
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4b2f8aad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4b2f8aad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4b2f8aad
Branch: refs/heads/develop
Commit: 4b2f8aad8d924cd1f2396b0057c885028210310b
Parents: b2f2d79 8da1503
Author: Jon Maron <jm...@hortonworks.com>
Authored: Mon Sep 8 09:27:56 2014 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Mon Sep 8 09:27:56 2014 -0400
----------------------------------------------------------------------
README.md | 4 +-
app-packages/accumulo/appConfig.json | 7 +-
.../src/test/resources/appConfig_kerberos.json | 57 ++
.../test/resources/appConfig_monitor_ssl.json | 7 +-
.../src/test/resources/appConfig_ssl.json | 7 +-
app-packages/hbase/appConfig.json | 76 +--
app-packages/hbase/pom.xml | 2 +-
app-packages/storm/README.txt | 2 +-
app-packages/storm/appConfig.json | 13 +-
app-packages/storm/metainfo.xml | 26 +-
...pache-storm-0.9.3.0.2.5.0-100.tar.gz.REPLACE | 16 -
app-packages/storm/package/scripts/params.py | 8 +-
app-packages/storm/package/scripts/service.py | 43 +-
.../storm/package/scripts/status_params.py | 4 +-
.../storm/package/templates/config.yaml.j2 | 9 -
app-packages/storm/pom.xml | 90 +++
app-packages/storm/resources.json | 12 +-
app-packages/storm/src/assembly/storm.xml | 68 +++
pom.xml | 42 +-
slider-agent/pom.xml | 4 +-
.../src/main/python/agent/Controller.py | 1 +
.../python/agent/CustomServiceOrchestrator.py | 10 +-
slider-agent/src/main/python/agent/Register.py | 5 +-
slider-agent/src/main/python/setup.py | 2 +-
.../src/test/python/agent/TestRegistration.py | 5 +-
slider-agent/src/test/python/python-wrap | 40 --
slider-agent/src/test/python/python-wrap.sh | 42 ++
slider-agent/src/test/python/unitTests.py | 36 +-
slider-assembly/pom.xml | 23 +-
slider-assembly/src/main/bash/README.md | 2 +-
slider-assembly/src/main/bash/slider_destroy | 4 +-
slider-assembly/src/main/scripts/slider | 2 +
slider-assembly/src/main/scripts/slider.py | 12 +-
slider-core/pom.xml | 4 +-
.../org/apache/slider/api/InternalKeys.java | 11 +
.../org/apache/slider/api/ResourceKeys.java | 13 -
.../org/apache/slider/client/SliderClient.java | 43 +-
.../common/params/AbstractActionArgs.java | 11 +
.../slider/common/params/ActionFreezeArgs.java | 2 +-
.../slider/common/params/ActionHelpArgs.java | 14 +-
.../slider/common/params/ActionVersionArgs.java | 12 +-
.../common/params/LaunchArgsAccessor.java | 2 +-
.../slider/common/params/SliderActions.java | 8 +-
.../apache/slider/common/tools/SliderUtils.java | 571 ++++++++++++++-----
.../slider/core/build/InstanceBuilder.java | 5 +-
.../apache/slider/core/zk/ZookeeperUtils.java | 3 +-
.../slider/providers/agent/AgentKeys.java | 2 +
.../providers/agent/AgentProviderService.java | 189 +++---
.../server/appmaster/RoleLaunchService.java | 8 +-
.../server/appmaster/SliderAppMaster.java | 71 ++-
.../server/appmaster/actions/ActionHalt.java | 6 +-
.../appmaster/actions/ActionKillContainer.java | 20 +-
.../appmaster/actions/ActionStartContainer.java | 8 +-
.../appmaster/actions/ActionStopSlider.java | 6 +-
.../server/appmaster/actions/AsyncAction.java | 47 +-
.../actions/ProviderReportedContainerLoss.java | 13 +-
.../actions/ProviderStartupCompleted.java | 4 -
.../server/appmaster/actions/QueueAccess.java | 5 +
.../server/appmaster/actions/QueueService.java | 11 +-
.../actions/RegisterComponentInstance.java | 5 +
.../actions/ReviewAndFlexApplicationSize.java | 43 ++
.../actions/UnregisterComponentInstance.java | 7 +-
.../server/appmaster/monkey/ChaosEntry.java | 2 +-
.../slider/server/appmaster/state/AppState.java | 11 +-
.../server/appmaster/state/NodeEntry.java | 2 +-
.../server/appmaster/state/RoleHistory.java | 6 +-
.../appmaster/web/rest/agent/Register.java | 13 +
.../services/utility/EndOfServiceWaiter.java | 84 +++
.../services/workflow/ForkedProcessService.java | 21 +-
.../services/workflow/LongLivedProcess.java | 57 +-
.../agent/AgentMiniClusterTestBase.groovy | 9 +
.../agent/actions/TestActionExists.groovy | 2 +-
.../agent/actions/TestActionVersion.groovy | 5 +-
.../agent/freezethaw/TestFreezeCommands.groovy | 10 +-
.../TestFreezeThawMasterlessAM.groovy | 8 +-
.../freezethaw/TestFreezeUnknownCluster.groovy | 2 +-
.../standalone/TestBuildStandaloneAM.groovy | 2 +-
.../standalone/TestStandaloneAMDestroy.groovy | 6 +-
.../standalone/TestStandaloneAMKill.groovy | 2 +-
.../TestStandaloneAMMonkeyRestart.groovy | 8 +-
.../standalone/TestStandaloneRegistryAM.groovy | 2 +-
.../slider/client/TestCommonArgParsing.groovy | 2 +-
.../tools/TestClientResourceRegistration.groovy | 3 +
.../common/tools/TestConfigHelperHDFS.groovy | 3 +
.../tools/TestExecutionEnvironment.groovy | 42 ++
.../common/tools/TestMiscSliderUtils.groovy | 3 +
.../common/tools/TestWindowsSupport.groovy | 76 ++-
.../common/tools/TestZKIntegration.groovy | 54 +-
.../slider/providers/agent/AgentTestBase.groovy | 10 +
.../agent/TestAgentAMManagementWS.groovy | 8 +-
.../slider/providers/agent/TestAgentEcho.groovy | 6 +-
.../curator/TestRegistryRestResources.groovy | 6 +-
.../model/history/TestRoleHistoryRW.groovy | 4 +-
.../publisher/TestPublisherRestResources.groovy | 26 +-
.../apache/slider/test/SliderTestUtils.groovy | 11 +-
.../slider/test/YarnMiniClusterTestBase.groovy | 32 +-
.../test/YarnZKMiniClusterTestBase.groovy | 2 +-
.../agent/TestAgentProviderService.java | 64 ++-
.../services/workflow/EndOfServiceWaiter.java | 56 --
.../workflow/ProcessCommandFactory.java | 21 +-
.../services/workflow/TestLongLivedProcess.java | 6 +-
.../TestWorkflowForkedProcessService.java | 4 +-
.../workflow/WorkflowServiceTestBase.java | 3 +-
.../src/test/resources/example-slider-test.xml | 4 +-
.../funtest/framework/CommandTestBase.groovy | 2 +-
.../lifecycle/AgentClusterLifecycleIT.groovy | 8 +-
.../src/test/manual/python/SliderTester.py | 4 +-
.../providers/accumulo/AccumuloTestBase.groovy | 4 +-
.../accumulo/live/TestAccFreezeThaw.groovy | 4 +-
.../funtest/HBaseClusterLifecycleIT.groovy | 8 +-
.../minicluster/HBaseMiniClusterTestBase.groovy | 1 -
.../TestFreezeThawClusterFromArchive.groovy | 2 +-
.../build/TestBuildThawClusterM1W1.groovy | 2 +-
.../flexing/TestClusterFlex1To1.groovy | 2 +-
...reezeReconfigureThawLiveRegionService.groovy | 4 +-
.../TestFreezeThawLiveRegionService.groovy | 4 +-
.../minicluster/live/TestTwoLiveClusters.groovy | 4 +-
src/test/clusters/sandbox/operations.md | 20 +-
src/test/clusters/ubuntu-secure/operations.md | 14 +-
119 files changed, 1812 insertions(+), 794 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4b2f8aad/app-packages/storm/README.txt
----------------------------------------------------------------------
diff --cc app-packages/storm/README.txt
index 2bae3d2,49adfce..288604a
--- a/app-packages/storm/README.txt
+++ b/app-packages/storm/README.txt
@@@ -17,19 -17,16 +17,19 @@@
How to create a Slider app package for Storm?
-To create the app package you will need the Storm tarball and invoke mvn command
-with appropriate parameters.
+To create the app package you will need the Storm tarball copied to a specific location.
+Various configurations provided in this sample are customized for apache-storm-0.9.1.2.1.1.0-237.tar.gz.
+So if you use a different version you may need to edit a few config values.
-Command:
-mvn clean package -Pstorm-app-package -Dpkg.version=<version>
- -Dpkg.name=<file name of app tarball> -Dpkg.src=<folder location where the pkg is available>
+Replace the placeholder tarball for Storm.
+ cp ~/Downloads/apache-storm-0.9.3.0.2.5.0-100.tar.gz package/files/
- rm package/files/apache-storm-0.9.3.0.2.5.0-100.tar.gz.REPLACE
++ rm package/files/apache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE
-Example:
-mvn clean package -Pstorm-app-package -Dpkg.version=0.9.3.2.2.0.0-578
- -Dpkg.name=apache-storm-0.9.3.2.2.0.0-578.tar.gz -Dpkg.src=/Users/user1/Downloads
+Create a zip package at the root of the package (<slider enlistment>/app-packages/storm-v0_91/)
+ zip -r Apache_Storm_v_0_9_3.zip .
+
+Verify the content using
+ unzip -l "$@" Apache_Storm_v_0_9_3.zip
While appConfig.json and resources.json are not required for the package they work
well as the default configuration for Slider apps. So its advisable that when you
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4b2f8aad/app-packages/storm/appConfig.json
----------------------------------------------------------------------
diff --cc app-packages/storm/appConfig.json
index d6dee84,1eae599..33e38ac
--- a/app-packages/storm/appConfig.json
+++ b/app-packages/storm/appConfig.json
@@@ -3,14 -3,15 +3,15 @@@
"metadata": {
},
"global": {
- "application.def": "Apache_Storm_v_0_9_3.zip",
+ "application.def": "slider-storm-app-package-${pkg.version}.zip",
"java_home": "/usr/jdk64/jdk1.7.0_45",
"create.default.zookeeper.node": "true",
+ "system_configs": "core-site",
"site.global.app_user": "yarn",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}",
"site.global.user_group": "hadoop",
-
+ "site.global.security_enabled": "false",
"site.global.ganglia_server_host": "${NN_HOST}",
"site.global.ganglia_server_id": "Application2",
"site.global.ganglia_enabled":"true",
@@@ -33,7 -32,7 +32,7 @@@
"site.storm-site.nimbus.host": "${NIMBUS_HOST}",
"site.storm-site.ui.port": "${STORM_UI_SERVER.ALLOCATED_PORT}",
"site.storm-site.supervisor.slots.ports": "[${SUPERVISOR.ALLOCATED_PORT}{DO_NOT_PROPAGATE},${SUPERVISOR.ALLOCATED_PORT}{DO_NOT_PROPAGATE}]",
- "site.storm-site.supervisor.childopts": "-Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=0 -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.3.0.2.5.0-100/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
- "site.storm-site.supervisor.childopts": "-Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=0 -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
++ "site.storm-site.supervisor.childopts": "-Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=0 -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.1.2.1.1.0-237/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-0.9.1.2.1.1.0-237/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
"site.storm-site.drpc.port": "0",
"site.storm-site.logviewer.port": "${SUPERVISOR.ALLOCATED_PORT}{DO_NOT_PROPAGATE}"
},
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4b2f8aad/app-packages/storm/metainfo.xml
----------------------------------------------------------------------
diff --cc app-packages/storm/metainfo.xml
index 89ee01e,bfd84e8..2c314b4
--- a/app-packages/storm/metainfo.xml
+++ b/app-packages/storm/metainfo.xml
@@@ -150,7 -130,7 +130,7 @@@
<packages>
<package>
<type>tarball</type>
- <name>files/apache-storm-0.9.3.0.2.5.0-100.tar.gz</name>
- <name>files/${pkg.name}</name>
++ <name>files/apache-storm-0.9.1.2.1.1.0-237.tar.gz</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4b2f8aad/app-packages/storm/package/scripts/params.py
----------------------------------------------------------------------
diff --cc app-packages/storm/package/scripts/params.py
index e0bf9e4,38e25fb..ff85765
--- a/app-packages/storm/package/scripts/params.py
+++ b/app-packages/storm/package/scripts/params.py
@@@ -57,7 -54,6 +53,7 @@@ if security_enabled
storm_jaas_client_principal = _storm_client_principal_name.replace('_HOST', _hostname_lowercase)
storm_client_keytab_path = config['configurations']['storm-env']['storm_client_keytab']
-- storm_jaas_server_principal = _storm_server_principal_name.replace('_HOST', _hostname_lowercase)
++ storm_jaas_server_principal = _storm_server_principal_name.replace('_HOST',nimbus_host.lower())
+ storm_jaas_stormclient_servicename = storm_jaas_server_principal.split("/")[0]
storm_server_keytab_path = config['configurations']['storm-env']['storm_server_keytab']
kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4b2f8aad/app-packages/storm/package/scripts/service.py
----------------------------------------------------------------------
diff --cc app-packages/storm/package/scripts/service.py
index 0ec6413,3a5e795..2150cd4
--- a/app-packages/storm/package/scripts/service.py
+++ b/app-packages/storm/package/scripts/service.py
@@@ -47,10 -47,7 +47,7 @@@ def service
crt_pid_cmd = format("{jps_path} -vl | grep \"^[0-9 ]*backtype.storm.daemon.{name}\" {grep_and_awk} > {pid_file}")
if action == "start":
- if name == "rest_api":
- cmd = format("{rest_process_cmd} {rest_api_conf_file} > {log_dir}/restapi.log")
- else:
- cmd = format("env JAVA_HOME={java64_home} PATH={java64_home}/bin:$PATH STORM_BASE_DIR={app_root} STORM_CONF_DIR={conf_dir} {storm_bin} {name} > {log_dir}/{name}.out 2>&1")
- cmd = format("env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin STORM_BASE_DIR={app_root} STORM_CONF_DIR={conf_dir} {python_binary} {storm_bin} {name} > {log_dir}/{name}.out 2>&1")
++ cmd = format("env JAVA_HOME={java64_home} PATH={java64_home}/bin:$PATH STORM_BASE_DIR={app_root} STORM_CONF_DIR={conf_dir} {python_binary} {storm_bin} {name} > {log_dir}/{name}.out 2>&1")
if params.security_enabled:
if name == "nimbus":
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4b2f8aad/app-packages/storm/resources.json
----------------------------------------------------------------------
diff --cc app-packages/storm/resources.json
index 606dc39,017766c..f14b2c8
--- a/app-packages/storm/resources.json
+++ b/app-packages/storm/resources.json
@@@ -11,16 -11,12 +11,12 @@@
"yarn.role.priority": "1",
"yarn.component.instances": "1"
},
- "STORM_REST_API": {
+ "STORM_UI_SERVER": {
"yarn.role.priority": "2",
- "yarn.component.instances": "1"
+ "yarn.component.instances": "0"
},
- "STORM_UI_SERVER": {
- "yarn.role.priority": "3",
- "yarn.component.instances": "1"
- },
"DRPC_SERVER": {
- "yarn.role.priority": "4",
+ "yarn.role.priority": "3",
"yarn.component.instances": "1"
},
"SUPERVISOR": {
@@@ -28,4 -24,4 +24,4 @@@
"yarn.component.instances": "1"
}
}
--}
++}
[2/6] git commit: Temporary Storm package with Security
Posted by jm...@apache.org.
Temporary Storm package with Security
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0878e528
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0878e528
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0878e528
Branch: refs/heads/develop
Commit: 0878e528c78147de0aab4b251ca43afe5943e57b
Parents: eb6620e
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Aug 28 18:30:42 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Aug 28 18:30:42 2014 -0700
----------------------------------------------------------------------
app-packages/storm/README.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0878e528/app-packages/storm/README.txt
----------------------------------------------------------------------
diff --git a/app-packages/storm/README.txt b/app-packages/storm/README.txt
index 77474f1..2bae3d2 100644
--- a/app-packages/storm/README.txt
+++ b/app-packages/storm/README.txt
@@ -22,8 +22,8 @@ Various configurations provided in this sample are customized for apache-storm-0
So if you use a different version you may need to edit a few config values.
Replace the placeholder tarball for Storm.
- cp ~/Downloads/apache-storm-0.9.1.2.1.1.0-237.tar.gz package/files/
- rm package/files/apache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE
+ cp ~/Downloads/apache-storm-0.9.3.0.2.5.0-100.tar.gz package/files/
+ rm package/files/apache-storm-0.9.3.0.2.5.0-100.tar.gz.REPLACE
Create a zip package at the root of the package (<slider enlistment>/app-packages/storm-v0_91/)
zip -r Apache_Storm_v_0_9_3.zip .