Author: rvs
Date: Wed Oct 10 23:04:50 2012
New Revision: 1396851
URL: http://svn.apache.org/viewvc?rev=1396851&view=rev
Log:
BIGTOP-734. Proposed fixes to Hive logging configuration (Sean Mackrory via rvs)
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh
incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh.suse
incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh?rev=1396851&r1=1396850&r2=1396851&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh Wed Oct 10
23:04:50 2012
@@ -72,10 +72,10 @@ USER="hive"
hive_start() {
[ -x $EXE_FILE ] || exit $ERROR_PROGRAM_NOT_INSTALLED
+ exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`
-Dhive.log.file=${NAME}.log -Dhive.log.threshold=INFO\""
service_name="@HIVE_DAEMON@"
if [ $service_name = "server" ] ; then
service_name="hiveserver"
- exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`\""
fi
if [ -x /sbin/runuser ]; then
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh.suse
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh.suse?rev=1396851&r1=1396850&r2=1396851&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh.suse
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh.suse Wed Oct
10 23:04:50 2012
@@ -132,10 +132,10 @@ hive_start() {
exit 0
fi
+ exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`
-Dhive.log.file=${NAME}.log -Dhive.log.threshold=INFO\""
service_name="@HIVE_DAEMON@"
if [ $service_name = "server" ] ; then
service_name="hiveserver"
- exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`\""
fi
su -s /bin/sh $HIVE_USER \
-c "$exec_env nohup nice -n $NICENESS \
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh?rev=1396851&r1=1396850&r2=1396851&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh Wed
Oct 10 23:04:50 2012
@@ -139,6 +139,10 @@ done
# Config
install -d -m 0755 ${PREFIX}${CONF_DIST_DIR}
(cd ${BUILD_DIR}/conf && tar -cf - .)|(cd ${PREFIX}${CONF_DIST_DIR} && tar -xf
-)
+for template in hive-exec-log4j.properties hive-log4j.properties
+do
+ mv ${PREFIX}${CONF_DIST_DIR}/${template}.template
${PREFIX}${CONF_DIST_DIR}/${template}
+done
cp hive-site.xml ${PREFIX}${CONF_DIST_DIR}
ln -s ${CONF_DIR}/conf $PREFIX/$LIB_DIR/conf
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl?rev=1396851&r1=1396850&r2=1396851&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl Wed
Oct 10 23:04:50 2012
@@ -78,10 +78,10 @@ TIMEOUT=3
hive_start() {
[ -x $EXE_FILE ] || exit $ERROR_PROGRAM_NOT_INSTALLED
+ exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`
-Dhive.log.file=${NAME}.log -Dhive.log.threshold=INFO\""
service_name="@HIVE_DAEMON@"
if [ $service_name = "server" ] ; then
service_name="hiveserver"
- exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`\""
fi
log_success_msg "Starting $desc (${NAME}): "
