Hello community, here is the log from the commit of package openais checked in at Fri Nov 21 15:39:07 CET 2008. -------- --- openais/openais.changes 2008-11-11 11:04:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/openais/openais.changes 2008-11-19 14:55:24.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 19 14:48:55 CET 2008 - abeekhof@suse.de + +- Update patch level to 26c4af74cac1 + + Fix nodeid generation to use the node's full ip address (not network address) to ensure uniqueness + + Start additional services after the default ones + + Correctly compare addresses with bindnetaddr + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openais.spec ++++++ --- /var/tmp/diff_new_pack.Q30122/_old 2008-11-21 15:38:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Q30122/_new 2008-11-21 15:38:41.000000000 +0100 @@ -31,7 +31,7 @@ Name: openais Summary: The OpenAIS Standards-Based Cluster Framework executive and APIs Version: 0.80.3 -Release: 12 +Release: 13 License: BSD 3-Clause Group: Productivity/Clustering/HA Url: http://www.openais.org/ @@ -253,6 +253,11 @@ %{_mandir}/man3/evs_*.3* %changelog +* Wed Nov 19 2008 abeekhof@suse.de +- Update patch level to 26c4af74cac1 + + Fix nodeid generation to use the node's full ip address (not network address) to ensure uniqueness + + Start additional services after the default ones + + Correctly compare addresses with bindnetaddr * Tue Nov 11 2008 abeekhof@suse.de - Update source tarball to r1661 - Fix rare problem where checkpoint synchronization database could be thrown away. ++++++ pacemaker.diff ++++++ --- /var/tmp/diff_new_pack.Q30122/_old 2008-11-21 15:38:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Q30122/_new 2008-11-21 15:38:41.000000000 +0100 @@ -1,5 +1,5 @@ --- whitetank-svn/Makefile 2008-08-13 22:38:16.000000000 +0200 -+++ whitetank-dev/Makefile 2008-09-23 20:37:27.000000000 +0200 ++++ whitetank-dev/Makefile 2008-11-19 11:54:17.000000000 +0100 @@ -29,30 +29,30 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGE. @@ -107,7 +107,7 @@ install -m 755 exec/*lcrso $(DESTDIR)$(LCRSODIR) --- whitetank-svn/Makefile.inc 2008-08-13 22:38:16.000000000 +0200 -+++ whitetank-dev/Makefile.inc 2008-09-23 20:36:31.000000000 +0200 ++++ whitetank-dev/Makefile.inc 2008-11-19 11:54:17.000000000 +0100 @@ -29,12 +29,17 @@ # THE POSSIBILITY OF SUCH DAMAGE. # Basic OS detection @@ -127,7 +127,7 @@ endif ifneq "" "$(findstring BSD,$(UNAME))" --- whitetank-svn/conf/openais.conf 2008-08-13 22:38:15.000000000 +0200 -+++ whitetank-dev/conf/openais.conf 2008-10-09 14:46:36.000000000 +0200 ++++ whitetank-dev/conf/openais.conf 2008-11-19 11:54:17.000000000 +0100 @@ -1,22 +1,66 @@ # Please read the openais.conf.5 manual page @@ -202,7 +202,7 @@ } --- whitetank-svn/exec/cfg.c 2008-08-13 22:38:15.000000000 +0200 -+++ whitetank-dev/exec/cfg.c 2008-08-22 10:44:27.000000000 +0200 ++++ whitetank-dev/exec/cfg.c 2008-11-19 11:54:17.000000000 +0100 @@ -109,6 +109,14 @@ static void message_handler_req_lib_cfg_ void *conn, void *msg); @@ -339,7 +339,7 @@ + LEAVE(""); +} --- whitetank-svn/exec/clm.c 2008-08-13 22:38:15.000000000 +0200 -+++ whitetank-dev/exec/clm.c 2008-08-13 22:55:34.000000000 +0200 ++++ whitetank-dev/exec/clm.c 2008-11-19 11:54:17.000000000 +0100 @@ -134,6 +134,8 @@ static void clm_sync_abort (void); static int clm_exec_init_fn (struct objdb_iface_ver0 *objdb); @@ -370,7 +370,7 @@ { struct clm_pd *clm_pd = (struct clm_pd *)openais_conn_private_data_get (conn); --- whitetank-svn/exec/main.c 2008-08-13 22:38:15.000000000 +0200 -+++ whitetank-dev/exec/main.c 2008-08-13 23:05:54.000000000 +0200 ++++ whitetank-dev/exec/main.c 2008-11-19 11:54:17.000000000 +0100 @@ -92,6 +92,8 @@ static struct totem_logging_configuratio static char delivery_data[MESSAGE_SIZE_MAX]; @@ -550,7 +550,7 @@ totem_config.vsf_type); --- whitetank-svn/exec/objdb.c 2008-08-13 22:38:15.000000000 +0200 -+++ whitetank-dev/exec/objdb.c 2008-10-30 08:55:17.000000000 +0100 ++++ whitetank-dev/exec/objdb.c 2008-11-19 11:54:17.000000000 +0100 @@ -52,10 +52,13 @@ struct object_instance { void *object_name; int object_name_len; @@ -1059,7 +1059,7 @@ struct lcr_iface objdb_iface_ver0[1] = { --- whitetank-svn/exec/objdb.h 2008-08-13 22:38:15.000000000 +0200 -+++ whitetank-dev/exec/objdb.h 2008-08-13 22:57:42.000000000 +0200 ++++ whitetank-dev/exec/objdb.h 2008-11-19 11:54:17.000000000 +0100 @@ -38,6 +38,8 @@ #define OBJECT_PARENT_HANDLE 0 @@ -1120,7 +1120,7 @@ #endif /* OBJDB_H_DEFINED */ --- whitetank-svn/exec/service.c 2008-08-13 22:38:15.000000000 +0200 -+++ whitetank-dev/exec/service.c 2008-08-13 23:05:54.000000000 +0200 ++++ whitetank-dev/exec/service.c 2008-11-19 12:06:42.000000000 +0100 @@ -84,59 +84,19 @@ static struct default_service default_se { .name = "openais_cpg", @@ -1138,8 +1138,7 @@ - struct objdb_iface_ver0 *objdb, - char *name, - int version) -+static unsigned int default_services_requested (struct objdb_iface_ver0 *objdb) - { +-{ - unsigned int object_handle; - - objdb->object_create (OBJECT_PARENT_HANDLE, &object_handle, @@ -1155,7 +1154,8 @@ -static int service_handler_config ( - struct openais_service_handler *handler, - struct objdb_iface_ver0 *objdb) --{ ++static unsigned int default_services_requested (struct objdb_iface_ver0 *objdb) + { - int res = 0; - - /* Already loaded? */ @@ -1342,7 +1342,7 @@ objdb->object_find_reset (OBJECT_PARENT_HANDLE); while (objdb->object_find ( -@@ -188,56 +265,124 @@ int openais_service_link_all (struct obj +@@ -188,56 +265,135 @@ int openais_service_link_all (struct obj objdb->object_key_get (object_service_handle, "name", strlen ("name"), @@ -1396,15 +1396,15 @@ - log_printf(LOG_LEVEL_NOTICE, "openais component %s loaded.\n", service_name); - } + log_printf(LOG_LEVEL_NOTICE, "Unloading all openais components\n"); - -- service_handler_config ( -- iface_ver0->openais_get_service_handler_ver0(), objdb); ++ + objdb->object_find_reset (OBJECT_PARENT_HANDLE); + while (objdb->object_find (OBJECT_PARENT_HANDLE, + "service", + strlen ("service"), + &object_service_handle) == 0) { -+ + +- service_handler_config ( +- iface_ver0->openais_get_service_handler_ver0(), objdb); + objdb->object_key_get (object_service_handle, + "name", + strlen ("name"), @@ -1443,6 +1443,17 @@ + char *found_service_ver = NULL; + unsigned int found_service_ver_atoi = 0; + ++ if (default_services_requested (objdb)) { ++ for (i = 0; ++ i < sizeof (default_services) / sizeof (struct default_service); i++) { ++ ++ openais_service_link_and_init ( ++ objdb, ++ default_services[i].name, ++ default_services[i].ver); ++ } ++ } ++ + objdb->object_find_reset (OBJECT_PARENT_HANDLE); + while (objdb->object_find ( + OBJECT_PARENT_HANDLE, @@ -1456,6 +1467,7 @@ - res = ais_service[i]->exec_init_fn (objdb); - if (res != 0) { - break; ++ int is_default_service = 0; + objdb->object_key_get (object_service_handle, + "name", + strlen ("name"), @@ -1470,7 +1482,16 @@ + + found_service_ver_atoi = atoi (found_service_ver); + -+ objdb->object_key_replace ( ++ for (i = 0; i < sizeof (default_services) / sizeof (struct default_service); i++) { ++ if(default_services[i].ver != found_service_ver ++ && found_service_name != NULL ++ && strcmp(default_services[i].name, found_service_name) == 0) { ++ is_default_service = 1; + } + } ++ ++ if(is_default_service == 0) { ++ objdb->object_key_replace ( + object_service_handle, + "ver", + strlen ("ver"), @@ -1479,28 +1500,18 @@ + &found_service_ver_atoi, + sizeof (found_service_ver_atoi)); + -+ openais_service_link_and_init ( ++ openais_service_link_and_init ( + objdb, + found_service_name, + found_service_ver_atoi); - } -+ -+ if (default_services_requested (objdb) == 0) { -+ return (0); - } -+ for (i = 0; -+ i < sizeof (default_services) / sizeof (struct default_service); i++) { -+ -+ openais_service_link_and_init ( -+ objdb, -+ default_services[i].name, -+ default_services[i].ver); } - return (res); ++ } ++ + return (0); } --- whitetank-svn/exec/service.h 2008-08-13 22:38:15.000000000 +0200 -+++ whitetank-dev/exec/service.h 2008-08-13 22:55:34.000000000 +0200 ++++ whitetank-dev/exec/service.h 2008-11-19 11:54:17.000000000 +0100 @@ -74,6 +74,7 @@ struct openais_service_handler { int lib_service_count; struct openais_exec_handler *exec_service; @@ -1559,7 +1570,7 @@ extern struct openais_service_handler *ais_service[]; --- whitetank-svn/exec/tlist.h 2008-08-13 22:38:15.000000000 +0200 -+++ whitetank-dev/exec/tlist.h 2008-08-25 08:46:46.000000000 +0200 ++++ whitetank-dev/exec/tlist.h 2008-11-19 11:54:17.000000000 +0100 @@ -45,7 +45,7 @@ #include "../include/list.h" @@ -1570,7 +1581,7 @@ #endif --- whitetank-svn/exec/totem.h 2008-10-09 14:41:04.000000000 +0200 -+++ whitetank-dev/exec/totem.h 2008-10-24 13:44:07.000000000 +0200 ++++ whitetank-dev/exec/totem.h 2008-11-19 11:54:17.000000000 +0100 @@ -44,26 +44,6 @@ #define SEND_THREADS_MAX 16 #define INTERFACE_MAX 2 @@ -1599,7 +1610,7 @@ struct totem_ip_address bindnet; struct totem_ip_address boundto; --- whitetank-svn/exec/totemconfig.c 2008-10-09 14:41:04.000000000 +0200 -+++ whitetank-dev/exec/totemconfig.c 2008-10-09 14:58:51.000000000 +0200 ++++ whitetank-dev/exec/totemconfig.c 2008-11-19 11:54:17.000000000 +0100 @@ -52,10 +52,7 @@ #include "totemconfig.h" #include "print.h" @@ -1612,8 +1623,51 @@ #define TOKEN_RETRANSMITS_BEFORE_LOSS_CONST 4 #define TOKEN_TIMEOUT 1000 +--- whitetank-svn/exec/totemip.c 2008-08-13 22:38:15.000000000 +0200 ++++ whitetank-dev/exec/totemip.c 2008-11-19 11:54:17.000000000 +0100 +@@ -516,7 +516,7 @@ int totemip_iface_check(struct totem_ip_ + memcpy(&network, RTA_DATA(tb[IFA_BROADCAST]), sizeof(uint32_t)); + memcpy(&addr, bindnet->addr, sizeof(uint32_t)); + +- if (addr == (network & netmask)) { ++ if ((addr & netmask) == (network & netmask)) { + memcpy(ipaddr.addr, RTA_DATA(tb[IFA_ADDRESS]), TOTEMIP_ADDRLEN); + found_if = 1; + } +--- whitetank-svn/exec/totemnet.c 2008-10-09 14:41:04.000000000 +0200 ++++ whitetank-dev/exec/totemnet.c 2008-11-19 12:05:40.000000000 +0100 +@@ -702,7 +702,12 @@ static int netif_determine ( + * field is only 32 bits. + */ + if (bound_to->family == AF_INET && bound_to->nodeid == 0) { +- memcpy (&bound_to->nodeid, bound_to->addr, sizeof (int)); ++ int32_t nodeid = 0; ++ memcpy (&nodeid, bound_to->addr, sizeof (int)); ++ if(nodeid < 0 && instance->totem_config->clear_node_high_bit) { ++ nodeid = 0 - nodeid; ++ } ++ bound_to->nodeid = nodeid; + } + + return (res); +@@ -1227,15 +1232,6 @@ int totemnet_initialize ( + + instance->totemnet_poll_handle = poll_handle; + +- if(instance->totem_config->node_id == 0) { +- int32_t nodeid = 0; +- memcpy (&nodeid, instance->totem_interface->bindnet.addr, sizeof (int32_t)); +- if(nodeid < 0 && instance->totem_config->clear_node_high_bit) { +- nodeid = 0 - nodeid; +- } +- instance->totem_config->node_id = nodeid; +- } +- + instance->totem_interface->bindnet.nodeid = instance->totem_config->node_id; + + instance->context = context; --- whitetank-svn/include/cfg.h 2008-08-13 22:38:14.000000000 +0200 -+++ whitetank-dev/include/cfg.h 2008-08-13 22:55:34.000000000 +0200 ++++ whitetank-dev/include/cfg.h 2008-11-19 11:54:17.000000000 +0100 @@ -140,6 +140,18 @@ openais_cfg_ring_reenable ( openais_cfg_handle_t cfg_handle); @@ -1634,7 +1688,7 @@ openais_cfg_handle_t cfg_handle, OpenaisCfgAdministrativeTargetT administrativeTarget, --- whitetank-svn/include/ipc_cfg.h 2008-08-13 22:38:14.000000000 +0200 -+++ whitetank-dev/include/ipc_cfg.h 2008-08-13 22:55:34.000000000 +0200 ++++ whitetank-dev/include/ipc_cfg.h 2008-11-19 11:54:17.000000000 +0100 @@ -47,6 +47,8 @@ enum req_lib_cfg_types { MESSAGE_REQ_CFG_STATETRACKSTOP = 3, MESSAGE_REQ_CFG_ADMINISTRATIVESTATESET = 4, @@ -1681,7 +1735,7 @@ AIS_AMF_ADMINISTRATIVETARGET_SERVICEUNIT = 0, AIS_AMF_ADMINISTRATIVETARGET_SERVICEGROUP = 1, --- whitetank-svn/init/generic 1970-01-01 01:00:00.000000000 +0100 -+++ whitetank-dev/init/generic 2008-11-11 10:42:32.000000000 +0100 ++++ whitetank-dev/init/generic 2008-11-19 11:54:17.000000000 +0100 @@ -0,0 +1,146 @@ +#!/bin/sh +# @@ -1830,7 +1884,7 @@ + exit 2 +esac --- whitetank-svn/lcr/Makefile 2008-08-13 22:38:14.000000000 +0200 -+++ whitetank-dev/lcr/Makefile 2008-08-13 23:05:54.000000000 +0200 ++++ whitetank-dev/lcr/Makefile 2008-11-19 11:54:17.000000000 +0100 @@ -26,8 +26,8 @@ # include ../Makefile.inc @@ -1842,7 +1896,7 @@ ifeq (${OPENAIS_COMPAT}, LINUX) LDFLAGS += -ldl --- whitetank-svn/lcr/lcr_ifact.c 2008-08-13 22:38:14.000000000 +0200 -+++ whitetank-dev/lcr/lcr_ifact.c 2008-08-13 23:05:54.000000000 +0200 ++++ whitetank-dev/lcr/lcr_ifact.c 2008-11-19 11:54:17.000000000 +0100 @@ -174,7 +174,7 @@ static void defaults_path_build (void) path_list[0] = strdup (cwd); path_list_entries++; @@ -1853,7 +1907,7 @@ static void ld_library_path_build (void) --- whitetank-svn/lib/Makefile 2008-08-13 22:38:16.000000000 +0200 -+++ whitetank-dev/lib/Makefile 2008-10-24 13:40:01.000000000 +0200 ++++ whitetank-dev/lib/Makefile 2008-11-19 11:54:17.000000000 +0100 @@ -55,35 +55,37 @@ libSaClm.a: util.o clm.o ifeq (${OPENAIS_COMPAT}, DARWIN) @@ -1903,7 +1957,7 @@ else --- whitetank-svn/lib/cfg.c 2008-08-13 22:38:16.000000000 +0200 -+++ whitetank-dev/lib/cfg.c 2008-08-13 22:55:34.000000000 +0200 ++++ whitetank-dev/lib/cfg.c 2008-11-19 11:54:17.000000000 +0100 @@ -458,6 +458,81 @@ openais_cfg_ring_reenable ( } @@ -1987,7 +2041,7 @@ openais_cfg_handle_t cfg_handle, SaUint8T trackFlags, --- whitetank-svn/lib/libSaMsg.versions 2008-08-13 22:38:16.000000000 +0200 -+++ whitetank-dev/lib/libSaMsg.versions 2008-10-15 15:25:24.000000000 +0200 ++++ whitetank-dev/lib/libSaMsg.versions 2008-11-19 11:54:17.000000000 +0100 @@ -24,18 +24,18 @@ OPENAIS_MSG_B.01.01 { saMsgMessageCancel; saMsgMessageReply; @@ -2014,7 +2068,7 @@ clustTimeNow; }; --- whitetank-svn/lib/libcfg.versions 2008-08-13 22:38:16.000000000 +0200 -+++ whitetank-dev/lib/libcfg.versions 2008-08-13 22:55:34.000000000 +0200 ++++ whitetank-dev/lib/libcfg.versions 2008-11-19 11:54:17.000000000 +0100 @@ -1,6 +1,6 @@ # Version and symbol export for libcfg.so @@ -2033,7 +2087,7 @@ local: --- whitetank-svn/lib/util.c 2008-08-13 22:38:16.000000000 +0200 -+++ whitetank-dev/lib/util.c 2008-08-13 22:55:34.000000000 +0200 ++++ whitetank-dev/lib/util.c 2008-11-19 11:54:17.000000000 +0100 @@ -525,7 +525,7 @@ saHandleCreate ( { uint32_t handle; @@ -2044,7 +2098,7 @@ void *instance; int i; --- whitetank-svn/test/openais-cfgtool.c 2008-08-13 22:38:14.000000000 +0200 -+++ whitetank-dev/test/openais-cfgtool.c 2008-08-13 22:55:34.000000000 +0200 ++++ whitetank-dev/test/openais-cfgtool.c 2008-11-19 11:54:17.000000000 +0100 @@ -98,19 +98,61 @@ static void ringreenable_do (void) openais_cfg_finalize (handle); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org