Skip to content

Release schema change lock when get migration lock failed #1350

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
chaoyli merged 4 commits into from
Jun 24, 2019
Merged

Release schema change lock when get migration lock failed #1350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a898e3
check file created and empty
yiguolei Jun 21, 2019
98bd7f3
Release schema change lock when get lock failed
yiguolei Jun 21, 2019
ee756e5
Remove file created check
yiguolei Jun 24, 2019
bd41d0b
Remove file created check
yiguolei Jun 24, 2019
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
7 changes: 5 additions & 2 deletions be/src/olap/schema_change.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,14 +1127,15 @@ OLAPStatus SchemaChangeHandler::process_alter_tablet(AlterTabletType type,
<< ", new_tablet_id=" << request.new_tablet_req.tablet_id
<< ", new_schema_hash=" << request.new_tablet_req.tablet_schema.schema_hash;
OLAPStatus res = OLAP_SUCCESS;
// 1. Lock schema_change_lock util schema change info is stored in tablet header

// Lock schema_change_lock util schema change info is stored in tablet header
if (!StorageEngine::instance()->tablet_manager()->try_schema_change_lock(request.base_tablet_id)) {
LOG(WARNING) << "failed to obtain schema change lock. "
<< "base_tablet=" << request.base_tablet_id;
return OLAP_ERR_TRY_LOCK_FAILED;
}

// 2. Get base tablet
// Get base tablet
TabletSharedPtr base_tablet = StorageEngine::instance()->tablet_manager()->get_tablet(
request.base_tablet_id, request.base_schema_hash);
if (base_tablet == nullptr) {
Expand Down Expand Up @@ -1196,10 +1197,12 @@ OLAPStatus SchemaChangeHandler::process_alter_tablet(AlterTabletType type,

ReadLock base_migration_rlock(base_tablet->get_migration_lock_ptr(), TRY_LOCK);
if (!base_migration_rlock.own_lock()) {
StorageEngine::instance()->tablet_manager()->release_schema_change_lock(request.base_tablet_id);
return OLAP_ERR_RWLOCK_ERROR;
}
ReadLock new_migration_rlock(new_tablet->get_migration_lock_ptr(), TRY_LOCK);
if (!new_migration_rlock.own_lock()) {
StorageEngine::instance()->tablet_manager()->release_schema_change_lock(request.base_tablet_id);
return OLAP_ERR_RWLOCK_ERROR;
}

Expand Down
1 change: 0 additions & 1 deletion be/src/olap/tablet_meta_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ OLAPStatus TabletMetaManager::save(DataDir* store,
key_stream << header_prefix << tablet_id << "_" << schema_hash;
std::string key = key_stream.str();
VLOG(3) << "save tablet meta to meta store: key = " << key;
std::cout << "save tablet meta to meta store: key = " << key << std::endl;
OlapMeta* meta = store->get_meta();

TabletMetaPB de_tablet_meta_pb;
Expand Down