[Cluster-devel] cluster/rgmanager ChangeLog include/resgroup.h
lhh at sourceware.org
lhh at sourceware.org
Thu Jun 14 19:08:57 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh at sourceware.org 2007-06-14 19:08:57
Modified files:
rgmanager : ChangeLog
rgmanager/include: resgroup.h
Log message:
Fix type size for 32/64-bit mixed clusters
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&r1=1.46&r2=1.47
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/include/resgroup.h.diff?cvsroot=cluster&r1=1.21&r2=1.22
--- cluster/rgmanager/ChangeLog 2007/06/14 15:06:51 1.46
+++ cluster/rgmanager/ChangeLog 2007/06/14 19:08:57 1.47
@@ -1,3 +1,8 @@
+2007-06-14 Lon Hohberger <lhh at redhat.com>
+ * include/resgroup.h: Fix size incompatibility on 32/64 bit mixed
+ clusters. Put in stubs for intelligent handling of state sizes
+ during a cluster upgrade.
+
2007-06-14 Marek Grac <mgrac at redhat.com>
* src/daemons/main.c, rg_state.c, rg_thread.c,
src/utils/clusvcadm.c
--- cluster/rgmanager/include/resgroup.h 2007/06/14 15:06:51 1.21
+++ cluster/rgmanager/include/resgroup.h 2007/06/14 19:08:57 1.22
@@ -27,15 +27,22 @@
*/
typedef struct {
char rs_name[64]; /**< Service name */
+ /* 64 */
uint32_t rs_id; /**< Service ID */
uint32_t rs_magic; /**< Magic ID */
uint32_t rs_owner; /**< Member ID running service. */
uint32_t rs_last_owner; /**< Last member to run the service. */
+ /* 80 */
uint32_t rs_state; /**< State of service. */
uint32_t rs_restarts; /**< Number of cluster-induced
restarts */
uint64_t rs_transition; /**< Last service transition time */
+ /* 96 */
uint32_t rs_flags; /**< User setted flags */
+ /* 100 */
+ uint8_t rs_version; /**< State version */
+ uint8_t _pad_[3];
+ /* 104 */
} rg_state_t;
#define swab_rg_state_t(ptr) \
@@ -50,6 +57,14 @@
swab32((ptr)->rs_flags);\
}
+#if 0
+/* Future upgrade compatibility */
+#define RG_STATE_MINSIZE 96
+#define RG_STATE_CURRENT_VERSION 1
+
+extern size_t rg_state_t_version_sizes[];
+#endif
+
#define RG_PORT 177
#define RG_MAGIC 0x11398fed
More information about the Cluster-devel
mailing list