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 lars from ([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 27 Mar 2006 02:56:17 -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:
group.c
Log Message:
Remove temporary debugging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/group.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- group.c 27 Mar 2006 05:44:24 -0000 1.56
+++ group.c 27 Mar 2006 09:56:16 -0000 1.57
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.56 2006/03/27 05:44:24 andrew Exp $ */
+/* $Id: group.c,v 1.57 2006/03/27 09:56:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -111,7 +111,6 @@
crm_free(new_rsc->graph_name);
if(data_set->short_rsc_names) {
- crm_err("Using %s for resource name", new_rsc->id);
new_rsc->graph_name = crm_strdup(new_rsc->id);
} else {
new_rsc->graph_name = crm_concat(
------------------------------
Message: 2
Date: Mon, 27 Mar 2006 03:03:55 -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:
Get Started -> Promoted working (should fix bugzilla 884)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- native.c 27 Mar 2006 05:44:24 -0000 1.118
+++ native.c 27 Mar 2006 10:03:55 -0000 1.119
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.118 2006/03/27 05:44:24 andrew Exp $ */
+/* $Id: native.c,v 1.119 2006/03/27 10:03:55 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -66,7 +66,7 @@
/* Next State: Unknown Stopped Started Slave
Master */
/* Unknown */ { RSC_ROLE_UNKNOWN, RSC_ROLE_STOPPED, RSC_ROLE_STOPPED,
RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, },
/* Stopped */ { RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_STARTED,
RSC_ROLE_SLAVE, RSC_ROLE_SLAVE, },
-/* Started */ { RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_STARTED,
RSC_ROLE_SLAVE, RSC_ROLE_UNKNOWN, },
+/* Started */ { RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_STARTED,
RSC_ROLE_SLAVE, RSC_ROLE_MASTER, },
/* Slave */ { RSC_ROLE_STOPPED, RSC_ROLE_STOPPED, RSC_ROLE_UNKNOWN,
RSC_ROLE_SLAVE, RSC_ROLE_MASTER, },
/* Master */ { RSC_ROLE_STOPPED, RSC_ROLE_SLAVE, RSC_ROLE_UNKNOWN,
RSC_ROLE_SLAVE, RSC_ROLE_MASTER, },
};
@@ -76,7 +76,7 @@
/* Next State: Unknown Stopped Started Slave
Master */
/* Unknown */ { RoleError, StopRsc, RoleError, RoleError,
RoleError, },
/* Stopped */ { RoleError, NullOp, StartRsc, StartRsc,
RoleError, },
-/* Started */ { RoleError, StopRsc, NullOp, NullOp,
RoleError, },
+/* Started */ { RoleError, StopRsc, NullOp, NullOp,
PromoteRsc, },
/* Slave */ { RoleError, StopRsc, RoleError, NullOp,
PromoteRsc, },
/* Master */ { RoleError, RoleError, RoleError, DemoteRsc,
NullOp, },
};
------------------------------
Message: 3
Date: Mon, 27 Mar 2006 03:03:56 -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:
master-4.dot master-4.exp master-4.xml
Log Message:
Get Started -> Promoted working (should fix bugzilla 884)
------------------------------
Message: 4
Date: Mon, 27 Mar 2006 06:56:42 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
cluster_provider.c
Log Message:
Non-void function needs to return a defined result, and if an error is
returned, it should be handled. (-Wall catches this.)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/cluster_provider.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- cluster_provider.c 20 Mar 2006 03:25:55 -0000 1.3
+++ cluster_provider.c 27 Mar 2006 13:56:42 -0000 1.4
@@ -355,6 +355,7 @@
cl_log(LOG_INFO, "process_config_data: %s:%s", key, val);
DEBUG_LEAVE();
+ return HA_OK;
}
/* update cluster instance, this will result in modification to the
@@ -387,7 +388,10 @@
CMPIData cmpidata;
cmpidata = CMGetProperty(inst, ClusterMap[i].name, rc);
if ( rc->rc == CMPI_RC_OK ) {
- process_config_data(&ClusterMap[i], cfginfo, cmpidata,
rc);
+ if (process_config_data(&ClusterMap[i], cfginfo,
+ cmpidata, rc) == HA_FAIL) {
+ return HA_FAIL;
+ }
}
}
------------------------------
Message: 5
Date: Mon, 27 Mar 2006 07:52:51 -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/admin
Modified Files:
.cvsignore
Log Message:
CVS ignore updates
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- .cvsignore 30 Oct 2005 10:01:05 -0000 1.14
+++ .cvsignore 27 Mar 2006 14:52:51 -0000 1.15
@@ -17,3 +17,5 @@
crm_standby
crm_master
crm_uuid
+crm_primitive.py
+crm_failcount
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 69
********************************************
