cluster-commits February 2011

cluster-commits@lists.fedorahosted.org

7 participants
135 discussions

cluster: RHEL6 - rgmanager: minor dbus cleanups
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6f… Commit: 6f7651001c3ab013f0d8bd68d0ff08978817c6dd Parent: cb93b21cd08d6c6ed206d1cc026c8f66f67bec93 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 14:15:32 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 15:11:59 2011 -0500 rgmanager: minor dbus cleanups Resolves: rhbz#657756 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/daemons/update-dbus.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index c9bbf40..f465d1d 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -47,7 +47,7 @@ rgm_dbus_init(void) dbc = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err); if (!dbc) { - logt_print(LOG_ERR, + logt_print(LOG_DEBUG, "DBus Failed to initialize: dbus_bus_get: %s\n", err.message); dbus_error_free(&err); @@ -72,7 +72,7 @@ rgm_dbus_init(void) #ifdef DBUS static int -_rgm_dbus_release(int err) +_rgm_dbus_release(void) { pthread_t t; @@ -83,7 +83,7 @@ _rgm_dbus_release(int err) * to wake up, so just have it poll XXX */ /* if the thread left because the dbus connection died, - this block is avoided since the thread exits */ + this block is avoided */ if (th) { t = th; th = 0; @@ -94,15 +94,13 @@ _rgm_dbus_release(int err) dbus_connection_unref(db); db = NULL; - if (err) - logt_print(LOG_ERR, "DBus Connection Lost\n"); - else - logt_print(LOG_DEBUG, "DBus Released\n"); + logt_print(LOG_DEBUG, "DBus Released\n"); return 0; } #endif +/* Clean shutdown (e.g. when exiting */ int rgm_dbus_release(void) #ifdef DBUS @@ -110,7 +108,7 @@ rgm_dbus_release(void) int ret; pthread_mutex_lock(&mu); - ret = _rgm_dbus_release(0); + ret = _rgm_dbus_release(); pthread_mutex_unlock(&mu); return ret; } @@ -122,6 +120,9 @@ rgm_dbus_release(void) #ifdef DBUS +/* Auto-flush thread. Since sending only guarantees queueing, + * we need this thread to push things out over dbus in the + * background */ static void * _dbus_auto_flush(void *arg) { @@ -154,8 +155,15 @@ _rgm_dbus_notify(const char *svcname, pthread_mutex_lock(&mu); + /* Check to ensure the connection is still valid. If it + * isn't, clean up and shut down the dbus connection. + * + * The main rgmanager thread will periodically try to + * reinitialize the dbus notification subsystem unless + * the administrator ran rgmanager with the -D command + * line option. + */ if (dbus_connection_get_is_connected(db) != TRUE) { - _rgm_dbus_release(1); goto out_unlock; } @@ -192,6 +200,9 @@ out_free: } +/* + * view-formation callback function + */ int32_t rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) { @@ -242,7 +253,7 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (ret < 0) { logt_print(LOG_ERR, "Error sending update for %s; " - "notifications disabled\n", key); + "DBus notifications disabled\n", key); rgm_dbus_release(); }

1 0

cluster: RHEL6 - rgmanager: Retry dbus if we get disconnected
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=cb… Commit: cb93b21cd08d6c6ed206d1cc026c8f66f67bec93 Parent: 7a2fb0827053eeba08bd254c46cc01506a6ed492 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 13:48:10 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 15:11:59 2011 -0500 rgmanager: Retry dbus if we get disconnected Resolves: rhbz#657756 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/daemons/main.c | 9 ++++- rgmanager/src/daemons/update-dbus.c | 60 ++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 21 deletions(-) diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 1929072..dad379a 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -684,6 +684,8 @@ event_loop(msgctx_t *localctx, msgctx_t *clusterctx) dump_internal_state("/var/lib/cluster/rgmanager-dump"); } + rgm_dbus_init(); + while (running && (tv.tv_sec || tv.tv_usec)) { FD_ZERO(&rfds); max = -1; @@ -1035,8 +1037,11 @@ main(int argc, char **argv) configure_rgmanager(-1, debug, &cluster_timeout); logt_print(LOG_NOTICE, "Resource Group Manager Starting\n"); - if (rgm_dbus_notify && rgm_dbus_init() != 0) - logt_print(LOG_NOTICE, "Failed to initialize DBus\n"); + if (rgm_dbus_notify && rgm_dbus_init() != 0) { + rgm_dbus_notify = 0; + logt_print(LOG_NOTICE, "Failed to initialize DBus; " + "notifications disabled\n"); + } if (init_resource_groups(0, do_init) != 0) { logt_print(LOG_CRIT, "#8: Couldn't initialize services\n"); diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index a3fb5e7..c9bbf40 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -21,8 +21,6 @@ static DBusConnection *db = NULL; static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; static pthread_t th = 0; -static char _err[512]; -static int err_set = 0; #endif /* Set this to the desired value prior to calling rgm_dbus_init() */ @@ -39,20 +37,29 @@ rgm_dbus_init(void) if (!rgm_dbus_notify) return 0; + pthread_mutex_lock(&mu); + if (db) { + pthread_mutex_unlock(&mu); + return 0; + } + dbus_error_init(&err); - dbc = dbus_bus_get(DBUS_BUS_SYSTEM, &err); + dbc = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err); if (!dbc) { - snprintf(_err, sizeof(_err), - "dbus_bus_get: %s", err.message); - err_set = 1; + logt_print(LOG_ERR, + "DBus Failed to initialize: dbus_bus_get: %s\n", + err.message); dbus_error_free(&err); + pthread_mutex_unlock(&mu); return -1; } dbus_connection_set_exit_on_disconnect(dbc, FALSE); db = dbc; + pthread_mutex_unlock(&mu); + logt_print(LOG_DEBUG, "DBus Notifications Initialized\n"); return 0; } #else @@ -63,9 +70,9 @@ rgm_dbus_init(void) #endif -int -rgm_dbus_release(void) #ifdef DBUS +static int +_rgm_dbus_release(int err) { pthread_t t; @@ -74,17 +81,39 @@ rgm_dbus_release(void) /* tell thread to exit - not sure how to tell dbus * to wake up, so just have it poll XXX */ + + /* if the thread left because the dbus connection died, + this block is avoided since the thread exits */ if (th) { t = th; th = 0; pthread_join(t, NULL); } + dbus_connection_close(db); dbus_connection_unref(db); db = NULL; + if (err) + logt_print(LOG_ERR, "DBus Connection Lost\n"); + else + logt_print(LOG_DEBUG, "DBus Released\n"); return 0; } +#endif + + +int +rgm_dbus_release(void) +#ifdef DBUS +{ + int ret; + + pthread_mutex_lock(&mu); + ret = _rgm_dbus_release(0); + pthread_mutex_unlock(&mu); + return ret; +} #else { return 0; @@ -98,14 +127,12 @@ _dbus_auto_flush(void *arg) { /* DBus connection functions are thread safe */ dbus_connection_ref(db); - while (dbus_connection_read_write(db, 500)) { if (!th) break; } dbus_connection_unref(db); - th = 0; return NULL; } @@ -121,11 +148,6 @@ _rgm_dbus_notify(const char *svcname, DBusMessage *msg = NULL; int ret = -1; - if (err_set) { - fprintf(stderr, "%s\n", _err); - err_set = 0; - } - if (!db) { goto out_free; } @@ -133,9 +155,7 @@ _rgm_dbus_notify(const char *svcname, pthread_mutex_lock(&mu); if (dbus_connection_get_is_connected(db) != TRUE) { - err_set = 1; - snprintf(_err, sizeof(_err), "DBus connection lost"); - rgm_dbus_release(); + _rgm_dbus_release(1); goto out_unlock; } @@ -184,6 +204,8 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (!rgm_dbus_notify) goto out_free; + if (!db) + goto out_free; if (view == 1) goto out_free; if (size != (sizeof(*st))) @@ -209,6 +231,7 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (!last) last = "(none)"; + flags[0] = 0; rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); if (flags[0] == 0) snprintf(flags, sizeof(flags), "(none)"); @@ -221,7 +244,6 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) logt_print(LOG_ERR, "Error sending update for %s; " "notifications disabled\n", key); rgm_dbus_release(); - rgm_dbus_notify = 0; } out_free:

1 0

cluster: RHEL6 - rgmanager: Clean up dbus notifications
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7a… Commit: 7a2fb0827053eeba08bd254c46cc01506a6ed492 Parent: f1cc6c0c9df06f393717c48c38b8140a897db1e2 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Feb 2 09:28:22 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 15:11:59 2011 -0500 rgmanager: Clean up dbus notifications Resolves: rhbz#657756 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/include/rg_dbus.h | 20 ++++-- rgmanager/src/daemons/Makefile | 2 +- rgmanager/src/daemons/main.c | 82 +-------------------------- rgmanager/src/daemons/update-dbus.c | 105 ++++++++++++++++++++++++++++++++--- 4 files changed, 115 insertions(+), 94 deletions(-) diff --git a/rgmanager/include/rg_dbus.h b/rgmanager/include/rg_dbus.h index 6454f29..3ef5ae1 100644 --- a/rgmanager/include/rg_dbus.h +++ b/rgmanager/include/rg_dbus.h @@ -1,14 +1,20 @@ -#ifdef DBUS #ifndef _RGM_DBUS_H #define _RGM_DBUS_H int rgm_dbus_init(void); int rgm_dbus_release(void); -int rgm_dbus_notify(const char *svcname, - const char *svcstatus, - const char *svcflags, - const char *svcowner, - const char *svclast); +extern int rgm_dbus_notify; -#endif +#ifdef DBUS + +#define RGM_DBUS_DEFAULT 1 +#define RGM_DBUS_UPDATE (rgm_dbus_notify?rgm_dbus_update:0) +int32_t rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size); + +#else + +#define RGM_DBUS_DEFAULT 0 +#define RGM_DBUS_UPDATE NULL + +#endif /* DBUS */ #endif diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 4dbbe5a..9619990 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -41,7 +41,7 @@ OBJS2= test-noccs.o \ rg_locks-noccs.o \ event_config-noccs.o -CFLAGS += -DDBUS -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE +CFLAGS += -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE CFLAGS += -fPIC CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} CFLAGS += `xml2-config --cflags` -I${slangincdir} diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 303e0c0..1929072 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -43,9 +43,6 @@ static int signalled = 0; static uint8_t ALIGNED port = RG_PORT; static char *rgmanager_lsname = (char *)"rgmanager"; /* XXX default */ static int status_poll_interval = DEFAULT_CHECK_INTERVAL; -#ifdef DBUS -static int state_notify = 1; -#endif static void segfault(int __attribute__ ((unused)) sig) @@ -938,68 +935,6 @@ shutdown_thread(void __attribute__ ((unused)) *arg) } -#ifdef DBUS -static int32_t -svc_update(char *key, uint64_t view, void *data, uint32_t size) -{ - char flags[64]; - rg_state_t *st; - cluster_member_list_t *m; - const char *owner; - const char *last; - int ret = 0; - - if (!state_notify) - goto out_free; - if (view == 1) - goto out_free; - if (size != (sizeof(*st))) - goto out_free; - - st = (rg_state_t *)data; - swab_rg_state_t(st); - - /* Don't send transitional states */ - if (st->rs_state == RG_STATE_STARTING || - st->rs_state == RG_STATE_STOPPING) - goto out_free; - - m = member_list(); - if (!m) - goto out_free; - - owner = memb_id_to_name(m, st->rs_owner); - last = memb_id_to_name(m, st->rs_last_owner); - - if (!owner) - owner = "(none)"; - if (!last) - last = "(none)"; - - rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); - if (flags[0] == 0) - snprintf(flags, sizeof(flags), "(none)"); - - ret = rgm_dbus_notify(st->rs_name, - rg_state_str(st->rs_state), - (char *)flags, owner, last); - - if (ret < 0) { - logt_print(LOG_ERR, "Error sending update for %s; " - "notifications disabled\n", key); - rgm_dbus_release(); - state_notify = 0; - } - -out_free: - if (m) - free_member_list(m); - free(data); - return 0; -} -#endif - - #ifdef WRAP_THREADS void dump_thread_states(FILE *); #endif @@ -1029,9 +964,7 @@ main(int argc, char **argv) foreground = 1; break; case 'D': -#ifdef DBUS - state_notify = 0; -#endif + rgm_dbus_notify = 0; break; default: return 1; @@ -1102,10 +1035,8 @@ main(int argc, char **argv) configure_rgmanager(-1, debug, &cluster_timeout); logt_print(LOG_NOTICE, "Resource Group Manager Starting\n"); -#ifdef DBUS - if (state_notify && rgm_dbus_init() != 0) + if (rgm_dbus_notify && rgm_dbus_init() != 0) logt_print(LOG_NOTICE, "Failed to initialize DBus\n"); -#endif if (init_resource_groups(0, do_init) != 0) { logt_print(LOG_CRIT, "#8: Couldn't initialize services\n"); @@ -1149,11 +1080,8 @@ main(int argc, char **argv) ds_key_init("rg_lockdown", 32, 10); #else - if (vf_init(me.cn_nodeid, port, NULL, -#ifdef DBUS /* Ugly */ - state_notify ? svc_update : -#endif - NULL, cluster_timeout) != 0) { + if (vf_init(me.cn_nodeid, port, NULL, RGM_DBUS_UPDATE, + cluster_timeout) != 0) { logt_print(LOG_CRIT, "#11: Couldn't set up VF listen socket\n"); goto out_ls; } @@ -1185,9 +1113,7 @@ out_ls: clu_lock_finished(rgmanager_lsname); out: -#ifdef DBUS rgm_dbus_release(); -#endif logt_print(LOG_NOTICE, "Shutdown complete, exiting\n"); cman_finish(clu); diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index 9e3078d..a3fb5e7 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -1,11 +1,18 @@ /* DBus notifications */ +#include <stdint.h> +#include <rg_dbus.h> +#include <errno.h> + +#ifdef DBUS + #include <stdio.h> #include <stdint.h> #include <resgroup.h> #include <poll.h> #include <dbus/dbus.h> -#include <rg_dbus.h> -#ifdef DBUS +#include <liblogthread.h> +#include <members.h> + #define DBUS_RGM_NAME "com.redhat.cluster.rgmanager" #define DBUS_RGM_IFACE "com.redhat.cluster.rgmanager" @@ -16,13 +23,22 @@ static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; static pthread_t th = 0; static char _err[512]; static int err_set = 0; +#endif + +/* Set this to the desired value prior to calling rgm_dbus_init() */ +int rgm_dbus_notify = RGM_DBUS_DEFAULT; + int rgm_dbus_init(void) +#ifdef DBUS { DBusConnection *dbc = NULL; DBusError err; + if (!rgm_dbus_notify) + return 0; + dbus_error_init(&err); dbc = dbus_bus_get(DBUS_BUS_SYSTEM, &err); @@ -39,10 +55,17 @@ rgm_dbus_init(void) db = dbc; return 0; } +#else +{ + errno = ENOSYS; + return -1; +} +#endif int rgm_dbus_release(void) +#ifdef DBUS { pthread_t t; @@ -62,8 +85,14 @@ rgm_dbus_release(void) return 0; } +#else +{ + return 0; +} +#endif +#ifdef DBUS static void * _dbus_auto_flush(void *arg) { @@ -82,12 +111,12 @@ _dbus_auto_flush(void *arg) } -int -rgm_dbus_notify(const char *svcname, - const char *svcstatus, - const char *svcflags, - const char *svcowner, - const char *svclast) +static int +_rgm_dbus_notify(const char *svcname, + const char *svcstatus, + const char *svcflags, + const char *svcowner, + const char *svclast) { DBusMessage *msg = NULL; int ret = -1; @@ -141,4 +170,64 @@ out_unlock: out_free: return ret; } + + +int32_t +rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) +{ + char flags[64]; + rg_state_t *st; + cluster_member_list_t *m = NULL; + const char *owner; + const char *last; + int ret = 0; + + if (!rgm_dbus_notify) + goto out_free; + if (view == 1) + goto out_free; + if (size != (sizeof(*st))) + goto out_free; + + st = (rg_state_t *)data; + swab_rg_state_t(st); + + /* Don't send transitional states */ + if (st->rs_state == RG_STATE_STARTING || + st->rs_state == RG_STATE_STOPPING) + goto out_free; + + m = member_list(); + if (!m) + goto out_free; + + owner = memb_id_to_name(m, st->rs_owner); + last = memb_id_to_name(m, st->rs_last_owner); + + if (!owner) + owner = "(none)"; + if (!last) + last = "(none)"; + + rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); + if (flags[0] == 0) + snprintf(flags, sizeof(flags), "(none)"); + + ret = _rgm_dbus_notify(st->rs_name, + rg_state_str(st->rs_state), + (char *)flags, owner, last); + + if (ret < 0) { + logt_print(LOG_ERR, "Error sending update for %s; " + "notifications disabled\n", key); + rgm_dbus_release(); + rgm_dbus_notify = 0; + } + +out_free: + if (m) + free_member_list(m); + free(data); + return 0; +} #endif

1 0

cluster: RHEL6 - rgmanager: DBus notifications for service state changes
by Lon Hohberger 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f1… Commit: f1cc6c0c9df06f393717c48c38b8140a897db1e2 Parent: 0f8d260207c686dd683da11b04868c483038a9ef Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Feb 1 14:20:34 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Feb 3 15:11:59 2011 -0500 rgmanager: DBus notifications for service state changes Resolves: rhbz#657756 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/include/rg_dbus.h | 14 ++++ rgmanager/man/rgmanager.8 | 2 + rgmanager/src/daemons/Makefile | 7 +- rgmanager/src/daemons/main.c | 88 ++++++++++++++++++++- rgmanager/src/daemons/update-dbus.c | 144 +++++++++++++++++++++++++++++++++++ 5 files changed, 250 insertions(+), 5 deletions(-) diff --git a/rgmanager/include/rg_dbus.h b/rgmanager/include/rg_dbus.h new file mode 100644 index 0000000..6454f29 --- /dev/null +++ b/rgmanager/include/rg_dbus.h @@ -0,0 +1,14 @@ +#ifdef DBUS +#ifndef _RGM_DBUS_H +#define _RGM_DBUS_H + +int rgm_dbus_init(void); +int rgm_dbus_release(void); +int rgm_dbus_notify(const char *svcname, + const char *svcstatus, + const char *svcflags, + const char *svcowner, + const char *svclast); + +#endif +#endif diff --git a/rgmanager/man/rgmanager.8 b/rgmanager/man/rgmanager.8 index 39b2195..a4e2c73 100644 --- a/rgmanager/man/rgmanager.8 +++ b/rgmanager/man/rgmanager.8 @@ -371,6 +371,8 @@ will leave the virtual machine running. Run in the foreground (do not fork). .IP \-d Enable debug-level logging. +.IP \-D +Disable DBus signals which are normally sent when services change state. .IP \-w Disable internal process monitoring (for debugging). .IP \-N diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 94e0dbb..4dbbe5a 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -29,6 +29,7 @@ OBJS1= fo_domain.o \ service_op.o \ slang_event.o \ event_config.o \ + update-dbus.o \ watchdog.o OBJS2= test-noccs.o \ @@ -40,12 +41,13 @@ OBJS2= test-noccs.o \ rg_locks-noccs.o \ event_config-noccs.o -CFLAGS += -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE +CFLAGS += -DDBUS -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE CFLAGS += -fPIC CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} CFLAGS += `xml2-config --cflags` -I${slangincdir} CFLAGS += -I$(S)/../../include CFLAGS += -I${incdir} +CFLAGS += `pkg-config --cflags dbus-1` NOCCS_CFLAGS += -DNO_CCS @@ -59,6 +61,7 @@ DLM_LDFLAGS += -L${dlmlibdir} -ldlm XML2_LDFLAGS += `xml2-config --libs` SLANG_LDFLAGS += -L${slanglibdir} -lslang EXTRA_LDFLAGS += -lpthread +DBUS_LDFLAGS += `pkg-config --libs dbus-1` LDDEPS += ../clulib/libclulib.a @@ -66,7 +69,7 @@ ${TARGET1}: ${OBJS1} ${LDDEPS} $(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \ $(DLM_LDFLAGS) $(XML2_LDFLAGS) \ $(SLANG_LDFLAGS) $(EXTRA_LDFLAGS) \ - $(LOGSYS_LDFLAGS) $(LD_FLAGS) + $(LOGSYS_LDFLAGS) $(LD_FLAGS) $(DBUS_LDFLAGS) # # Our test program links against the local allocator so that diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 4e34246..303e0c0 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -23,6 +23,7 @@ #include <members.h> #include <daemon_init.h> #include <groups.h> +#include <rg_dbus.h> #ifdef WRAP_THREADS void dump_thread_states(FILE *); @@ -42,7 +43,9 @@ static int signalled = 0; static uint8_t ALIGNED port = RG_PORT; static char *rgmanager_lsname = (char *)"rgmanager"; /* XXX default */ static int status_poll_interval = DEFAULT_CHECK_INTERVAL; - +#ifdef DBUS +static int state_notify = 1; +#endif static void segfault(int __attribute__ ((unused)) sig) @@ -935,6 +938,68 @@ shutdown_thread(void __attribute__ ((unused)) *arg) } +#ifdef DBUS +static int32_t +svc_update(char *key, uint64_t view, void *data, uint32_t size) +{ + char flags[64]; + rg_state_t *st; + cluster_member_list_t *m; + const char *owner; + const char *last; + int ret = 0; + + if (!state_notify) + goto out_free; + if (view == 1) + goto out_free; + if (size != (sizeof(*st))) + goto out_free; + + st = (rg_state_t *)data; + swab_rg_state_t(st); + + /* Don't send transitional states */ + if (st->rs_state == RG_STATE_STARTING || + st->rs_state == RG_STATE_STOPPING) + goto out_free; + + m = member_list(); + if (!m) + goto out_free; + + owner = memb_id_to_name(m, st->rs_owner); + last = memb_id_to_name(m, st->rs_last_owner); + + if (!owner) + owner = "(none)"; + if (!last) + last = "(none)"; + + rg_flags_str(flags, sizeof(flags), st->rs_flags, (char *)" "); + if (flags[0] == 0) + snprintf(flags, sizeof(flags), "(none)"); + + ret = rgm_dbus_notify(st->rs_name, + rg_state_str(st->rs_state), + (char *)flags, owner, last); + + if (ret < 0) { + logt_print(LOG_ERR, "Error sending update for %s; " + "notifications disabled\n", key); + rgm_dbus_release(); + state_notify = 0; + } + +out_free: + if (m) + free_member_list(m); + free(data); + return 0; +} +#endif + + #ifdef WRAP_THREADS void dump_thread_states(FILE *); #endif @@ -949,7 +1014,7 @@ main(int argc, char **argv) pthread_t th; cman_handle_t clu = NULL; - while ((rv = getopt(argc, argv, "wfdN")) != EOF) { + while ((rv = getopt(argc, argv, "wfdND")) != EOF) { switch (rv) { case 'w': wd = 0; @@ -963,6 +1028,11 @@ main(int argc, char **argv) case 'f': foreground = 1; break; + case 'D': +#ifdef DBUS + state_notify = 0; +#endif + break; default: return 1; break; @@ -1032,6 +1102,11 @@ main(int argc, char **argv) configure_rgmanager(-1, debug, &cluster_timeout); logt_print(LOG_NOTICE, "Resource Group Manager Starting\n"); +#ifdef DBUS + if (state_notify && rgm_dbus_init() != 0) + logt_print(LOG_NOTICE, "Failed to initialize DBus\n"); +#endif + if (init_resource_groups(0, do_init) != 0) { logt_print(LOG_CRIT, "#8: Couldn't initialize services\n"); goto out_ls; @@ -1074,7 +1149,11 @@ main(int argc, char **argv) ds_key_init("rg_lockdown", 32, 10); #else - if (vf_init(me.cn_nodeid, port, NULL, NULL, cluster_timeout) != 0) { + if (vf_init(me.cn_nodeid, port, NULL, +#ifdef DBUS /* Ugly */ + state_notify ? svc_update : +#endif + NULL, cluster_timeout) != 0) { logt_print(LOG_CRIT, "#11: Couldn't set up VF listen socket\n"); goto out_ls; } @@ -1106,6 +1185,9 @@ out_ls: clu_lock_finished(rgmanager_lsname); out: +#ifdef DBUS + rgm_dbus_release(); +#endif logt_print(LOG_NOTICE, "Shutdown complete, exiting\n"); cman_finish(clu); diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c new file mode 100644 index 0000000..9e3078d --- /dev/null +++ b/rgmanager/src/daemons/update-dbus.c @@ -0,0 +1,144 @@ +/* DBus notifications */ +#include <stdio.h> +#include <stdint.h> +#include <resgroup.h> +#include <poll.h> +#include <dbus/dbus.h> +#include <rg_dbus.h> +#ifdef DBUS + +#define DBUS_RGM_NAME "com.redhat.cluster.rgmanager" +#define DBUS_RGM_IFACE "com.redhat.cluster.rgmanager" +#define DBUS_RGM_PATH "/com/redhat/cluster/rgmanager" + +static DBusConnection *db = NULL; +static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; +static pthread_t th = 0; +static char _err[512]; +static int err_set = 0; + +int +rgm_dbus_init(void) +{ + DBusConnection *dbc = NULL; + DBusError err; + + dbus_error_init(&err); + + dbc = dbus_bus_get(DBUS_BUS_SYSTEM, &err); + if (!dbc) { + snprintf(_err, sizeof(_err), + "dbus_bus_get: %s", err.message); + err_set = 1; + dbus_error_free(&err); + return -1; + } + + dbus_connection_set_exit_on_disconnect(dbc, FALSE); + + db = dbc; + return 0; +} + + +int +rgm_dbus_release(void) +{ + pthread_t t; + + if (!db) + return 0; + + /* tell thread to exit - not sure how to tell dbus + * to wake up, so just have it poll XXX */ + if (th) { + t = th; + th = 0; + pthread_join(t, NULL); + } + + dbus_connection_unref(db); + db = NULL; + + return 0; +} + + +static void * +_dbus_auto_flush(void *arg) +{ + /* DBus connection functions are thread safe */ + dbus_connection_ref(db); + + while (dbus_connection_read_write(db, 500)) { + if (!th) + break; + } + + dbus_connection_unref(db); + + th = 0; + return NULL; +} + + +int +rgm_dbus_notify(const char *svcname, + const char *svcstatus, + const char *svcflags, + const char *svcowner, + const char *svclast) +{ + DBusMessage *msg = NULL; + int ret = -1; + + if (err_set) { + fprintf(stderr, "%s\n", _err); + err_set = 0; + } + + if (!db) { + goto out_free; + } + + pthread_mutex_lock(&mu); + + if (dbus_connection_get_is_connected(db) != TRUE) { + err_set = 1; + snprintf(_err, sizeof(_err), "DBus connection lost"); + rgm_dbus_release(); + goto out_unlock; + } + + if (!th) { + /* start auto-flush thread if needed */ + pthread_create(&th, NULL, _dbus_auto_flush, NULL); + } + + if (!(msg = dbus_message_new_signal(DBUS_RGM_PATH, + DBUS_RGM_IFACE, + "ServiceStateChange"))) { + goto out_unlock; + } + + if (!dbus_message_append_args(msg, + DBUS_TYPE_STRING, &svcname, + DBUS_TYPE_STRING, &svcstatus, + DBUS_TYPE_STRING, &svcflags, + DBUS_TYPE_STRING, &svcowner, + DBUS_TYPE_STRING, &svclast, + DBUS_TYPE_INVALID)) { + goto out_unlock; + } + + dbus_connection_send(db, msg, NULL); + ret = 0; + +out_unlock: + pthread_mutex_unlock(&mu); + if (msg) + dbus_message_unref(msg); +out_free: + return ret; +} +#endif

1 0

cluster: STABLE31 - fenced: update fenced man page with -q option
by rohara 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e2… Commit: e2c5e231eb9d6732235a073e2556993891b79e3f Parent: 77ad746968784f1ede7d79f368ffbf01a7cd75cd Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Thu Feb 3 14:06:01 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Feb 3 14:11:44 2011 -0600 fenced: update fenced man page with -q option The new dbus code in fenced can be disabled with the -q command line option. Add -q option to fenced man page. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: David Teigland <teigland(a)redhat.com> --- fence/man/fenced.8 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fence/man/fenced.8 b/fence/man/fenced.8 index c3496fb..64f26e0 100644 --- a/fence/man/fenced.8 +++ b/fence/man/fenced.8 @@ -142,6 +142,9 @@ All nodes are in a clean state to start. Do no startup fencing. .B \-s Skip startup fencing of nodes with no defined fence methods. .TP +.B \-q +Disable dbus signals. +.TP .BI \-j " secs" Post-join fencing delay. Default 6. .TP

1 0

cluster: RHEL6 - fenced: update fenced man page with -q option
by rohara 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0f… Commit: 0f8d260207c686dd683da11b04868c483038a9ef Parent: 4536bfb712dffa40a0e26910a8977babd902743e Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Thu Feb 3 14:06:01 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Feb 3 14:06:01 2011 -0600 fenced: update fenced man page with -q option The new dbus code in fenced can be disabled with the -q command line option. Add -q option to fenced man page. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: David Teigland <teigland(a)redhat.com> --- fence/man/fenced.8 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fence/man/fenced.8 b/fence/man/fenced.8 index c3496fb..64f26e0 100644 --- a/fence/man/fenced.8 +++ b/fence/man/fenced.8 @@ -142,6 +142,9 @@ All nodes are in a clean state to start. Do no startup fencing. .B \-s Skip startup fencing of nodes with no defined fence methods. .TP +.B \-q +Disable dbus signals. +.TP .BI \-j " secs" Post-join fencing delay. Default 6. .TP

1 0

cluster: STABLE31 - fenced: send dbus signal when node is fenced
by rohara 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=77… Commit: 77ad746968784f1ede7d79f368ffbf01a7cd75cd Parent: 5d044c3b62d51c688257faecd69bbf3112d7728f Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Wed Feb 2 18:15:32 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Feb 3 13:57:14 2011 -0600 fenced: send dbus signal when node is fenced This patch adds the ability to send a dbus signal when a node is fenced. This code is can reestablish a connection with dbus if necessary. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/Makefile | 8 ++++- fence/fenced/config.c | 2 + fence/fenced/config.h | 3 ++ fence/fenced/dbus.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ fence/fenced/fd.h | 6 +++ fence/fenced/main.c | 14 +++++++- fence/fenced/recover.c | 4 ++ 7 files changed, 121 insertions(+), 3 deletions(-) diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile index 7455544..902c299 100644 --- a/fence/fenced/Makefile +++ b/fence/fenced/Makefile @@ -16,7 +16,8 @@ OBJS= config.o \ main.o \ member_cman.o \ recover.o \ - logging.o + logging.o \ + dbus.o CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir} -I${corosyncincdir} @@ -30,6 +31,11 @@ LDFLAGS += -L${corosynclibdir} -lcpg -lpthread LDFLAGS += -L../../group/lib -l group LDFLAGS += -L${libdir} +ifndef disable_dbus +CFLAGS += $(shell pkg-config --cflags dbus-1) -DDBUS +LDFLAGS += $(shell pkg-config --libs dbus-1) +endif + LDDEPS += ../../group/lib/libgroup.a ${TARGET}: ${OBJS} ${LDDEPS} diff --git a/fence/fenced/config.c b/fence/fenced/config.c index 37f98f9..0517c2a 100644 --- a/fence/fenced/config.c +++ b/fence/fenced/config.c @@ -9,6 +9,7 @@ int ccs_handle; int optd_groupd_compat; int optd_debug_logfile; int optd_clean_start; +int optd_disable_dbus; int optd_skip_undefined; int optd_post_join_delay; int optd_post_fail_delay; @@ -20,6 +21,7 @@ int optd_override_path; int cfgd_groupd_compat = DEFAULT_GROUPD_COMPAT; int cfgd_debug_logfile = DEFAULT_DEBUG_LOGFILE; int cfgd_clean_start = DEFAULT_CLEAN_START; +int cfgd_disable_dbus = DEFAULT_DISABLE_DBUS; int cfgd_skip_undefined = DEFAULT_SKIP_UNDEFINED; int cfgd_post_join_delay = DEFAULT_POST_JOIN_DELAY; int cfgd_post_fail_delay = DEFAULT_POST_FAIL_DELAY; diff --git a/fence/fenced/config.h b/fence/fenced/config.h index f65af0e..d17ed1a 100644 --- a/fence/fenced/config.h +++ b/fence/fenced/config.h @@ -4,6 +4,7 @@ #define DEFAULT_GROUPD_COMPAT 0 #define DEFAULT_DEBUG_LOGFILE 0 #define DEFAULT_CLEAN_START 0 +#define DEFAULT_DISABLE_DBUS 0 #define DEFAULT_SKIP_UNDEFINED 0 #define DEFAULT_POST_JOIN_DELAY 6 #define DEFAULT_POST_FAIL_DELAY 0 @@ -13,6 +14,7 @@ extern int optd_groupd_compat; extern int optd_debug_logfile; extern int optd_clean_start; +extern int optd_disable_dbus; extern int optd_skip_undefined; extern int optd_post_join_delay; extern int optd_post_fail_delay; @@ -22,6 +24,7 @@ extern int optd_override_path; extern int cfgd_groupd_compat; extern int cfgd_debug_logfile; extern int cfgd_clean_start; +extern int cfgd_disable_dbus; extern int cfgd_skip_undefined; extern int cfgd_post_join_delay; extern int cfgd_post_fail_delay; diff --git a/fence/fenced/dbus.c b/fence/fenced/dbus.c new file mode 100644 index 0000000..5d1e1d5 --- /dev/null +++ b/fence/fenced/dbus.c @@ -0,0 +1,87 @@ +#include "fd.h" +#include "config.h" + +#ifdef DBUS +#include <dbus/dbus.h> + +#define DBUS_FENCE_NAME "com.redhat.cluster.fence" +#define DBUS_FENCE_IFACE "com.redhat.cluster.fence" +#define DBUS_FENCE_PATH "/com/redhat/cluster/fence" + +static DBusConnection *bus = NULL; + +void fd_dbus_init(void) +{ + if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL))) { + log_error("failed to get dbus connection"); + } else { + log_debug("connected to dbus %s", dbus_bus_get_unique_name(bus)); + } +} + +void fd_dbus_exit(void) +{ + if (bus) { + dbus_connection_close(bus); + dbus_connection_unref(bus); + } + bus = NULL; +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ + DBusMessage *msg = NULL; + + if (bus && !dbus_connection_read_write(bus, 1)) { + log_debug("disconnected from dbus"); + fd_dbus_exit(); + } + + if (!bus) { + fd_dbus_init(); + } + + if (!bus) { + goto out; + } + + if (!(msg = dbus_message_new_signal(DBUS_FENCE_PATH, + DBUS_FENCE_IFACE, + "FenceNode"))) { + log_error("failed to create dbus signal"); + goto out; + } + + if (!dbus_message_append_args(msg, + DBUS_TYPE_STRING, &nodename, + DBUS_TYPE_INT32, &nodeid, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INVALID)) { + log_error("failed to append args to dbus signal"); + goto out; + } + + dbus_connection_send(bus, msg, NULL); + dbus_connection_flush(bus); + +out: + if (msg) { + dbus_message_unref(msg); + } +} + +#else + +void fd_dbus_init(void) +{ +} + +void fd_dbus_exit(void) +{ +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ +} + +#endif /* DBUS */ diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h index a5a78bf..21855b2 100644 --- a/fence/fenced/fd.h +++ b/fence/fenced/fd.h @@ -286,5 +286,11 @@ void init_logging(void); void setup_logging(void); void close_logging(void); +/* dbus.c */ + +void fd_dbus_init(void); +void fd_dbus_exit(void); +void fd_dbus_send(const char *nodename, int nodeid, int result); + #endif /* __FD_DOT_H__ */ diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 1c61962..a9fecb5 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -902,7 +902,7 @@ static void print_usage(void) printf(" -j <secs> Post-join fencing delay (default %d)\n", DEFAULT_POST_JOIN_DELAY); printf(" -f <secs> Post-fail fencing delay (default %d)\n", DEFAULT_POST_FAIL_DELAY); printf(" -R <secs> Override time (default %d)\n", DEFAULT_OVERRIDE_TIME); - + printf(" -q Disable dbus signals\n"); printf(" -O <path> Override path (default %s)\n", DEFAULT_OVERRIDE_PATH); printf(" -h Print this help, then exit\n"); printf(" -V Print program version information, then exit\n"); @@ -912,7 +912,7 @@ static void print_usage(void) printf("\n"); } -#define OPTION_STRING "Lg:cj:f:Dn:O:hVSse:r:" +#define OPTION_STRING "Lg:cj:f:Dn:O:hVSse:r:q" static void read_arguments(int argc, char **argv) { @@ -970,6 +970,11 @@ static void read_arguments(int argc, char **argv) cfgd_override_path = strdup(optarg); break; + case 'q': + optd_disable_dbus = 1; + cfgd_disable_dbus = 1; + break; + case 'r': register_controlled_dir(optarg); break; @@ -1029,8 +1034,13 @@ int main(int argc, char **argv) log_level(LOG_INFO, "fenced %s started", RELEASE_VERSION); signal(SIGTERM, sigterm_handler); + if (!cfgd_disable_dbus) { + fd_dbus_init(); + } + loop(); + fd_dbus_exit(); unlink(LOCKFILE_NAME); return 0; } diff --git a/fence/fenced/recover.c b/fence/fenced/recover.c index a7ca047..13014c8 100644 --- a/fence/fenced/recover.c +++ b/fence/fenced/recover.c @@ -384,6 +384,10 @@ void fence_victims(struct fd *fd) log_error("fence %s %s", node->name, error ? "failed" : "success"); + if (!cfgd_disable_dbus) { + fd_dbus_send(node->name, node->nodeid, error); + } + skip_log_message: if (!error) { node->local_victim_done = 1;

1 0

cluster: RHEL6 - fenced: send dbus signal when node is fenced
by rohara 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=45… Commit: 4536bfb712dffa40a0e26910a8977babd902743e Parent: 5cb72e7ab6105f78af396a7e68d19ddaf3d06289 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Wed Feb 2 18:15:32 2011 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Feb 3 13:54:47 2011 -0600 fenced: send dbus signal when node is fenced This patch adds the ability to send a dbus signal when a node is fenced. This code is can reestablish a connection with dbus if necessary. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> Reviewed-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/Makefile | 8 ++++- fence/fenced/config.c | 2 + fence/fenced/config.h | 3 ++ fence/fenced/dbus.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ fence/fenced/fd.h | 6 +++ fence/fenced/main.c | 14 +++++++- fence/fenced/recover.c | 4 ++ 7 files changed, 121 insertions(+), 3 deletions(-) diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile index 7455544..902c299 100644 --- a/fence/fenced/Makefile +++ b/fence/fenced/Makefile @@ -16,7 +16,8 @@ OBJS= config.o \ main.o \ member_cman.o \ recover.o \ - logging.o + logging.o \ + dbus.o CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir} -I${corosyncincdir} @@ -30,6 +31,11 @@ LDFLAGS += -L${corosynclibdir} -lcpg -lpthread LDFLAGS += -L../../group/lib -l group LDFLAGS += -L${libdir} +ifndef disable_dbus +CFLAGS += $(shell pkg-config --cflags dbus-1) -DDBUS +LDFLAGS += $(shell pkg-config --libs dbus-1) +endif + LDDEPS += ../../group/lib/libgroup.a ${TARGET}: ${OBJS} ${LDDEPS} diff --git a/fence/fenced/config.c b/fence/fenced/config.c index 37f98f9..0517c2a 100644 --- a/fence/fenced/config.c +++ b/fence/fenced/config.c @@ -9,6 +9,7 @@ int ccs_handle; int optd_groupd_compat; int optd_debug_logfile; int optd_clean_start; +int optd_disable_dbus; int optd_skip_undefined; int optd_post_join_delay; int optd_post_fail_delay; @@ -20,6 +21,7 @@ int optd_override_path; int cfgd_groupd_compat = DEFAULT_GROUPD_COMPAT; int cfgd_debug_logfile = DEFAULT_DEBUG_LOGFILE; int cfgd_clean_start = DEFAULT_CLEAN_START; +int cfgd_disable_dbus = DEFAULT_DISABLE_DBUS; int cfgd_skip_undefined = DEFAULT_SKIP_UNDEFINED; int cfgd_post_join_delay = DEFAULT_POST_JOIN_DELAY; int cfgd_post_fail_delay = DEFAULT_POST_FAIL_DELAY; diff --git a/fence/fenced/config.h b/fence/fenced/config.h index f65af0e..d17ed1a 100644 --- a/fence/fenced/config.h +++ b/fence/fenced/config.h @@ -4,6 +4,7 @@ #define DEFAULT_GROUPD_COMPAT 0 #define DEFAULT_DEBUG_LOGFILE 0 #define DEFAULT_CLEAN_START 0 +#define DEFAULT_DISABLE_DBUS 0 #define DEFAULT_SKIP_UNDEFINED 0 #define DEFAULT_POST_JOIN_DELAY 6 #define DEFAULT_POST_FAIL_DELAY 0 @@ -13,6 +14,7 @@ extern int optd_groupd_compat; extern int optd_debug_logfile; extern int optd_clean_start; +extern int optd_disable_dbus; extern int optd_skip_undefined; extern int optd_post_join_delay; extern int optd_post_fail_delay; @@ -22,6 +24,7 @@ extern int optd_override_path; extern int cfgd_groupd_compat; extern int cfgd_debug_logfile; extern int cfgd_clean_start; +extern int cfgd_disable_dbus; extern int cfgd_skip_undefined; extern int cfgd_post_join_delay; extern int cfgd_post_fail_delay; diff --git a/fence/fenced/dbus.c b/fence/fenced/dbus.c new file mode 100644 index 0000000..5d1e1d5 --- /dev/null +++ b/fence/fenced/dbus.c @@ -0,0 +1,87 @@ +#include "fd.h" +#include "config.h" + +#ifdef DBUS +#include <dbus/dbus.h> + +#define DBUS_FENCE_NAME "com.redhat.cluster.fence" +#define DBUS_FENCE_IFACE "com.redhat.cluster.fence" +#define DBUS_FENCE_PATH "/com/redhat/cluster/fence" + +static DBusConnection *bus = NULL; + +void fd_dbus_init(void) +{ + if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL))) { + log_error("failed to get dbus connection"); + } else { + log_debug("connected to dbus %s", dbus_bus_get_unique_name(bus)); + } +} + +void fd_dbus_exit(void) +{ + if (bus) { + dbus_connection_close(bus); + dbus_connection_unref(bus); + } + bus = NULL; +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ + DBusMessage *msg = NULL; + + if (bus && !dbus_connection_read_write(bus, 1)) { + log_debug("disconnected from dbus"); + fd_dbus_exit(); + } + + if (!bus) { + fd_dbus_init(); + } + + if (!bus) { + goto out; + } + + if (!(msg = dbus_message_new_signal(DBUS_FENCE_PATH, + DBUS_FENCE_IFACE, + "FenceNode"))) { + log_error("failed to create dbus signal"); + goto out; + } + + if (!dbus_message_append_args(msg, + DBUS_TYPE_STRING, &nodename, + DBUS_TYPE_INT32, &nodeid, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INVALID)) { + log_error("failed to append args to dbus signal"); + goto out; + } + + dbus_connection_send(bus, msg, NULL); + dbus_connection_flush(bus); + +out: + if (msg) { + dbus_message_unref(msg); + } +} + +#else + +void fd_dbus_init(void) +{ +} + +void fd_dbus_exit(void) +{ +} + +void fd_dbus_send(const char *nodename, int nodeid, int result) +{ +} + +#endif /* DBUS */ diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h index a5a78bf..21855b2 100644 --- a/fence/fenced/fd.h +++ b/fence/fenced/fd.h @@ -286,5 +286,11 @@ void init_logging(void); void setup_logging(void); void close_logging(void); +/* dbus.c */ + +void fd_dbus_init(void); +void fd_dbus_exit(void); +void fd_dbus_send(const char *nodename, int nodeid, int result); + #endif /* __FD_DOT_H__ */ diff --git a/fence/fenced/main.c b/fence/fenced/main.c index e5ab568..835dc76 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -902,7 +902,7 @@ static void print_usage(void) printf(" -j <secs> Post-join fencing delay (default %d)\n", DEFAULT_POST_JOIN_DELAY); printf(" -f <secs> Post-fail fencing delay (default %d)\n", DEFAULT_POST_FAIL_DELAY); printf(" -R <secs> Override time (default %d)\n", DEFAULT_OVERRIDE_TIME); - + printf(" -q Disable dbus signals\n"); printf(" -O <path> Override path (default %s)\n", DEFAULT_OVERRIDE_PATH); printf(" -h Print this help, then exit\n"); printf(" -V Print program version information, then exit\n"); @@ -912,7 +912,7 @@ static void print_usage(void) printf("\n"); } -#define OPTION_STRING "Lg:cj:f:Dn:O:hVSse:r:" +#define OPTION_STRING "Lg:cj:f:Dn:O:hVSse:r:q" static void read_arguments(int argc, char **argv) { @@ -970,6 +970,11 @@ static void read_arguments(int argc, char **argv) cfgd_override_path = strdup(optarg); break; + case 'q': + optd_disable_dbus = 1; + cfgd_disable_dbus = 1; + break; + case 'r': register_controlled_dir(optarg); break; @@ -1042,8 +1047,13 @@ int main(int argc, char **argv) signal(SIGTERM, sigterm_handler); set_oom_adj(-16); + if (!cfgd_disable_dbus) { + fd_dbus_init(); + } + loop(); + fd_dbus_exit(); unlink(LOCKFILE_NAME); return 0; } diff --git a/fence/fenced/recover.c b/fence/fenced/recover.c index a7ca047..13014c8 100644 --- a/fence/fenced/recover.c +++ b/fence/fenced/recover.c @@ -384,6 +384,10 @@ void fence_victims(struct fd *fd) log_error("fence %s %s", node->name, error ? "failed" : "success"); + if (!cfgd_disable_dbus) { + fd_dbus_send(node->name, node->nodeid, error); + } + skip_log_message: if (!error) { node->local_victim_done = 1;

1 0

cluster: RHEL6 - gfs2_edit: fix segfault in set_bitmap when block is in rgrp
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5c… Commit: 5cb72e7ab6105f78af396a7e68d19ddaf3d06289 Parent: 04ed614339bb64003f3cc42af9994ff637313618 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Thu Feb 3 12:18:49 2011 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 12:18:49 2011 -0600 gfs2_edit: fix segfault in set_bitmap when block is in rgrp If you called libgfs2 function gfs2_set_bitmap to set a bit but specified a block outside the data blocks, it would segfault. rhbz#674843 --- gfs2/libgfs2/fs_bits.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index 7409bed..38ef92c 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -168,7 +168,7 @@ int gfs2_set_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, int state) rgd = gfs2_blk2rgrpd(sdp, blkno); - if(!rgd) + if(!rgd || blkno < rgd->ri.ri_data0) return -1; rgrp_block = (uint32_t)(blkno - rgd->ri.ri_data0);

1 0

cluster: RHEL6 - gfs2_edit: Fix bitmap editing function
by Bob Peterson 03 Feb '11

03 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=04… Commit: 04ed614339bb64003f3cc42af9994ff637313618 Parent: 8bad0161fb746d58889758d5d2b0e28ed8e3bcbc Author: Steven Whitehouse <swhiteho(a)redhat.com> AuthorDate: Wed Oct 27 10:47:34 2010 +0100 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Feb 3 11:59:04 2011 -0600 gfs2_edit: Fix bitmap editing function The bitmap editing function wasn't reading in the rgrp, so that it would fail with a NULL pointer dereference. rhbz#674843 --- gfs2/edit/hexedit.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index c82ddae..abeed18 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -2557,28 +2557,28 @@ static void find_change_block_alloc(int *newval) if (ablock == sbd.sb_addr) printf("3 (the superblock is not in the bitmap)\n"); else { - if (newval) { - if (gfs2_set_bitmap(&sbd, ablock, *newval)) - printf("-1 (block invalid or part of an rgrp).\n"); - else - printf("%d\n", *newval); - } else { - rgd = gfs2_blk2rgrpd(&sbd, ablock); - if (rgd) { - gfs2_rgrp_read(&sbd, rgd); + rgd = gfs2_blk2rgrpd(&sbd, ablock); + if (rgd) { + gfs2_rgrp_read(&sbd, rgd); + if (newval) { + if (gfs2_set_bitmap(&sbd, ablock, *newval)) + printf("-1 (block invalid or part of an rgrp).\n"); + else + printf("%d\n", *newval); + } else { type = gfs2_get_bitmap(&sbd, ablock, rgd); - gfs2_rgrp_relse(rgd); if (type < 0) { printf("-1 (block invalid or part of " "an rgrp).\n"); exit(-1); } printf("%d (%s)\n", type, allocdesc[gfs1][type]); - } else { - gfs2_rgrp_free(&sbd.rglist); - printf("-1 (block invalid or part of an rgrp).\n"); - exit(-1); } + gfs2_rgrp_relse(rgd); + } else { + gfs2_rgrp_free(&sbd.rglist); + printf("-1 (block invalid or part of an rgrp).\n"); + exit(-1); } } gfs2_rgrp_free(&sbd.rglist);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits February 2011