hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

patch backup piece to 3.1. open source

Browse Source
This commit is contained in:
xuhuleon
2021-09-02 15:26:39 +08:00
committed by wangzelin.wzl
parent 153f16ad8a
commit 62cb470338
314 changed files with 88279 additions and 35466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/storage/ob_partition_meta_redo_module.cpp
View File

@ -773,13 +773,12 @@ int ObPartitionMetaRedoModule::inner_del_partition_for_replay(const ObPartitionK
LOG_WARN("fail to inner del partition", K(ret));
} else if (OB_INVALID_DATA_FILE_ID == file_id) {
// replay slog before 3.1, need to remove pg from file mgr explicitly
const ObIPartitionGroup &pg = *guard.get_partition_group();
const ObStorageFile *file = pg.get_storage_file();
const ObIPartitionGroup& pg = *guard.get_partition_group();
const ObStorageFile* file = pg.get_storage_file();
if (OB_ISNULL(file)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("partition group has null file", K(ret), K(pkey));
} else if (OB_FAIL(file_mgr_->remove_pg(
ObTenantFileKey(file->get_tenant_id(), file->get_file_id()), pkey))) {
} else if (OB_FAIL(file_mgr_->remove_pg(ObTenantFileKey(file->get_tenant_id(), file->get_file_id()), pkey))) {
LOG_WARN("remove pg key from file fail", K(ret), K(pkey));
}
}
@ -989,10 +988,9 @@ int ObPartitionMetaRedoModule::replay_create_partition_group(const ObRedoModuleR
if (OB_FAIL(file_mgr_->alloc_file(
log_entry.meta_.pg_key_.get_tenant_id(), sys_table, file_handle, false /*write slog*/))) {
LOG_WARN("fail to open pg file", K(ret));
} else if (OB_FAIL(file_mgr_->add_pg(
ObTenantFileKey(file_handle.get_storage_file()->get_tenant_id(),
file_handle.get_storage_file()->get_file_id()),
log_entry.meta_.pg_key_))) {
} else if (OB_FAIL(file_mgr_->add_pg(ObTenantFileKey(file_handle.get_storage_file()->get_tenant_id(),
file_handle.get_storage_file()->get_file_id()),
log_entry.meta_.pg_key_))) {
LOG_WARN("fail to add pg to tenant file", K(ret), K(log_entry), "file", *file_handle.get_storage_file());
}
}
@ -1601,6 +1599,7 @@ int ObPartitionMetaRedoModule::get_create_pg_param(const ObCreatePartitionGroupL
param.last_restore_log_id_ = log_entry.meta_.last_restore_log_id_;
param.last_restore_log_ts_ = log_entry.meta_.last_restore_log_ts_;
param.restore_snapshot_version_ = log_entry.meta_.restore_snapshot_version_;
param.restore_schema_version_ = log_entry.meta_.restore_schema_version_;
}
return ret;
}