fix timeout error when scaning mysql result in blacklist unittest

Mellorsssss · Feb 21, 2024 · 14fa1dc · 14fa1dc
1 parent d260112
commit 14fa1dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/mittest/simple_server/test_ob_black_list_service.cpp b/mittest/simple_server/test_ob_black_list_service.cpp
@@ -40,6 +40,7 @@ TEST_F(TestObBlackListService, black_list_inner_func)
   // init, bl_service already inited in ObServer::init()
   int ret = OB_SUCCESS;
   bool check = true;
+  const int64_t query_timeout = 10 * 1000 * 1000; // 10s
   ObBLKey bl_key;
   ObLsInfo ls_info;
   ObBLService &bl_service = ObBLService::get_instance();
@@ -52,7 +53,7 @@ TEST_F(TestObBlackListService, black_list_inner_func)
   SMART_VAR(ObISQLClient::ReadResult, res) {
     // do sql query
     ObMySQLProxy &sql_proxy = *GCTX.sql_proxy_;
-    ASSERT_EQ(OB_SUCCESS, sql_proxy.read(res, OB_SYS_TENANT_ID, sql.ptr(), nullptr, INNER_SQL_QUERY_TIMEOUT));
+    ASSERT_EQ(OB_SUCCESS, sql_proxy.read(res, OB_SYS_TENANT_ID, sql.ptr(), nullptr, query_timeout));
     sqlclient::ObMySQLResult *result = res.get_result();
     ASSERT_NE(nullptr, result);
 
@@ -73,7 +74,7 @@ TEST_F(TestObBlackListService, black_list_inner_func)
     ASSERT_EQ(false, check);
 
     // query again
-    ASSERT_EQ(OB_SUCCESS, sql_proxy.read(res, OB_SYS_TENANT_ID, sql.ptr(), nullptr, INNER_SQL_QUERY_TIMEOUT));
+    ASSERT_EQ(OB_SUCCESS, sql_proxy.read(res, OB_SYS_TENANT_ID, sql.ptr(), nullptr, query_timeout));
     result = res.get_result();
     ASSERT_NE(nullptr, result);
 

diff --git a/src/storage/tx/wrs/ob_black_list.h b/src/storage/tx/wrs/ob_black_list.h
@@ -34,7 +34,7 @@
 // 查询 __all_virtual_ls_info 的语句，设置了2s超时时间
 // select /*+query_timeout(2000000)*/ a.svr_ip, a.svr_port, a.tenant_id, a.ls_id, a.role, nvl(b.weak_read_scn, 1) as weak_read_scn, nvl(b.migrate_status, 0) as migrate_status, nvl(b.tx_blocked, 0) as tx_blocked from oceanbase.__all_virtual_ls_meta_table a left join oceanbase.__all_virtual_ls_info b on a.svr_ip = b.svr_ip and a.svr_port = b.svr_port and a.tenant_id = b.tenant_id and a.ls_id = b.ls_id;
 #define BLACK_LIST_SELECT_LS_INFO_STMT \
-  "select /*+query_timeout(2000000)*/ a.svr_ip, a.svr_port, a.tenant_id, a.ls_id, a.role, \
+  "select a.svr_ip, a.svr_port, a.tenant_id, a.ls_id, a.role, \
   nvl(b.weak_read_scn, 1) as weak_read_scn, nvl(b.migrate_status, 0) as migrate_status, nvl(b.tx_blocked, 0) as tx_blocked \
   from oceanbase.__all_virtual_ls_meta_table a left join oceanbase.__all_virtual_ls_info b \
   on a.svr_ip = b.svr_ip and a.svr_port = b.svr_port and a.tenant_id = b.tenant_id and a.ls_id = b.ls_id;"