Hi,
Finally got the time to work on this. I have now made it mandatory to have a
"pid file" entry in the rsyncd.conf file for the RA to work.
Please find attached, the patch.
Rgds
Oza
>>> Lars Marowsky-Bree <[EMAIL PROTECTED]> 11/02/06 10:12 PM >>>
On 2006-11-02T08:22:36, Oza Dhairesh <[EMAIL PROTECTED]> wrote:
>Lars, Dejan thanks for the suggestions. After giving it some more
> thought, I think not allowing the user to use rsync daemon with the
> default setup (my default rsyncd.conf file does not have the pid file
> entry) would be too harsh as on most setups I expect just a single
> instance of rsync to be running.
The reason why there's no pid file by default is that, at least on SUSE,
the init script will kill all rsyncd processes on "stop".
We can, however, easily modify the default packaging to include a PID
file.
> instances of rsync daemon running and the config file does not have a
> pid file entry then and then only I can create it manually. This way
> only if a daemon comes up between the time of my testing for it and
> launching of the daemon, there will be error. But as this is a rare case
> on most setups, it should work most of the times.
If you use "startproc", like the init script does, this will not be an
issue. It even has a -p option to write the pidfile for you.
It's perfectly reasonable to expect that people don't just use the
default configuration with the OCF RA; if that's what they wanted to do,
they could simply use the rsyncd LSB script, afterall.
> In case this is not acceptable, do let me know and I will submit the
> RA that disallows starting the daemon if there is no pid file entry in
> the config file. I am attaching just the rsyncd.in for the time being.
> After incorporating comments on this, I shall submit the complete patch.
Sincerely,
Lars Marowsky-Brée
--
High Availability & Clustering
SUSE Labs, Research and Development
SUSE LINUX Products GmbH - A Novell Business -- Charles Darwin
"Ignorance more frequently begets confidence than does knowledge."
___
Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
diff -uprN Heartbeat-Dev-280e2df2ed91/configure.in Heartbeat-Dev/configure.in
--- Heartbeat-Dev-280e2df2ed91/configure.in 2006-11-09 18:21:22.0
+0530
+++ Heartbeat-Dev/configure.in 2006-11-13 14:19:46.560408794 +0530
@@ -2899,6 +2899,7 @@ resources/Makefile
\
resources/OCF/oralsnr \
resources/OCF/portblock \
resources/OCF/Raid1 \
+ resources/OCF/rsyncd\
resources/OCF/pgsql \
resources/OCF/Pure-FTPd \
resources/OCF/SendArp \
diff -uprN Heartbeat-Dev-280e2df2ed91/resources/OCF/Makefile.am
Heartbeat-Dev/resources/OCF/Makefile.am
--- Heartbeat-Dev-280e2df2ed91/resources/OCF/Makefile.am2006-11-09
18:21:22.0 +0530
+++ Heartbeat-Dev/resources/OCF/Makefile.am 2006-11-13 14:20:34.534825727
+0530
@@ -66,6 +66,7 @@ ocf_SCRIPTS= ClusterMon \
pgsql \
Pure-FTPd \
Raid1 \
+ rsyncd \
SendArp \
ServeRAID \
Stateful\
diff -uprN Heartbeat-Dev-280e2df2ed91/resources/OCF/rsyncd.in
Heartbeat-Dev/resources/OCF/rsyncd.in
--- Heartbeat-Dev-280e2df2ed91/resources/OCF/rsyncd.in 1970-01-01
05:30:00.0 +0530
+++ Heartbeat-Dev/resources/OCF/rsyncd.in 2006-11-13 14:31:17.974810750
+0530
@@ -0,0 +1,270 @@
+#!/bin/sh
+#
+# Resource script for rsync daemon
+#
+# Description: Manages rsync daemon as an OCF resource in
+# an High Availability setup.
+#
+# Author: Dhairesh Oza <[EMAIL PROTECTED]>
+# License: GNU General Public License (GPL)
+#
+#
+# usage: $0 {start|stop|status|monitor|validate-all|meta-data}
+#
+# The "start" arg starts rsyncd.
+#
+# The "stop" arg stops it.
+#
+# OCF parameters:
+# OCF_RESKEY_binpath
+# OCF_RESKEY_conffile
+# OCF_RESKEY_bwlimit
+#
+# Note:This RA requires that the rsyncd config files has a "pid file"
+# entry so that it is able to act on the correct process
+##
+# Initialization:
+
+. @hb_libdir@/ocf-shellfuncs
+
[EMAIL PROTECTED]@/run/@HB_PKG@
+USAGE="Usage: $0 {start|stop|status|monitor|validate-all|meta-data}";
+
+##
+
+usage()
+{
+ echo $USAGE >&2
+}
+
+meta_data()
+{
+cat <
+
+
+1.0
+
+This
