Merge pull request #827 from taosdata/fix/TD-33101-MAIN-1

fix: cloud service not support bind vgroups
taosdata · Dec 3, 2024 · c72a4f3 · c72a4f3
2 parents 1b3bafd + 459a30c
commit c72a4f3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/benchInsert.c b/src/benchInsert.c
@@ -4464,7 +4464,7 @@ int insertTestProcess() {
                 return -1;
             }
             succPrint("created database (%s)\n", database->dbName);
-        } else {
+        } else if(g_arguments->bind_vgroup) {
             // database already exist, get vgroups from server
             SBenchConn* conn = initBenchConn();
             if (conn) {

diff --git a/src/benchJsonOpt.c b/src/benchJsonOpt.c
@@ -945,16 +945,16 @@ static int getStableInfo(tools_cJSON *dbinfos, int index) {
                 g_arguments->rest_server_ver_major =
                     getServerVersionRest(g_arguments->port + TSDB_PORT_HTTP);
             }
-        }
-
 #ifdef WEBSOCKET
-        if (g_arguments->websocket) {
-            infoPrint("Since WebSocket interface is enabled, "
-                    "the interface %s is changed to use WebSocket.\n",
-                    stbIface->valuestring);
-            superTable->iface = TAOSC_IFACE;
-        }
+            if (g_arguments->websocket) {
+                infoPrint("Since WebSocket interface is enabled, "
+                        "the interface %s is changed to use WebSocket.\n",
+                        stbIface->valuestring);
+                superTable->iface = TAOSC_IFACE;
+            }
 #endif
+        }
+
 
         tools_cJSON *stbLineProtocol =
             tools_cJSON_GetObjectItem(stbInfo, "line_protocol");

diff --git a/tests/taosbenchmark/json/TD-32913-1.json b/tests/taosbenchmark/json/TD-32913-1.json
@@ -32,7 +32,6 @@
 					"auto_create_table":	"no",
 					"batch_create_tbl_num":	500,
 					"data_source":	"rand",
-					"insert_mode":	"taosc",
 					"non_stop_mode":	"no",
 					"line_protocol":	"line",
 					"insert_rows":	1000,