add code for sw compiling and fix some problems

This commit is contained in:
zb0
2021-12-15 10:54:48 +08:00
committed by LINxiansheng
parent 77cf1effd1
commit 0dc8820123
27 changed files with 460 additions and 16 deletions

View File

@ -1876,7 +1876,6 @@ int ObPartitionGroup::replay_split_source_log(
"replay split source log failed",
K(ret),
K_(pkey),
K(log),
K(log_id),
K(log_ts),
"used_time",
@ -1885,7 +1884,6 @@ int ObPartitionGroup::replay_split_source_log(
STORAGE_LOG(INFO,
"replay split source log success",
K_(pkey),
K(log),
K(log_id),
K(log_ts),
K(write_slog),
@ -2475,7 +2473,7 @@ int ObPartitionGroup::split_dest_partition(const ObPartitionSplitInfo& split_inf
split_info.get_spp()))) {
STORAGE_LOG(WARN, "split dest log init failed", K(ret));
} else if (OB_FAIL(submit_split_dest_log_(log))) {
STORAGE_LOG(WARN, "submit split dest log failed", K(ret), K(log));
STORAGE_LOG(WARN, "submit split dest log failed", K(ret));
} else {
// do nothing
}
@ -2552,10 +2550,10 @@ int ObPartitionGroup::push_reference_tables(const ObIArray<ObPartitionKey>& dest
ret = OB_NOT_INIT;
STORAGE_LOG(WARN, "not init", K(ret));
} else if (OB_FAIL(check_if_dest_pg_ready_(dest_array, is_dest_partition_ready))) {
STORAGE_LOG(WARN, "check if dest partition group ready failed", K(ret), K(log));
STORAGE_LOG(WARN, "check if dest partition group ready failed", K(ret));
} else if (!is_dest_partition_ready) {
ret = OB_EAGAIN;
STORAGE_LOG(WARN, "dest partition group is not ready, need retry", K(ret), K(log));
STORAGE_LOG(WARN, "dest partition group is not ready, need retry", K(ret));
} else if (OB_FAIL(push_reference_tables_(dest_array, split_version))) {
STORAGE_LOG(WARN, "failed to push reference tables", K(ret), K(dest_array), K(split_version));
}