mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-06 06:53:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "fixes for compaction" from Raphael

Browse Source
This commit is contained in:
Avi Kivity
2015-07-25 13:43:53 +03:00
parent 1c562fcdb3 15bbb71b7b
commit 092ca04f54
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
database.cc
View File

@@ -440,8 +440,22 @@ column_family::stop() {
return _in_flight_seals.close().then([this] {
_compaction_sem.broken();
return _compaction_done.then([this] {
return make_ready_future<>();
return _compaction_done.then_wrapped([this] (future<> f) {
// NOTE: broken_semaphore and seastar::gate_closed_exception exceptions
// are used for regular termination of compaction fiber.
try {
f.get();
} catch (broken_semaphore& e) {
dblog.info("compaction for column_family {}/{} not restarted due to shutdown", _schema->ks_name(), _schema->cf_name());
} catch (seastar::gate_closed_exception& e) {
dblog.info("compaction for column_family {}/{} not restarted due to shutdown", _schema->ks_name(), _schema->cf_name());
} catch (std::exception& e) {
dblog.error("compaction failed: {}", e.what());
throw;
} catch (...) {
dblog.error("compaction failed: unknown error");
throw;
}
});
});
}
@@ -522,22 +536,6 @@ void column_family::start_compaction() {
return cs.compact(*this);
});
});
}).then_wrapped([this] (future<> f) {
// NOTE: broken_semaphore and seastar::gate_closed_exception
// exceptions are used to finish keep_doing().
try {
f.get();
} catch (broken_semaphore& e) {
dblog.info("compaction for column_family {}/{} not restarted due to shutdown", _schema->ks_name(), _schema->cf_name());
} catch (seastar::gate_closed_exception& e) {
dblog.info("compaction for column_family {}/{} not restarted due to shutdown", _schema->ks_name(), _schema->cf_name());
} catch (std::exception& e) {
dblog.error("compaction failed: {}", e.what());
throw;
} catch (...) {
dblog.error("compaction failed: unknown error");
throw;
}
});
});
}