You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by ad...@apache.org on 2017/03/09 19:34:53 UTC
incubator-hawq git commit: HAWQ-1354. Externalized RPS heap size
parameter
Repository: incubator-hawq
Updated Branches:
refs/heads/master e5bb0d99b -> 92391054c
HAWQ-1354. Externalized RPS heap size parameter
(this closes #1168)
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/92391054
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/92391054
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/92391054
Branch: refs/heads/master
Commit: 92391054c064328cf69d810297feff72b2a204c2
Parents: e5bb0d9
Author: Alexander Denissov <ad...@pivotal.io>
Authored: Thu Mar 9 10:40:12 2017 -0800
Committer: Alexander Denissov <ad...@pivotal.io>
Committed: Thu Mar 9 11:34:10 2017 -0800
----------------------------------------------------------------------
ranger-plugin/conf/rps.properties | 3 +++
ranger-plugin/pom.xml | 7 +++++++
ranger-plugin/scripts/rps.sh | 2 +-
ranger-plugin/service/pom.xml | 5 +++++
4 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/92391054/ranger-plugin/conf/rps.properties
----------------------------------------------------------------------
diff --git a/ranger-plugin/conf/rps.properties b/ranger-plugin/conf/rps.properties
index a08a9f2..e733e68 100644
--- a/ranger-plugin/conf/rps.properties
+++ b/ranger-plugin/conf/rps.properties
@@ -31,6 +31,9 @@ RANGER_HAWQ_INSTANCE=hawq
# version of the software
RPS_VERSION=${project.version}
+# max heap size for RPS (Tomcat) process
+RPS_HEAP_SIZE=128m
+
# catalina home path of Tomcat/6.0.x for Ranger Plugin Service
SYS_CATALINA_HOME=
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/92391054/ranger-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/ranger-plugin/pom.xml b/ranger-plugin/pom.xml
index 8943e2a..4b55443 100644
--- a/ranger-plugin/pom.xml
+++ b/ranger-plugin/pom.xml
@@ -33,6 +33,7 @@
</modules>
<properties>
+ <hadoop.version>2.7.1</hadoop.version>
<jackson.version>1.9</jackson.version>
<release.version>1</release.version>
<postgresql.version>9.1-901-1.jdbc4</postgresql.version>
@@ -254,6 +255,12 @@
<artifactId>httpcore</artifactId>
<version>4.4.4</version>
</dependency>
+ <!-- HDFS library is needed for auditing to HDFS -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/92391054/ranger-plugin/scripts/rps.sh
----------------------------------------------------------------------
diff --git a/ranger-plugin/scripts/rps.sh b/ranger-plugin/scripts/rps.sh
index cc63af0..fa268c9 100755
--- a/ranger-plugin/scripts/rps.sh
+++ b/ranger-plugin/scripts/rps.sh
@@ -37,7 +37,7 @@ export CATALINA_BASE=${BASEDIR}/plugin-service
export CATALINA_PID=${CATALINA_BASE}/work/rps.pid
# options used to start the RPS process
-export CATALINA_OPTS="-server -Xms512m -Xmx512m -XX:MaxPermSize=128m
+export CATALINA_OPTS="-server -Xms${RPS_HEAP_SIZE} -Xmx${RPS_HEAP_SIZE}
-Dproc_rps -Dversion=${RPS_VERSION}
-Dranger.hawq.instance=${RANGER_HAWQ_INSTANCE}
-Drps.http.port=${RPS_HTTP_PORT} -Drps.https.port=${RPS_HTTPS_PORT}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/92391054/ranger-plugin/service/pom.xml
----------------------------------------------------------------------
diff --git a/ranger-plugin/service/pom.xml b/ranger-plugin/service/pom.xml
index 8901343..500df1f 100644
--- a/ranger-plugin/service/pom.xml
+++ b/ranger-plugin/service/pom.xml
@@ -91,6 +91,11 @@
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugins-common</artifactId>
</dependency>
+ <!-- explicitly package hadoop-hdfs.jar required for auditing to HDFS -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </dependency>
<dependency>
<groupId>log4j</groupId>