xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: add inspect tool to installation and removal scripts in packaging

This commit is contained in:
chenhaoran 2025-03-17 16:42:55 +08:00
parent 4c089dadbc
commit c5478b15d3
2 changed files with 50 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
packaging/tools/install.sh
View File

@ -37,6 +37,7 @@ demoName="${PREFIX}demo"
xname="${PREFIX}x" xname="${PREFIX}x"
explorerName="${PREFIX}-explorer" explorerName="${PREFIX}-explorer"
keeperName="${PREFIX}keeper" keeperName="${PREFIX}keeper"
inspect_name="${PREFIX}inspect"
bin_link_dir="/usr/bin" bin_link_dir="/usr/bin"
lib_link_dir="/usr/lib" lib_link_dir="/usr/lib"
@ -156,12 +157,13 @@ done
#echo "verType=${verType} interactiveFqdn=${interactiveFqdn}" #echo "verType=${verType} interactiveFqdn=${interactiveFqdn}"
tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} remove.sh udfd set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh) tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} ${inspect_name} remove.sh udfd set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh)
if [ "${verMode}" == "cluster" ]; then if [ "${verMode}" == "cluster" ]; then
services=(${serverName} ${adapterName} ${xname} ${explorerName} ${keeperName}) services=(${serverName} ${adapterName} ${xname} ${explorerName} ${keeperName})
elif [ "${verMode}" == "edge" ]; then elif [ "${verMode}" == "edge" ]; then
if [ "${pagMode}" == "full" ]; then if [ "${pagMode}" == "full" ]; then
services=(${serverName} ${adapterName} ${keeperName} ${explorerName}) services=(${serverName} ${adapterName} ${keeperName} ${explorerName})
tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} remove.sh taosudf set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh)
else else
services=(${serverName}) services=(${serverName})
tools=(${clientName} ${benchmarkName} remove.sh start_pre.sh) tools=(${clientName} ${benchmarkName} remove.sh start_pre.sh)
@ -225,6 +227,7 @@ function install_bin() {
${csudo}cp -r ${script_dir}/bin/${clientName} ${install_main_dir}/bin ${csudo}cp -r ${script_dir}/bin/${clientName} ${install_main_dir}/bin
${csudo}cp -r ${script_dir}/bin/${benchmarkName} ${install_main_dir}/bin ${csudo}cp -r ${script_dir}/bin/${benchmarkName} ${install_main_dir}/bin
${csudo}cp -r ${script_dir}/bin/${dumpName} ${install_main_dir}/bin ${csudo}cp -r ${script_dir}/bin/${dumpName} ${install_main_dir}/bin
${csudo}cp -r ${script_dir}/bin/${inspect_name} ${install_main_dir}/bin
${csudo}cp -r ${script_dir}/bin/remove.sh ${install_main_dir}/bin ${csudo}cp -r ${script_dir}/bin/remove.sh ${install_main_dir}/bin
else else
${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin
@ -521,14 +524,14 @@ function local_fqdn_check() {
function install_taosx_config() { function install_taosx_config() {
[ ! -z $1 ] && return 0 || : # only install client [ ! -z $1 ] && return 0 || : # only install client
fileName="${script_dir}/${xname}/etc/${PREFIX}/${xname}.toml" file_name="${script_dir}/${xname}/etc/${PREFIX}/${xname}.toml"
if [ -f ${fileName} ]; then if [ -f ${file_name} ]; then
${csudo}sed -i -r "s/#*\s*(fqdn\s*=\s*).*/\1\"${serverFqdn}\"/" ${fileName} ${csudo}sed -i -r "s/#*\s*(fqdn\s*=\s*).*/\1\"${serverFqdn}\"/" ${file_name}
if [ -f "${configDir}/${xname}.toml" ]; then if [ -f "${configDir}/${xname}.toml" ]; then
${csudo}cp ${fileName} ${configDir}/${xname}.toml.new ${csudo}cp ${file_name} ${configDir}/${xname}.toml.new
else else
${csudo}cp ${fileName} ${configDir}/${xname}.toml ${csudo}cp ${file_name} ${configDir}/${xname}.toml
fi fi
fi fi
} }
@ -538,18 +541,18 @@ function install_explorer_config() {
[ ! -z $1 ] && return 0 || : # only install client [ ! -z $1 ] && return 0 || : # only install client
if [ "$verMode" == "cluster" ]; then if [ "$verMode" == "cluster" ]; then
fileName="${script_dir}/${xname}/etc/${PREFIX}/explorer.toml" file_name="${script_dir}/${xname}/etc/${PREFIX}/explorer.toml"
else else
fileName="${script_dir}/cfg/explorer.toml" file_name="${script_dir}/cfg/explorer.toml"
fi fi
if [ -f ${fileName} ]; then if [ -f ${file_name} ]; then
${csudo}sed -i "s/localhost/${serverFqdn}/g" ${fileName} ${csudo}sed -i "s/localhost/${serverFqdn}/g" ${file_name}
if [ -f "${configDir}/explorer.toml" ]; then if [ -f "${configDir}/explorer.toml" ]; then
${csudo}cp ${fileName} ${configDir}/explorer.toml.new ${csudo}cp ${file_name} ${configDir}/explorer.toml.new
else else
${csudo}cp ${fileName} ${configDir}/explorer.toml ${csudo}cp ${file_name} ${configDir}/explorer.toml
fi fi
fi fi
} }
@ -557,14 +560,14 @@ function install_explorer_config() {
function install_adapter_config() { function install_adapter_config() {
[ ! -z $1 ] && return 0 || : # only install client [ ! -z $1 ] && return 0 || : # only install client
fileName="${script_dir}/cfg/${adapterName}.toml" file_name="${script_dir}/cfg/${adapterName}.toml"
if [ -f ${fileName} ]; then if [ -f ${file_name} ]; then
${csudo}sed -i -r "s/localhost/${serverFqdn}/g" ${fileName} ${csudo}sed -i -r "s/localhost/${serverFqdn}/g" ${file_name}
if [ -f "${configDir}/${adapterName}.toml" ]; then if [ -f "${configDir}/${adapterName}.toml" ]; then
${csudo}cp ${fileName} ${configDir}/${adapterName}.toml.new ${csudo}cp ${file_name} ${configDir}/${adapterName}.toml.new
else else
${csudo}cp ${fileName} ${configDir}/${adapterName}.toml ${csudo}cp ${file_name} ${configDir}/${adapterName}.toml
fi fi
fi fi
} }
@ -572,21 +575,21 @@ function install_adapter_config() {
function install_keeper_config() { function install_keeper_config() {
[ ! -z $1 ] && return 0 || : # only install client [ ! -z $1 ] && return 0 || : # only install client
fileName="${script_dir}/cfg/${keeperName}.toml" file_name="${script_dir}/cfg/${keeperName}.toml"
if [ -f ${fileName} ]; then if [ -f ${file_name} ]; then
${csudo}sed -i -r "s/127.0.0.1/${serverFqdn}/g" ${fileName} ${csudo}sed -i -r "s/127.0.0.1/${serverFqdn}/g" ${file_name}
if [ -f "${configDir}/${keeperName}.toml" ]; then if [ -f "${configDir}/${keeperName}.toml" ]; then
${csudo}cp ${fileName} ${configDir}/${keeperName}.toml.new ${csudo}cp ${file_name} ${configDir}/${keeperName}.toml.new
else else
${csudo}cp ${fileName} ${configDir}/${keeperName}.toml ${csudo}cp ${file_name} ${configDir}/${keeperName}.toml
fi fi
fi fi
} }
function install_taosd_config() { function install_taosd_config() {
fileName="${script_dir}/cfg/${configFile}" file_name="${script_dir}/cfg/${configFile}"
if [ -f ${fileName} ]; then if [ -f ${file_name} ]; then
${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$serverFqdn/" ${script_dir}/cfg/${configFile} ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$serverFqdn/" ${script_dir}/cfg/${configFile}
${csudo}echo "monitor 1" >>${script_dir}/cfg/${configFile} ${csudo}echo "monitor 1" >>${script_dir}/cfg/${configFile}
${csudo}echo "monitorFQDN ${serverFqdn}" >>${script_dir}/cfg/${configFile} ${csudo}echo "monitorFQDN ${serverFqdn}" >>${script_dir}/cfg/${configFile}
@ -595,15 +598,27 @@ function install_taosd_config() {
fi fi
if [ -f "${configDir}/${configFile}" ]; then if [ -f "${configDir}/${configFile}" ]; then
${csudo}cp ${fileName} ${configDir}/${configFile}.new ${csudo}cp ${file_name} ${configDir}/${configFile}.new
else else
${csudo}cp ${fileName} ${configDir}/${configFile} ${csudo}cp ${file_name} ${configDir}/${configFile}
fi fi
fi fi
${csudo}ln -sf ${configDir}/${configFile} ${install_main_dir}/cfg ${csudo}ln -sf ${configDir}/${configFile} ${install_main_dir}/cfg
} }
function install_taosinspect_config() {
file_name="${script_dir}/cfg/inspect.cfg"
if [ -f ${file_name} ]; then
if [ -f "${configDir}/inspect.cfg" ]; then
${csudo}cp ${file_name} ${configDir}/inspect.cfg.new
else
${csudo}cp ${file_name} ${configDir}/inspect.cfg
fi
fi
${csudo}ln -sf ${configDir}/inspect.cfg ${install_main_dir}/cfg
}
function install_config() { function install_config() {
@ -915,6 +930,10 @@ function updateProduct() {
install_adapter_config install_adapter_config
install_taosx_config install_taosx_config
install_explorer_config install_explorer_config
if [ "${verMode}" == "cluster" ]; then
install_taosinspect_config
fi
if [ "${verMode}" != "cloud" ]; then if [ "${verMode}" != "cloud" ]; then
install_keeper_config install_keeper_config
fi fi

6
packaging/tools/remove.sh
View File

@ -44,6 +44,7 @@ dumpName="${PREFIX}dump"
keeperName="${PREFIX}keeper" keeperName="${PREFIX}keeper"
xName="${PREFIX}x" xName="${PREFIX}x"
explorerName="${PREFIX}-explorer" explorerName="${PREFIX}-explorer"
inspect_name="${PREFIX}inspect"
tarbitratorName="tarbitratord" tarbitratorName="tarbitratord"
productName="TDengine" productName="TDengine"
@ -58,10 +59,13 @@ config_dir="/etc/${PREFIX}"
if [ "${verMode}" == "cluster" ]; then if [ "${verMode}" == "cluster" ]; then
services=(${PREFIX}"d" ${PREFIX}"adapter" ${PREFIX}"keeper") services=(${PREFIX}"d" ${PREFIX}"adapter" ${PREFIX}"keeper")
tools=(${PREFIX} ${PREFIX}"Benchmark" ${PREFIX}"dump" ${PREFIX}"demo" ${PREFIX}"inspect" udfd set_core.sh TDinsight.sh $uninstallScript start-all.sh stop-all.sh)
else else
tools=(${PREFIX} ${PREFIX}"Benchmark" ${PREFIX}"dump" ${PREFIX}"demo" udfd set_core.sh TDinsight.sh $uninstallScript start-all.sh stop-all.sh)
services=(${PREFIX}"d" ${PREFIX}"adapter" ${PREFIX}"keeper" ${PREFIX}"-explorer") services=(${PREFIX}"d" ${PREFIX}"adapter" ${PREFIX}"keeper" ${PREFIX}"-explorer")
fi fi
tools=(${PREFIX} ${PREFIX}"Benchmark" ${PREFIX}"dump" ${PREFIX}"demo" udfd set_core.sh TDinsight.sh $uninstallScript start-all.sh stop-all.sh)
csudo="" csudo=""
if command -v sudo >/dev/null; then if command -v sudo >/dev/null; then