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: heartbeat by zhenh from
([email protected])
2. Linux-HA CVS: mgmt by sunjd from
([email protected])
3. Linux-HA CVS: mgmt by sunjd from
([email protected])
4. Linux-HA CVS: lib by sunjd from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 6 Dec 2005 22:41:33 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/lib
Modified Files:
BasicSanityCheck.in
Log Message:
add check for management daemon
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/BasicSanityCheck.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- BasicSanityCheck.in 7 Nov 2005 22:50:56 -0000 1.88
+++ BasicSanityCheck.in 7 Dec 2005 05:41:33 -0000 1.89
@@ -39,6 +39,7 @@
[EMAIL PROTECTED]@/cl_status
APPHBTEST=$HBLIB/apphbtest
IPCTEST=$HBLIB/ipctest
+MGMTDTEST=$HBLIB/mgmtdtest
LRMTEST=$HBLIB/lrmtest/LRMBasicSanityCheck
STONITHDTEST=$HBLIB/stonithdtest/STONITHDBasicSanityCheck
CRMTEST=$HBLIB/crmtest/1node.sh
@@ -206,6 +207,27 @@
# #useapphbd no
# !
}
+GenerateMgmtdCrmdHaCf() {
+ cat <<-! >$1
+ # $IDENTSTRING
+ logfile /dev/null
+ debugfile $LOGFILE
+ keepalive 10ms
+ debug 1
+ deadtime 5
+ initdead 5
+ mcast $INTERFACE $MCASTIP 694 0 0
+ #bcast $INTERFACE
+ ping 127.0.0.1
+ ping_group pingus_please 127.0.0.1
+ node $LOCALNODE $DUMMYNODE
+ use_logd off
+ crm yes
+ apiauth mgmtd uid=root
+ respawn root $HBLIB/mgmtd -t
+ !
+ chmod 644 $1
+}
GenerateHaResources() {
cat <<-! >$1
@@ -774,6 +796,56 @@
rm $CRM_LOG
}
+TestMgmtd() {
+ if [ ! -f $MGMTDTEST ]; then
+ return 0
+ fi
+ GenerateMgmtdCrmdHaCf $HADIR/ha.cf $HADIR/ha_logd.cf
+ echo "Starting Mgmtd tests" | tee -a $LOGFILE
+
+ if
+ ! HBStart
+ then
+ echo "cannot start heartbeat, so donnot start mgmt daemon
test." | tee -a $LOGFILE
+ return 1
+ fi
+
+ i=0
+ while
+ [ "$i" -lt 10 ]
+ do
+ if
+ $CLSTATUS hbstatus >/dev/null 2>&1
+ then
+ break
+ else
+ sleep 1
+ fi
+ i=`expr "$i" + 1`
+ done
+
+ if
+ ! $CLSTATUS hbstatus >/dev/null 2>&1
+ then
+ echo "There are internal errors in heartbeat, so donnot start
mgmt daemon test." | tee -a $LOGFILE
+ return 1
+ fi
+
+ sleep 10
+ $MGMTDTEST > $LOGFILE 2>&1
+ ret=$?
+ if [ $ret != 0 ]; then
+ errcount=`expr $errcount + 1`
+ echo "Mgmtd test failed." | tee -a $LOGFILE
+ else
+ echo "Mgmtd test passed."
+ fi
+
+ HBStop
+
+
+}
+
SNMPAgentTest() {
if
[ ! -f $SNMPAGENTTEST ]
@@ -855,6 +927,7 @@
StonithDaemonTest
TestCRM
SNMPAgentTest
+#TestMgmtd
ls -l $HADIR/core* 2>/dev/null
if
------------------------------
Message: 2
Date: Wed, 7 Dec 2005 02:16:27 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
Makefile.am
Log Message:
make file polish
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 7 Dec 2005 05:28:02 -0000 1.4
+++ Makefile.am 7 Dec 2005 09:16:26 -0000 1.5
@@ -31,7 +31,7 @@
halib_PROGRAMS = mgmtdtest
mgmtdtest_SOURCES = mgmtdtest.c
-mgmtdtest_LDFLAGS = $(top_builddir)/lib/$(MGMT_DIR)/libmgmtclient.la \
+mgmtdtest_LDADD = $(top_builddir)/lib/$(MGMT_DIR)/libmgmtclient.la \
$(top_builddir)/lib/$(MGMT_DIR)/libmgmttls.la \
- $(top_builddir)/lib/$(MGMT_DIR)/libmgmtcommon.la \
- `libgnutls-config --libs`
+ $(top_builddir)/lib/$(MGMT_DIR)/libmgmtcommon.la
+mgmtdtest_LDFLAGS = `libgnutls-config --libs`
------------------------------
Message: 3
Date: Wed, 7 Dec 2005 02:31:28 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
Makefile.am
Log Message:
makefile polish
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 6 Dec 2005 16:14:11 -0000 1.3
+++ Makefile.am 7 Dec 2005 09:31:27 -0000 1.4
@@ -1,6 +1,6 @@
#
# Author: Sun Jiang Dong <[EMAIL PROTECTED]>
-# Copyright (c) 2002 International Business Machines
+# Copyright (c) 2005 International Business Machines
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -39,32 +39,21 @@
halib_PROGRAMS = mgmtd
mgmtd_SOURCES = mgmtd.c
-mgmtd_LDFLAGS = $(top_builddir)/lib/mgmt/libmgmtclient.la \
+mgmtd_LDADD = $(top_builddir)/lib/mgmt/libmgmtclient.la \
$(top_builddir)/lib/mgmt/libmgmttls.la \
$(top_builddir)/mgmt/daemon/libmgmt.la \
$(top_builddir)/lib/$(LRM_DIR)/liblrm.la \
$(top_builddir)/lib/mgmt/libmgmtcommon.la \
$(COMMONLIBS)
-mgmtd_DEPENDENCIES = $(top_builddir)/lib/mgmt/libmgmtclient.la \
- $(top_builddir)/lib/mgmt/libmgmttls.la \
- $(top_builddir)/mgmt/daemon/libmgmt.la \
- $(top_builddir)/lib/mgmt/libmgmtcommon.la \
- $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
lib_LTLIBRARIES = libmgmt.la
libmgmt_la_SOURCES = mgmt_lib.c mgmt_crm.c mgmt_lrm.c mgmt_hb.c
-libmgmt_la_LDFLAGS = $(COMMONLIBS) $(top_builddir)/lib/mgmt/libmgmttls.la \
- $(top_builddir)/lib/crm/cib/libcib.la \
- $(top_builddir)/lib/crm/common/libcrmcommon.la \
- $(top_builddir)/lib/apphb/libapphb.la \
- $(top_builddir)/crm/pengine/libpengine.la
\
- $(top_builddir)/lib/hbclient/libhbclient.la \
- $(CURSESLIBS) `libgnutls-config --libs` \
- -lpam -ldl
libmgmt_la_CFLAGS = $(INCLUDES)
-libmgmt_la_DEPENDENCIES = $(top_builddir)/lib/mgmt/libmgmttls.la \
- $(top_builddir)/lib/crm/cib/libcib.la \
+libmgmt_la_LDFLAGS = `libgnutls-config --libs`
+libmgmt_la_LIBADD = $(top_builddir)/lib/mgmt/libmgmttls.la \
+ $(top_builddir)/lib/crm/cib/libcib.la \
$(top_builddir)/lib/crm/common/libcrmcommon.la \
$(top_builddir)/lib/apphb/libapphb.la \
$(top_builddir)/crm/pengine/libpengine.la \
- $(top_builddir)/lib/hbclient/libhbclient.la
+ $(top_builddir)/lib/hbclient/libhbclient.la \
+ $(COMMONLIBS) $(CURSESLIBS)
------------------------------
Message: 4
Date: Wed, 7 Dec 2005 02:36:14 -0700 (MST)
From: [email protected]
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/mgmt
Modified Files:
Makefile.am
Log Message:
makefile update
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/mgmt/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 6 Dec 2005 14:59:55 -0000 1.3
+++ Makefile.am 7 Dec 2005 09:36:14 -0000 1.4
@@ -1,6 +1,6 @@
#
# Author: Sun Jiang Dong <[EMAIL PROTECTED]>
-# Copyright (c) 2004 International Business Machines
+# Copyright (c) 2005 International Business Machines
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -32,21 +32,29 @@
lib_LTLIBRARIES = libmgmttls.la libmgmtclient.la libmgmtcommon.la
libmgmttls_la_SOURCES = mgmt_tls_lib.c
-libmgmttls_la_LDFLAGS = $(COMMONLIBS) `libgnutls-config --libs`
+libmgmttls_la_LIBADD = $(COMMONLIBS)
+libmgmttls_la_LDFLAGS = `libgnutls-config --libs`
libmgmttls_la_CFLAGS = $(INCLUDES) `libgnutls-config --cflags`
libmgmtclient_la_SOURCES = mgmt_client_lib.c
-libmgmtclient_la_LDFLAGS = $(COMMONLIBS) $(top_builddir)/lib/mgmt/libmgmttls.la
+libmgmtclient_la_LIBADD = $(COMMONLIBS) libmgmttls.la
libmgmtclient_la_CFLAGS = $(INCLUDES)
-libmgmtclient_la_DEPENDENCIES = $(top_builddir)/lib/mgmt/libmgmttls.la
libmgmtcommon_la_SOURCES = mgmt_common_lib.c
-libmgmtcommon_la_LDFLAGS = $(COMMONLIBS)
+libmgmtcommon_la_LIBADD = $(COMMONLIBS)
libmgmtcommon_la_CFLAGS = $(INCLUDES)
+halib_LTLIBRARIES = _pymgmt.la
+_pymgmt_la_SOURCES = pymgmt_wrap.c mgmt_client_lib.c mgmt_tls_lib.c
mgmt_common_lib.c
+_pymgmt_la_CFLAGS = -I$(includedir)/@PYTHON_HEADER_DIR@
-I$(top_builddir)/include -w
+_pymgmt_la_LDFLAGS = -module `libgnutls-config --libs`
+
+halib_SCRIPTS = pymgmt.py
+
+pymgmt_wrap.c : pymgmt.i
+ $(SWIG) -python -o $@ $^
+
install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(mgmtdir)
-chgrp $(apigid) $(DESTDIR)/$(mgmtdir)
chmod 770 $(DESTDIR)/$(mgmtdir)
-
-
------------------------------
_______________________________________________
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 13
********************************************
