diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh index 605944e9b3d3a296b9cd6ce252224d3702e57fc8..0ec8dbd0cce46cd6861ef4f93b4b180df949a65f 100755 --- a/packaging/tools/install_client.sh +++ b/packaging/tools/install_client.sh @@ -31,6 +31,7 @@ cfg_install_dir="/etc/taos" if [ "$osType" != "Darwin" ]; then bin_link_dir="/usr/bin" lib_link_dir="/usr/lib" + lib64_link_dir="/usr/lib64" inc_link_dir="/usr/include" else bin_link_dir="/usr/local/bin" @@ -45,7 +46,7 @@ install_main_dir="/usr/local/taos" bin_dir="/usr/local/taos/bin" # v1.5 jar dir -v15_java_app_dir="/usr/local/lib/taos" +#v15_java_app_dir="/usr/local/lib/taos" # Color setting RED='\033[0;31m' @@ -90,7 +91,7 @@ function install_bin() { ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/* - #Make link + #Make link [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos || : if [ "$osType" == "Darwin" ]; then [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || : @@ -106,13 +107,16 @@ function clean_lib() { function install_lib() { # Remove links ${csudo} rm -f ${lib_link_dir}/libtaos.* || : - ${csudo} rm -rf ${v15_java_app_dir} || : + ${csudo} rm -f ${lib64_link_dir}/libtaos.* || : + #${csudo} rm -rf ${v15_java_app_dir} || : ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* if [ "$osType" != "Darwin" ]; then ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1 ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so + ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 || : + ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so || : else ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh index 9fb8731449ec4db6a56e617febd6e073119e3f21..63e09dc56894a4e035c691be29b2bbc34e48bd7c 100755 --- a/packaging/tools/remove.sh +++ b/packaging/tools/remove.sh @@ -18,11 +18,12 @@ log_link_dir="/usr/local/taos/log" cfg_link_dir="/usr/local/taos/cfg" bin_link_dir="/usr/bin" lib_link_dir="/usr/lib" +lib64_link_dir="/usr/lib64" inc_link_dir="/usr/include" install_nginxd_dir="/usr/local/nginxd" # v1.5 jar dir -v15_java_app_dir="/usr/local/lib/taos" +#v15_java_app_dir="/usr/local/lib/taos" service_config_dir="/etc/systemd/system" taos_service_name="taosd" @@ -78,7 +79,8 @@ function clean_bin() { function clean_lib() { # Remove link ${csudo} rm -f ${lib_link_dir}/libtaos.* || : - ${csudo} rm -rf ${v15_java_app_dir} || : + ${csudo} rm -f ${lib64_link_dir}/libtaos.* || : + #${csudo} rm -rf ${v15_java_app_dir} || : } function clean_header() { diff --git a/packaging/tools/remove_client.sh b/packaging/tools/remove_client.sh index 9210546a9f407fd821a176cadfcf88ae8023dc2f..4bc278fcf06ec18534535547f2c60ae156bc5da1 100755 --- a/packaging/tools/remove_client.sh +++ b/packaging/tools/remove_client.sh @@ -15,11 +15,12 @@ log_link_dir="/usr/local/taos/log" cfg_link_dir="/usr/local/taos/cfg" bin_link_dir="/usr/bin" lib_link_dir="/usr/lib" +lib64_link_dir="/usr/lib64" inc_link_dir="/usr/include" # v1.5 jar dir -v15_java_app_dir="/usr/local/lib/taos" +#v15_java_app_dir="/usr/local/lib/taos" csudo="" if command -v sudo > /dev/null; then @@ -43,7 +44,8 @@ function clean_bin() { function clean_lib() { # Remove link ${csudo} rm -f ${lib_link_dir}/libtaos.* || : - ${csudo} rm -rf ${v15_java_app_dir} || : + ${csudo} rm -f ${lib64_link_dir}/libtaos.* || : + #${csudo} rm -rf ${v15_java_app_dir} || : } function clean_header() { diff --git a/src/dnode/src/dnodeCheck.c b/src/dnode/src/dnodeCheck.c index a5b6fa09dd5196ccfd088ddc1e628ef8495ea995..dfdc3fa53fe7ef01c3cb95c6bd8295251909bc03 100644 --- a/src/dnode/src/dnodeCheck.c +++ b/src/dnode/src/dnodeCheck.c @@ -173,7 +173,7 @@ static int dnodeCheckDatafile() { } static void dnodeAllocCheckItem() { - tsCheckItem[TSDB_CHECK_ITEM_NETWORK].enable = true; + tsCheckItem[TSDB_CHECK_ITEM_NETWORK].enable = false; tsCheckItem[TSDB_CHECK_ITEM_NETWORK].name = "network"; tsCheckItem[TSDB_CHECK_ITEM_NETWORK].initFp = NULL; tsCheckItem[TSDB_CHECK_ITEM_NETWORK].cleanUpFp = NULL;