You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2015/09/16 22:29:16 UTC
[05/13] incubator-ranger git commit: RANGER-641 : Ranger KMS startup
fails if java not set and started using service
RANGER-641 : Ranger KMS startup fails if java not set and started using service
Signed-off-by: Velmurugan Periasamy <ve...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/34d68b61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/34d68b61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/34d68b61
Branch: refs/heads/tag-policy
Commit: 34d68b61bb8781a10df96ff0eb1dbe74b65a7f43
Parents: 68a406e
Author: Gautam Borad <gb...@gmail.com>
Authored: Thu Sep 3 17:51:20 2015 +0530
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Fri Sep 11 13:00:09 2015 -0400
----------------------------------------------------------------------
kms/scripts/ranger-kms | 4 ++++
kms/scripts/setup.sh | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/34d68b61/kms/scripts/ranger-kms
----------------------------------------------------------------------
diff --git a/kms/scripts/ranger-kms b/kms/scripts/ranger-kms
index 805ebcc..dfde6d5 100755
--- a/kms/scripts/ranger-kms
+++ b/kms/scripts/ranger-kms
@@ -32,6 +32,10 @@ RANGER_KMS_EWS_LIB_DIR="${RANGER_KMS_EWS_DIR}/webapp/WEB-INF/classes/lib"
JAVA_OPTS=" ${JAVA_OPTS} -XX:MaxPermSize=256m -Xmx1024m -Xms1024m "
+if [ -f ${RANGER_KMS_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh ]; then
+ . ${RANGER_KMS_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh
+fi
+
for custom_env_script in `find ${RANGER_KMS_DIR}/ews/webapp/WEB-INF/classes/conf/ -name "ranger-kms-env*"`; do
if [ -f $custom_env_script ]; then
. $custom_env_script
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/34d68b61/kms/scripts/setup.sh
----------------------------------------------------------------------
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index 2e7dd8e..e0c3136 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -326,7 +326,7 @@ setup_kms(){
log "[I] Adding ranger kms provider as services in hadoop-common jar"
for f in lib/hadoop-common*.jar
do
- jar -uf ${f} META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory
+ ${JAVA_HOME}/bin/jar -uf ${f} META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory
chown ${unix_user}:${unix_group} ${f}
done
cd ${oldP}
@@ -334,8 +334,8 @@ setup_kms(){
update_properties() {
newPropertyValue=''
- #echo "export JAVA_HOME=${JAVA_HOME}" > ${WEBAPP_ROOT}/WEB-INF/classes/conf/java_home.sh
- #chmod a+rx ${WEBAPP_ROOT}/WEB-INF/classes/conf/java_home.sh
+ echo "export JAVA_HOME=${JAVA_HOME}" > ${WEBAPP_ROOT}/WEB-INF/classes/conf/java_home.sh
+ chmod a+rx ${WEBAPP_ROOT}/WEB-INF/classes/conf/java_home.sh
to_file=$PWD/ews/webapp/WEB-INF/classes/conf/dbks-site.xml