Skip to contentSkip to conversation

ccs_tool enhancement

PATCH New Dmitry Mishin 2 participants 12 messages Dec 10, 2010

lore
Share & tools
lore
#0 lore raw

cover ccs_tool enhancement

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

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 |  386 +++++++++++++++++++++++++++++++++++++-
 config/tools/ccs_tool/editconf.h |    3 +
 3 files changed, 400 insertions(+), 4 deletions(-)
config/tools/ccs_tool/ccs_tool.c +15 -0
index a00f0dc..824da6d 100644
@@ -227,6 +227,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);
@@ -239,6 +247,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);
@@ -281,6 +293,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 +382 -4

446 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 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 |   68 ++-----------------------------------
 config/tools/ccs_tool/editconf.h |    1 -
 3 files changed, 5 insertions(+), 66 deletions(-)
config/tools/ccs_tool/ccs_tool.c +1 -1
index 824da6d..12d447c 100644
@@ -232,7 +232,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 -64

86 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
#3 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 |  201 ++++++++++++++++++++++++++++++++++++++
 config/tools/ccs_tool/editconf.h |    2 +
 3 files changed, 218 insertions(+), 0 deletions(-)
config/tools/ccs_tool/ccs_tool.c +15 -0
index 12d447c..bb91389 100644
@@ -235,6 +235,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);
@@ -255,6 +263,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);
@@ -299,6 +311,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 +201 -0

240 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
#4 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 |  174 +++++++++----------------------------
 1 files changed, 43 insertions(+), 131 deletions(-)
config/tools/ccs_tool/editconf.c +43 -131
index 13aa33b..313f83f 100644
@@ -786,16 +786,7 @@ struct option addnode_options[] =
       { NULL, 0, NULL, 0 },
 };
 
-struct option delnode_options[] =
-{
-      { "outputfile", required_argument, NULL, 'o'},
-      { "configfile", required_argument, NULL, 'c'},
-      { "no_ccs", no_argument, NULL, 'C'},
-      { "force_ccs", no_argument, NULL, 'F'},
-      { NULL, 0, NULL, 0 },
-};
-
-struct option addfence_options[] =
+struct option commonw_options[] =
 {
       { "outputfile", required_argument, NULL, 'o'},
       { "configfile", required_argument, NULL, 'c'},
@@ -836,14 +827,41 @@ 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'},
-      { "no_ccs", no_argument, NULL, 'C'},
-      { "force_ccs", no_argument, NULL, 'F'},
-      { NULL, 0, NULL, 0 },
-};
+	int opt;
+
+	memset(ninfo, 0, sizeof(*ninfo));
+	ninfo->tell_ccsd = 1;
+
+	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 'C':
+			ninfo->tell_ccsd = 0;
+			break;
+
+		case 'F':
+			ninfo->force_ccsd = 1;
+			break;
+
+		case '?':
+		default:
+			return 1;
+		}
+	}
+	return 0;
+}
 
 static int next_nodeid(int startid, int *nodeids, int nodecount)
 {
@@ -1087,38 +1105,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));
-	ninfo.tell_ccsd = 1;
-
-	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 'C':
-			ninfo.tell_ccsd = 0;
-			break;
-
-		case 'F':
-			ninfo.force_ccsd = 1;
-			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)
@@ -1381,41 +1372,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));
-	ninfo.tell_ccsd = 1;
-
-	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 'C':
-			ninfo.tell_ccsd = 0;
-			break;
-
-		case 'F':
-			ninfo.force_ccsd = 1;
-			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]);
@@ -1546,35 +1510,9 @@ void add_fence(int argc, char **argv)
 	char *fencename;
 	char *agentname;
 	struct option_info ninfo;
-	int opt;
-
-	memset(&ninfo, 0, sizeof(ninfo));
-	ninfo.tell_ccsd = 1;
-
-	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 'C':
-			ninfo.tell_ccsd = 0;
-			break;
 
-		case 'F':
-			ninfo.force_ccsd = 1;
-			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]);
@@ -1617,35 +1555,9 @@ void del_fence(int argc, char **argv)
 	xmlDocPtr doc;
 	char *fencename;
 	struct option_info ninfo;
-	int opt;
-
-	memset(&ninfo, 0, sizeof(ninfo));
-	ninfo.tell_ccsd = 1;
-
-	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 'C':
-			ninfo.tell_ccsd = 0;
-			break;
 
-		case 'F':
-			ninfo.force_ccsd = 1;
-			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
#5 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 bb91389..441f495 100644
@@ -243,6 +243,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);
@@ -267,6 +275,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);
@@ -313,7 +325,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
#6 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 |  275 ++++++++++++++++++++++++++++++++++++++
 config/tools/ccs_tool/editconf.h |    2 +
 3 files changed, 292 insertions(+), 0 deletions(-)
config/tools/ccs_tool/ccs_tool.c +15 -0
index 441f495..dfe5610 100644
@@ -251,6 +251,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);
@@ -279,6 +287,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);
@@ -329,6 +341,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 +275 -0

335 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
#7 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 |  292 +++++++++++++++++++++++++++++++++++++-
 config/tools/ccs_tool/editconf.h |    2 +
 3 files changed, 305 insertions(+), 10 deletions(-)
config/tools/ccs_tool/ccs_tool.c +18 -3
index dfe5610..e1dc3cc 100644
@@ -259,6 +259,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);
@@ -291,6 +299,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);
@@ -341,9 +353,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 +285 -7

373 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
#8 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 aae1095..baa6fd3 100644
@@ -46,6 +46,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;
@@ -695,6 +696,7 @@ static void add_clusterservice(xmlNode *root_element, struct option_info *ninfo,
 {
 	xmlNode *rm;
 	xmlNode *rs;
+	xmlNode *fdomains;
 	xmlNode *newnode;
 
 	xmlNode *newfs = NULL;
@@ -711,6 +713,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);
@@ -720,11 +723,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);
@@ -1135,6 +1143,7 @@ struct option list_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'},
@@ -1553,7 +1562,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)
 		{
@@ -1562,6 +1571,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
#9 lore raw

cover ccs_tool enhancement

In reply to Dmitry Mishin
Quoted 6 lines · Dmitry Mishin

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

Thanks,
Dmitry.

Wow... against what branch is this patch set?

Thanks
Fabio

#10 lore raw

cover ccs_tool enhancement

dim at dim-nb:~/src/cluster> cat .git/config [core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/* url = git://git.fedorahosted.org/cluster.git
[branch "master"]
remote = origin
merge = refs/heads/master
dim at dim-nb:~/src/cluster> cat .git/ORIG_HEAD 536b9582b9bda33576fe78f6645562acc540f1f4

Quoted 11 lines · On Friday 10 December 2010 12:12:36 Fabio M. Di Nitto wrote:
Quoted 5 lines · Dmitry Mishin

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

Thanks,
Dmitry.

Wow... against what branch is this patch set?

Thanks
Fabio

Signature · 2 lines
Thanks,
Dmitry.
#11 lore raw

cover ccs_tool enhancement

Ok,... the patch set looks really nice, just a couple of quirks:

1) the master branch has been obsoleted since eventually cman will disappear in favor of corosync quorum providers

2) the patchset can still go in the STABLE31 branch since ccs_tool is still present there.

Would it be possible for you to rebase the patchset on ccs_tool from STABLE31?

I?d be happy to pull the whole thing in.

thanks!
Fabio

Quoted 28 lines · Dmitry Mishin

dim at dim-nb:~/src/cluster> cat .git/config [core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/* url = git://git.fedorahosted.org/cluster.git
[branch "master"]
remote = origin
merge = refs/heads/master
dim at dim-nb:~/src/cluster> cat .git/ORIG_HEAD 536b9582b9bda33576fe78f6645562acc540f1f4

Quoted 11 lines · On Friday 10 December 2010 12:12:36 Fabio M. Di Nitto wrote:
Quoted 5 lines · Dmitry Mishin

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

Thanks,
Dmitry.

Wow... against what branch is this patch set?

Thanks
Fabio