From 4447fb87ee2acb283bf8b7eaa5b60ab2f38f210f Mon Sep 17 00:00:00 2001 From: Erik Boasson Date: Thu, 7 May 2020 09:33:25 +0200 Subject: [PATCH] No reason to prevent rediscovery for 10s by default Signed-off-by: Erik Boasson --- docs/manual/options.md | 2 +- etc/cyclonedds.rnc | 2 +- etc/cyclonedds.xsd | 2 +- src/core/ddsi/src/q_config.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/manual/options.md b/docs/manual/options.md index 8341f3d..f8a7aa5 100644 --- a/docs/manual/options.md +++ b/docs/manual/options.md @@ -1349,7 +1349,7 @@ is therefore recommended to set it to at least several seconds. Valid values are finite durations with an explicit unit or the keyword 'inf' for infinity. Recognised units: ns, us, ms, s, min, hr, day. -The default value is: "10s". +The default value is: "0s". #### //CycloneDDS/Domain/Internal/RediscoveryBlacklistDuration[@enforce] diff --git a/etc/cyclonedds.rnc b/etc/cyclonedds.rnc index e6ce80d..0898f32 100644 --- a/etc/cyclonedds.rnc +++ b/etc/cyclonedds.rnc @@ -1113,7 +1113,7 @@ is therefore recommended to set it to at least several seconds.

Valid values are finite durations with an explicit unit or the keyword 'inf' for infinity. Recognised units: ns, us, ms, s, min, hr, -day.

The default value is: "10s".

""" ] ] +day.

The default value is: "0s".

""" ] ] element RediscoveryBlacklistDuration { [ a:documentation [ xml:lang="en" """

This attribute controls whether the configured time during which diff --git a/etc/cyclonedds.xsd b/etc/cyclonedds.xsd index cca1c3c..8214bf1 100644 --- a/etc/cyclonedds.xsd +++ b/etc/cyclonedds.xsd @@ -1475,7 +1475,7 @@ is therefore recommended to set it to at least several seconds.</p> <p>Valid values are finite durations with an explicit unit or the keyword 'inf' for infinity. Recognised units: ns, us, ms, s, min, hr, -day.</p><p>The default value is: &quot;10s&quot;.</p> +day.</p><p>The default value is: &quot;0s&quot;.</p> diff --git a/src/core/ddsi/src/q_config.c b/src/core/ddsi/src/q_config.c index 6808f31..6bfb3de 100644 --- a/src/core/ddsi/src/q_config.c +++ b/src/core/ddsi/src/q_config.c @@ -728,7 +728,7 @@ static const struct cfgelem internal_cfgelems[] = { BLURB("

Do not use.

") }, { LEAF("SendAsync"), 1, "false", ABSOFF(xpack_send_async), 0, uf_boolean, 0, pf_boolean, BLURB("

This element controls whether the actual sending of packets occurs on the same thread that prepares them, or is done asynchronously by another thread.

") }, - { LEAF_W_ATTRS("RediscoveryBlacklistDuration", rediscovery_blacklist_duration_attrs), 1, "10s", ABSOFF(prune_deleted_ppant.delay), 0, uf_duration_inf, 0, pf_duration, + { LEAF_W_ATTRS("RediscoveryBlacklistDuration", rediscovery_blacklist_duration_attrs), 1, "0s", ABSOFF(prune_deleted_ppant.delay), 0, uf_duration_inf, 0, pf_duration, BLURB("

This element controls for how long a remote participant that was previously deleted will remain on a blacklist to prevent rediscovery, giving the software on a node time to perform any cleanup actions it needs to do. To some extent this delay is required internally by DDSI2E, but in the default configuration with the 'enforce' attribute set to false, DDSI2E will reallow rediscovery as soon as it has cleared its internal administration. Setting it to too small a value may result in the entry being pruned from the blacklist before DDSI2E is ready, it is therefore recommended to set it to at least several seconds.

") }, { LEAF_W_ATTRS("MultipleReceiveThreads", multiple_recv_threads_attrs), 1, "default", ABSOFF(multiple_recv_threads), 0, uf_boolean_default, 0, pf_boolean_default, BLURB("

This element controls whether all traffic is handled by a single receive thread (false) or whether multiple receive threads may be used to improve latency (true). By default it is disabled on Windows because it appears that one cannot count on being able to send packets to oneself, which is necessary to stop the thread during shutdown. Currently multiple receive threads are only used for connectionless transport (e.g., UDP) and ManySocketsMode not set to single (the default).

") },