Repository: incubator-trafodion Updated Branches: refs/heads/master 536c51d54 -> bc009d556
Fix for [TRAFODION-1617] Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f12221d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f12221d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f12221d2 Branch: refs/heads/master Commit: f12221d222efc1ff9b8927cab85013e5ce5a80a5 Parents: 9ba333a Author: Narendra Goyal <[email protected]> Authored: Fri Apr 15 20:12:07 2016 +0000 Committer: Narendra Goyal <[email protected]> Committed: Fri Apr 15 20:12:07 2016 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/ilh_cleanhb | 4 +++- core/sqf/sql/scripts/install_local_hadoop | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f12221d2/core/sqf/sql/scripts/ilh_cleanhb ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/ilh_cleanhb b/core/sqf/sql/scripts/ilh_cleanhb index 0b1076b..76c2617 100755 --- a/core/sqf/sql/scripts/ilh_cleanhb +++ b/core/sqf/sql/scripts/ilh_cleanhb @@ -88,6 +88,8 @@ if [[ ${lv_clean_hb_data} -gt 0 ]]; then lv_zk_dir="${MY_SW_ROOT}/hdfs:" echo "Deleting the zookeeper directory: ${lv_zk_dir}" rm -rf ${lv_zk_dir} + echo "Deleting the zookeeper directory: ${MY_ZOOKEEPER_DATA_DIR}" + rm -rf ${MY_ZOOKEEPER_DATA_DIR} fi #delete the logs @@ -101,6 +103,6 @@ fi if [[ ${lv_clean_hb_data} -gt 1 ]]; then # delete the HBase table data from HDFS - echo "Deleting the HBase data directory (hdfs) /hbase" + echo "Deleting the HBase data directory (hdfs) /hbase" swhdfs dfs -rm -f -r -skipTrash /hbase fi http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f12221d2/core/sqf/sql/scripts/install_local_hadoop ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop index 84643e2..a5c8c54 100755 --- a/core/sqf/sql/scripts/install_local_hadoop +++ b/core/sqf/sql/scripts/install_local_hadoop @@ -305,6 +305,7 @@ MY_DERBY_DATA_DIR=${MY_DATA_DIR}/derby MY_HADOOP_DATA_DIR=${MY_DATA_DIR}/hadoop MY_HIVE_DATA_DIR=${MY_DATA_DIR}/hive MY_HBASE_DATA_DIR=${MY_DATA_DIR}/hbase +MY_ZOOKEEPER_DATA_DIR=${MY_DATA_DIR}/zookeeper # Administrator and Hive user name for MySQL installation MY_SQL_ADMIN=root @@ -758,6 +759,7 @@ export MY_HADOOP_HDFS_PORT_NUM=${MY_HADOOP_HDFS_PORT_NUM} export MY_HBASE_ZOOKEEPER_PEERPORT_NUM=${MY_HBASE_ZOOKEEPER_PEERPORT_NUM} export MY_HBASE_ZOOKEEPER_LEADERPORT_NUM=${MY_HBASE_ZOOKEEPER_LEADERPORT_NUM} export MY_HBASE_ZOOKEEPER_PROPERTY_CLIENTPORT_NUM=${MY_HBASE_ZOOKEEPER_PROPERTY_CLIENTPORT_NUM} +export MY_ZOOKEEPER_DATA_DIR=${MY_ZOOKEEPER_DATA_DIR} export MY_DCS_MASTER_PORT=${MY_DCS_MASTER_PORT} export MY_DCS_MASTER_INFO_PORT=${MY_DCS_MASTER_INFO_PORT} export MY_DCS_SERVER_INFO_PORT=${MY_DCS_SERVER_INFO_PORT} @@ -1537,8 +1539,12 @@ echo "$MY_LOCAL_SW_DIST/${HBASE_TAR}" <value>hdfs://${MY_HOST_1}:${MY_HADOOP_HDFS_PORT_NUM}/hbase</value> </property> <property> + <name>hbase.zookeeper.quorum</name> + <value>${HOSTNAME}</value> + </property> + <property> <name>hbase.zookeeper.property.dataDir</name> - <value>hdfs://${MY_HOST_1}:${MY_HADOOP_HDFS_PORT_NUM}/zookeeper</value> + <value>${MY_ZOOKEEPER_DATA_DIR}</value> </property> <property> <name>hbase.master.port</name>
