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

re-added replication applier

This commit is contained in:
Jan Steemann 2014-06-23 17:55:08 +02:00
parent f72ccde9cf
commit e89e390cda
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangod/V8Server/v8-vocbase.cpp
View File

@ -4995,11 +4995,11 @@ static v8::Handle<v8::Value> JS_StartApplierReplication (v8::Arguments const& ar
TRI_vocbase_t* vocbase = GetContextVocBase();
if (vocbase == 0) {
if (vocbase == nullptr) {
TRI_V8_EXCEPTION(scope, TRI_ERROR_ARANGO_DATABASE_NOT_FOUND);
}
if (vocbase->_replicationApplier == 0) {
if (vocbase->_replicationApplier == nullptr) {
TRI_V8_EXCEPTION(scope, TRI_ERROR_INTERNAL);
}
@ -5039,11 +5039,11 @@ static v8::Handle<v8::Value> JS_StopApplierReplication (v8::Arguments const& arg
TRI_vocbase_t* vocbase = GetContextVocBase();
if (vocbase == 0) {
if (vocbase == nullptr) {
TRI_V8_EXCEPTION(scope, TRI_ERROR_ARANGO_DATABASE_NOT_FOUND);
}
if (vocbase->_replicationApplier == 0) {
if (vocbase->_replicationApplier == nullptr) {
TRI_V8_EXCEPTION(scope, TRI_ERROR_INTERNAL);
}
@ -5069,11 +5069,11 @@ static v8::Handle<v8::Value> JS_StateApplierReplication (v8::Arguments const& ar
TRI_vocbase_t* vocbase = GetContextVocBase();
if (vocbase == 0) {
if (vocbase == nullptr) {
TRI_V8_EXCEPTION(scope, TRI_ERROR_ARANGO_DATABASE_NOT_FOUND);
}
if (vocbase->_replicationApplier == 0) {
if (vocbase->_replicationApplier == nullptr) {
TRI_V8_EXCEPTION(scope, TRI_ERROR_INTERNAL);
}

23
arangod/VocBase/server.cpp
View File

@ -1446,6 +1446,29 @@ static int InitAll (TRI_server_t* server) {
// start the compactor for the database
TRI_StartCompactorVocBase(vocbase);
// start the replication applier
vocbase->_replicationApplier = TRI_CreateReplicationApplier(vocbase);
if (vocbase->_replicationApplier == nullptr) {
// TODO
LOG_FATAL_AND_EXIT("initialising replication applier for database '%s' failed", vocbase->_name);
}
if (vocbase->_replicationApplier->_configuration._autoStart) {
if (server->_disableReplicationAppliers) {
LOG_INFO("replication applier explicitly deactivated for database '%s'", vocbase->_name);
}
else {
int res = TRI_StartReplicationApplier(vocbase->_replicationApplier, 0, false);
if (res != TRI_ERROR_NO_ERROR) {
LOG_WARNING("unable to start replication applier for database '%s': %s",
vocbase->_name,
TRI_errno_string(res));
}
}
}
}
}