fix some test case

This commit is contained in:
obdev
2023-07-27 14:24:15 +00:00
committed by ob-robot
parent ee32feae70
commit 319e9f0a3c
9 changed files with 28 additions and 220 deletions

View File

@ -29,6 +29,26 @@ function(errsim_ha_unittest_observer case)
target_link_libraries(${case} PRIVATE gtest gmock observer_test oceanbase) target_link_libraries(${case} PRIVATE gtest gmock observer_test oceanbase)
endfunction() endfunction()
add_executable(test_simple_ob
EXCLUDE_FROM_ALL
test_ob_simple_cluster.cpp
env/ob_simple_server.cpp
env/ob_simple_server_restart_helper.cpp
env/ob_simple_cluster_test_base.cpp
)
target_include_directories(test_simple_ob PUBLIC
${CMAKE_SOURCE_DIR}/unittest ${CMAKE_SOURCE_DIR}/mittest)
target_link_libraries(test_simple_ob
PRIVATE
-Wl,--start-group
oceanbase_static
ob_sql_static
ob_storage_static
-Wl,--end-group
-static-libgcc
-static-libstdc++
gtest
gmock)
ob_unittest_observer(test_standby_balance test_standby_balance_ls_group.cpp) ob_unittest_observer(test_standby_balance test_standby_balance_ls_group.cpp)
ob_unittest_observer(test_ls_recover test_ls_recover.cpp) ob_unittest_observer(test_ls_recover test_ls_recover.cpp)

View File

@ -1,212 +0,0 @@
#pragma once
#include "lib/ob_define.h"
#include "lib/profile/ob_trace_id.h"
#include "rootserver/ob_bootstrap.h"
#include "share/schema/ob_schema_service.h"
#include "share/schema/ob_schema_getter_guard.h"
#include "share/schema/ob_multi_version_schema_service.h"
#include "share/schema/ob_ddl_sql_service.h"
#include "share/schema/ob_schema_service_sql_impl.h"
#include <thread>
namespace oceanbase
{
namespace rootserver
{
int batch_create_schema_local(uint64_t tenant_id,
ObDDLService &ddl_service,
ObIArray<ObTableSchema> &table_schemas,
const int64_t begin, const int64_t end)
{
int ret = OB_SUCCESS;
const int64_t begin_time = ObTimeUtility::current_time();
if (begin < 0 || begin >= end || end > table_schemas.count()) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(ret), K(begin), K(end), "table count", table_schemas.count());
} else {
ObDDLOperator ddl_operator(ddl_service.get_schema_service(), ddl_service.get_sql_proxy());
ObMySQLTransaction trans(true);
if (OB_FAIL(trans.start(&ddl_service.get_sql_proxy(), tenant_id))) {
LOG_WARN("start transaction failed", KR(ret));
} else {
for (int64_t idx = begin;idx < end && OB_SUCC(ret); idx++) {
ObTableSchema &table = table_schemas.at(idx);
const ObString *ddl_stmt = NULL;
bool need_sync_schema_version = !(ObSysTableChecker::is_sys_table_index_tid(table.get_table_id()) ||
is_sys_lob_table(table.get_table_id()));
int64_t start_time = ObTimeUtility::current_time();
if (OB_FAIL(ddl_operator.create_table(table, trans, ddl_stmt,
need_sync_schema_version,
false))) {
LOG_WARN("add table schema failed", K(ret),
"table_id", table.get_table_id(),
"table_name", table.get_table_name());
} else {
int64_t end_time = ObTimeUtility::current_time();
LOG_INFO("add table schema succeed", K(idx),
"table_id", table.get_table_id(),
"table_name", table.get_table_name(), "core_table", is_core_table(table.get_table_id()), "cost", end_time-start_time);
}
}
}
if (trans.is_started()) {
const bool is_commit = (OB_SUCCESS == ret);
int tmp_ret = trans.end(is_commit);
if (OB_SUCCESS != tmp_ret) {
LOG_WARN("end trans failed", K(tmp_ret), K(is_commit));
ret = (OB_SUCCESS == ret) ? tmp_ret : ret;
} else {
}
}
}
const int64_t now = ObTimeUtility::current_time();
LOG_INFO("batch create schema finish", K(ret), "table_count", end - begin, "total_time_used", now - begin_time);
//BOOTSTRAP_CHECK_SUCCESS();
return ret;
}
int parallel_create_table_schema(uint64_t tenant_id, ObDDLService &ddl_service, ObIArray<ObTableSchema> &table_schemas)
{
int ret = OB_SUCCESS;
int64_t begin = 0;
int64_t batch_count = table_schemas.count() / 16;
const int64_t MAX_RETRY_TIMES = 10;
int64_t finish_cnt = 0;
std::vector<std::thread> ths;
ObCurTraceId::TraceId *cur_trace_id = ObCurTraceId::get_trace_id();
for (int64_t i = 0; OB_SUCC(ret) && i < table_schemas.count(); ++i) {
if (table_schemas.count() == (i + 1) || (i + 1 - begin) >= batch_count) {
std::thread th([&, begin, i, cur_trace_id] () {
int ret = OB_SUCCESS;
ObCurTraceId::set(*cur_trace_id);
int64_t retry_times = 1;
while (OB_SUCC(ret)) {
if (OB_FAIL(batch_create_schema_local(tenant_id, ddl_service, table_schemas, begin, i + 1))) {
LOG_WARN("batch create schema failed", K(ret), "table count", i + 1 - begin);
// bugfix:
if (retry_times <= MAX_RETRY_TIMES) {
retry_times++;
ret = OB_SUCCESS;
LOG_INFO("schema error while create table, need retry", KR(ret), K(retry_times));
usleep(1 * 1000 * 1000L); // 1s
}
} else {
ATOMIC_AAF(&finish_cnt, i + 1 - begin);
break;
}
}
LOG_INFO("worker job", K(begin), K(i), K(i-begin), K(ret));
});
ths.push_back(std::move(th));
if (OB_SUCC(ret)) {
begin = i + 1;
}
}
}
for (auto &th : ths) {
th.join();
}
if (finish_cnt != table_schemas.count()) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("parallel_create_table_schema fail", K(finish_cnt), K(table_schemas.count()), K(ret), K(tenant_id));
}
return ret;
}
int ObBootstrap::create_all_schema(ObDDLService &ddl_service,
ObIArray<ObTableSchema> &table_schemas)
{
int ret = OB_SUCCESS;
const int64_t begin_time = ObTimeUtility::current_time();
LOG_INFO("start create all schemas", "table count", table_schemas.count());
if (table_schemas.count() <= 0) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("table_schemas is empty", K(table_schemas), K(ret));
} else {
// persist __all_core_table's schema in inner table, which is only used for sys views.
HEAP_VAR(ObTableSchema, core_table) {
ObArray<ObTableSchema> tmp_tables;
if (OB_FAIL(share::ObInnerTableSchema::all_core_table_schema(core_table))) {
LOG_WARN("fail to construct __all_core_table's schema", KR(ret), K(core_table));
} else if (OB_FAIL(tmp_tables.push_back(core_table))) {
LOG_WARN("fail to push back __all_core_table's schema", KR(ret), K(core_table));
} else if (OB_FAIL(batch_create_schema_local(OB_SYS_TENANT_ID, ddl_service, tmp_tables, 0, 1))) {
LOG_WARN("fail to create __all_core_table's schema", KR(ret), K(core_table));
}
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(parallel_create_table_schema(OB_SYS_TENANT_ID, ddl_service, table_schemas))) {
LOG_WARN("create_all_schema", K(ret));
}
}
LOG_INFO("end create all schemas", K(ret), "table count", table_schemas.count(),
"time_used", ObTimeUtility::current_time() - begin_time);
return ret;
}
/*
int ObDDLService::create_sys_table_schemas(
ObDDLOperator &ddl_operator,
ObMySQLTransaction &trans,
common::ObIArray<ObTableSchema> &tables)
{
int ret = OB_SUCCESS;
if (OB_FAIL(check_inner_stat())) {
LOG_WARN("variable is not init", KR(ret));
} else if (OB_ISNULL(sql_proxy_) || OB_ISNULL(schema_service_) || tables.count() == 0) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ptr is null", KR(ret), KP_(sql_proxy), KP_(schema_service));
} else if (OB_FAIL(parallel_create_table_schema(tables.at(0).get_tenant_id(), *this, tables))) {
LOG_WARN("create_sys_table_schemas", K(ret));
}
return ret;
}
*/
} // end rootserver
namespace share
{
namespace schema
{
common::SpinRWLock lock_for_schema_version;
int ObSchemaServiceSQLImpl::gen_new_schema_version(
uint64_t tenant_id,
int64_t refreshed_schema_version,
int64_t &schema_version)
{
int ret = OB_SUCCESS;
schema_version = OB_INVALID_VERSION;
SpinWLockGuard guard(lock_for_schema_version);
if (OB_INVALID_TENANT_ID == tenant_id) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid tenant_id", K(ret), K(tenant_id));
} else {
if (is_sys_tenant(tenant_id)) {
if (OB_FAIL(gen_leader_sys_schema_version(tenant_id, schema_version))) {
LOG_WARN("failed to gen leader sys tenant_id schema version", K(ret), K(tenant_id));
}
} else {
// normal tenant
if (OB_FAIL(gen_leader_normal_schema_version(tenant_id, refreshed_schema_version, schema_version))) {
LOG_WARN("failed to gen leader normal schema version", K(ret), K(tenant_id), K(refreshed_schema_version));
}
}
}
if (OB_FAIL(ret)) {
} else {
LOG_INFO("new schema version", K(schema_version), "this", OB_P(this));
}
return ret;
}
}
}
} // end oceanbase

View File

@ -16,7 +16,6 @@
#define private public #define private public
#include "env/ob_simple_cluster_test_base.h" #include "env/ob_simple_cluster_test_base.h"
#include "env/ob_fast_bootstrap.h"
#include "lib/mysqlclient/ob_mysql_result.h" #include "lib/mysqlclient/ob_mysql_result.h"
#include "storage/tx/ob_tx_loop_worker.h" #include "storage/tx/ob_tx_loop_worker.h"
#include "storage/tx_storage/ob_ls_map.h" #include "storage/tx_storage/ob_ls_map.h"

View File

@ -16,7 +16,6 @@
#define private public #define private public
#include "env/ob_simple_cluster_test_base.h" #include "env/ob_simple_cluster_test_base.h"
#include "env/ob_fast_bootstrap.h"
#include "lib/mysqlclient/ob_mysql_result.h" #include "lib/mysqlclient/ob_mysql_result.h"
#include "storage/ls/ob_ls.h" #include "storage/ls/ob_ls.h"

View File

@ -23,7 +23,6 @@
#include "lib/utility/serialization.h" #include "lib/utility/serialization.h"
#include "share/cache/ob_kv_storecache.h" #include "share/cache/ob_kv_storecache.h"
#include "env/ob_simple_cluster_test_base.h" #include "env/ob_simple_cluster_test_base.h"
#include "env/ob_fast_bootstrap.h"
#include "lib/mysqlclient/ob_mysql_result.h" #include "lib/mysqlclient/ob_mysql_result.h"
#include "storage/multi_data_source/mds_table_handle.h" #include "storage/multi_data_source/mds_table_handle.h"
#include "storage/tx_storage/ob_ls_handle.h" #include "storage/tx_storage/ob_ls_handle.h"

View File

@ -23,7 +23,6 @@
// simple server // simple server
#include "env/ob_simple_cluster_test_base.h" #include "env/ob_simple_cluster_test_base.h"
#include "env/ob_fast_bootstrap.h"
#include "lib/mysqlclient/ob_mysql_result.h" #include "lib/mysqlclient/ob_mysql_result.h"
using namespace oceanbase; using namespace oceanbase;

View File

@ -16,7 +16,6 @@
#define private public #define private public
#include "env/ob_simple_cluster_test_base.h" #include "env/ob_simple_cluster_test_base.h"
#include "env/ob_fast_bootstrap.h"
#include "lib/mysqlclient/ob_mysql_result.h" #include "lib/mysqlclient/ob_mysql_result.h"
#include "rootserver/ob_partition_balance.h" #include "rootserver/ob_partition_balance.h"
#include "storage/tx_storage/ob_ls_service.h" #include "storage/tx_storage/ob_ls_service.h"

View File

@ -16,7 +16,6 @@
#define private public #define private public
#include "env/ob_simple_cluster_test_base.h" #include "env/ob_simple_cluster_test_base.h"
#include "env/ob_fast_bootstrap.h"
#include "lib/mysqlclient/ob_mysql_result.h" #include "lib/mysqlclient/ob_mysql_result.h"
namespace oceanbase namespace oceanbase

View File

@ -88,6 +88,12 @@ int ObTxTableGuard::init(ObTxTable *tx_table)
return OB_SUCCESS; return OB_SUCCESS;
} }
int ObReadInfoStruct::init_compat_version()
{
compat_version_ = READ_INFO_VERSION_V1;
return OB_SUCCESS;
}
} // end storage } // end storage
namespace memtable namespace memtable
@ -188,10 +194,10 @@ public:
// iter_param_.rowkey_cnt_ = rowkey_cnt_; // iter_param_.rowkey_cnt_ = rowkey_cnt_;
iter_param_.tablet_id_ = tablet_id_; iter_param_.tablet_id_ = tablet_id_;
iter_param_.table_id_ = tablet_id_.id(); iter_param_.table_id_ = tablet_id_.id();
read_info_.init(allocator_, 16000, rowkey_cnt_, false, columns_, nullptr/*storage_cols_index*/); int ret = read_info_.init(allocator_, 16000, rowkey_cnt_, false, columns_, nullptr/*storage_cols_index*/);
iter_param_.read_info_ = &read_info_; iter_param_.read_info_ = &read_info_;
return OB_SUCCESS; return ret;
} }
void prepare_schema(share::schema::ObTableSchema &table_schema) void prepare_schema(share::schema::ObTableSchema &table_schema)