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: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: cim by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 22 Dec 2005 14:04:23 -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
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- incarnation.c 21 Dec 2005 10:46:39 -0000 1.67
+++ incarnation.c 22 Dec 2005 21:04:22 -0000 1.68
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.67 2005/12/21 10:46:39 andrew Exp $ */
+/* $Id: incarnation.c,v 1.68 2005/12/22 21:04:22 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -993,28 +993,25 @@
clone_expand_reallocate:
if(rsc_list != NULL) {
crm_free(*rsc_list);
+ crm_malloc0(*uuid_list, sizeof(char)*list_len);
+ CRM_ASSERT(*uuid_list != NULL);
+ uuid_list_s = *uuid_list;
+ uuid_len = 0;
}
if(node_list != NULL) {
crm_free(*node_list);
+ crm_malloc0(*node_list, sizeof(char)*list_len);
+ CRM_ASSERT(*node_list != NULL);
+ node_list_s = *node_list;
+ node_len = 0;
}
if(uuid_list != NULL) {
crm_free(*uuid_list);
- }
-
- crm_malloc0(*rsc_list, sizeof(char)*list_len);
- CRM_ASSERT(*rsc_list != NULL);
- rsc_list_s = *rsc_list;
- rsc_len = 0;
-
- crm_malloc0(*node_list, sizeof(char)*list_len);
- CRM_ASSERT(*node_list != NULL);
- node_list_s = *node_list;
- node_len = 0;
-
- crm_malloc0(*uuid_list, sizeof(char)*list_len);
- CRM_ASSERT(*uuid_list != NULL);
- uuid_list_s = *uuid_list;
- uuid_len = 0;
+ crm_malloc0(*rsc_list, sizeof(char)*list_len);
+ CRM_ASSERT(*rsc_list != NULL);
+ rsc_list_s = *rsc_list;
+ rsc_len = 0;
+ }
/* keep BEAM extra happy */
if(rsc_list_s == NULL || node_list_s == NULL || uuid_list_s == NULL) {
@@ -1055,44 +1052,41 @@
last_rsc_id = rsc_id;
last_uuid = uuid;
- if(rsc_len + 1 + strlen(rsc_id) >= list_len) {
- crm_free(*rsc_list);
- crm_free(*node_list);
- crm_free(*uuid_list);
- list_len *= 2;
- goto clone_expand_reallocate;
+ if(rsc_list != NULL) {
+ if(rsc_len + 1 + strlen(rsc_id) >= list_len) {
+ list_len *= 2;
+ 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++;
}
- sprintf(rsc_list_s, "%s ", rsc_id);
- 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);
- crm_free(*uuid_list);
- list_len *= 2;
- goto clone_expand_reallocate;
+ if(node_list != NULL) {
+ if(node_len + 1 + strlen(uname) >= list_len) {
+ list_len *= 2;
+ goto clone_expand_reallocate;
+ }
+ sprintf(node_list_s, "%s ", uname);
+ node_list_s += strlen(uname);
+ node_len += strlen(uname);
+ node_list_s++;
+ node_len++;
}
- sprintf(node_list_s, "%s ", uname);
- 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);
- crm_free(*uuid_list);
- list_len *= 2;
- goto clone_expand_reallocate;
+ if(uuid_list != NULL) {
+ if(uuid_len + 1 + strlen(uuid) >= list_len) {
+ list_len *= 2;
+ goto clone_expand_reallocate;
+ }
+ sprintf(uuid_list_s, "%s ", uuid);
+ uuid_list_s += strlen(uuid);
+ uuid_len += strlen(uuid);
+ uuid_list_s++;
+ uuid_len++;
}
- sprintf(uuid_list_s, "%s ", uuid);
- uuid_list_s += strlen(uuid);
- uuid_len += strlen(uuid);
- uuid_list_s++;
- uuid_len++;
);
}
------------------------------
Message: 2
Date: Thu, 22 Dec 2005 14:05:29 -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 regression.sh
Log Message:
Fix for a recovery bug (partial reocvery of a group)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- native.c 21 Dec 2005 06:46:40 -0000 1.104
+++ native.c 22 Dec 2005 21:05:28 -0000 1.105
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.104 2005/12/21 06:46:40 andrew Exp $ */
+/* $Id: native.c,v 1.105 2005/12/22 21:05:28 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -381,7 +381,7 @@
}
custom_action_order(rsc, start_key(rsc), NULL,
NULL, crm_strdup(key), mon,
- pe_ordering_manditory, data_set);
+ pe_ordering_restart, data_set);
);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- regression.sh 17 Dec 2005 08:56:36 -0000 1.70
+++ regression.sh 22 Dec 2005 21:05:28 -0000 1.71
@@ -145,6 +145,7 @@
do_test group7 "Group colocation"
do_test group8 "Group anti-colocation"
do_test group9 "Group recovery"
+do_test group10 "Group partial recovery"
echo ""
do_test inc0 "Incarnation start "
------------------------------
Message: 3
Date: Thu, 22 Dec 2005 14:05:29 -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/testcases
Added Files:
group10.dot group10.exp group10.xml
Log Message:
Fix for a recovery bug (partial reocvery of a group)
------------------------------
Message: 4
Date: Thu, 22 Dec 2005 21:04:23 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
cluster_info.c
Log Message:
the size of pointer is the size of unsigned long in all platform
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/cluster_info.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- cluster_info.c 22 Dec 2005 06:11:48 -0000 1.2
+++ cluster_info.c 23 Dec 2005 04:04:22 -0000 1.3
@@ -76,7 +76,7 @@
const char * localtion_keys [] = {"id", "rsc"};
const char * colocation_keys [] = {"id", "from", "to", "score"};
-typedef unsigned int POINTER_t;
+typedef unsigned long POINTER_t;
/*************************************
* mgmt lib
*************************************/
@@ -337,11 +337,11 @@
}
/* should be atomic */
- cl_log(LOG_INFO, "insert %s to (private: 0x%0x, array: 0x%0x), type:
%d",
+ cl_log(LOG_INFO, "insert %s to (private: 0x%0lx, array: 0x%0lx), type:
%d",
key, (POINTER_t)private, (POINTER_t)private->array, type);
g_ptr_array_add(private->array, data);
- cl_log(LOG_INFO, "insert %s to (private: 0x%0x, map: 0x%0x), type:
%d",
+ cl_log(LOG_INFO, "insert %s to (private: 0x%0lx, map: 0x%0lx), type:
%d",
key, (POINTER_t)private, (POINTER_t)private->map, type);
g_hash_table_insert(private->map, CIM_STRDUP(key), data);
@@ -378,7 +378,7 @@
CIM_FREE(private);
return;
}
- cl_log(LOG_INFO, "freeing (private: 0x%0x)", (POINTER_t)private);
+ cl_log(LOG_INFO, "freeing (private: 0x%0lx)", (POINTER_t)private);
for ( i = 0; i < private->array->len; i ++ ) {
struct ci_data * data;
data = (struct ci_data *)
@@ -407,7 +407,7 @@
g_hash_table_destroy(private->map);
}
- cl_log(LOG_INFO, "(private: 0x%0x) freed", (POINTER_t)private);
+ cl_log(LOG_INFO, "(private: 0x%0lx) freed", (POINTER_t)private);
CIM_FREE(private);
}
@@ -490,7 +490,7 @@
return zero_data;
}
- cl_log(LOG_INFO, "got %s from (private: 0x%0x, map: 0x%0x), type: %d",
+ cl_log(LOG_INFO, "got %s from (private: 0x%0lx, map: 0x%0lx), type:
%d",
key, (POINTER_t)private, (POINTER_t)private->map, data->type);
return * data;
}
@@ -516,7 +516,7 @@
data = (struct ci_data *)g_ptr_array_index(private->array, index);
if ( data == NULL ) { return zero_data; }
- cl_log(LOG_INFO, "got data %d from (private: 0x%0x, array: 0x%0x),
type: %d",
+ cl_log(LOG_INFO, "got data %d from (private: 0x%0lx, array: 0x%0lx),
type: %d",
index, (POINTER_t)private, (POINTER_t)private->array,
data->type);
return * data;
------------------------------
_______________________________________________
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 65
********************************************
