Skip to content

Check get_header status returned #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imay merged 1 commit into from
Jun 23, 2019
Merged

Check get_header status returned #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions be/src/olap/olap_define.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ enum OLAPStatus {
OLAP_ERR_META_PUT = -3004,
OLAP_ERR_META_ITERATOR = -3005,
OLAP_ERR_META_DELETE = -3006,
OLAP_ERR_META_ALREADY_EXIST = -3007,
};

enum ColumnFamilyIndex {
Expand Down
29 changes: 19 additions & 10 deletions be/src/olap/olap_snapshot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,16 @@ OLAPStatus OLAPEngine::storage_medium_migrate(
<< "schema_hash_path=" << schema_hash_path;
remove_all_dir(schema_hash_path);
}

OLAPHeader new_olap_header;
res = OlapHeaderManager::get_header(stores[0], tablet->tablet_id(), tablet->schema_hash(), &new_olap_header);
if (res != OLAP_ERR_META_KEY_NOT_FOUND) {
LOG(WARNING) << "olap_header already exists. "
<< "data_dir:" << stores[0]->path()
<< "tablet:" << tablet->full_name();
return OLAP_ERR_META_ALREADY_EXIST;
}

create_dirs(schema_hash_path);

// migrate all index and data files but header file
Expand All @@ -727,21 +737,14 @@ OLAPStatus OLAPEngine::storage_medium_migrate(
break;
}

// generate new header file from the old
OLAPHeader* new_olap_header = new(std::nothrow) OLAPHeader();
if (new_olap_header == NULL) {
OLAP_LOG_WARNING("new olap header failed");
res = OLAP_ERR_BUFFER_OVERFLOW;
break;
}
res = _generate_new_header(stores[0], shard, tablet, version_entity_vec, new_olap_header);
res = _generate_new_header(stores[0], shard, tablet, version_entity_vec, &new_olap_header);
if (res != OLAP_SUCCESS) {
OLAP_LOG_WARNING("fail to generate new header file from the old. [res=%d]", res);
break;
}

// load the new tablet into OLAPEngine
auto olap_table = OLAPTable::create_from_header(new_olap_header, stores[0]);
auto olap_table = OLAPTable::create_from_header(&new_olap_header, stores[0]);
if (olap_table == NULL) {
OLAP_LOG_WARNING("failed to create from header");
res = OLAP_ERR_TABLE_CREATE_FROM_HEADER_ERROR;
Expand Down Expand Up @@ -793,7 +796,13 @@ OLAPStatus OLAPEngine::_generate_new_header(

OlapStore* ref_store =
OLAPEngine::get_instance()->get_store(tablet->storage_root_path_name());
OlapHeaderManager::get_header(ref_store, tablet->tablet_id(), tablet->schema_hash(), new_olap_header);
res = OlapHeaderManager::get_header(ref_store, tablet->tablet_id(), tablet->schema_hash(), new_olap_header);
if (res == OLAP_ERR_META_KEY_NOT_FOUND) {
LOG(WARNING) << "olap_header has already been dropped. "
<< "data_dir:" << ref_store->path()
<< "tablet:" << tablet->full_name();
return res;
}
_update_header_file_info(version_entity_vec, new_olap_header);
new_olap_header->set_shard(new_shard);

Expand Down