Commit 6205b4ba authored by Dominik Charousset's avatar Dominik Charousset

Revert heartbeat default value

While we should push for enabling heartbeat + connection timeout by
default, doing so in a patch release is the wrong way. This easily
breaks deployments when mixing 0.17.5 and 0.17.4 in the network.
parent 87baa353
...@@ -43,14 +43,14 @@ app-identifiers=["generic-caf-app"] ...@@ -43,14 +43,14 @@ app-identifiers=["generic-caf-app"]
; maximum number of consecutive I/O reads per broker ; maximum number of consecutive I/O reads per broker
max-consecutive-reads=50 max-consecutive-reads=50
; heartbeat message interval for periodic traffic ; heartbeat message interval for periodic traffic
; (0 disables heartbeating - not recommended) ; (0 disables heartbeating)
heartbeat-interval=10s heartbeat-interval=0s
; force disconnects of CAF nodes after receiving no traffic for this amount of ; force disconnects of CAF nodes after receiving no traffic for this amount of
; time (0 disables this feature - not recommended), be careful when deploying ; time (0 disables this feature, but we highly recommend using heartbeats and
; CAF applications with different heartbeat intervals and connection timeouts: ; connection timeouts), be careful when deploying CAF applications with
; this timeout should lign up with the *longest* heartbeat interval (ideally ; different heartbeat intervals and connection timeouts: this timeout should
; it's a multiple) ; lign up with the *longest* heartbeat interval (ideally it's a multiple)
connection-timeout=30s connection-timeout=0s
; configures whether the MM attaches its internal utility actors to the ; configures whether the MM attaches its internal utility actors to the
; scheduler instead of dedicating individual threads (needed only for ; scheduler instead of dedicating individual threads (needed only for
; deterministic testing) ; deterministic testing)
......
...@@ -110,8 +110,8 @@ namespace middleman { ...@@ -110,8 +110,8 @@ namespace middleman {
std::vector<std::string> app_identifiers{"generic-caf-app"}; std::vector<std::string> app_identifiers{"generic-caf-app"};
const atom_value network_backend = atom("default"); const atom_value network_backend = atom("default");
const size_t max_consecutive_reads = 50; const size_t max_consecutive_reads = 50;
const timespan heartbeat_interval = ms(10000); const timespan heartbeat_interval = timespan{0};
const timespan connection_timeout = ms(30000); const timespan connection_timeout = timespan{0};
const size_t cached_udp_buffers = 10; const size_t cached_udp_buffers = 10;
const size_t max_pending_msgs = 10; const size_t max_pending_msgs = 10;
const size_t workers = min(3u, std::thread::hardware_concurrency() / 4u) + 1; const size_t workers = min(3u, std::thread::hardware_concurrency() / 4u) + 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment