Author: daijy Date: Fri Jun 28 17:45:44 2013 New Revision: 1497859 URL: http://svn.apache.org/r1497859 Log: HIVE-4591: Making changes to webhcat-site.xml have no effect
Modified: hive/trunk/RELEASE_NOTES.txt hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh Modified: hive/trunk/RELEASE_NOTES.txt URL: http://svn.apache.org/viewvc/hive/trunk/RELEASE_NOTES.txt?rev=1497859&r1=1497858&r2=1497859&view=diff ============================================================================== --- hive/trunk/RELEASE_NOTES.txt (original) +++ hive/trunk/RELEASE_NOTES.txt Fri Jun 28 17:45:44 2013 @@ -269,6 +269,7 @@ Release Notes - Hive - Version 0.11.0 * [HIVE-4505] - Hive can't load transforms added using 'ADD FILE' * [HIVE-4527] - Fix eclipse project template * [HIVE-4784] - ant testreport doesn't include any HCatalog tests + * [HIVE-4591] - Making changes to webhcat-site.xml have no effect ** Improvement * [HIVE-581] - improve group by syntax Modified: hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh?rev=1497859&r1=1497858&r2=1497859&view=diff ============================================================================== --- hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh (original) +++ hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh Fri Jun 28 17:45:44 2013 @@ -46,7 +46,7 @@ SLEEP_TIME_AFTER_START=10 #================================================ #These parameters can be overriden by webhcat-env.sh -# the root of the WEBHCAT installation +# the root of the WEBHCAT installation ('this' is defined in webhcat_server.sh) export WEBHCAT_PREFIX=`dirname "$this"`/.. #check to see if the conf dir is given as an optional argument @@ -62,9 +62,9 @@ then fi # Allow alternate conf dir location. -if [ -e "${WEBHCAT_PREFIX}/etc/webhcat/webhcat-env.sh" ]; then +if [ -e "${WEBHCAT_PREFIX}/etc/webhcat/webhcat-env.sh" -o -e "${WEBHCAT_PREFIX}/etc/webhcat/webhcat-site.xml" ]; then DEFAULT_CONF_DIR=${WEBHCAT_PREFIX}/"etc/webhcat" -elif [ -e "${WEBHCAT_PREFIX}/conf/webhcat-env.sh" ]; then +elif [ -e "${WEBHCAT_PREFIX}/conf/webhcat-env.sh" -o -e "${WEBHCAT_PREFIX}/etc/webhcat/webhcat-site.xml" ]; then DEFAULT_CONF_DIR=${WEBHCAT_PREFIX}/"conf" else DEFAULT_CONF_DIR="/etc/webhcat"