diff --git a/fencing/admin.c b/fencing/admin.c
index a305629003..9c22c5303e 100644
--- a/fencing/admin.c
+++ b/fencing/admin.c
@@ -1,227 +1,241 @@
/*
* Copyright (C) 2009 Andrew Beekhof <andrew@beekhof.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <crm_internal.h>
#include <sys/param.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/utsname.h>
#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
#include <crm/crm.h>
#include <crm/msg_xml.h>
#include <crm/common/ipc.h>
#include <crm/common/cluster.h>
#include <crm/stonith-ng.h>
#include <crm/common/xml.h>
#include <crm/common/msg.h>
static struct crm_option long_options[] = {
- {"verbose", 0, 0, 'V'},
- {"version", 0, 0, '$'},
- {"help", 0, 0, '?'},
+ {"help", 0, 0, '?', "\tThis text"},
+ {"version", 0, 0, '$', "\tVersion information" },
+ {"verbose", 0, 0, 'V', "\tIncrease debug output"},
- {"list", 1, 0, 'l'},
- {"list-all", 0, 0, 'L'},
+ {"list", 1, 0, 'l', "List devices that can terminate the specified host"},
+ {"list-all", 0, 0, 'L', "List all registered devices"},
- {"query", 1, 0, 'Q'},
- {"fence", 1, 0, 'F'},
- {"unfence", 1, 0, 'U'},
+ {"metadata", 0, 0, 'M', "Check the device's metadata"},
+ {"query", 1, 0, 'Q', "Check the device's status"},
+ {"fence", 1, 0, 'F', "Fence the named host"},
+ {"unfence", 1, 0, 'U', "Unfence the named host"},
- {"register", 1, 0, 'R'},
- {"deregister", 1, 0, 'D'},
+ {"register", 1, 0, 'R', "Register a stonith device"},
+ {"deregister", 1, 0, 'D', "De-register a stonith device"},
{"env-option", 1, 0, 'e'},
{"option", 1, 0, 'o'},
{"agent", 1, 0, 'a'},
{0, 0, 0, 0}
};
int st_opts = st_opt_sync_call;
static void st_callback(stonith_t *st, const char *event, xmlNode *msg)
{
crm_log_xml_notice(msg, event);
}
int
main(int argc, char ** argv)
{
int flag;
int rc = 0;
int argerr = 0;
int option_index = 0;
char name[512];
char value[512];
const char *agent = NULL;
const char *device = NULL;
const char *target = NULL;
char action = 0;
stonith_t *st = NULL;
GHashTable *hash = g_hash_table_new(g_str_hash, g_str_equal);
crm_log_init("stonith-admin", LOG_INFO, TRUE, TRUE, argc, argv);
- crm_set_options("V?$LQ:R:D:o:a:l:e:F:U:", "mode [options]", long_options,
- "Provides a summary of cluster's current state."
- "\n\nOutputs varying levels of detail in a number of different formats.\n");
+ crm_set_options("V?$LQ:R:D:o:a:l:e:F:U:M", "mode [options]", long_options,
+ "Provides access to the stonith-ng API.\n");
while (1) {
flag = crm_get_option(argc, argv, &option_index);
if (flag == -1)
break;
switch(flag) {
case 'V':
alter_debug(DEBUG_INC);
cl_log_enable_stderr(1);
break;
case '$':
case '?':
crm_help(flag, LSB_EXIT_OK);
break;
case 'L':
action = flag;
break;
case 'Q':
case 'R':
case 'D':
action = flag;
device = optarg;
break;
case 'a':
agent = optarg;
break;
case 'l':
target = optarg;
action = 'L';
break;
+ case 'M':
+ action = flag;
+ break;
case 'F':
case 'U':
target = optarg;
action = flag;
break;
case 'o':
crm_info("Scanning: -o %s", optarg);
rc = sscanf(optarg, "%[^=]=%[^=]", name, value);
if(rc != 2) {
crm_err("Invalid option: -o %s", optarg);
++argerr;
} else {
crm_info("Got: '%s'='%s'", name, value);
g_hash_table_insert(hash, crm_strdup(name), crm_strdup(value));
}
break;
case 'e':
{
char *key = crm_concat("OCF_RESKEY", optarg, '_');
const char *env = getenv(key);
if(env == NULL) {
crm_err("Invalid option: -e %s", optarg);
++argerr;
} else {
crm_info("Got: '%s'='%s'", optarg, env);
g_hash_table_insert(hash, crm_strdup(optarg), crm_strdup(env));
}
}
break;
default:
++argerr;
break;
}
}
if (optind > argc) {
++argerr;
}
if (argerr) {
crm_help('?', LSB_EXIT_GENERIC);
}
#if 0
g_hash_table_insert(hash, crm_strdup("ipaddr"), crm_strdup("localhost"));
g_hash_table_insert(hash, crm_strdup("pcmk-portmap"), crm_strdup("some-host=pcmk-1 pcmk-3=3,4"));
g_hash_table_insert(hash, crm_strdup("login"), crm_strdup("root"));
g_hash_table_insert(hash, crm_strdup("identity_file"), crm_strdup("/root/.ssh/id_dsa"));
#endif
crm_debug("Create");
st = stonith_api_new();
- rc = st->cmds->connect(st, crm_system_name, NULL, NULL);
- crm_debug("Connect: %d", rc);
-
- rc = st->cmds->register_notification(st, T_STONITH_NOTIFY_DISCONNECT, st_callback);
-
+ if(action != 'M') {
+ rc = st->cmds->connect(st, crm_system_name, NULL, NULL);
+ crm_debug("Connect: %d", rc);
+
+ rc = st->cmds->register_notification(st, T_STONITH_NOTIFY_DISCONNECT, st_callback);
+ }
+
switch(action)
{
case 'L':
{
GListPtr devices = NULL;
rc = st->cmds->query(st, st_opts, target, &devices, 10);
if(rc == 0) {
fprintf(stderr, "No devices found\n");
} else if(rc > 0) {
fprintf(stderr, "%d devices found\n", rc);
slist_iter(device, char, devices, lpc,
fprintf(stdout, " %s\n", device);
);
rc = 0;
}
}
break;
case 'Q':
rc = st->cmds->call(st, st_opts, device, "monitor", NULL, 10);
if(rc < 0) {
rc = st->cmds->call(st, st_opts, device, "list", NULL, 10);
}
break;
case 'R':
rc = st->cmds->register_device(st, st_opts, device, "stonith-ng", agent, hash);
break;
case 'D':
rc = st->cmds->remove_device(st, st_opts, device);
break;
+ case 'M':
+ {
+ char *buffer = NULL;
+ st->cmds->metadata(st, st_opt_sync_call, agent, NULL, &buffer, 0);
+ printf("%s\n", buffer);
+ crm_free(buffer);
+ }
+ break;
+
case 'F':
rc = st->cmds->fence(st, st_opts, target, "off", 120);
break;
case 'U':
rc = st->cmds->fence(st, st_opts, target, "on", 120);
break;
}
st->cmds->disconnect(st);
crm_debug("Disconnect: %d", rc);
crm_debug("Destroy");
stonith_api_delete(st);
return rc;
}