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

longer WAL file retention for test (#8736)

This commit is contained in:
Jan 2019-04-15 10:16:34 +02:00 committed by GitHub
parent 449ab1ed8e
commit 69f7a8a00d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arangod/Replication/ReplicationApplier.cpp
View File

@ -454,6 +454,7 @@ Result ReplicationApplier::resetState(bool reducedSet) {
}
LOG_TOPIC("87584", DEBUG, Logger::REPLICATION)
<< "stopped replication applier for database '" << _state.databaseName
<< "' with lastProcessedContinuousTick: " << _state._lastProcessedContinuousTick
<< ", lastAppliedContinuousTick: " << _state._lastAppliedContinuousTick
<< ", safeResumeTick: " << _state._safeResumeTick;

3
arangod/Replication/TailingSyncer.cpp
View File

@ -1375,6 +1375,8 @@ retry:
// necessary to reset the state here, because otherwise running the
// InitialSyncer may fail with "applier is running" errors
_applier->_state._phase = ReplicationApplierState::ActivityPhase::INITIAL;
_applier->_state._stopInitialSynchronization = false;
_applier->_state._preventStart = false;
}
// start initial synchronization
@ -2085,6 +2087,7 @@ Result TailingSyncer::handleRequiredFromPresentFailure(TRI_voc_tick_t fromTick,
"of historic logfiles/WAL file timeout or archive size on the master.";
if (_requireFromPresent) { // hard fail
abortOngoingTransactions();
setProgress(msg);
return Result(TRI_ERROR_REPLICATION_START_TICK_NOT_PRESENT, msg);
}

3
js/client/modules/@arangodb/testsuites/replication.js
View File

@ -130,7 +130,8 @@ function replicationFuzz (options) {
};
return tu.performTests(options, testCases, 'replication_fuzz', tu.runInArangosh, {}, startStopHandlers);
return tu.performTests(options, testCases, 'replication_fuzz', tu.runInArangosh,
{"rocksdb.wal-file-timeout-initial": "7200"}, startStopHandlers);
}
// //////////////////////////////////////////////////////////////////////////////