Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
5. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Aug 2006 02:51:23 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
All ops are recorded in the op table
Ops that return 7 or 8 are marked as "done" and its up to the PE/TE to decide
what to do
------------------------------
Message: 2
Date: Mon, 14 Aug 2006 02:51:23 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/pengine
Modified Files:
unpack.c
Log Message:
All ops are recorded in the op table
Ops that return 7 or 8 are marked as "done" and its up to the PE/TE to decide
what to do
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/unpack.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- unpack.c 18 Jul 2006 06:17:34 -0000 1.13
+++ unpack.c 14 Aug 2006 08:51:23 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.13 2006/07/18 06:17:34 andrew Exp $ */
+/* $Id: unpack.c,v 1.14 2006/08/14 08:51:23 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1072,8 +1072,7 @@
if(is_stop_action) {
task_status_i = LRM_OP_DONE;
} else {
- CRM_CHECK(task_status_i == LRM_OP_ERROR,
- task_status_i = LRM_OP_ERROR);
+ task_status_i = LRM_OP_ERROR;
}
} else if(EXECRA_RUNNING_MASTER == actual_rc_i) {
@@ -1081,15 +1080,14 @@
|| (rsc->role == RSC_ROLE_MASTER
&& safe_str_eq(task, CRMD_ACTION_STATUS))) {
task_status_i = LRM_OP_DONE;
+
} else {
+ task_status_i = LRM_OP_ERROR;
if(rsc->role != RSC_ROLE_MASTER) {
crm_err("%s reported %s in master mode on %s",
id, rsc->id,
node->details->uname);
}
-
- CRM_CHECK(task_status_i == LRM_OP_ERROR,
- task_status_i = LRM_OP_ERROR);
}
rsc->role = RSC_ROLE_MASTER;
------------------------------
Message: 3
Date: Mon, 14 Aug 2006 02:52:08 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
Remove
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -3 -r1.204 -r1.205
--- lrm.c 14 Aug 2006 08:51:23 -0000 1.204
+++ lrm.c 14 Aug 2006 08:52:08 -0000 1.205
@@ -1461,7 +1461,6 @@
} else {
crm_err("Resource state update failed: %s",
cib_error2string(rc));
- CRM_DEV_ASSERT(rc == cib_ok);
}
free_xml(update);
------------------------------
Message: 4
Date: Mon, 14 Aug 2006 02:52:08 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
ipc.c
Log Message:
Remove
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/ipc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ipc.c 12 Jul 2006 09:31:36 -0000 1.27
+++ ipc.c 14 Aug 2006 08:52:08 -0000 1.28
@@ -1,4 +1,4 @@
-/* $Id: ipc.c,v 1.27 2006/07/12 09:31:36 andrew Exp $ */
+/* $Id: ipc.c,v 1.28 2006/08/14 08:52:08 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -153,7 +153,11 @@
(int)ipc_client->farside_pid);
} else if(ipc_client->conntype == IPC_CLIENT) {
- CRM_CHECK(ipc_client->send_queue->current_qlen <
ipc_client->send_queue->max_qlen, ;);
+ if(ipc_client->send_queue->current_qlen >=
ipc_client->send_queue->max_qlen) {
+ crm_err("Send queue to %d (size=%d) full.",
+ ipc_client->farside_pid,
+ (int)ipc_client->send_queue->max_qlen);
+ }
}
}
/* ipc_client->ops->resume_io(ipc_client); */
------------------------------
Message: 5
Date: Mon, 14 Aug 2006 02:52:31 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/tengine
Modified Files:
events.c utils.c
Log Message:
Remove
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- events.c 22 Jun 2006 12:58:45 -0000 1.21
+++ events.c 14 Aug 2006 08:52:30 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.21 2006/06/22 12:58:45 andrew Exp $ */
+/* $Id: events.c,v 1.22 2006/08/14 08:52:30 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -497,25 +497,13 @@
process_graph_event(crm_data_t *event, const char *event_node)
{
int rc = -1;
- int op_status_i = 0;
const char *magic = NULL;
const char *rsc_id = NULL;
- const char *op_status = NULL;
CRM_ASSERT(event != NULL);
rsc_id = crm_element_value(event, XML_ATTR_ID);
- op_status = crm_element_value(event, XML_LRM_ATTR_OPSTATUS);
magic = crm_element_value(event, XML_ATTR_TRANSITION_MAGIC);
- if(op_status != NULL) {
- op_status_i = crm_parse_int(op_status, NULL);
- if(op_status_i == LRM_OP_PENDING) {
- /* just information that the action was sent */
- crm_debug_2("Ignoring TE initiated updates");
- return;
- }
- }
-
if(magic == NULL) {
crm_log_xml_debug_2(event, "Skipping \"non-change\"");
return;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/utils.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- utils.c 19 Apr 2006 12:24:59 -0000 1.59
+++ utils.c 14 Aug 2006 08:52:30 -0000 1.60
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.59 2006/04/19 12:24:59 andrew Exp $ */
+/* $Id: utils.c,v 1.60 2006/08/14 08:52:30 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -33,53 +33,6 @@
extern cib_t *te_cib_conn;
-const char *
-get_rsc_state(const char *task, op_status_t status)
-{
- if(safe_str_eq(CRMD_ACTION_START, task)) {
- if(status == LRM_OP_PENDING) {
- return CRMD_ACTION_START_PENDING;
- } else if(status == LRM_OP_DONE) {
- return CRMD_ACTION_STARTED;
- } else {
- return CRMD_ACTION_START_FAIL;
- }
-
- } else if(safe_str_eq(CRMD_ACTION_STOP, task)) {
- if(status == LRM_OP_PENDING) {
- return CRMD_ACTION_STOP_PENDING;
- } else if(status == LRM_OP_DONE) {
- return CRMD_ACTION_STOPPED;
- } else {
- return CRMD_ACTION_STOP_FAIL;
- }
-
- } else {
- if(safe_str_eq(CRMD_ACTION_MON, task)) {
- if(status == LRM_OP_PENDING) {
- return CRMD_ACTION_MON_PENDING;
- } else if(status == LRM_OP_DONE) {
- return CRMD_ACTION_MON_OK;
- } else {
- return CRMD_ACTION_MON_FAIL;
- }
- } else {
- const char *rsc_state = NULL;
- if(status == LRM_OP_PENDING) {
- rsc_state = CRMD_ACTION_GENERIC_PENDING;
- } else if(status == LRM_OP_DONE) {
- rsc_state = CRMD_ACTION_GENERIC_OK;
- } else {
- rsc_state = CRMD_ACTION_GENERIC_FAIL;
- }
- crm_warn("Using status \"%s\" for op \"%s\"..."
- " this is still in the experimental stage.",
- rsc_state, task);
- return rsc_state;
- }
- }
-}
-
gboolean
stop_te_timer(crm_action_timer_t *timer)
{
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 14
********************************************
