Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: lib by alan from ([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 20 Dec 2005 23:00:22 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
make the find_xml_node_list internal
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- mgmt_crm.c 14 Dec 2005 09:39:24 -0000 1.4
+++ mgmt_crm.c 21 Dec 2005 06:00:22 -0000 1.5
@@ -81,7 +81,7 @@
static resource_t* find_resource(GList* rsc_list, const char* id);
static int delete_object(const char* type, const char* entry, const char* id);
-GList* find_xml_node_list(crm_data_t *root, const char *search_path);
+static GList* find_xml_node_list(crm_data_t *root, const char *search_path);
static pe_working_set_t get_data_set(void);
#define GET_RESOURCE() if (argc != 2) {
\
------------------------------
Message: 2
Date: Tue, 20 Dec 2005 23:36:23 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/mgmt
Modified Files:
Makefile.am
Log Message:
Added an EXTRA_DIST for a .i file.
Not sure if it'll solve the problem or not...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/mgmt/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 13 Dec 2005 18:41:45 -0000 1.5
+++ Makefile.am 21 Dec 2005 06:36:23 -0000 1.6
@@ -30,6 +30,8 @@
mgmtdir =
$(HA_VARLIBDIR)/$(HB_PKG)/$(MGMT_DIR)
apigid = @HA_APIGID@
+EXTRA_DIST = pymgmt.i
+
lib_LTLIBRARIES = libmgmttls.la libmgmtclient.la libmgmtcommon.la
libmgmttls_la_SOURCES = mgmt_tls_lib.c
libmgmttls_la_LIBADD = $(COMMONLIBS)
------------------------------
Message: 3
Date: Tue, 20 Dec 2005 23:44:12 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
lrm.c
Log Message:
BEAM Fixes: Use of NULLs
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -3 -r1.156 -r1.157
--- lrm.c 23 Nov 2005 00:42:25 -0000 1.156
+++ lrm.c 21 Dec 2005 06:44:11 -0000 1.157
@@ -188,6 +188,7 @@
lrm_source = NULL;
crm_info("Disconnecting from the LRM");
fsa_lrm_conn->lrm_ops->signoff(fsa_lrm_conn);
+ clear_bit_inplace(fsa_input_register, R_LRM_CONNECTED);
}
/* TODO: Clean up the hashtable */
}
@@ -831,7 +832,7 @@
op->op_status = LRM_OP_DONE;
op->rc = EXECRA_OK;
- send_direct_ack(op, rsc->id);
+ send_direct_ack(op, id_from_cib);
free_lrm_op(op);
} else if(safe_str_eq(operation, CRMD_ACTION_DELETE)) {
------------------------------
Message: 4
Date: Tue, 20 Dec 2005 23:44:12 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
incarnation.c
Log Message:
BEAM Fixes: Use of NULLs
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- incarnation.c 22 Nov 2005 02:44:41 -0000 1.65
+++ incarnation.c 21 Dec 2005 06:44:11 -0000 1.66
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.65 2005/11/22 02:44:41 andrew Exp $ */
+/* $Id: incarnation.c,v 1.66 2005/12/21 06:44:11 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1049,11 +1049,13 @@
goto clone_expand_reallocate;
}
sprintf(rsc_list_s, "%s ", rsc_id);
- rsc_list_s += strlen(rsc_id);
- rsc_len += strlen(rsc_id);
- rsc_list_s++;
- rsc_len++;
-
+ if(rsc_list_s != NULL) {
+ rsc_list_s += strlen(rsc_id);
+ rsc_len += strlen(rsc_id);
+ rsc_list_s++;
+ rsc_len++;
+ }
+
if(node_len + 1 + strlen(uname) >= list_len) {
crm_free(*rsc_list);
crm_free(*node_list);
@@ -1062,11 +1064,13 @@
goto clone_expand_reallocate;
}
sprintf(node_list_s, "%s ", uname);
- node_list_s += strlen(uname);
- node_len += strlen(uname);
- node_list_s++;
- node_len++;
-
+ if(node_list_s != NULL) {
+ node_list_s += strlen(uname);
+ node_len += strlen(uname);
+ node_list_s++;
+ node_len++;
+ }
+
if(uuid_len + 1 + strlen(uuid) >= list_len) {
crm_free(*rsc_list);
crm_free(*node_list);
@@ -1075,10 +1079,12 @@
goto clone_expand_reallocate;
}
sprintf(uuid_list_s, "%s ", uuid);
- uuid_list_s += strlen(uuid);
- uuid_len += strlen(uuid);
- uuid_list_s++;
- uuid_len++;
+ if(uuid_list_s != NULL) {
+ uuid_list_s += strlen(uuid);
+ uuid_len += strlen(uuid);
+ uuid_list_s++;
+ uuid_len++;
+ }
);
}
------------------------------
Message: 5
Date: Tue, 20 Dec 2005 23:46:41 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
native.c
Log Message:
BEAM: use of NULL
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- native.c 19 Dec 2005 16:54:44 -0000 1.103
+++ native.c 21 Dec 2005 06:46:40 -0000 1.104
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.103 2005/12/19 16:54:44 andrew Exp $ */
+/* $Id: native.c,v 1.104 2005/12/21 06:46:40 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1066,9 +1066,10 @@
crm_debug_4("Processing pecs_must_not constraint");
/* pecs_must_not */
- if(update_lh) {
- color_rh = rsc_rh->color;
+ color_rh = rsc_rh->color;
+ color_lh = rsc_lh->color;
+ if(update_lh) {
if(rsc_lh->provisional && color_rh != NULL) {
color_lh = add_color(rsc_lh, color_rh);
color_lh->local_weight = -INFINITY;
@@ -1082,11 +1083,9 @@
} else if(rsc_lh->provisional) {
- } else if(rsc_lh->color
- && rsc_lh->color->details->pending) {
+ } else if(color_lh && color_lh->details->pending) {
node_t *node_lh = NULL;
- color_lh = rsc_lh->color;
node_lh = pe_find_node_id(
color_lh->details->candidate_nodes,
safe_val5(NULL, color_rh, details,
@@ -1110,9 +1109,11 @@
pe_warn("lh else");
}
}
-
+
+ /* in case anything was modified */
+ color_rh = rsc_rh->color;
+ color_lh = rsc_lh->color;
if(update_rh) {
- color_lh = rsc_lh->color;
if(rsc_rh->provisional && color_lh != NULL) {
color_rh = add_color(rsc_lh, color_lh);
color_rh->local_weight = -INFINITY;
@@ -1126,10 +1127,8 @@
} else if(rsc_rh->provisional) {
- } else if(rsc_rh->color
- && rsc_rh->color->details->pending) {
+ } else if(color_rh && color_rh->details->pending) {
node_t *node_rh = NULL;
- color_rh = rsc_rh->color;
node_rh = pe_find_node_id(
color_rh->details->candidate_nodes,
safe_val5(NULL, color_lh, details,
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 51
********************************************
