cherry pick commits to opensource

This commit is contained in:
obdev
2021-07-21 14:54:15 +08:00
committed by wangzelin.wzl
parent a9e70b7bcd
commit d6d35f670c
11 changed files with 115 additions and 56 deletions

View File

@ -3823,7 +3823,10 @@ int ObPartitionGroup::freeze_log_and_data_v2_(const bool emergency, const bool f
STORAGE_LOG(WARN, "fail to freeze log", K(ret), K(pkey_));
}
} else if (OB_FAIL(check_range_changed_(old_handle, is_leader, changed))) {
if (OB_EAGAIN != ret) {
if (OB_STATE_NOT_MATCH == ret) {
STORAGE_LOG(INFO, "skip freeze due to clog state", K(ret), K(pkey_));
ret = OB_SUCCESS;
} else if (OB_EAGAIN != ret) {
STORAGE_LOG(WARN, "failed to check log_id or version range changed", K(ret), K(old_handle));
}
} else if (!changed) {