diff --git a/mittest/simple_server/test_arbitration_service_rpc.cpp b/mittest/simple_server/test_arbitration_service_rpc.cpp index 0601d11911..ffae68d767 100644 --- a/mittest/simple_server/test_arbitration_service_rpc.cpp +++ b/mittest/simple_server/test_arbitration_service_rpc.cpp @@ -88,61 +88,6 @@ TEST_F(TestArbitrationServiceRpc, test_argument) ASSERT_EQ(OB_SUCCESS, ret); } -TEST_F(TestArbitrationServiceRpc, test_simple) -{ - int ret = OB_SUCCESS; - obrpc::ObNetClient client; - obrpc::ObSrvRpcProxy srv_proxy; - - uint64_t tenant_id = 1001; - share::ObLSID ls_id(1); - common::ObAddr dst_server = GCTX.self_addr(); - int64_t timestamp_for_arb_member = ObTimeUtility::current_time(); - common::ObMember arb_member(dst_server, timestamp_for_arb_member); - int64_t timeout_us = 180 * 1000 * 1000; //180s - - ret = client.init(); - ASSERT_EQ(OB_SUCCESS, ret); - - ret = client.get_proxy(srv_proxy); - ASSERT_EQ(OB_SUCCESS, ret); - - srv_proxy.set_server(dst_server); - srv_proxy.set_timeout(timeout_us); - - ObAddArbArg add_arg; - ObAddArbResult add_result; - ret = add_arg.init(tenant_id, ls_id, arb_member, timeout_us); - ASSERT_EQ(OB_SUCCESS, ret); - ret = srv_proxy.to(dst_server).add_arb(add_arg, add_result); - ASSERT_EQ(OB_SUCCESS, ret); - ASSERT_EQ(OB_SUCCESS, add_result.get_result()); - - ObRemoveArbArg remove_arg; - ObRemoveArbResult remove_result; - ret = remove_arg.init(tenant_id, ls_id, arb_member, timeout_us); - ASSERT_EQ(OB_SUCCESS, ret); - ret = srv_proxy.to(dst_server).remove_arb(remove_arg, remove_result); - ASSERT_EQ(OB_SUCCESS, ret); - ASSERT_EQ(OB_SUCCESS, remove_result.get_result()); - - ObCreateArbArg create_arg; - ObCreateArbResult create_result; - share::ObTenantRole tenant_role(ObTenantRole::PRIMARY_TENANT); - ret = create_arg.init(tenant_id, ls_id, tenant_role); - ASSERT_EQ(OB_SUCCESS, ret); - ret = srv_proxy.to(dst_server).create_arb(create_arg, create_result); - ASSERT_EQ(OB_SUCCESS, ret); - ASSERT_EQ(OB_SUCCESS, create_result.get_result()); - - ObDeleteArbArg delete_arg; - ObDeleteArbResult delete_result; - ret = delete_arg.init(tenant_id, ls_id); - ASSERT_EQ(OB_SUCCESS, ret); - ret = srv_proxy.to(dst_server).delete_arb(delete_arg, delete_result); - ASSERT_EQ(OB_SUCCESS, ret); - ASSERT_EQ(OB_SUCCESS, delete_result.get_result()); -} } // namespace share } // namespace oceanbase diff --git a/mittest/simple_server/test_change_arb_service_status.cpp b/mittest/simple_server/test_change_arb_service_status.cpp index 6a0209d556..d21133ccca 100644 --- a/mittest/simple_server/test_change_arb_service_status.cpp +++ b/mittest/simple_server/test_change_arb_service_status.cpp @@ -77,7 +77,7 @@ TEST_F(TestChangeArbServiceStatus, test_change_arb_service_status) } // 2. enable tenant's arbitration service without arbitration service addr - ASSERT_EQ(OB_SUCCESS, sql.assign("alter tenant arbitration_tenant_1 enable arbitration service;")); + ASSERT_EQ(OB_SUCCESS, sql.assign("alter tenant arbitration_tenant_1 enable_arbitration_service = true;")); ASSERT_EQ(OB_OP_NOT_ALLOW, sql_proxy.write(sql.ptr(), affected_rows)); // 3. enable tenant's arbitration service with arbitration service addr @@ -95,7 +95,7 @@ TEST_F(TestChangeArbServiceStatus, test_change_arb_service_status) } // 1F not allow to enable arb service - ASSERT_EQ(OB_SUCCESS, sql.assign("alter tenant arbitration_tenant_1 enable arbitration service;")); + ASSERT_EQ(OB_SUCCESS, sql.assign("alter tenant arbitration_tenant_1 enable_arbitration_service = true;")); ASSERT_EQ(OB_OP_NOT_ALLOW, sql_proxy.write(sql.ptr(), affected_rows)); ASSERT_EQ(OB_SUCCESS, sql.assign_fmt("select count(*) as cnt " @@ -112,7 +112,7 @@ TEST_F(TestChangeArbServiceStatus, test_change_arb_service_status) } // 5. disable tenant's arbitration service when tenant already in disabled status - ASSERT_EQ(OB_SUCCESS, sql.assign("alter tenant arbitration_tenant_1 disable arbitration service;")); + ASSERT_EQ(OB_SUCCESS, sql.assign("alter tenant arbitration_tenant_1 enable_arbitration_service = false;")); ASSERT_EQ(OB_SUCCESS, sql_proxy.write(sql.ptr(), affected_rows)); ASSERT_EQ(OB_SUCCESS, sql.assign_fmt("select count(*) as cnt " @@ -128,8 +128,6 @@ TEST_F(TestChangeArbServiceStatus, test_change_arb_service_status) ASSERT_EQ(0, tmp_cnt); } - ASSERT_EQ(OB_SUCCESS, sql.assign("drop tenant arbitration_tenant_1 force;")); - ASSERT_EQ(OB_SUCCESS, sql_proxy.write(sql.ptr(), affected_rows)); } } // namespace share } // namespace oceanbase diff --git a/mittest/simple_server/test_create_tenant_with_arbitration_service.cpp b/mittest/simple_server/test_create_tenant_with_arbitration_service.cpp index b64a488373..4fdb768857 100644 --- a/mittest/simple_server/test_create_tenant_with_arbitration_service.cpp +++ b/mittest/simple_server/test_create_tenant_with_arbitration_service.cpp @@ -147,44 +147,8 @@ TEST_F(TestAddRemoveReplaceArbitrationService, test_add_remove_replace) ASSERT_EQ(OB_SUCCESS, sql_proxy.write(sql.ptr(), affected_rows)); ASSERT_EQ(OB_SUCCESS, sql.assign("create tenant arbitration_tenant_4 resource_pool_list=('arbitration_pool'), enable_arbitration_service = true;")); - ASSERT_EQ(OB_SUCCESS, sql_proxy.write(sql.ptr(), affected_rows)); - ASSERT_EQ(OB_SUCCESS, sql.assign("select tenant_id " - "from __all_tenant " - "where tenant_name = 'arbitration_tenant_4';")); - SMART_VAR(ObMySQLProxy::MySQLResult, res6) { - ASSERT_EQ(OB_SUCCESS, sql_proxy.read(res6, sql.ptr())); - sqlclient::ObMySQLResult *result6 = res6.get_result(); - ASSERT_NE(nullptr, result6); - ASSERT_EQ(OB_SUCCESS, result6->next()); - ASSERT_EQ(OB_SUCCESS, result6->get_int("tenant_id", tenant_id)); - } + ASSERT_EQ(OB_OP_NOT_ALLOW, sql_proxy.write(sql.ptr(), affected_rows)); - ASSERT_EQ(OB_SUCCESS, sql.assign_fmt("select count(*) as cnt " - "from __all_tenant " - "where tenant_id = %ld and arbitration_service_status = 'ENABLING';", tenant_id)); - SMART_VAR(ObMySQLProxy::MySQLResult, res7) { - ASSERT_EQ(OB_SUCCESS, sql_proxy.read(res7, sql.ptr())); - sqlclient::ObMySQLResult *result7 = res7.get_result(); - ASSERT_NE(nullptr, result7); - ASSERT_EQ(OB_SUCCESS, result7->next()); - ASSERT_EQ(OB_SUCCESS, result7->get_int("cnt", tmp_cnt)); - ASSERT_EQ(1, tmp_cnt); - } - - ASSERT_EQ(OB_SUCCESS, sql.assign_fmt("select count(*) as cnt " - "from __all_tenant " - "where tenant_id = %ld and arbitration_service_status = 'ENABLING';", gen_meta_tenant_id(tenant_id))); - SMART_VAR(ObMySQLProxy::MySQLResult, res8) { - ASSERT_EQ(OB_SUCCESS, sql_proxy.read(res8, sql.ptr())); - sqlclient::ObMySQLResult *result8 = res8.get_result(); - ASSERT_NE(nullptr, result8); - ASSERT_EQ(OB_SUCCESS, result8->next()); - ASSERT_EQ(OB_SUCCESS, result8->get_int("cnt", tmp_cnt)); - ASSERT_EQ(1, tmp_cnt); - } - - ASSERT_EQ(OB_SUCCESS, sql.assign("drop tenant arbitration_tenant_4 force")); - ASSERT_EQ(OB_SUCCESS, sql_proxy.write(sql.ptr(), affected_rows)); } } // namespace share } // namespace oceanbase