This is an automated email from the ASF dual-hosted git repository.
abukor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 54ee2103d [ranger-kms] part1: thirdparty changes
54ee2103d is described below
commit 54ee2103d9dde5347891d4cf4a4dbd674774f475
Author: Zoltan Chovan <[email protected]>
AuthorDate: Tue May 3 20:46:23 2022 +0200
[ranger-kms] part1: thirdparty changes
Added RangerKMS to thirdparty libs, to facilitate Ranger KMS integration
in following changes.
Change-Id: Id46312bdb81e2fed5a1f19be17df5b974a6716a0
Reviewed-on: http://gerrit.cloudera.org:8080/18644
Reviewed-by: Khazar Mammadli <[email protected]>
Reviewed-by: Attila Bukor <[email protected]>
Tested-by: Attila Bukor <[email protected]>
---
thirdparty/build-thirdparty.sh | 15 ++++++++++++++-
thirdparty/download-thirdparty.sh | 6 ++++++
thirdparty/vars.sh | 4 ++++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index e7ab77256..7b95460c9 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -107,7 +107,8 @@ else
"ranger") F_RANGER=1 ;;
"oatpp") F_OATPP=1 ;;
"oatpp-swagger") F_OATPP_SWAGGER=1 ;;
- "jwt-cpp") F_JWT_CPP=1;;
+ "jwt-cpp") F_JWT_CPP=1 ;;
+ "ranger-kms") F_RANGER_KMS=1 ;;
*) echo "Unknown module: $arg"; exit 1 ;;
esac
done
@@ -286,6 +287,18 @@ if [ -n "$F_COMMON" -o -n "$F_RANGER" ]; then
$PREFIX/opt/ranger/ews/webapp/WEB-INF/classes/conf
fi
+if [ -n "$F_COMMON" -o -n "$F_RANGER_KMS" ]; then
+ mkdir -p $PREFIX/opt
+ # Remove any hadoop jars included in the Ranger package to avoid unexpected
+ # runtime behavior due to different versions of hadoop jars.
+ rm -rf $RANGER_KMS_SOURCE/lib/hadoop-[a-z-]*.jar
+ ln -nsf $RANGER_KMS_SOURCE $PREFIX/opt/ranger-kms
+
+ # Symlink conf.dist to conf
+ ln -nsf $PREFIX/opt/ranger-kms/ews/webapp/WEB-INF/classes/conf.dist \
+ $PREFIX/opt/ranger-kms/ews/webapp/WEB-INF/classes/conf
+fi
+
### Build C dependencies without instrumentation
PREFIX=$PREFIX_DEPS
diff --git a/thirdparty/download-thirdparty.sh
b/thirdparty/download-thirdparty.sh
index e7bf40071..e9606fcc5 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -485,5 +485,11 @@ fetch_and_patch \
$JWT_CPP_SOURCE \
$JWT_CPP_PATCHLEVEL
+RANGER_KMS_PATCHLEVEL=0
+fetch_and_patch \
+ $RANGER_KMS_NAME.tar.gz \
+ $RANGER_KMS_SOURCE \
+ $RANGER_KMS_PATCHLEVEL
+
echo "---------------"
echo "Thirdparty dependencies downloaded successfully"
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 4e94419f3..a5971670a 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -259,6 +259,10 @@ RANGER_VERSION=2.1.0
RANGER_NAME=ranger-$RANGER_VERSION-admin
RANGER_SOURCE=$TP_SOURCE_DIR/$RANGER_NAME
+RANGER_KMS_VERSION=2.1.0 # this probably should match the ranger version
+RANGER_KMS_NAME=ranger-$RANGER_KMS_VERSION-kms
+RANGER_KMS_SOURCE=$TP_SOURCE_DIR/$RANGER_KMS_NAME
+
OATPP_VERSION=1.2.5
OATPP_NAME=oatpp-$OATPP_VERSION
OATPP_SOURCE=$TP_SOURCE_DIR/$OATPP_NAME
