This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
STABLE2 - rgmanager: Clean up build
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 22 Sep 2008 15:47:31 +0000 (UTC)
- Subject: STABLE2 - rgmanager: Clean up build
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5c5b6e5ed97417ec3f1b88a365e9db49e0accd3a
Commit: 5c5b6e5ed97417ec3f1b88a365e9db49e0accd3a
Parent: 360f2d3cceb34bf510459b971ec3fbbaa1f3755e
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Mon Sep 8 12:53:46 2008 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Sep 22 11:23:26 2008 -0400
rgmanager: Clean up build
General build cleanups. Also fixes small bug in
check_rdomain_crash().
---
rgmanager/include/members.h | 2 ++
rgmanager/include/resgroup.h | 7 -------
rgmanager/src/daemons/clurmtabd.c | 4 ++--
rgmanager/src/daemons/event_config.c | 8 ++++++++
rgmanager/src/daemons/fo_domain.c | 6 +++++-
rgmanager/src/daemons/groups.c | 21 ++++++++++++---------
rgmanager/src/daemons/main.c | 1 +
rgmanager/src/daemons/reslist.c | 7 ++++++-
rgmanager/src/daemons/restree.c | 3 ++-
rgmanager/src/daemons/rg_event.c | 10 ++++++----
rgmanager/src/daemons/rg_forward.c | 6 +++---
rgmanager/src/daemons/rg_locks.c | 3 ++-
rgmanager/src/daemons/rg_state.c | 29 +++++++++++++++--------------
rgmanager/src/daemons/rg_thread.c | 3 ++-
rgmanager/src/daemons/test.c | 3 ++-
15 files changed, 68 insertions(+), 45 deletions(-)
diff --git a/rgmanager/include/members.h b/rgmanager/include/members.h
index 5aa9f1e..768f040 100644
--- a/rgmanager/include/members.h
+++ b/rgmanager/include/members.h
@@ -32,5 +32,7 @@ cluster_member_list_t *memb_lost(cluster_member_list_t *old,
cluster_member_list_t *new);
cluster_member_list_t *member_list_dup(cluster_member_list_t *old);
+cluster_member_list_t *member_list(void);
+void member_list_update(cluster_member_list_t *new_ml);
#endif
diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h
index c79924c..915925d 100644
--- a/rgmanager/include/resgroup.h
+++ b/rgmanager/include/resgroup.h
@@ -196,13 +196,6 @@ int rg_unlock(struct dlm_lksb *p);
#endif
-/*
- from memberlist.c
- */
-void member_list_update(cluster_member_list_t *new_ml);
-cluster_member_list_t *member_list(void);
-int my_id(void);
-
/* Return codes */
#define RG_EEXCL -16 /* Service not runnable due to
inability to start exclusively */
diff --git a/rgmanager/src/daemons/clurmtabd.c b/rgmanager/src/daemons/clurmtabd.c
index 563e96d..46a79ca 100644
--- a/rgmanager/src/daemons/clurmtabd.c
+++ b/rgmanager/src/daemons/clurmtabd.c
@@ -264,7 +264,7 @@ sh_exit(int sig)
* Traditional behavior. Reconfigure on SIGHUP.
*/
static void
-sh_reconfigure(int sig)
+sh_reconfigure(int __attribute__ ((unused)) sig)
{
clulog(LOG_DEBUG, "Re-reading the cluster database\n");
rmtabd_reconfigure();
@@ -374,7 +374,7 @@ get_rmtabd_loglevel(void)
* configuration database.
*/
static int
-get_rmtabd_pollinterval(int *interval)
+get_rmtabd_pollinterval(int __attribute__((unused)) *interval)
{
#if 0
return __get_int_param(POLLINT_STR, interval, POLLINT_DEFAULT);
diff --git a/rgmanager/src/daemons/event_config.c b/rgmanager/src/daemons/event_config.c
index 5764102..514d68f 100644
--- a/rgmanager/src/daemons/event_config.c
+++ b/rgmanager/src/daemons/event_config.c
@@ -141,7 +141,11 @@ event_match(event_t *pattern, event_t *actual)
char *
+#ifndef NO_CCS
ccs_node_id_to_name(int ccsfd, int nodeid)
+#else
+ccs_node_id_to_name(int __attribute__ ((unused)) ccsfd, int nodeid)
+#endif
{
char xpath[256], *ret = 0;
@@ -154,7 +158,11 @@ ccs_node_id_to_name(int ccsfd, int nodeid)
int
+#ifndef NO_CCS
ccs_node_name_to_id(int ccsfd, char *name)
+#else
+ccs_node_name_to_id(int __attribute__((unused)) ccsfd, char *name)
+#endif
{
char xpath[256], *ret = 0;
int rv = 0;
diff --git a/rgmanager/src/daemons/fo_domain.c b/rgmanager/src/daemons/fo_domain.c
index 6104c40..222a12d 100644
--- a/rgmanager/src/daemons/fo_domain.c
+++ b/rgmanager/src/daemons/fo_domain.c
@@ -49,7 +49,11 @@
int group_property(char *, char *, char *, size_t);
fod_node_t *
+#ifndef NO_CCS
fod_get_node(int ccsfd, char *base, int idx, fod_t *domain)
+#else
+fod_get_node(int __attribute__((unused)) ccsfd, char *base, int idx, fod_t *domain)
+#endif
{
fod_node_t *fodn;
char xpath[256];
@@ -538,7 +542,7 @@ node_should_start(int nodeid, cluster_member_list_t *membership,
*/
if (svc_state.rs_state == RG_STATE_STARTED)
started = 1;
- if (svc_state.rs_owner == nodeid)
+ if (svc_state.rs_owner == (uint32_t)nodeid)
owned_by_node = 1;
if (!memb_online(membership, svc_state.rs_owner))
no_owner = 1;
diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c
index f656977..7300443 100644
--- a/rgmanager/src/daemons/groups.c
+++ b/rgmanager/src/daemons/groups.c
@@ -42,6 +42,7 @@ void res_build_name(char *, size_t, resource_t *);
int get_rg_state_local(char *, rg_state_t *);
int group_migratory(char *groupname, int lock);
int _group_property(char *groupname, char *property, char *ret, size_t len);
+int restart_threshold_exceeded(restart_counter_t arg);
struct status_arg {
@@ -228,7 +229,7 @@ count_resource_groups_local(cman_node_t *mp)
st.rs_state != RG_STATE_STARTING)
continue;
- if (mp->cn_nodeid != st.rs_owner)
+ if (mp->cn_nodeid != (int)st.rs_owner)
continue;
++mp->cn_svccount;
@@ -475,7 +476,7 @@ consider_start(resource_node_t *node, char *svcName, rg_state_t *svcStatus,
* local start.
*/
if (svcStatus->rs_state == RG_STATE_STARTED &&
- svcStatus->rs_owner == mp->cn_nodeid)
+ svcStatus->rs_owner == (uint32_t)mp->cn_nodeid)
return;
if (svcStatus->rs_state == RG_STATE_DISABLED)
@@ -579,7 +580,7 @@ consider_relocate(char *svcName, rg_state_t *svcStatus, uint32_t nodeid,
*/
if ((svcStatus->rs_state != RG_STATE_STARTING &&
svcStatus->rs_state != RG_STATE_STARTED) ||
- svcStatus->rs_owner != my_id())
+ svcStatus->rs_owner != (uint32_t)my_id())
return;
/*
@@ -783,7 +784,9 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus)
* @see eval_groups
*/
int
-group_event(char *rg_name, uint32_t state, int owner)
+group_event(char __attribute__ ((unused)) *rg_name,
+ uint32_t state,
+ int __attribute__ ((unused)) owner)
{
char svcName[64], *nodeName;
resource_node_t *node;
@@ -858,7 +861,7 @@ group_event(char *rg_name, uint32_t state, int owner)
*/
if (depend == 0 &&
svcStatus.rs_state == RG_STATE_STARTED &&
- svcStatus.rs_owner == my_id()) {
+ svcStatus.rs_owner == (uint32_t)my_id()) {
clulog(LOG_WARNING, "Stopping service %s: Dependency missing\n",
svcName);
@@ -1287,7 +1290,7 @@ rg_doall(int request, int block, char *debugfmt)
/* Always run stop if we're the owner, regardless
of state; otherwise, don't run stop */
- if (svcblk.rs_owner != my_id())
+ if (svcblk.rs_owner != (uint32_t)my_id())
continue;
}
@@ -1337,7 +1340,7 @@ q_status_checks(void __attribute__ ((unused)) *arg)
rg_unlock(&lockp);
}
- if (svcblk.rs_owner != my_id() ||
+ if (svcblk.rs_owner != (uint32_t)my_id() ||
(svcblk.rs_state != RG_STATE_STARTED &&
svcblk.rs_state != RG_STATE_MIGRATE))
continue;
@@ -1395,7 +1398,7 @@ do_condstops(void)
continue;
}
- if (svcblk.rs_owner != my_id())
+ if (svcblk.rs_owner != (uint32_t)my_id())
continue;
/* Set state to uninitialized if we're killing a RG */
@@ -1475,7 +1478,7 @@ do_condstarts(void)
rg_unlock(&lockp);
}
- if (!need_init && svcblk.rs_owner != my_id())
+ if (!need_init && svcblk.rs_owner != (uint32_t)my_id())
continue;
if (need_init) {
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index bb69e07..bc2375d 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -17,6 +17,7 @@
#include <malloc.h>
#include <cman-private.h>
#include <event.h>
+#include <members.h>
#define L_SHUTDOWN (1<<2)
#define L_SYS (1<<1)
diff --git a/rgmanager/src/daemons/reslist.c b/rgmanager/src/daemons/reslist.c
index 647fe15..d6fb015 100644
--- a/rgmanager/src/daemons/reslist.c
+++ b/rgmanager/src/daemons/reslist.c
@@ -431,7 +431,8 @@ store_resource(resource_t **reslist, resource_t *newres)
@return newly allocated pointer to value or NULL if not found.
*/
char *
-xpath_get_one(xmlDocPtr doc, xmlXPathContextPtr ctx, char *query)
+xpath_get_one(xmlDocPtr __attribute__ ((unused)) doc,
+ xmlXPathContextPtr ctx, char *query)
{
char *val = NULL, *ret = NULL;
xmlXPathObjectPtr obj;
@@ -626,7 +627,11 @@ act_dup(resource_act_t *acts)
/* Copied from resrules.c -- _get_actions */
void
+#ifndef NO_CCS
_get_actions_ccs(int ccsfd, char *base, resource_t *res)
+#else
+_get_actions_ccs(int __attribute__((unused)) ccsfd, char *base, resource_t *res)
+#endif
{
char xpath[256];
int idx = 0;
diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index 51f26fa..ec5a684 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -1172,7 +1172,8 @@ clear_checks(resource_node_t *node)
@see _res_op_by_level res_exec
*/
static inline int
-_res_op_internal(resource_node_t **tree, resource_t *first,
+_res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
+ resource_t *first,
char *type, void *__attribute__((unused))ret, int realop,
resource_node_t *node)
{
diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c
index fc5b1cb..8339f03 100644
--- a/rgmanager/src/daemons/rg_event.c
+++ b/rgmanager/src/daemons/rg_event.c
@@ -77,7 +77,8 @@ central_events_enabled(void)
@see eval_groups
*/
void
-node_event(int local, int nodeID, int nodeStatus, int clean)
+node_event(int local, int nodeID, int nodeStatus,
+ int __attribute__((unused)) clean)
{
if (!running)
return;
@@ -196,7 +197,8 @@ node_fenced(int nodeid)
Master key.
*/
int32_t
-master_event_callback(char *key, uint64_t viewno,
+master_event_callback(char __attribute__ ((unused)) *key,
+ uint64_t __attribute__ ((unused)) viewno,
void *data, uint32_t datalen)
{
event_master_t *m;
@@ -213,7 +215,7 @@ master_event_callback(char *key, uint64_t viewno,
return 1;
}
- if (m->m_nodeid == my_id())
+ if (m->m_nodeid == (uint32_t)my_id())
clulog(LOG_DEBUG, "Master Commit: I am master\n");
else
clulog(LOG_DEBUG, "Master Commit: %d is master\n", m->m_nodeid);
@@ -368,7 +370,7 @@ void group_event(char *name, uint32_t state, int owner);
events are on the queue.
*/
void *
-_event_thread_f(void *arg)
+_event_thread_f(void __attribute__ ((unused)) *arg)
{
event_t *ev;
int notice = 0, count = 0;
diff --git a/rgmanager/src/daemons/rg_forward.c b/rgmanager/src/daemons/rg_forward.c
index 1694124..197cddd 100644
--- a/rgmanager/src/daemons/rg_forward.c
+++ b/rgmanager/src/daemons/rg_forward.c
@@ -66,7 +66,7 @@ forwarding_thread(void *arg)
clulog(LOG_ERR, "FW: Attempt to forward to invalid node ID\n");
goto out_fail;
}
- if (rgs.rs_owner == my_id()) {
+ if (rgs.rs_owner == (uint32_t)my_id()) {
clulog(LOG_WARNING, "BUG! Attempt to forward to myself!\n");
goto out_fail;
}
@@ -90,7 +90,7 @@ forwarding_thread(void *arg)
rgs.rs_owner, ctx);
goto out_fail;
}
- if (msg_send(ctx, &msg, sizeof(msg)) < sizeof(msg)) {
+ if (msg_send(ctx, &msg, sizeof(msg)) < (int)sizeof(msg)) {
clulog(LOG_DEBUG, "FW: Failed to send message to %d CTX: %p\n",
rgs.rs_owner, ctx);
goto out_fail;
@@ -192,7 +192,7 @@ forwarding_thread_v2(void *arg)
/* swap + send */
swab_SmMessageSt(msgp);
- if (msg_send(ctx, msgp, sizeof(*msgp)) < sizeof(*msgp)) {
+ if (msg_send(ctx, msgp, sizeof(*msgp)) < (int)sizeof(*msgp)) {
clulog(LOG_DEBUG, "FW: Failed to send message to %d CTX: %p\n",
target, ctx);
goto out_fail;
diff --git a/rgmanager/src/daemons/rg_locks.c b/rgmanager/src/daemons/rg_locks.c
index 225c0be..f5f8d6b 100644
--- a/rgmanager/src/daemons/rg_locks.c
+++ b/rgmanager/src/daemons/rg_locks.c
@@ -108,8 +108,8 @@ ccs_lock(void)
int
-ccs_unlock(int fd)
#ifndef NO_CCS
+ccs_unlock(int fd)
{
int ret;
@@ -121,6 +121,7 @@ ccs_unlock(int fd)
return 0;
}
#else
+ccs_unlock(int __attribute__((unused)) fd)
{
xmlFreeDoc(ccs_doc);
ccs_doc = NULL;
diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 14a1d5e..0edd3b4 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -491,7 +491,7 @@ svc_advise_stop(rg_state_t *svcStatus, char *svcName, int req)
case RG_STATE_STARTING:
case RG_STATE_RECOVER:
case RG_STATE_MIGRATE:
- if ((svcStatus->rs_owner != my_id()) &&
+ if ((svcStatus->rs_owner != (uint32_t)my_id()) &&
memb_online(membership, svcStatus->rs_owner)) {
/*
Service is running and the owner is online.
@@ -517,7 +517,7 @@ svc_advise_stop(rg_state_t *svcStatus, char *svcName, int req)
}
if (svcStatus->rs_owner == 0 ||
- (svcStatus->rs_owner == my_id())) {
+ (svcStatus->rs_owner == (uint32_t)my_id())) {
/*
Service is marked as running locally or on
0 (e.g. no member). Safe
@@ -623,7 +623,7 @@ svc_advise_start(rg_state_t *svcStatus, char *svcName, int req)
case RG_STATE_STARTED:
case RG_STATE_CHECK:
case RG_STATE_STARTING:
- if (svcStatus->rs_owner == my_id()) {
+ if (svcStatus->rs_owner == (uint32_t)my_id()) {
/*
* Service is already running locally
clulog(LOG_DEBUG,
@@ -633,7 +633,7 @@ svc_advise_start(rg_state_t *svcStatus, char *svcName, int req)
break;
}
- if (svcStatus->rs_owner != my_id() &&
+ if (svcStatus->rs_owner != (uint32_t)my_id() &&
memb_online(membership, svcStatus->rs_owner)) {
/*
* Service is running and the owner is online!
@@ -895,13 +895,13 @@ svc_migrate(char *svcName, int target)
return RG_EFAIL;
}
- if (svcStatus.rs_owner == target) {
+ if (svcStatus.rs_owner == (uint32_t)target) {
rg_unlock(&lockp);
/* Do not allow migration to its current owner! */
return 0;
}
- if (svcStatus.rs_owner != my_id()) {
+ if (svcStatus.rs_owner != (uint32_t)my_id()) {
rg_unlock(&lockp);
return RG_EFORWARD;
}
@@ -978,8 +978,8 @@ svc_migrate(char *svcName, int target)
return ret;
}
- if (svcStatus.rs_last_owner != my_id() ||
- svcStatus.rs_owner != target ||
+ if (svcStatus.rs_last_owner != (uint32_t)my_id() ||
+ svcStatus.rs_owner != (uint32_t)target ||
svcStatus.rs_state != RG_STATE_MIGRATE) {
rg_unlock(&lockp);
return ret;
@@ -1151,7 +1151,7 @@ svc_status(char *svcName)
/* Don't check status if the service is frozen */
return 0;
- if (svcStatus.rs_owner != my_id())
+ if (svcStatus.rs_owner != (uint32_t)my_id())
/* Don't check status for anything not owned */
return 0;
@@ -1171,7 +1171,8 @@ svc_status(char *svcName)
static inline int
-handle_started_status(char *svcName, int ret, rg_state_t *svcStatus)
+handle_started_status(char *svcName, int ret,
+ rg_state_t __attribute__((unused)) *svcStatus)
{
int newowner;
@@ -1471,7 +1472,7 @@ svc_fail(char *svcName)
}
if ((svcStatus.rs_state == RG_STATE_STARTED) &&
- (svcStatus.rs_owner != my_id())) {
+ (svcStatus.rs_owner != (uint32_t)my_id())) {
rg_unlock(&lockp);
clulog(LOG_DEBUG, "Unable to disable RG %s in %s state\n",
svcName, rg_state_str(svcStatus.rs_state));
@@ -1609,7 +1610,7 @@ svc_start_remote(char *svcName, int request, uint32_t target)
/* Send relocate message to the other node */
if (msg_send(&ctx, &msg_relo, sizeof (SmMessageSt)) <
- sizeof (SmMessageSt)) {
+ (int)sizeof (SmMessageSt)) {
clulog(LOG_ERR,
"#59: Error sending remote-start request to member #%d\n",
target);
@@ -2056,8 +2057,8 @@ handle_start_remote_req(char *svcName, int req)
/* XXX ok, so we need to say "should I start this if I was the
only cluster member online */
- for (x = 0; x < membership->cml_count; x++) {
- if (membership->cml_members[x].cn_nodeid == me)
+ for (x = 0; x < (int)membership->cml_count; x++) {
+ if (membership->cml_members[x].cn_nodeid == (int)me)
continue;
membership->cml_members[x].cn_member = 0;
diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c
index c57a4ff..8ba2474 100644
--- a/rgmanager/src/daemons/rg_thread.c
+++ b/rgmanager/src/daemons/rg_thread.c
@@ -4,6 +4,7 @@
#include <gettid.h>
#include <rg_queue.h>
#include <assert.h>
+#include <members.h>
/**
* Resource thread list entry.
@@ -247,7 +248,7 @@ resgroup_thread_main(void *arg)
case RG_ENABLE:
if (req->rr_target != 0 &&
- req->rr_target != my_id()) {
+ req->rr_target != (unsigned)my_id()) {
error = RG_EFORWARD;
ret = RG_NONE;
break;
diff --git a/rgmanager/src/daemons/test.c b/rgmanager/src/daemons/test.c
index 57ddf98..5d236fe 100644
--- a/rgmanager/src/daemons/test.c
+++ b/rgmanager/src/daemons/test.c
@@ -86,7 +86,8 @@ char *agentpath = RESOURCE_ROOTDIR;
int
-rules_func(int argc, char **argv)
+rules_func(int __attribute__((unused)) argc,
+ char __attribute__((unused)) **argv)
{
resource_rule_t *rulelist = NULL, *currule;
int rules = 0;