CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2008-02-20 17:07:56
Modified files:
. : clustermon.spec.in.in ricci.spec.in.in
make : version.in
ricci : Makefile
ricci/docs : Makefile
ricci/init.d : ricci
ricci/modules/cluster/clumon/init.d: modclusterd
Log message:
- Install API docs in /usr/share/doc/
- Don't start services automatically
- More init script tweaks
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.35&r2=1.36
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci.spec.in.in.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.34&r2=1.35
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/docs/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/init.d/ricci.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/init.d/modclusterd.diff?cvsroot=cluster&r1=1.5&r2=1.6
--- conga/clustermon.spec.in.in 2008/01/15 04:41:41 1.35
+++ conga/clustermon.spec.in.in 2008/02/20 17:07:55 1.36
@@ -18,7 +18,7 @@
Name: clustermon
Version: @@VERS@@
Release: @@REL@@%{?dist}
-License: GPL
+License: GPLv2
URL: http://sources.redhat.com/cluster/conga
Group: System Environment/Base
@@ -186,61 +186,5 @@
%changelog
-* Wed Sep 19 2007 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-1
-- Fixed bz317541 (Conga displays quorum status incorrectly when qdisk is used)
-
-* Mon Aug 20 2007 Ryan McCabe <[EMAIL PROTECTED]> 0.10.0-5
-- Fixed bz253341 (failure to start cluster service which had been modifed for
correction)
-- Fixed bz230451 (fence_xvm.key file is not automatically created. Should have
a least a default)
-- Fixed bz249351 (conga reports that ricci agent is unresponsive even though
it's running)
-- Fixed bz230454 (Unable to configure a virtual service)
-- Performance improvements.
-- Make the clustermon init script more LSB-compliant
-
-* Tue Mar 20 2007 Stanko Kupcevic <[EMAIL PROTECTED]> 0.9.3-2
-- Do not fail on i18n machines
-- Improved bz218941: Conga/luci - cannot add node to cluster via luci web app
-- Fixed bz225747 (Create/delete cluster - then access disk on node = Generic
error on host: cluster tools: cman_tool errored)
-
-* Fri Nov 17 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.9.1-1
-- version bump
-
-* Wed Nov 01 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-23
-- version bump
-
-* Tue Oct 31 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-22
-- Version bump
-
-* Wed Oct 25 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-21
-- 211942: Xenvm moniker must be eradicated
-
-* Wed Oct 16 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-20
-- cluster module: mark services as being xenvms, in status report
-
-* Wed Oct 16 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-19
-- Fixed bz 206571 (clustat changed output)
-- modclusterd startup/shutdown improvements
-
-* Fri Oct 06 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-18
-- Add purge_conf argument to stop_node modcluster call (bz202314)
-
-* Wed Oct 04 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-17
-- Version bump
-
-* Fri Sep 25 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-16
-- Suppress msgs from init script (bz204235)
-
-* Fri Aug 21 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-14
-- Version bump
-
-* Fri Aug 18 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-13
-- Version bump
-
-* Wed Aug 16 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-12
-- Move modcluster from /usr/sbin to /usr/libexec
-- Implement support for Cluster Suite 5
-- Don't auto-start modclusterd after installation, do it manually
-
-* Wed Aug 09 2006 Stanko Kupcevic <[EMAIL PROTECTED]> 0.8-11
-- Spinoff: separate clustermon.srpm (modcluster, cluster-snmp and
- cluster-cim) from conga.srpm
+* Wed Feb 20 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-1
+- Initial build.
--- conga/ricci.spec.in.in 2008/02/19 18:37:39 1.1
+++ conga/ricci.spec.in.in 2008/02/20 17:07:55 1.2
@@ -129,7 +129,6 @@
fi
exit 0
-
%changelog
-* Tue Jan 22 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-0
-- Empty
+* Wed Feb 20 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-1
+- Initial build.
--- conga/make/version.in 2007/10/09 20:24:42 1.34
+++ conga/make/version.in 2008/02/20 17:07:55 1.35
@@ -1,6 +1,2 @@
-VERSION=0.12.0
-RELEASE=1_UNRELEASED
-# Remove "_UNRELEASED" at release time.
-# Put release num at the beggining,
-# so that after it gets released, it has
-# seniority over UNRELEASED one
+VERSION=0.13.0
+RELEASE=1
--- conga/ricci/Makefile 2008/02/19 18:37:40 1.15
+++ conga/ricci/Makefile 2008/02/20 17:07:55 1.16
@@ -34,8 +34,8 @@
${MAKE} -C modules install
${MAKE} -C init.d install
${MAKE} -C pam.d install
- ${MAKE} -C docs install
${INSTALL_DIR} ${docdir}/ricci-${VERSION}/
+ ${MAKE} -C docs install
${INSTALL_FILE} COPYING ${docdir}/ricci-${VERSION}/
install_clustermon:
--- conga/ricci/docs/Makefile 2008/02/19 18:37:40 1.1
+++ conga/ricci/docs/Makefile 2008/02/20 17:07:55 1.2
@@ -1,3 +1,32 @@
+################################################################################
+##
+## Copyright (C) 2005-2008 Red Hat, Inc. All rights reserved.
+##
+## This copyrighted material is made available to anyone wishing to use,
+## modify, copy, or redistribute it subject to the terms and conditions
+## of the GNU General Public License v.2.
+##
+################################################################################
+
+include ../make/version.in
+include ../make/defines.mk
+
all:
install:
+ $(INSTALL_FILE) cluster_api.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) logging_api.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) modules_common.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) modules.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) reboot_api.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) ricci_api.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) rpm_api.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) service_api.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) storage_api.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) storage-bds.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) storage-bd_template.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) storage-content.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) storage-content_template.html
${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) storage-mappers.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) storage-mapper_template.html ${docdir}/ricci-${VERSION}/
+ $(INSTALL_FILE) variables.html ${docdir}/ricci-${VERSION}/
--- conga/ricci/init.d/ricci 2008/02/19 22:49:30 1.14
+++ conga/ricci/init.d/ricci 2008/02/20 17:07:55 1.15
@@ -73,8 +73,13 @@
}
ricci_status() {
- status -p "$PIDFILE" "$RICCID"
- ricci_up=$?
+ if [ -f "$PIDFILE" ]; then
+ status -p "$PIDFILE" "$RICCID"
+ ricci_up=$?
+ else
+ status "$RICCID"
+ ricci_up=$?
+ fi
return $ricci_up
}
@@ -95,7 +100,7 @@
max_wait=10
cur_wait=0
- while [ $ret -eq 0 ] && [ $cur_wait -lt $max_wait ]; do
+ while [ "$ret" -eq 0 ] && [ $cur_wait -lt $max_wait ]; do
sleep 1
cur_wait=`expr $cur_wait + 1`
ricci_status >& /dev/null
@@ -107,21 +112,19 @@
if [ "$ret" -ne 0 ]; then
rm -f -- "$PIDFILE" "$LOCKFILE"
- /usr/bin/logger -t "$RICCID" -- "shutdown succeeded"
return 0
fi
- /usr/bin/logger -t "$RICCID" -- "shutdown failed"
return 1
}
case $1 in
start)
service messagebus status >&/dev/null
- if [ $? -ne 0 ]; then
+ if [ "$?" -ne 0 ]; then
service messagebus start
service messagebus status >&/dev/null
- if [ $? -ne 0 ]; then
+ if [ "$?" -ne 0 ]; then
/usr/bin/logger -t "$RICCID" -- "messagebus
startup failed"
failure "not starting $RICCID"
exit 1
@@ -129,10 +132,10 @@
fi
service oddjobd status >&/dev/null
- if [ $? -ne 0 ]; then
+ if [ "$?" -ne 0 ]; then
service oddjobd start
service oddjobd status >&/dev/null
- if [ $? -ne 0 ]; then
+ if [ "$?" -ne 0 ]; then
/usr/bin/logger -t "$RICCID" -- "oddjob startup
failed"
failure "not starting $RICCID"
exit 1
@@ -140,18 +143,20 @@
fi
service saslauthd start >&/dev/null
+
ssl_certs_ok
- if [ $? -ne 0 ] ; then
+ if [ "$?" -ne 0 ] ; then
generate_ssl_certs
fi
+
check_ricci_lockfiles
NewUID=`grep "^$RUNASUSER:" /etc/passwd | cut -d: -f3`
echo -n $"Starting $ID: "
daemon "$RICCID" -u "$NewUID"
echo
- rtrn=$?
+ ret=$?
- if [ $rtrn -eq 0 ]; then
+ if [ "$ret" -eq 0 ]; then
touch -- "$LOCKFILE"
/usr/bin/logger -t $RICCID -- "startup succeeded"
else
@@ -162,39 +167,45 @@
restart)
$0 stop
$0 start
- rtrn=$?
+ ret=$?
;;
status)
ricci_status
- rtrn=$?
+ ret=$?
;;
stop)
echo -n "Shutting down $ID: "
ricci_stop
+ ret=$?
+ if [ "$ret" -eq 0 ]; then
+ /usr/bin/logger -t "$RICCID" -- "shutdown succeeded"
+ else
+ /usr/bin/logger -t "$RICCID" -- "shutdown failed"
+ fi
echo
;;
condrestart)
- if [ -f ${PIDFILE} ] ; then
+ if [ -f "$PIDFILE" ]; then
$0 restart
- rtrn=$?
+ ret=$?
fi
;;
try-restart)
- rtrn=3
+ ret=3
;;
reload)
- rtrn=3
+ ret=3
;;
*)
echo "Usage: $0 {start|stop|status|restart|condrestart|reload}"
- rtrn=3
+ ret=3
;;
esac
-exit $rtrn
+exit $ret
--- conga/ricci/modules/cluster/clumon/init.d/modclusterd 2008/01/02
20:47:35 1.5
+++ conga/ricci/modules/cluster/clumon/init.d/modclusterd 2008/02/20
17:07:55 1.6
@@ -7,7 +7,7 @@
# any later version.
#
# description: Starts and stops Ricci Cluster Module - cluster monitor
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
#
# Source function library
@@ -37,66 +37,122 @@
# If we're not configured, then don't start anything.
#
[ "${NETWORKING}" = "yes" ] || exit 1
-#[ -f "$CFG_FILE" ] || exit 0
+modclusterd_status() {
+ if [ -f "$PIDFILE" ]; then
+ status -p "$PIDFILE" "$MODCLUSTERD"
+ ret=$?
+ else
+ status "$MODCLUSTERD"
+ ret=$?
+ fi
+ return $ret
+}
+
+check_modclusterd_lockfiles() {
+ modclusterd_status >& /dev/null
+ ret=$?
+ if [ "$ret" -eq 1 ] || [ "$ret" -eq 2 ]; then
+ # stale pid and/or lockfile
+ rm -f -- "$PIDFILE" "$LOCKFILE"
+ fi
+ return 0
+}
+
+modclusterd_stop() {
+ modclusterd_status >& /dev/null
+ ret=$?
+
+ if [ "$ret" -ne 0 ]; then
+ # already stopped - no error
+ check_modclusterd_lockfiles
+ return 0
+ fi
+
+ killproc "$MODCLUSTERD" SIGTERM
+
+ modclusterd_status >& /dev/null
+ ret=$?
+
+ max_wait=10
+ cur_wait=0
+ while [ "$ret" -eq 0 ] && [ $cur_wait -lt $max_wait ]; do
+ sleep 1
+ cur_wait=`expr $cur_wait + 1`
+ modclusterd_status >& /dev/null
+ ret=$?
+ done
+
+ modclusterd_status >& /dev/null
+ ret=$?
+
+ if [ "$ret" -ne 0 ]; then
+ rm -f -- "$PIDFILE" "$LOCKFILE"
+ return 0
+ fi
+
+ return 1
+}
case $1 in
start)
echo -n $"Starting $ID: "
- daemon $MODCLUSTERD
- rtrn=$?
- if [ $rtrn -eq 0 ]; then
- touch $LOCKFILE
- /usr/bin/logger -t $MODCLUSTERD "startup succeeded"
+ check_modclusterd_lockfiles
+ daemon "$MODCLUSTERD"
+ ret=$?
+ if [ "$ret" -eq 0 ]; then
+ touch -- "$LOCKFILE"
+ /usr/bin/logger -t "$MODCLUSTERD" -- "startup succeeded"
else
- /usr/bin/logger -t $MODCLUSTERD "startup failed"
- rtrn=1
+ /usr/bin/logger -t "$MODCLUSTERD" -- "startup failed"
+ ret=1
fi
echo
;;
restart)
$0 stop
- sleep 8
$0 start
- rtrn=$?
+ ret=$?
;;
status)
- status $MODCLUSTERD
- rtrn=$?
+ modclusterd_status
+ ret=$?
;;
stop)
echo -n "Shutting down $ID: "
- killproc $MODCLUSTERD SIGTERM
- rtrn=$?
- if [ $rtrn -eq 0 ]; then
- rm -f $PIDFILE
- rm -f $LOCKFILE
- /usr/bin/logger -t $MODCLUSTERD "shutdown succeeded"
+ modclusterd_stop
+ ret=$?
+ if [ "$ret" -eq 0 ]; then
+ /usr/bin/logger -t "$MODCLUSTERD" -- "shutdown
succeeded"
else
- /usr/bin/logger -t $MODCLUSTERD "shutdown failed"
- rtrn=1
+ /usr/bin/logger -t "$MODCLUSTERD" -- "shutdown failed"
+ ret=1
fi
echo
;;
condrestart)
- if [ -f ${PIDFILE} ] ; then
+ if [ -f "$PIDFILE" ]; then
$0 restart
- rtrn=$?
+ ret=$?
fi
;;
+ try-restart)
+ ret=3
+ ;;
+
reload)
- rtrn=3
+ ret=3
;;
*)
echo $"Usage: $0 {start|stop|reload|restart|status}"
- rtrn=3
+ ret=3
;;
esac
-exit $rtrn
+exit $ret
