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: debian by horms from
([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 8 May 2006 14:35:14 -0600 (MDT)
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:
crm_mon.c
Log Message:
Allow crm_mon to be used in a limited capacity even if ncurses wasn't
available at compile time
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_mon.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- crm_mon.c 8 May 2006 12:09:46 -0000 1.21
+++ crm_mon.c 8 May 2006 20:35:13 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Id: crm_mon.c,v 1.21 2006/05/08 12:09:46 andrew Exp $ */
+/* $Id: crm_mon.c,v 1.22 2006/05/08 20:35:13 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -59,7 +59,6 @@
#define OPTARGS "V?i:nrh:cdp:1"
-#if CURSES_ENABLED
void usage(const char *cmd, int exit_status);
void blank_screen(void);
int print_status(crm_data_t *cib);
@@ -155,7 +154,12 @@
as_html_file = crm_strdup(optarg);
break;
case 'c':
+#if CURSES_ENABLED
as_console = TRUE;
+#else
+ printf("You need to have curses available at
compile time to enable console mode\n");
+ argerr++;
+#endif
break;
case '1':
one_shot = TRUE;
@@ -178,7 +182,13 @@
}
if(as_html_file == NULL) {
+#if CURSES_ENABLED
as_console = TRUE;
+#else
+ printf("Defaulting to one-shot mode\n");
+ printf("You need to have curses available at compile time to
enable console mode\n");
+ one_shot = TRUE;
+#endif
}
if(daemonize) {
@@ -663,13 +673,3 @@
close(FD_STDERR);
(void)open(devnull, O_WRONLY); /* Stderr: fd 2 */
}
-
-#else
-int
-main(int argc, char **argv)
-{
- fprintf(stderr, "The use of %s requires ncurses to be available"
- " during the build process\n", crm_system_name);
- exit(1);
-}
-#endif
------------------------------
Message: 2
Date: Mon, 8 May 2006 22:33:47 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
changelog heartbeat-2-dev.files heartbeat-2.files
Log Message:
Debian Packaging Update
Released 2.0.5-1
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- changelog 10 Mar 2006 02:20:01 -0000 1.62
+++ changelog 9 May 2006 04:33:46 -0000 1.63
@@ -1,12 +1,13 @@
-heartbeat-2 (2.0.4-2) UNRELEASED; urgency=low
+heartbeat-2 (2.0.5-1) unstable; urgency=low
+ * New Upstream
* Removed build depenancy on openssl-devel,
as heartbeat no longer uses openssl directly.
(Libraries that heartbeat depends on may in turn
depend on openssl creating an indirect depenancy
or build-dependancy).
- -- Simon Horman <[EMAIL PROTECTED]> Fri, 10 Mar 2006 10:12:24 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Tue, 9 May 2006 11:55:52 +0900
heartbeat-2 (2.0.4-1) unstable; urgency=low
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2-dev.files,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- heartbeat-2-dev.files 8 Mar 2006 03:27:30 -0000 1.6
+++ heartbeat-2-dev.files 9 May 2006 04:33:46 -0000 1.7
@@ -1,4 +1,5 @@
usr/include/clplumbing/GSource.h
+usr/include/clplumbing/GSource_internal.h
usr/include/clplumbing/Gmain_timeout.h
usr/include/clplumbing/apphb_cs.h
usr/include/clplumbing/base64.h
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- heartbeat-2.files 14 Apr 2006 08:06:55 -0000 1.12
+++ heartbeat-2.files 9 May 2006 04:33:46 -0000 1.13
@@ -40,30 +40,21 @@
usr/lib/heartbeat/_pymgmt.so
usr/lib/heartbeat/_pymgmt.so.0
usr/lib/heartbeat/_pymgmt.so.0.0.0
+usr/lib/heartbeat/active-node.png
+usr/lib/heartbeat/add-resource.png
usr/lib/heartbeat/api_test
usr/lib/heartbeat/apphbd
usr/lib/heartbeat/apphbtest
usr/lib/heartbeat/atest
+usr/lib/heartbeat/attrd
usr/lib/heartbeat/base64_md5_test
usr/lib/heartbeat/ccm
usr/lib/heartbeat/ccm_testclient
usr/lib/heartbeat/cib
usr/lib/heartbeat/cibmon
usr/lib/heartbeat/clmtest
+usr/lib/heartbeat/crm.dtd
usr/lib/heartbeat/crmd
-usr/lib/heartbeat/crmtest/1node.sh
-usr/lib/heartbeat/crmtest/2node-empty.sh
-usr/lib/heartbeat/crmtest/2node-fail.sh
-usr/lib/heartbeat/crmtest/2node-fence.sh
-usr/lib/heartbeat/crmtest/2node.sh
-usr/lib/heartbeat/crmtest/3node-fail.sh
-usr/lib/heartbeat/crmtest/3node-rapid.sh
-usr/lib/heartbeat/crmtest/3node.sh
-usr/lib/heartbeat/crmtest/cib_suite.sh
-usr/lib/heartbeat/crmtest/extract.logs
-usr/lib/heartbeat/crmtest/helper.sh
-usr/lib/heartbeat/crmtest/stop.sh
-usr/lib/heartbeat/crmtest/testutils.pl
usr/lib/heartbeat/cts/CIB.py
usr/lib/heartbeat/cts/CM_LinuxHAv2.py
usr/lib/heartbeat/cts/CM_fs.py
@@ -73,8 +64,11 @@
usr/lib/heartbeat/cts/CTSlab.py
usr/lib/heartbeat/cts/CTSproxy.py
usr/lib/heartbeat/cts/CTStests.py
+usr/lib/heartbeat/cts/LSBDummy
usr/lib/heartbeat/cts/OCFIPraTest.py
+usr/lib/heartbeat/cts/OCFMSDummy
usr/lib/heartbeat/cts/extracttests.py
+usr/lib/heartbeat/exit.png
usr/lib/heartbeat/findif
usr/lib/heartbeat/ha.png
usr/lib/heartbeat/ha_config
@@ -93,17 +87,21 @@
usr/lib/heartbeat/ipctransientclient
usr/lib/heartbeat/ipctransientserver
usr/lib/heartbeat/ipfail
+usr/lib/heartbeat/login.png
+usr/lib/heartbeat/logout.png
usr/lib/heartbeat/logtest
usr/lib/heartbeat/lrmadmin
usr/lib/heartbeat/lrmd
usr/lib/heartbeat/lrmtest/LRMBasicSanityCheck
usr/lib/heartbeat/mach_down
+usr/lib/heartbeat/master-resource.png
usr/lib/heartbeat/mgmtcmd.py
usr/lib/heartbeat/mgmtd
usr/lib/heartbeat/mgmtdtest
usr/lib/heartbeat/mlock
usr/lib/heartbeat/ocf-shellfuncs
usr/lib/heartbeat/pengine
+usr/lib/heartbeat/pingd
usr/lib/heartbeat/plugins/AppHBNotification/recmgr.so
usr/lib/heartbeat/plugins/HBauth/crc.so
usr/lib/heartbeat/plugins/HBauth/md5.so
@@ -126,11 +124,16 @@
usr/lib/heartbeat/ptest
usr/lib/heartbeat/pymgmt.py
usr/lib/heartbeat/recoverymgrd
+usr/lib/heartbeat/remove-resource.png
usr/lib/heartbeat/req_resource
usr/lib/heartbeat/send_arp
+usr/lib/heartbeat/slave-resource.png
+usr/lib/heartbeat/standby-node.png
+usr/lib/heartbeat/start-resource.png
usr/lib/heartbeat/stonithd
usr/lib/heartbeat/stonithdtest/STONITHDBasicSanityCheck
usr/lib/heartbeat/stonithdtest/apitest
+usr/lib/heartbeat/stop-resource.png
usr/lib/heartbeat/tengine
usr/lib/heartbeat/ttest
usr/lib/libapphb.so.0
@@ -192,6 +195,7 @@
usr/lib/ocf/resource.d/heartbeat/ServeRAID
usr/lib/ocf/resource.d/heartbeat/WAS
usr/lib/ocf/resource.d/heartbeat/WinPopup
+usr/lib/ocf/resource.d/heartbeat/Xen
usr/lib/ocf/resource.d/heartbeat/Xinetd
usr/lib/ocf/resource.d/heartbeat/apache
usr/lib/ocf/resource.d/heartbeat/db2
@@ -218,12 +222,15 @@
usr/lib/stonith/plugins/stonith2/ssh.so
usr/lib/stonith/plugins/stonith2/suicide.so
usr/lib/stonith/plugins/stonith2/wti_nps.so
+usr/sbin/attrd_updater
usr/sbin/ccm_tool
usr/sbin/cibadmin
usr/sbin/crm_attribute
usr/sbin/crm_diff
+usr/sbin/crm_failcount
usr/sbin/crm_master
usr/sbin/crm_mon
+usr/sbin/crm_primitive.py
usr/sbin/crm_resource
usr/sbin/crm_standby
usr/sbin/crm_uuid
------------------------------
Message: 3
Date: Tue, 9 May 2006 00:00:07 -0600 (MDT)
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:
add the function to set target_role
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- mgmt_crm.c 14 Apr 2006 09:03:20 -0000 1.30
+++ mgmt_crm.c 9 May 2006 06:00:06 -0000 1.31
@@ -79,6 +79,7 @@
static char* on_get_rsc_params(char* argv[], int argc);
static char* on_update_rsc_params(char* argv[], int argc);
static char* on_delete_rsc_param(char* argv[], int argc);
+static char* on_set_target_role(char* argv[], int argc);
static char* on_get_rsc_ops(char* argv[], int argc);
static char* on_update_rsc_ops(char* argv[], int argc);
@@ -362,6 +363,7 @@
reg_msg(MSG_RSC_PARAMS, on_get_rsc_params);
reg_msg(MSG_UP_RSC_PARAMS, on_update_rsc_params);
reg_msg(MSG_DEL_RSC_PARAM, on_delete_rsc_param);
+ reg_msg(MSG_SET_TARGET_ROLE, on_set_target_role);
reg_msg(MSG_RSC_OPS, on_get_rsc_ops);
reg_msg(MSG_UP_RSC_OPS, on_update_rsc_ops);
@@ -1171,6 +1173,53 @@
}
return cl_strdup(MSG_OK);
}
+
+char*
+on_set_target_role(char* argv[], int argc)
+{
+ int rc;
+ crm_data_t* fragment = NULL;
+ crm_data_t* cib_object = NULL;
+ crm_data_t* output;
+ char xml[MAX_STRLEN];
+ char buf[MAX_STRLEN];
+ char prefix[MAX_STRLEN];
+ char suffix[MAX_STRLEN];
+
+ if(get_fix(argv[1], prefix, suffix) == -1) {
+ return cl_strdup(MSG_FAIL);
+ }
+
+ snprintf(xml, MAX_STRLEN,
+ "%s<instance_attributes><attributes>", prefix);
+ snprintf(buf, MAX_STRLEN,
+ "<nvpair id=\"%s_target_role\" " \
+ "name=\"target_role\" value=\"%s\"/>",
+ argv[1], argv[2]);
+ strncat(xml, buf, MAX_STRLEN);
+
+ strncat(xml, "</attributes></instance_attributes>", MAX_STRLEN);
+ strncat(xml, suffix, MAX_STRLEN);
+
+ cib_object = string2xml(xml);
+ if(cib_object == NULL) {
+ return cl_strdup(MSG_FAIL);
+ }
+ mgmt_log(LOG_INFO, "xml:%s",xml);
+ fragment = create_cib_fragment(cib_object, "resources");
+
+ rc = cib_conn->cmds->update(
+ cib_conn, "resources", fragment, &output,
cib_sync_call);
+
+ free_xml(fragment);
+ free_xml(cib_object);
+ if (rc < 0) {
+ return failed_msg(output, rc);
+ }
+ free_xml(output);
+ return cl_strdup(MSG_OK);
+}
+
/* resource operations */
char*
on_get_rsc_ops(char* argv[], int argc)
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 19
********************************************
