Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

properly handle removals during recovery (#9528) (#9529)

This commit is contained in:
Andrey Abramov 2019-07-21 16:20:02 +03:00 committed by KVS85
parent be88d8d499
commit 8c74c16dbc
5 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdParty/iresearch/core/index/index_writer.cpp vendored
View File

@ -722,6 +722,7 @@ index_writer::documents_context::~documents_context() NOEXCEPT {
} }
void index_writer::documents_context::reset() NOEXCEPT { void index_writer::documents_context::reset() NOEXCEPT {
tick_ = 0; // reset tick
auto& ctx = segment_.ctx(); auto& ctx = segment_.ctx();
if (!ctx) { if (!ctx) {

2
3rdParty/iresearch/core/index/index_writer.hpp vendored
View File

@ -190,7 +190,9 @@ class IRESEARCH_API index_writer:
documents_context(documents_context&& other) NOEXCEPT documents_context(documents_context&& other) NOEXCEPT
: segment_(std::move(other.segment_)), : segment_(std::move(other.segment_)),
segment_use_count_(std::move(other.segment_use_count_)), segment_use_count_(std::move(other.segment_use_count_)),
tick_(other.tick_),
writer_(other.writer_) { writer_(other.writer_) {
other.tick_ = 0;
other.segment_use_count_ = 0; other.segment_use_count_ = 0;
} }

1
3rdParty/iresearch/core/index/segment_writer.cpp vendored
View File

@ -328,6 +328,7 @@ void segment_writer::flush(index_meta::index_segment_t& segment) {
void segment_writer::reset() NOEXCEPT { void segment_writer::reset() NOEXCEPT {
initialized_ = false; initialized_ = false;
tick_ = 0;
dir_.clear_tracked(); dir_.clear_tracked();
docs_context_.clear(); docs_context_.clear();
docs_mask_.clear(); docs_mask_.clear();

7
arangod/IResearch/IResearchLink.cpp
View File

@ -1074,6 +1074,13 @@ Result IResearchLink::initDataStore(InitCallback const& initCallback, bool sorte
"failed to get last committed tick while initializing link '" + std::to_string(id()) + "'" "failed to get last committed tick while initializing link '" + std::to_string(id()) + "'"
}; };
} }
LOG_TOPIC("7e028", TRACE, iresearch::TOPIC)
<< "successfully opened existing data store data store reader for link '" + std::to_string(id())
<< "', docs count '" << _dataStore._reader->docs_count()
<< "', live docs count '" << _dataStore._reader->live_docs_count()
<< "', recovery tick '" << _dataStore._recoveryTick << "'";
} catch (irs::index_not_found const&) { } catch (irs::index_not_found const&) {
// NOOP // NOOP
} }

9
arangod/IResearch/IResearchRocksDBRecoveryHelper.cpp
View File

@ -205,7 +205,10 @@ void IResearchRocksDBRecoveryHelper::PutCF(
const rocksdb::Slice& key, const rocksdb::Slice& key,
const rocksdb::Slice& value, const rocksdb::Slice& value,
rocksdb::SequenceNumber /*tick*/) { rocksdb::SequenceNumber /*tick*/) {
if (column_family_id == _documentCF) { if (column_family_id != _documentCF) {
return;
}
auto coll = lookupCollection(*_dbFeature, *_engine, RocksDBKey::objectId(key)); auto coll = lookupCollection(*_dbFeature, *_engine, RocksDBKey::objectId(key));
if (coll == nullptr) { if (coll == nullptr) {
@ -253,16 +256,16 @@ void IResearchRocksDBRecoveryHelper::PutCF(
return; return;
} }
}
// common implementation for DeleteCF / SingleDeleteCF // common implementation for DeleteCF / SingleDeleteCF
void IResearchRocksDBRecoveryHelper::handleDeleteCF( void IResearchRocksDBRecoveryHelper::handleDeleteCF(
uint32_t column_family_id, uint32_t column_family_id,
const rocksdb::Slice& key, const rocksdb::Slice& key,
rocksdb::SequenceNumber /*tick*/) { rocksdb::SequenceNumber /*tick*/) {
if (column_family_id == _documentCF) { if (column_family_id != _documentCF) {
return; return;
} }
auto coll = lookupCollection(*_dbFeature, *_engine, RocksDBKey::objectId(key)); auto coll = lookupCollection(*_dbFeature, *_engine, RocksDBKey::objectId(key));
if (coll == nullptr) { if (coll == nullptr) {