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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2016-06-27 13:42:12 +02:00
parent 2477f8c73a 5326e35b3b
commit e37729c8c0
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arangod/Agency/State.cpp
View File

@ -180,6 +180,8 @@ std::vector<VPackSlice> State::slices(
std::vector<VPackSlice> slices; std::vector<VPackSlice> slices;
MUTEX_LOCKER(mutexLocker, _logLock); MUTEX_LOCKER(mutexLocker, _logLock);
if (start < _log.front().index) { // no start specified if (start < _log.front().index) { // no start specified
start = _log.front().index; start = _log.front().index;
} }
@ -260,12 +262,26 @@ bool State::createCollection(std::string const& name) {
} }
bool State::loadCollections(TRI_vocbase_t* vocbase, bool waitForSync) { bool State::loadCollections(TRI_vocbase_t* vocbase, bool waitForSync) {
_vocbase = vocbase;
_vocbase = vocbase;
_options.waitForSync = waitForSync; _options.waitForSync = waitForSync;
_options.silent = true; _options.silent = true;
return loadPersisted(); if (loadPersisted()) {
if (_log.empty()) {
std::shared_ptr<Buffer<uint8_t>> buf = std::make_shared<Buffer<uint8_t>>();
VPackSlice value = arangodb::basics::VelocyPackHelper::EmptyObjectValue();
buf->append(value.startAs<char const>(), value.byteSize());
_log.push_back(log_t(arangodb::consensus::index_t(0), term_t(0),
arangodb::consensus::id_t(0), buf));
persist(
0, 0, (std::numeric_limits<arangodb::consensus::id_t>::max)(), value);
}
return true;
}
return false;
} }
bool State::loadPersisted() { bool State::loadPersisted() {