8000 make replication timeouts configurable via startup options by jsteemann · Pull Request #10473 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

make replication timeouts configurable via startup options #10473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 19, 2019
Merged

make replication timeouts configurable via startup options #10473

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe4f84b
make replication timeouts configurable via startup options
jsteemann Nov 19, 2019
8250df8
do *not* change default value for timeouts
jsteemann Nov 19, 2019
72b1a1d
make tests work again
jsteemann Nov 19, 2019
f110336
Update CHANGELOG
KVS85 Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make tests work again
  • Loading branch information
@jsteemann
jsteemann committed Nov 19, 2019
commit 72b1a1dca070fd47ee9e1160055ef05b184fc84b
8 changes: 5 additions & 3 deletions arangod/Cluster/HeartbeatThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,9 +774,11 @@ void HeartbeatThread::runSingleServer() {
TRI_ASSERT(!config._skipCreateDrop);
config._includeFoxxQueues = true; // sync _queues and _jobs

auto feature = application_features::ApplicationServer::getFeature<ReplicationFeature>("Replication");
config._connectTimeout = feature->checkConnectTimeout(config._connectTimeout);
config._requestTimeout = feature->checkRequestTimeout(config._requestTimeout);
auto* feature = application_features::ApplicationServer::lookupFeature<ReplicationFeature>("Replication");
if (feature != nullptr) {
config._connectTimeout = feature->checkConnectTimeout(config._connectTimeout);
config._requestTimeout = feature->checkRequestTimeout(config._requestTimeout);
}

applier->forget(); // forget about any existing configuration
applier->reconfigure(config);
Expand Down
28 changes: 18 additions & 10 deletions arangod/Replication/ReplicationApplierConfiguration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ ReplicationApplierConfiguration::ReplicationApplierConfiguration()
_incremental(false),
_verbose(false),
_restrictType(RestrictType::None) {
auto feature = application_features::ApplicationServer::getFeature<ReplicationFeature>("Replication");
_requestTimeout = feature->requestTimeout();
_connectTimeout = feature->connectTimeout();
auto* feature = application_features::ApplicationServer::lookupFeature<ReplicationFeature>("Replication");
if (feature != nullptr) {
_requestTimeout = feature->requestTimeout();
_connectTimeout = feature->connectTimeout();
}
}

/// @brief reset the configuration to defaults
Expand Down Expand Up @@ -105,9 +107,11 @@ void ReplicationApplierConfiguration::reset() {
_force32mode = false;
#endif

auto feature = application_features::ApplicationServer::getFeature<ReplicationFeature>("Replication");
_requestTimeout = feature->requestTimeout();
_connectTimeout = feature->connectTimeout();
auto* feature = application_features::ApplicationServer::lookupFeature<ReplicationFeature>("Replication");
if (feature != nullptr) {
_requestTimeout = feature->requestTimeout();
_connectTimeout = feature->connectTimeout();
}
}

/// @brief get a VelocyPack representation
Expand Down Expand Up @@ -228,14 +232,18 @@ ReplicationApplierConfiguration ReplicationApplierConfiguration::fromVelocyPack(

value = slice.get("requestTimeout");
if (value.isNumber()) {
auto feature = application_features::ApplicationServer::getFeature<ReplicationFeature>("Replication");
configuration._requestTimeout = feature->checkRequestTimeout(value.getNumber<double>());
auto* feature = application_features::ApplicationServer::lookupFeature<ReplicationFeature>("Replication");
if (feature != nullptr) {
configuration._requestTimeout = feature->checkRequestTimeout(value.getNumber<double>());
}
}

value = slice.get("connectTimeout");
if (value.isNumber()) {
auto feature = application_features::ApplicationServer::getFeature<ReplicationFeature>("Replication");
configuration._connectTimeout = feature->checkConnectTimeout(value.getNumber<double>());
auto* feature = application_features::ApplicationServer::lookupFeature<ReplicationFeature>("Replication");
if (feature != nullptr) {
configuration._connectTimeout = feature->checkConnectTimeout(value.getNumber<double>());
}
}

value = slice.get("maxConnectRetries");
Expand Down
0