Now, if multiple link watchers are used, link is up if any of the
link-watchers reports the link up.
Introduce new option "lw_policy" to change this behaviour. Possible values
are "any" and "all". If nothing specified, default value "any" will be
used and there will be no change in current behaviour. If value "all" will
be set, link will be up only if ALL the link-watchers report the link up.
Signed-off-by: Otto Hollmann <otto.hollmann(a)suse.com>
---
.../activebackup_multi_lw_1.conf | 1 +
teamd/teamd.c | 28 +++++++++++++++++++
teamd/teamd.h | 1 +
teamd/teamd_link_watch.c | 27 ++++++++++++++----
4 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/teamd/example_configs/activebackup_multi_lw_1.conf
b/teamd/example_configs/activebackup_multi_lw_1.conf
index c1645d2..c66e6d7 100644
--- a/teamd/example_configs/activebackup_multi_lw_1.conf
+++ b/teamd/example_configs/activebackup_multi_lw_1.conf
@@ -1,6 +1,7 @@
{
"device": "team0",
"runner": {"name": "activebackup"},
+ "lw_policy": "any",
"link_watch": [
{
"name": "arp_ping",
diff --git a/teamd/teamd.c b/teamd/teamd.c
index a89b702..a8a347f 100644
--- a/teamd/teamd.c
+++ b/teamd/teamd.c
@@ -1805,6 +1805,30 @@ static int teamd_drop_privileges()
#endif
+static int teamd_get_lw_policy(struct teamd_context *ctx)
+{
+ int err;
+ const char *lw_policy;
+
+ err = teamd_config_string_get(ctx, &lw_policy, "$.lw_policy");
+
+ if (!err) {
+ if (!strcmp(lw_policy, "all")) {
+ ctx->evaluate_all_watchers = true;
+ } else if (!strcmp(lw_policy, "any")) {
+ ctx->evaluate_all_watchers = false;
+ } else {
+ teamd_log_err("Unrecognized value for lw_policy.");
+ teamd_log_err("Only \"any\" or \"all\" are allowed but
\"%s\" found in config.", lw_policy);
+ return -EINVAL;
+ }
+ } else {
+ ctx->evaluate_all_watchers = false;
+ teamd_log_dbg(ctx, "No lw_policy specified in config, using
default value \"any\".");
+ }
+ return 0;
+}
+
int main(int argc, char **argv)
{
enum teamd_exit_code ret = TEAMD_EXIT_FAILURE;
@@ -1863,6 +1887,10 @@ int main(int argc, char **argv)
if (err)
goto config_free;
+ err = teamd_get_lw_policy(ctx);
+ if (err)
+ goto config_free;
+
err = teamd_set_default_pid_file(ctx);
if (err)
goto config_free;
diff --git a/teamd/teamd.h b/teamd/teamd.h
index 541d2a7..4ca40a1 100644
--- a/teamd/teamd.h
+++ b/teamd/teamd.h
@@ -110,6 +110,7 @@ struct teamd_context {
json_t * config_json;
char * pid_file;
char * team_devname;
+ bool evaluate_all_watchers;
char * ident;
char * argv0;
struct team_handle * th;
diff --git a/teamd/teamd_link_watch.c b/teamd/teamd_link_watch.c
index cae6549..11f4697 100644
--- a/teamd/teamd_link_watch.c
+++ b/teamd/teamd_link_watch.c
@@ -133,11 +133,28 @@ bool teamd_link_watch_port_up(struct teamd_context *ctx,
if (!tdport)
return true;
link = true;
- teamd_for_each_port_priv_by_creator(common_ppriv, tdport,
- LW_PORT_PRIV_CREATOR_PRIV) {
- link = common_ppriv->link_up;
- if (link)
- return link;
+ if (ctx->evaluate_all_watchers) {
+ /*
+ * If multiple link-watchers used at the same time,
+ * link is up if ALL of the link-watchers reports the link up.
+ */
+ teamd_for_each_port_priv_by_creator(common_ppriv, tdport,
+ LW_PORT_PRIV_CREATOR_PRIV) {
+ link = common_ppriv->link_up;
+ if (!link)
+ return link;
+ }
+ } else {
+ /*
+ * If multiple link-watchers used at the same time,
+ * link is up if ANY of the link-watchers reports the link up.
+ */
+ teamd_for_each_port_priv_by_creator(common_ppriv, tdport,
+ LW_PORT_PRIV_CREATOR_PRIV) {
+ link = common_ppriv->link_up;
+ if (link)
+ return link;
+ }
}
return link;
}
--
2.35.3
