Skip to contentSkip to conversation

sccs_tool enhancement

PATCH New Dmitry Mishin 3 participants 13 messages Dec 10, 2010 – Dec 15, 2010

lore
Share & tools
lore
#0 lore raw

cover sccs_tool enhancement

Command line utilities are useful for automation. But current cluster configuration command line tool has only rudimentary support of cluster options. Thus one needs to install heavy X server for GUI system-config-cluster or web server for Conga in order to prepare cluster's configuration or use complex scripting and edit configuration XML file for automation.

This patchset enhances ccs_tool allowing to create basic cluster configs entirely via this tool.

Ported to STABLE31

Thanks,
Dmitry.

#1 lore raw

PATCH 1/8 Add "service" object manipulations

In order to be useful, cluster needs service defined, which it will take care of. Patch adds ability to define service using already defined resources (like fs, script, ip, etc.)

---
 config/tools/ccs_tool/ccs_tool.c |   15 ++
 config/tools/ccs_tool/editconf.c |  364 +++++++++++++++++++++++++++++++++++++-
 config/tools/ccs_tool/editconf.h |    3 +
 3 files changed, 378 insertions(+), 4 deletions(-)
config/tools/ccs_tool/ccs_tool.c +15 -0
index 34805be..2fe6f78 100644
@@ -225,6 +225,14 @@ static int tool_main(int argc, char *argv[])
 	    del_node(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "addservice")){
+	    add_service(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
+    else if(!strcmp(argv[optind], "delservice")){
+	    del_service(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "addfence")){
 	    add_fence(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -237,6 +245,10 @@ static int tool_main(int argc, char *argv[])
 	    list_nodes(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "lsservice")){
+	    list_services(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "lsfence")){
 	    list_fences(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -279,6 +291,9 @@ static void tool_print_usage(FILE *stream){
 	  "  addnode <node>      Add a node\n"
           "  delnode <node>      Delete a node\n"
           "  lsnode              List nodes\n"
+	  "  addservice <name>   Add a service\n"
+          "  delservice <name>   Delete a service\n"
+          "  lsservice           List services\n"
           "  lsfence             List fence devices\n"
 	  "  addfence <fencedev> Add a new fence device\n"
 	  "  delfence <fencedev> Delete a fence device\n"
config/tools/ccs_tool/editconf.c +360 -4

424 lines not on this page · raw message

config/tools/ccs_tool/editconf.h +3 -0
index 1847e2c..be8945e 100644
@@ -1,8 +1,11 @@
 void add_node(int argc, char **argv);
 void add_nodeids(int argc, char **argv);
+void add_service(int argc, char **argv);
 void add_fence(int argc, char **argv);
 void del_node(int argc, char **argv);
+void del_service(int argc, char **argv);
 void del_fence(int argc, char **argv);
 void list_nodes(int argc, char **argv);
+void list_services(int argc, char **argv);
 void list_fences(int argc, char **argv);
 void create_skeleton(int argc, char **argv);
Signature · 1 line
1.7.1
#2 lore raw

PATCH 1/8 Add "service" object manipulations

config/tools/ccs_tool/editconf.c static xmlNode *find_node(xmlNode *clusternodes, const char *nodename) · line 448

Quoted 5 lines · Dmitry Mishin
config/tools/ccs_tool/editconf.c +5 -0
+static xmlNode *find_ip_resource(xmlNode *root, const char *name)
+{
+	return do_find_node(root, name, "ip", "name");
+}
+

should be

	return do_find_node(root, name, "ip", "address");

IP resources don't have names; the primary attribute is the address field. Adding a "name" will break configuration validation without patches to ip.sh and cluster.rng.

(this might happen in other patches too)

-- Lon

#3 lore raw

PATCH 1/8 Add "service" object manipulations

Quoted 9 lines · Lon Hohberger

config/tools/ccs_tool/editconf.c static xmlNode *find_node(xmlNode *clusternodes, const char *nodename) · line 448

Quoted 5 lines · Dmitry Mishin
config/tools/ccs_tool/editconf.c +5 -0
+static xmlNode *find_ip_resource(xmlNode *root, const char *name)
+{
+	return do_find_node(root, name, "ip", "name");
+}
+

should be

Quoted 7 lines
	return do_find_node(root, name, "ip", "address");

IP resources don't have names; the primary attribute is the address field. Adding a "name" will break configuration validation without patches to ip.sh and cluster.rng.

(this might happen in other patches too)

Scratch that, you fixed it in patch 5.

-- Lon

#4 lore raw

PATCH 2/8 Unify 'del' functions

In reply to Dmitry Mishin

No need to keep 2 copies with almost the same logic inside - better to add if.. else clause.

---
 config/tools/ccs_tool/ccs_tool.c |    2 +-
 config/tools/ccs_tool/editconf.c |   59 ++-----------------------------------
 config/tools/ccs_tool/editconf.h |    1 -
 3 files changed, 5 insertions(+), 57 deletions(-)
config/tools/ccs_tool/ccs_tool.c +1 -1
index 2fe6f78..8062549 100644
@@ -230,7 +230,7 @@ static int tool_main(int argc, char *argv[])
 	    exit(EXIT_SUCCESS);
     }
     else if(!strcmp(argv[optind], "delservice")){
-	    del_service(argc-1, argv+1);
+	    del_node(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
     else if(!strcmp(argv[optind], "addfence")){
config/tools/ccs_tool/editconf.c +4 -55

77 lines not on this page · raw message

config/tools/ccs_tool/editconf.h +0 -1
index be8945e..0090ab6 100644
@@ -3,7 +3,6 @@ void add_nodeids(int argc, char **argv);
 void add_service(int argc, char **argv);
 void add_fence(int argc, char **argv);
 void del_node(int argc, char **argv);
-void del_service(int argc, char **argv);
 void del_fence(int argc, char **argv);
 void list_nodes(int argc, char **argv);
 void list_services(int argc, char **argv);
Signature · 1 line
1.7.1
#5 lore raw

PATCH 3/8 Add "script" object manipulations

In reply to Dmitry Mishin

Script object is used when one needs to perform some actions on service relocation event. This patch adds ability to add, delete and list scripts in cluster config.

---
 config/tools/ccs_tool/ccs_tool.c |   15 +++
 config/tools/ccs_tool/editconf.c |  192 ++++++++++++++++++++++++++++++++++++++
 config/tools/ccs_tool/editconf.h |    2 +
 3 files changed, 209 insertions(+), 0 deletions(-)
config/tools/ccs_tool/ccs_tool.c +15 -0
index 8062549..9726da2 100644
@@ -233,6 +233,14 @@ static int tool_main(int argc, char *argv[])
 	    del_node(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "addscript")){
+	    add_script(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
+    else if(!strcmp(argv[optind], "delscript")){
+	    del_node(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "addfence")){
 	    add_fence(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -253,6 +261,10 @@ static int tool_main(int argc, char *argv[])
 	    list_fences(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "lsscript")){
+	    list_scripts(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "create")){
 	    create_skeleton(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -297,6 +309,9 @@ static void tool_print_usage(FILE *stream){
           "  lsfence             List fence devices\n"
 	  "  addfence <fencedev> Add a new fence device\n"
 	  "  delfence <fencedev> Delete a fence device\n"
+	  "  addscript <name>    Add a script resource\n"
+	  "  delscript <name>    Delete a script resource\n"
+          "  lsscript            List script resources\n"
 	  "  create              Create a skeleton config file\n"
 	  "  addnodeids          Assign node ID numbers to all nodes\n"
 	  "\n");
config/tools/ccs_tool/editconf.c +192 -0

231 lines not on this page · raw message

config/tools/ccs_tool/editconf.h +2 -0
index 0090ab6..c83af1d 100644
@@ -1,10 +1,12 @@
 void add_node(int argc, char **argv);
 void add_nodeids(int argc, char **argv);
 void add_service(int argc, char **argv);
+void add_script(int argc, char **argv);
 void add_fence(int argc, char **argv);
 void del_node(int argc, char **argv);
 void del_fence(int argc, char **argv);
 void list_nodes(int argc, char **argv);
 void list_services(int argc, char **argv);
 void list_fences(int argc, char **argv);
+void list_scripts(int argc, char **argv);
 void create_skeleton(int argc, char **argv);
Signature · 1 line
1.7.1
#6 lore raw

PATCH 4/8 Unify parsing of options

In reply to Dmitry Mishin

This patch unifies options parsing for operations, which changes config and supports only standard options.

---
 config/tools/ccs_tool/editconf.c |  125 ++++++++++---------------------------
 1 files changed, 34 insertions(+), 91 deletions(-)
config/tools/ccs_tool/editconf.c +34 -91
index e431bb3..9d81593 100644
@@ -785,14 +785,7 @@ struct option addnode_options[] =
       { NULL, 0, NULL, 0 },
 };
 
-struct option delnode_options[] =
-{
-      { "outputfile", required_argument, NULL, 'o'},
-      { "configfile", required_argument, NULL, 'c'},
-      { NULL, 0, NULL, 0 },
-};
-
-struct option addfence_options[] =
+struct option commonw_options[] =
 {
       { "outputfile", required_argument, NULL, 'o'},
       { "configfile", required_argument, NULL, 'c'},
@@ -838,12 +831,32 @@ struct option addservice_options[] =
       { NULL, 0, NULL, 0 },
 };
 
-struct option delservice_options[] =
+static int parse_commonw_options(int argc, char **argv,
+	struct option_info *ninfo)
 {
-      { "outputfile", required_argument, NULL, 'o'},
-      { "configfile", required_argument, NULL, 'c'},
-      { NULL, 0, NULL, 0 },
-};
+	int opt;
+
+	memset(ninfo, 0, sizeof(*ninfo));
+
+	while ( (opt = getopt_long(argc, argv, "o:c:CFh?", commonw_options, NULL)) != EOF)
+	{
+		switch(opt)
+		{
+		case 'c':
+			ninfo->configfile = strdup(optarg);
+			break;
+
+		case 'o':
+			ninfo->outputfile = strdup(optarg);
+			break;
+
+		case '?':
+		default:
+			return 1;
+		}
+	}
+	return 0;
+}
 
 static int next_nodeid(int startid, int *nodeids, int nodecount)
 {
@@ -1074,29 +1087,11 @@ void add_node(int argc, char **argv)
 void del_node(int argc, char **argv)
 {
 	struct option_info ninfo;
-	int opt;
 	xmlDoc *doc;
 	xmlNode *root_element;
 
-	memset(&ninfo, 0, sizeof(ninfo));
-
-	while ( (opt = getopt_long(argc, argv, "o:c:CFh?", delnode_options, NULL)) != EOF)
-	{
-		switch(opt)
-		{
-		case 'c':
-			ninfo.configfile = strdup(optarg);
-			break;
-
-		case 'o':
-			ninfo.outputfile = strdup(optarg);
-			break;
-
-		case '?':
-		default:
-			delnode_usage(argv[0]);
-		}
-	}
+	if (parse_commonw_options(argc, argv, &ninfo))
+		delnode_usage(argv[0]);
 
 	/* Get node name parameter */
 	if (optind < argc)
@@ -1350,32 +1345,14 @@ void list_services(int argc, char **argv)
 void add_script(int argc, char **argv)
 {
 	struct option_info ninfo;
-	int opt;
 	xmlDoc *doc;
 	xmlNode *root_element;
 	xmlNode *rm, *rs, *node;
 	char *name;
 	char *sc_file;
 
-	memset(&ninfo, 0, sizeof(ninfo));
-
-	while ( (opt = getopt_long(argc, argv, "o:c:CFh?", addfence_options, NULL)) != EOF)
-	{
-		switch(opt)
-		{
-		case 'c':
-			ninfo.configfile = strdup(optarg);
-			break;
-
-		case 'o':
-			ninfo.outputfile = strdup(optarg);
-			break;
-
-		case '?':
-		default:
-			addscript_usage(argv[0]);
-		}
-	}
+	if (parse_commonw_options(argc, argv, &ninfo))
+		addscript_usage(argv[0]);
 
 	if (argc - optind < 2)
 		addscript_usage(argv[0]);
@@ -1515,26 +1492,9 @@ void add_fence(int argc, char **argv)
 	char *fencename;
 	char *agentname;
 	struct option_info ninfo;
-	int opt;
-
-	memset(&ninfo, 0, sizeof(ninfo));
-
-	while ( (opt = getopt_long(argc, argv, "c:o:CFh?", list_options, NULL)) != EOF)
-	{
-		switch(opt)
-		{
-		case 'c':
-			ninfo.configfile = strdup(optarg);
-			break;
-		case 'o':
-			ninfo.outputfile = strdup(optarg);
-			break;
 
-		case '?':
-		default:
-			addfence_usage(argv[0]);
-		}
-	}
+	if (parse_commonw_options(argc, argv, &ninfo))
+		addfence_usage(argv[0]);
 
 	if (argc - optind < 2)
 		addfence_usage(argv[0]);
@@ -1577,26 +1537,9 @@ void del_fence(int argc, char **argv)
 	xmlDocPtr doc;
 	char *fencename;
 	struct option_info ninfo;
-	int opt;
-
-	memset(&ninfo, 0, sizeof(ninfo));
 
-	while ( (opt = getopt_long(argc, argv, "c:o:CFhv?", list_options, NULL)) != EOF)
-	{
-		switch(opt)
-		{
-		case 'c':
-			ninfo.configfile = strdup(optarg);
-			break;
-		case 'o':
-			ninfo.outputfile = strdup(optarg);
-			break;
-
-		case '?':
-		default:
-			delfence_usage(argv[0]);
-		}
-	}
+	if (parse_commonw_options(argc, argv, &ninfo))
+		delfence_usage(argv[0]);
 
 	if (argc - optind < 1)
 		delfence_usage(argv[0]);
Signature · 1 line
1.7.1
#7 lore raw

PATCH 5/8 Added "ip" object manipulations

In reply to Dmitry Mishin
---
 config/tools/ccs_tool/ccs_tool.c |   17 ++++-
 config/tools/ccs_tool/editconf.c |  155 +++++++++++++++++++++++++++++++++++++-
 config/tools/ccs_tool/editconf.h |    2 +
 3 files changed, 172 insertions(+), 2 deletions(-)
config/tools/ccs_tool/ccs_tool.c +16 -1
index 9726da2..9df5445 100644
@@ -241,6 +241,14 @@ static int tool_main(int argc, char *argv[])
 	    del_node(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "addip")){
+	    add_ip(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
+    else if(!strcmp(argv[optind], "delip")){
+	    del_node(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "addfence")){
 	    add_fence(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -265,6 +273,10 @@ static int tool_main(int argc, char *argv[])
 	    list_scripts(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "lsip")){
+	    list_ips(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "create")){
 	    create_skeleton(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -311,7 +323,10 @@ static void tool_print_usage(FILE *stream){
 	  "  delfence <fencedev> Delete a fence device\n"
 	  "  addscript <name>    Add a script resource\n"
 	  "  delscript <name>    Delete a script resource\n"
-          "  lsscript            List script resources\n"
+	  "  lsscript            List script resources\n"
+	  "  addip <name>        Add an IP address resource\n"
+	  "  delip <name>        Delete an IP address resource\n"
+	  "  lsip                List IP address resources\n"
 	  "  create              Create a skeleton config file\n"
 	  "  addnodeids          Assign node ID numbers to all nodes\n"
 	  "\n");
config/tools/ccs_tool/editconf.c +154 -1

188 lines not on this page · raw message

config/tools/ccs_tool/editconf.h +2 -0
index c83af1d..a1119d7 100644
@@ -2,6 +2,7 @@ void add_node(int argc, char **argv);
 void add_nodeids(int argc, char **argv);
 void add_service(int argc, char **argv);
 void add_script(int argc, char **argv);
+void add_ip(int argc, char **argv);
 void add_fence(int argc, char **argv);
 void del_node(int argc, char **argv);
 void del_fence(int argc, char **argv);
@@ -9,4 +10,5 @@ void list_nodes(int argc, char **argv);
 void list_services(int argc, char **argv);
 void list_fences(int argc, char **argv);
 void list_scripts(int argc, char **argv);
+void list_ips(int argc, char **argv);
 void create_skeleton(int argc, char **argv);
Signature · 1 line
1.7.1
#8 lore raw

PATCH 6/8 Added 'fs' object manipulations

In reply to Dmitry Mishin
---
 config/tools/ccs_tool/ccs_tool.c |   15 ++
 config/tools/ccs_tool/editconf.c |  264 ++++++++++++++++++++++++++++++++++++++
 config/tools/ccs_tool/editconf.h |    2 +
 3 files changed, 281 insertions(+), 0 deletions(-)
config/tools/ccs_tool/ccs_tool.c +15 -0
index 9df5445..92a7dac 100644
@@ -249,6 +249,14 @@ static int tool_main(int argc, char *argv[])
 	    del_node(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "addfs")){
+	    add_fs(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
+    else if(!strcmp(argv[optind], "delfs")){
+	    del_node(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "addfence")){
 	    add_fence(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -277,6 +285,10 @@ static int tool_main(int argc, char *argv[])
 	    list_ips(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "lsfs")){
+	    list_fs(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "create")){
 	    create_skeleton(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -327,6 +339,9 @@ static void tool_print_usage(FILE *stream){
 	  "  addip <name>        Add an IP address resource\n"
 	  "  delip <name>        Delete an IP address resource\n"
 	  "  lsip                List IP address resources\n"
+	  "  addfs <name>        Add an IP address resource\n"
+	  "  delfs <name>        Delete an IP address resource\n"
+	  "  lsfs                List IP address resources\n"
 	  "  create              Create a skeleton config file\n"
 	  "  addnodeids          Assign node ID numbers to all nodes\n"
 	  "\n");
config/tools/ccs_tool/editconf.c +264 -0

324 lines not on this page · raw message

config/tools/ccs_tool/editconf.h +2 -0
index a1119d7..3d1f5c2 100644
@@ -3,6 +3,7 @@ void add_nodeids(int argc, char **argv);
 void add_service(int argc, char **argv);
 void add_script(int argc, char **argv);
 void add_ip(int argc, char **argv);
+void add_fs(int argc, char **argv);
 void add_fence(int argc, char **argv);
 void del_node(int argc, char **argv);
 void del_fence(int argc, char **argv);
@@ -11,4 +12,5 @@ void list_services(int argc, char **argv);
 void list_fences(int argc, char **argv);
 void list_scripts(int argc, char **argv);
 void list_ips(int argc, char **argv);
+void list_fs(int argc, char **argv);
 void create_skeleton(int argc, char **argv);
Signature · 1 line
1.7.1
#9 lore raw

PATCH 7/8 Added 'failoverdomain' object manipulations

In reply to Dmitry Mishin
---
 config/tools/ccs_tool/ccs_tool.c |   21 +++-
 config/tools/ccs_tool/editconf.c |  281 +++++++++++++++++++++++++++++++++++++-
 config/tools/ccs_tool/editconf.h |    2 +
 3 files changed, 294 insertions(+), 10 deletions(-)
config/tools/ccs_tool/ccs_tool.c +18 -3
index 92a7dac..28bbadc 100644
@@ -257,6 +257,14 @@ static int tool_main(int argc, char *argv[])
 	    del_node(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "addfdomain")){
+	    add_fdomain(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
+    else if(!strcmp(argv[optind], "delfdomain")){
+	    del_node(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "addfence")){
 	    add_fence(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -289,6 +297,10 @@ static int tool_main(int argc, char *argv[])
 	    list_fs(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
     }
+    else if(!strcmp(argv[optind], "lsfdomains")){
+	    list_fdomains(argc-1, argv+1);
+	    exit(EXIT_SUCCESS);
+    }
     else if(!strcmp(argv[optind], "create")){
 	    create_skeleton(argc-1, argv+1);
 	    exit(EXIT_SUCCESS);
@@ -339,9 +351,12 @@ static void tool_print_usage(FILE *stream){
 	  "  addip <name>        Add an IP address resource\n"
 	  "  delip <name>        Delete an IP address resource\n"
 	  "  lsip                List IP address resources\n"
-	  "  addfs <name>        Add an IP address resource\n"
-	  "  delfs <name>        Delete an IP address resource\n"
-	  "  lsfs                List IP address resources\n"
+	  "  addfs <name>        Add an filesystem resource\n"
+	  "  delfs <name>        Delete an filesystem resource\n"
+	  "  lsfs                List filesystem resources\n"
+	  "  addfdomain <name>   Add an failover domain\n"
+	  "  delfdomain <name>   Delete an failover domain\n"
+	  "  lsfdomains          List failover domains\n"
 	  "  create              Create a skeleton config file\n"
 	  "  addnodeids          Assign node ID numbers to all nodes\n"
 	  "\n");
config/tools/ccs_tool/editconf.c +274 -7

362 lines not on this page · raw message

config/tools/ccs_tool/editconf.h +2 -0
index 3d1f5c2..7edd52f 100644
@@ -4,6 +4,7 @@ void add_service(int argc, char **argv);
 void add_script(int argc, char **argv);
 void add_ip(int argc, char **argv);
 void add_fs(int argc, char **argv);
+void add_fdomain(int argc, char **argv);
 void add_fence(int argc, char **argv);
 void del_node(int argc, char **argv);
 void del_fence(int argc, char **argv);
@@ -13,4 +14,5 @@ void list_fences(int argc, char **argv);
 void list_scripts(int argc, char **argv);
 void list_ips(int argc, char **argv);
 void list_fs(int argc, char **argv);
+void list_fdomains(int argc, char **argv);
 void create_skeleton(int argc, char **argv);
Signature · 1 line
1.7.1
#10 lore raw

PATCH 8/8 Added ability to reference domains from services

In reply to Dmitry Mishin
---
 config/tools/ccs_tool/editconf.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
config/tools/ccs_tool/editconf.c +14 -1
index 516b338..a443831 100644
@@ -44,6 +44,7 @@ struct option_info
 	const char *exclusive;
 	const char *recovery;
 	const char *fs;
+	const char *domain;
 	const char *script;
 	const char *mountpoint;
 	const char *type;
@@ -696,6 +697,7 @@ static void add_clusterservice(xmlNode *root_element, struct option_info *ninfo,
 {
 	xmlNode *rm;
 	xmlNode *rs;
+	xmlNode *fdomains;
 	xmlNode *newnode;
 
 	xmlNode *newfs = NULL;
@@ -712,6 +714,7 @@ static void add_clusterservice(xmlNode *root_element, struct option_info *ninfo,
 				ninfo->configfile);
 
 	rs = findnode(rm, "resources");
+	fdomains = findnode(rm, "failoverdomains");
 	if (ninfo->fs && (!rs || !find_fs_resource(rs, ninfo->fs)))
 		die("fs resource %s doesn't exist in %s\n", ninfo->fs,
 				ninfo->configfile);
@@ -721,11 +724,16 @@ static void add_clusterservice(xmlNode *root_element, struct option_info *ninfo,
 	if (ninfo->ip_addr && (!rs || !find_ip_resource(rs, ninfo->ip_addr)))
 		die("ip resource %s doesn't exist in %s\n", ninfo->ip_addr,
 				ninfo->configfile);
+	if (ninfo->domain && (!fdomains || !find_fdomain_resource(fdomains, ninfo->domain)))
+		die("failover domain %s doesn't exist in %s\n", ninfo->domain,
+				ninfo->configfile);
 
 	/* Add the new service */
 	newnode = xmlNewNode(NULL, BAD_CAST "service");
 	xmlSetProp(newnode, BAD_CAST "name", BAD_CAST ninfo->name);
 	xmlSetProp(newnode, BAD_CAST "autostart", BAD_CAST ninfo->autostart);
+	if (ninfo->domain)
+		xmlSetProp(newnode, BAD_CAST "domain", BAD_CAST ninfo->domain);
 	if (ninfo->exclusive)
 		xmlSetProp(newnode, BAD_CAST "exclusive",
 				BAD_CAST ninfo->exclusive);
@@ -1137,6 +1145,7 @@ struct option create_options[] =
 struct option addservice_options[] =
 {
       { "autostart", required_argument, NULL, 'a'},
+      { "domain", required_argument, NULL, 'd'},
       { "exclusive", required_argument, NULL, 'x'},
       { "recovery", required_argument, NULL, 'r'},
       { "fs", required_argument, NULL, 'f'},
@@ -1530,7 +1539,7 @@ void add_service(int argc, char **argv)
 	ninfo.autostart = "1";
 	ninfo.recovery = "relocate";
 
-	while ( (opt = getopt_long(argc, argv, "a:x:r:f:o:c:s:i:CFh?", addservice_options, NULL)) != EOF)
+	while ( (opt = getopt_long(argc, argv, "a:d:x:r:f:o:c:s:i:CFh?", addservice_options, NULL)) != EOF)
 	{
 		switch(opt)
 		{
@@ -1539,6 +1548,10 @@ void add_service(int argc, char **argv)
 			ninfo.autostart = optarg;
 			break;
 
+		case 'd':
+			ninfo.domain = strdup(optarg);
+			break;
+
 		case 'x':
 			validate_int_arg(opt, optarg);
 			ninfo.exclusive = optarg;
Signature · 1 line
1.7.1
#11 lore raw

cover sccs_tool enhancement

In reply to Dmitry Mishin

Hi Dmitry,

thank you very much for the work. I?ll try to merge it into STABLE31 asap.

Fabio

Quoted 14 lines · Dmitry Mishin

Command line utilities are useful for automation. But current cluster configuration command line tool has only rudimentary support of cluster options. Thus one needs to install heavy X server for GUI system-config-cluster or web server for Conga in order to prepare cluster's configuration or use complex scripting and edit configuration XML file for automation.

This patchset enhances ccs_tool allowing to create basic cluster configs entirely via this tool.

Ported to STABLE31

Thanks,
Dmitry.

#12 lore raw

cover sccs_tool enhancement

In reply to Dmitry Mishin
Quoted 10 lines · Dmitry Mishin

Command line utilities are useful for automation. But current cluster configuration command line tool has only rudimentary support of cluster options. Thus one needs to install heavy X server for GUI system-config-cluster or web server for Conga in order to prepare cluster's configuration or use complex scripting and edit configuration XML file for automation.

This patchset enhances ccs_tool allowing to create basic cluster configs entirely via this tool.

Ported to STABLE31

Thanks for the submission, the patches are now merged in STABLE31 branch and will be part of the next upstream release.

Cheers
Fabio