cluster: STABLE3 - rgmanager: Fix build warnings

Lon Hohberger lon at fedoraproject.org
Tue Dec 15 14:51:00 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=2bd0c588c585f335138d8d5c9eac475135a09d88
Commit:        2bd0c588c585f335138d8d5c9eac475135a09d88
Parent:        4de65ae875a1548817cb544d569db7800a3a044f
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Tue Dec 15 09:43:00 2009 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Dec 15 09:43:00 2009 -0500

rgmanager: Fix build warnings

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/include/event.h           |    1 +
 rgmanager/include/reslist.h         |    3 +++
 rgmanager/src/daemons/main.c        |   31 ++++++++++++++++++++-----------
 rgmanager/src/daemons/slang_event.c |    2 +-
 rgmanager/src/daemons/test.c        |    9 +++------
 rgmanager/src/utils/clustat.c       |    2 +-
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/rgmanager/include/event.h b/rgmanager/include/event.h
index b0b1bee..a9a8235 100644
--- a/rgmanager/include/event.h
+++ b/rgmanager/include/event.h
@@ -124,6 +124,7 @@ void set_transition_throttling(int nsecs);
 int service_op_start(char *svcName, int *target_list, int target_list_len,
 		     int *new_owner);
 int service_op_stop(char *svcName, int do_disable, int event_type);
+int service_op_migrate(char *svcName, int target_node);
 
 
 /* Non-central event processing */
diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h
index 119fbfc..382dfae 100644
--- a/rgmanager/include/reslist.h
+++ b/rgmanager/include/reslist.h
@@ -146,6 +146,7 @@ int resource_tree_delta(resource_node_t **, resource_node_t **);
    Load/kill resource rule sets
  */
 int load_resource_rules(const char *rpath, resource_rule_t **rules);
+void print_resource_rule(FILE *fp, resource_rule_t *rule);
 void print_resource_rules(resource_rule_t **rules);
 void dump_resource_rules(FILE *fp, resource_rule_t **rules);
 void destroy_resource_rules(resource_rule_t **rules);
@@ -154,6 +155,7 @@ void destroy_resource_rules(resource_rule_t **rules);
    Load/kill resource sets
  */
 int load_resources(int ccsfd, resource_t **reslist, resource_rule_t **rulelist);
+void print_resource(FILE *fp, resource_t *res);
 void print_resources(resource_t **reslist);
 void dump_resources(FILE *fp, resource_t **reslist);
 void destroy_resources(resource_t **list);
@@ -168,6 +170,7 @@ void dump_resource_tree(FILE *fp, resource_node_t **tree);
 void destroy_resource_tree(resource_node_t **tree);
 
 void *act_dup(resource_act_t *acts);
+void dump_resource_info(FILE *fp);
 
 
 /*
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index 5b2ad7b..04d9961 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -946,6 +946,8 @@ main(int argc, char **argv)
 	}
 
 	init_logging(NULL, foreground, (debug? LOG_DEBUG : SYSLOGLEVEL));
+
+	rv = -1;
 	if (cman_connect(&clu) != 0)
 		goto out;	/* Clean exit if sigint/sigterm here */
 
@@ -956,6 +958,7 @@ main(int argc, char **argv)
 
 	if (clu_lock_init(rgmanager_lsname) != 0) {
 		printf("Locks not working!\n");
+		cman_finish(clu);
 		return -1;
 	}
 
@@ -965,14 +968,16 @@ main(int argc, char **argv)
 	if (me.cn_nodeid == 0) {
 		printf("Unable to determine local node ID\n");
 		perror("cman_get_node");
-		return -1;
+		goto out_ls;
 	}
 	set_my_id(me.cn_nodeid);
 
 	logt_print(LOG_INFO, "I am node #%d\n", my_id());
 
-	if (wait_for_fencing() != 0)
-		goto out;
+	if (wait_for_fencing() != 0) {
+		rv = 0;
+		goto out_ls;
+	}
 
 	/*
 	   We know we're quorate.  At this point, we need to
@@ -983,24 +988,26 @@ main(int argc, char **argv)
 
 	if (init_resource_groups(0, do_init) != 0) {
 		logt_print(LOG_CRIT, "#8: Couldn't initialize services\n");
-		return -1;
+		goto out_ls;
 	}
 
-	if (shutdown_pending)
-		goto out;
+	if (shutdown_pending) {
+		rv = 0;
+		goto out_ls;
+	}
 
 	if (msg_listen(MSG_SOCKET, RGMGR_SOCK, me.cn_nodeid, &local_ctx) < 0) {
 		logt_print(LOG_CRIT,
 		       "#10: Couldn't set up cluster message system: %s\n",
 		       strerror(errno));
-		return -1;
+		goto out_ls;
 	}
 
 	if (msg_listen(MSG_CLUSTER, &port, me.cn_nodeid, &cluster_ctx) < 0) {
 		logt_print(LOG_CRIT,
 		       "#10b: Couldn't set up cluster message system: %s\n",
 		       strerror(errno));
-		return -1;
+		goto out_ls;
 	}
 
 	rg_set_quorate();
@@ -1016,14 +1023,14 @@ main(int argc, char **argv)
 #ifdef OPENAIS
 	if (ds_init() < 0) {
 		logt_print(LOG_CRIT, "#11b: Couldn't initialize SAI AIS CKPT\n");
-		return -1;
+		goto out_ls;
 	}
 
 	ds_key_init("rg_lockdown", 32, 10);
 #else
 	if (vf_init(me.cn_nodeid, port, NULL, NULL) != 0) {
 		logt_print(LOG_CRIT, "#11: Couldn't set up VF listen socket\n");
-		return -1;
+		goto out_ls;
 	}
 
 	vf_key_init("rg_lockdown", 10, NULL, lock_commit_cb);
@@ -1048,6 +1055,8 @@ main(int argc, char **argv)
 
 	if (rg_initialized())
 		cleanup(cluster_ctx);
+	rv = 0;
+out_ls:
 	clu_lock_finished(rgmanager_lsname);
 
 out:
@@ -1058,5 +1067,5 @@ out:
 	/*malloc_stats();*/
 
 	daemon_cleanup();
-	exit(0);
+	exit(rv);
 }
diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c
index 29ae9f2..76663e9 100644
--- a/rgmanager/src/daemons/slang_event.c
+++ b/rgmanager/src/daemons/slang_event.c
@@ -585,7 +585,7 @@ sl_migrate_service(void)
 {
 	char *svcname = NULL;
 	int target_node = 0;
-	int nargs, t, newowner = 0, ret = -1;
+	int nargs, t, ret = -1;
 
 	nargs = SLang_Num_Function_Args;
 
diff --git a/rgmanager/src/daemons/test.c b/rgmanager/src/daemons/test.c
index ad1384d..1c7cae9 100644
--- a/rgmanager/src/daemons/test.c
+++ b/rgmanager/src/daemons/test.c
@@ -304,13 +304,10 @@ tree_delta_test(int argc, char **argv)
 	resource_delta(&reslist, &reslist2);
 
 	printf("=== Old Resource List ===\n");
-	list_do(&reslist, curres) {
-		print_resource(curres);
-	} while (!list_done(&reslist, curres));
+	print_resources(&reslist);
+
 	printf("=== New Resource List ===\n");
-	list_do(&reslist2, curres) {
-		print_resource(curres);
-	} while (!list_done(&reslist2, curres));
+	print_resources(&reslist2);
 
 	resource_tree_delta(&tree, &tree2);
 	printf("=== Old Resource Tree ===\n");
diff --git a/rgmanager/src/utils/clustat.c b/rgmanager/src/utils/clustat.c
index 164d5b0..f56d3f5 100644
--- a/rgmanager/src/utils/clustat.c
+++ b/rgmanager/src/utils/clustat.c
@@ -788,7 +788,7 @@ xml_member_state(cman_node_t *node)
 
 
 static void
-print_member_header(nodesize)
+print_member_header(int nodesize)
 {
 	printf(" %-*.*s", nodesize, nodesize, "Member Name");
 	printf("%-4.4s %s\n", "ID", "Status");


More information about the cluster-commits mailing list