Merge pull request #5165 from taosdata/hotfix/test

[TD-2947]<fix>when update version, first stop nginx

packaging/tools/install.sh

@@ -147,8 +147,8 @@ done
 
 #echo "verType=${verType} interactiveFqdn=${interactiveFqdn}"
 
-function kill_taosd() {
+function kill_process() {
-  pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
+  pid=$(ps -ef | grep "$1" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
     ${csudo} kill -9 $pid   || :
   fi
@@ -168,7 +168,10 @@ function install_main_path() {
     if [ "$verMode" == "cluster" ]; then
         ${csudo} mkdir -p ${nginx_dir}
     fi
+    
+    if [[ -e ${script_dir}/email ]]; then
       ${csudo} cp ${script_dir}/email ${install_main_dir}/ ||: 
+    fi    
 }
 
 function install_bin() {
@@ -680,7 +683,7 @@ function install_service() {
         install_service_on_sysvinit
     else
         # must manual stop taosd
-        kill_taosd
+        kill_process taosd
     fi
 }
 
@@ -749,11 +752,24 @@ function update_TDengine() {
         elif ((${service_mod}==1)); then
             ${csudo} service taosd stop || :
         else
-            kill_taosd
+            kill_process taosd
         fi
         sleep 1
     fi
     
+    if [ "$verMode" == "cluster" ]; then
+      if pidof nginx &> /dev/null; then
+        if ((${service_mod}==0)); then
+            ${csudo} systemctl stop nginxd || :
+        elif ((${service_mod}==1)); then
+            ${csudo} service nginxd stop || :
+        else
+            kill_process nginx
+        fi
+        sleep 1
+      fi
+    fi
+    
     install_main_path
 
     install_log

packaging/tools/install_power.sh

@@ -146,8 +146,8 @@ done
 
 #echo "verType=${verType} interactiveFqdn=${interactiveFqdn}"
 
-function kill_powerd() {
+function kill_process() {
-  pid=$(ps -ef | grep "powerd" | grep -v "grep" | awk '{print $2}')
+  pid=$(ps -ef | grep "$1" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
     ${csudo} kill -9 $pid   || :
   fi
@@ -652,7 +652,7 @@ function install_service() {
         install_service_on_sysvinit
     else
         # must manual stop powerd
-        kill_powerd
+        kill_process powerd
     fi
 }
 
@@ -721,10 +721,22 @@ function update_PowerDB() {
         elif ((${service_mod}==1)); then
             ${csudo} service powerd stop || :
         else
-            kill_powerd
+            kill_process powerd
         fi
         sleep 1
     fi    
+    if [ "$verMode" == "cluster" ]; then 
+      if pidof nginx &> /dev/null; then
+        if ((${service_mod}==0)); then
+            ${csudo} systemctl stop nginxd || :
+        elif ((${service_mod}==1)); then
+            ${csudo} service nginxd stop || :
+        else
+            kill_process nginx
+        fi
+        sleep 1
+      fi
+    fi
     
     install_main_path
 

src/kit/taosdemox/insert.json

@@ -8,6 +8,7 @@
 	"thread_count": 4,
 	"thread_count_create_tbl": 1,
 	"result_file": "./insert_res.txt",
+        "confirm_parameter_prompt": "no",
 	"databases": [{
 		"dbinfo": {
 			"name": "db",

src/kit/taosdemox/query.json

@@ -5,6 +5,7 @@
   "port": 6030,
   "user": "root",
   "password": "taosdata",
+  "confirm_parameter_prompt": "yes",
   "databases": "db01",
   "specified_table_query":
     {"query_interval":1, "concurrent":1,

src/kit/taosdemox/taosdemox.c

@@ -181,6 +181,7 @@ typedef struct SArguments_S {
   char *   sqlFile;
   bool     use_metric;
   bool     insert_only;
+  bool     answer_yes;
   char *   output_file;
   int      mode;
   char *   datatype[MAX_NUM_DATATYPE + 1];
@@ -434,6 +435,7 @@ typedef  struct curlMemInfo_S {
     {0, 't', "num_of_tables",            0, "The number of tables. Default is 10000.",                                                                          4},
     {0, 'n', "num_of_records_per_table", 0, "The number of records per table. Default is 10000.",                                                               4},
     {0, 'x', 0,                          0, "Not insert only flag.",                                                                                            4},
+    {0, 'y', 0,                          0, "Default input yes for prompt.",                                                                                    4},
     {0, 'O', "disorderRatio",            0, "Insert mode--0: In order, > 0: disorder ratio. Default is in order.",                                              4},
     {0, 'R', "disorderRang",             0, "Out of order data's range, ms, default is 1000.",                                                                  4},
     //{0, 'D', "delete database",          0, "if elete database if exists. 0: no, 1: yes, default is 1",                                                       5},
@@ -529,6 +531,8 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
       break;
     case 'x':
       arguments->insert_only = false;
+    case 'y':
+      arguments->answer_yes = true;
       break;
     case 'c':
       if (wordexp(arg, &full_path, 0) != 0) {
@@ -644,6 +648,7 @@ SArguments g_args = {NULL,
                      NULL,            // sqlFile
                      false,           // use_metric
                      true,            // insert_only
+                     false,           // answer_yes;
                      "./output.txt",  // output_file
                      0,               // mode : sync or async
                      {
@@ -2537,6 +2542,22 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     goto PARSE_OVER;
   } 
 
+  cJSON *answerPrompt = cJSON_GetObjectItem(root, "confirm_parameter_prompt"); // yes, no,
+  if (answerPrompt && answerPrompt->type == cJSON_String && answerPrompt->valuestring != NULL) {
+    if (0 == strncasecmp(answerPrompt->valuestring, "yes", 3)) {
+      g_args.answer_yes = false;
+    } else if (0 == strncasecmp(answerPrompt->valuestring, "no", 2)) {
+      g_args.answer_yes = true;
+    } else {
+      g_args.answer_yes = false;
+    }
+  } else if (!answerPrompt) {
+    g_args.answer_yes = false;
+  } else {
+    printf("failed to read json, confirm_parameter_prompt not found");
+    goto PARSE_OVER;
+  }  
+
   cJSON* dbs = cJSON_GetObjectItem(root, "databases");
   if (!dbs || dbs->type != cJSON_Array) {
     printf("failed to read json, databases not found\n");
@@ -3052,6 +3073,22 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
     strncpy(g_queryInfo.password, "taosdata", MAX_DB_NAME_SIZE);;
   }
 
+  cJSON *answerPrompt = cJSON_GetObjectItem(root, "confirm_parameter_prompt"); // yes, no,
+  if (answerPrompt && answerPrompt->type == cJSON_String && answerPrompt->valuestring != NULL) {
+    if (0 == strncasecmp(answerPrompt->valuestring, "yes", 3)) {
+      g_args.answer_yes = false;
+    } else if (0 == strncasecmp(answerPrompt->valuestring, "no", 2)) {
+      g_args.answer_yes = true;
+    } else {
+      g_args.answer_yes = false;
+    }
+  } else if (!answerPrompt) {
+    g_args.answer_yes = false;
+  } else {
+    printf("failed to read json, confirm_parameter_prompt not found");
+    goto PARSE_OVER;
+  }  
+
   cJSON* dbs = cJSON_GetObjectItem(root, "databases");
   if (dbs && dbs->type == cJSON_String && dbs->valuestring != NULL) {
     strncpy(g_queryInfo.dbName, dbs->valuestring, MAX_DB_NAME_SIZE);
@@ -4289,8 +4326,10 @@ int insertTestProcess() {
   printfInsertMeta();
   printfInsertMetaToFile(g_fpOfInsertResult);
 
+  if (!g_args.answer_yes) {
     printf("Press enter key to continue\n\n");
     (void)getchar();
+  }
   
   init_rand_data();
 
@@ -4469,8 +4508,11 @@ int queryTestProcess() {
   }  
   
   printfQueryMeta();
+  
+  if (!g_args.answer_yes) {
     printf("Press enter key to continue\n\n");
     (void)getchar();
+  }
   
   printfQuerySystemInfo(taos);
   
@@ -4724,8 +4766,10 @@ void *superSubscribeProcess(void *sarg) {
 int subscribeTestProcess() {
   printfQueryMeta();
 
+  if (!g_args.answer_yes) {
     printf("Press enter key to continue\n\n");
     (void)getchar();
+  }
 
   TAOS * taos = NULL;  
   taos_init();