|
 |
2d8bb4 |
From 0dc5bcf0ee82f6d6dc42a92e6564b93740b3c7ee Mon Sep 17 00:00:00 2001
|
|
|
2d8bb4 |
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
|
2d8bb4 |
Date: Mon, 3 Sep 2018 15:29:19 +0200
|
|
|
2d8bb4 |
Subject: [PATCH] fence_kdump: add validate-all action
|
|
|
2d8bb4 |
|
|
|
2d8bb4 |
---
|
|
|
2d8bb4 |
agents/kdump/fence_kdump.c | 6 +++++-
|
|
|
2d8bb4 |
agents/kdump/options.h | 3 +++
|
|
|
2d8bb4 |
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
2d8bb4 |
|
|
|
2d8bb4 |
diff --git a/agents/kdump/fence_kdump.c b/agents/kdump/fence_kdump.c
|
|
|
2d8bb4 |
index 768a9344..4ab2dd9b 100644
|
|
|
2d8bb4 |
--- a/agents/kdump/fence_kdump.c
|
|
|
2d8bb4 |
+++ b/agents/kdump/fence_kdump.c
|
|
|
2d8bb4 |
@@ -295,6 +295,7 @@ do_action_metadata (const char *self)
|
|
|
2d8bb4 |
fprintf (stdout, "\t<action name=\"off\" />\n");
|
|
|
2d8bb4 |
fprintf (stdout, "\t<action name=\"monitor\" />\n");
|
|
|
2d8bb4 |
fprintf (stdout, "\t<action name=\"metadata\" />\n");
|
|
|
2d8bb4 |
+ fprintf (stdout, "\t<action name=\"validate-all\" />\n");
|
|
|
2d8bb4 |
fprintf (stdout, "</actions>\n");
|
|
|
2d8bb4 |
|
|
|
2d8bb4 |
fprintf (stdout, "</resource-agent>\n");
|
|
|
2d8bb4 |
@@ -316,7 +317,7 @@ print_usage (const char *self)
|
|
|
2d8bb4 |
fprintf (stdout, "%s\n",
|
|
|
2d8bb4 |
" -f, --family=FAMILY Network family: ([auto], ipv4, ipv6)");
|
|
|
2d8bb4 |
fprintf (stdout, "%s\n",
|
|
|
2d8bb4 |
- " -o, --action=ACTION Fencing action: ([off], monitor, metadata)");
|
|
|
2d8bb4 |
+ " -o, --action=ACTION Fencing action: ([off], monitor, metadata, validate-all)");
|
|
|
2d8bb4 |
fprintf (stdout, "%s\n",
|
|
|
2d8bb4 |
" -t, --timeout=TIMEOUT Timeout in seconds (default: 60)");
|
|
|
2d8bb4 |
fprintf (stdout, "%s\n",
|
|
|
2d8bb4 |
@@ -556,6 +557,9 @@ main (int argc, char **argv)
|
|
|
2d8bb4 |
case FENCE_KDUMP_ACTION_MONITOR:
|
|
|
2d8bb4 |
error = do_action_monitor ();
|
|
|
2d8bb4 |
break;
|
|
|
2d8bb4 |
+ case FENCE_KDUMP_ACTION_VALIDATE:
|
|
|
2d8bb4 |
+ error = 0;
|
|
|
2d8bb4 |
+ break;
|
|
|
2d8bb4 |
default:
|
|
|
2d8bb4 |
break;
|
|
|
2d8bb4 |
}
|
|
|
2d8bb4 |
diff --git a/agents/kdump/options.h b/agents/kdump/options.h
|
|
|
2d8bb4 |
index 22731d7c..6d774e5a 100644
|
|
|
2d8bb4 |
--- a/agents/kdump/options.h
|
|
|
2d8bb4 |
+++ b/agents/kdump/options.h
|
|
|
2d8bb4 |
@@ -36,6 +36,7 @@ enum {
|
|
|
2d8bb4 |
FENCE_KDUMP_ACTION_LIST = 4,
|
|
|
2d8bb4 |
FENCE_KDUMP_ACTION_MONITOR = 5,
|
|
|
2d8bb4 |
FENCE_KDUMP_ACTION_METADATA = 6,
|
|
|
2d8bb4 |
+ FENCE_KDUMP_ACTION_VALIDATE = 7,
|
|
|
2d8bb4 |
};
|
|
|
2d8bb4 |
|
|
|
2d8bb4 |
enum {
|
|
|
2d8bb4 |
@@ -191,6 +192,8 @@ set_option_action (fence_kdump_opts_t *opts, const char *arg)
|
|
|
2d8bb4 |
opts->action = FENCE_KDUMP_ACTION_METADATA;
|
|
|
2d8bb4 |
} else if (!strcasecmp (arg, "monitor")) {
|
|
|
2d8bb4 |
opts->action = FENCE_KDUMP_ACTION_MONITOR;
|
|
|
2d8bb4 |
+ } else if (!strcasecmp (arg, "validate-all")) {
|
|
|
2d8bb4 |
+ opts->action = FENCE_KDUMP_ACTION_VALIDATE;
|
|
|
2d8bb4 |
} else {
|
|
|
2d8bb4 |
fprintf (stderr, "[error]: unsupported action '%s'\n", arg);
|
|
|
2d8bb4 |
exit (1);
|