[JIRA:GPSQL-2015] add HIVE_SERVER_OPTS and use it when starting hiveserver
diff --git a/pxf/tools/single-cluster/bin/hive-service.sh b/pxf/tools/single-cluster/bin/hive-service.sh
index 3806e14..7a01b88 100755
--- a/pxf/tools/single-cluster/bin/hive-service.sh
+++ b/pxf/tools/single-cluster/bin/hive-service.sh
@@ -78,7 +78,11 @@
hive_rotate_log $log
echo starting $service, logging to $log
- nohup nice -n $HIVE_NICENESS $HIVE_BIN/hive --config $HIVE_ROOT/conf --service $service $HIVE_OPTS > $log 2>&1 < /dev/null &
+ ACTUAL_HIVE_OPTS=$HIVE_OPTS
+ if [ $service = "hiveserver" ]; then
+ ACTUAL_HIVE_OPTS=$HIVE_SERVER_OPTS
+ fi
+ nohup nice -n $HIVE_NICENESS $HIVE_BIN/hive --config $HIVE_ROOT/conf --service $service $ACTUAL_HIVE_OPTS > $log 2>&1 < /dev/null &
echo $! > $pid
}
diff --git a/pxf/tools/single-cluster/templates/hive/conf/hive-env.sh b/pxf/tools/single-cluster/templates/hive/conf/hive-env.sh
index bed61ce..ebcd3ea 100644
--- a/pxf/tools/single-cluster/templates/hive/conf/hive-env.sh
+++ b/pxf/tools/single-cluster/templates/hive/conf/hive-env.sh
@@ -6,4 +6,5 @@
fi
export HIVE_OPTS="-hiveconf hive.log.dir=$LOGS_ROOT -hiveconf derby.stream.error.file=$LOGS_ROOT/derby.log -hiveconf javax.jdo.option.ConnectionURL=jdbc:derby:;databaseName=$HIVE_STORAGE_ROOT/metastore_db;create=true"
+export HIVE_SERVER_OPTS="-hiveconf hive.log.dir=$LOGS_ROOT -hiveconf derby.stream.error.file=$LOGS_ROOT/derby.log -hiveconf ;databaseName=$HIVE_STORAGE_ROOT/metastore_db;create=true"
export HADOOP_HOME=$HADOOP_ROOT
