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: debian by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: linux-ha by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: lib by sunjd from (linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: mgmt by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 20 Jun 2006 18:48:57 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
heartbeat-2.files
Log Message:
Added some Oracle resource agents - due to Dejan Muhamedagic.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- heartbeat-2.files 12 Jun 2006 08:26:52 -0000 1.23
+++ heartbeat-2.files 21 Jun 2006 00:48:56 -0000 1.24
@@ -204,6 +204,8 @@
usr/lib/ocf/resource.d/heartbeat/LVM
usr/lib/ocf/resource.d/heartbeat/LinuxSCSI
usr/lib/ocf/resource.d/heartbeat/MailTo
+usr/lib/ocf/resource.d/heartbeat/oracle
+usr/lib/ocf/resource.d/heartbeat/oralsnr
usr/lib/ocf/resource.d/heartbeat/Raid1
usr/lib/ocf/resource.d/heartbeat/ServeRAID
usr/lib/ocf/resource.d/heartbeat/VIPArip
------------------------------
Message: 2
Date: Tue, 20 Jun 2006 18:48:57 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Added some Oracle resource agents - due to Dejan Muhamedagic.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -3 -r1.530 -r1.531
--- configure.in 10 Jun 2006 19:10:20 -0000 1.530
+++ configure.in 21 Jun 2006 00:48:56 -0000 1.531
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.530 $) dnl cvs revision
+AC_REVISION($Revision: 1.531 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2743,6 +2743,8 @@
resources/OCF/LinuxSCSI \
resources/OCF/LVM \
resources/OCF/MailTo \
+ resources/OCF/oracle \
+ resources/OCF/oralsnr \
resources/OCF/portblock \
resources/OCF/Raid1 \
resources/OCF/ServeRAID \
------------------------------
Message: 3
Date: Tue, 20 Jun 2006 20:22:52 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/fencing
Modified Files:
stonithd_lib.c
Log Message:
To use the single exit in the second part of signon function
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/fencing/stonithd_lib.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- stonithd_lib.c 20 Jun 2006 05:55:51 -0000 1.28
+++ stonithd_lib.c 21 Jun 2006 02:22:52 -0000 1.29
@@ -154,14 +154,13 @@
rc_tmp= chan_waitout_timeout(chan, DEFAULT_TIMEOUT);
} while (rc_tmp == IPC_INTR);
+ ZAPMSG(request);
if (IPC_OK != rc_tmp) {
stdlib_log(LOG_ERR, "%s:%d: waitout failed."
, __FUNCTION__, __LINE__);
return ST_FAIL;
}
- ZAPMSG(request);
-
/* Read the reply... */
stdlib_log(LOG_DEBUG, "waiting for the signon reply msg.");
@@ -193,60 +192,60 @@
ZAPMSG(reply);
if (ST_OK != rc) { /* Something wrong when try to sign on to stonithd */
- stonithd_signoff();
- return rc;
+ goto end;
}
- /* Signed on to stonithd daemon */
+ /* Connect to the stonith deamon via callback channel */
wchanattrs = g_hash_table_new(g_str_hash, g_str_equal);
g_hash_table_insert(wchanattrs, path, cbsock);
- /* Connect to the stonith deamon via callback channel */
cbchan = ipc_channel_constructor(IPC_ANYTYPE, wchanattrs);
g_hash_table_destroy(wchanattrs);
if (cbchan == NULL) {
stdlib_log(LOG_ERR, "stonithd_signon: Can't construct "
"callback channel to stonithd.");
- stonithd_signoff();
- return ST_FAIL;
+ rc = ST_FAIL;
+ goto end;
}
if (cbchan->ops->initiate_connection(cbchan) != IPC_OK) {
stdlib_log(LOG_ERR, "stonithd_signon: Can't initiate "
"connection with the callback channel");
- stonithd_signoff();
- return ST_FAIL;
+ rc = ST_FAIL;
+ goto end;
}
if ( (reply = msgfromIPC_noauth(cbchan)) == NULL ) {
stdlib_log(LOG_ERR, "%s:%d: failed to fetch reply via the "
" callback channel"
, __FUNCTION__, __LINE__);
- stonithd_signoff();
- return ST_FAIL;
+ rc = ST_FAIL;
+ goto end;
}
if ( TRUE == is_expected_msg(reply, F_STONITHD_TYPE, ST_APIRPL,
F_STONITHD_APIRPL, ST_RSIGNON, TRUE) ) {
if ( ((tmpstr=cl_get_string(reply, F_STONITHD_APIRET)) != NULL)
&& (STRNCMP_CONST(tmpstr, ST_APIOK) == 0) ) {
- rc = ST_OK;
stdlib_log(LOG_DEBUG, "%s:%d: Got a good signon reply "
"via the callback channel."
, __FUNCTION__, __LINE__);
} else {
- stdlib_log(LOG_WARNING, "%s:%d: Got a bad signon reply "
+ rc = ST_FAIL;
+ stdlib_log(LOG_ERR, "%s:%d: Got a bad signon reply "
"via the callback channel."
, __FUNCTION__, __LINE__);
}
} else {
+ rc = ST_FAIL;
stdlib_log(LOG_ERR, "stonithd_signon: "
"Got an unexpected message via the callback chan.");
}
ZAPMSG(reply);
- /* Something wrong when try to sign to stonithd via callback channel */
+end:
if (ST_OK != rc) {
+ /* Something wrong when confirm via callback channel */
stonithd_signoff();
}
------------------------------
Message: 4
Date: Tue, 20 Jun 2006 20:28:28 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
use #default to mark the unsetted attributes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- mgmt_crm.c 20 Jun 2006 05:18:06 -0000 1.57
+++ mgmt_crm.c 21 Jun 2006 02:28:28 -0000 1.58
@@ -1207,31 +1207,31 @@
ret = mgmt_msg_append(ret, ha_msg_value(attrs, "type"));
}
value = ha_msg_value(attrs, "is_managed");
- ret = mgmt_msg_append(ret, value?value:"default");
+ ret = mgmt_msg_append(ret, value?value:"#default");
value = ha_msg_value(attrs, "restart_type");
- ret = mgmt_msg_append(ret, value?value:"ignore");
+ ret = mgmt_msg_append(ret, value?value:"#default");
value = ha_msg_value(attrs, "multiple_active");
- ret = mgmt_msg_append(ret, value?value:"stop_start");
+ ret = mgmt_msg_append(ret, value?value:"#default");
value = ha_msg_value(attrs, "resource_stickiness");
- ret = mgmt_msg_append(ret, value?value:"0");
+ ret = mgmt_msg_append(ret, value?value:"#default");
switch (rsc->variant) {
case pe_group:
value = ha_msg_value(attrs, "ordered");
- ret = mgmt_msg_append(ret, value?value:"true");
+ ret = mgmt_msg_append(ret, value?value:"#default");
value = ha_msg_value(attrs, "collocated");
- ret = mgmt_msg_append(ret, value?value:"true");
+ ret = mgmt_msg_append(ret, value?value:"#default");
break;
case pe_clone:
case pe_master:
value = ha_msg_value(attrs, "notify");
- ret = mgmt_msg_append(ret, value?value:"false");
+ ret = mgmt_msg_append(ret, value?value:"#default");
value = ha_msg_value(attrs, "globally_unique");
- ret = mgmt_msg_append(ret, value?value:"true");
+ ret = mgmt_msg_append(ret, value?value:"#default");
value = ha_msg_value(attrs, "ordered");
- ret = mgmt_msg_append(ret, value?value:"false");
+ ret = mgmt_msg_append(ret, value?value:"#default");
value = ha_msg_value(attrs, "interleave");
- ret = mgmt_msg_append(ret, value?value:"false");
+ ret = mgmt_msg_append(ret, value?value:"#default");
break;
default:
break;
------------------------------
_______________________________________________
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 31, Issue 67
********************************************
