diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-06-19 16:35:12 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-07-14 09:57:18 +0200 |
| commit | 74428e5c1463d6c60880ba593c880bc36a8f1ff4 (patch) | |
| tree | 0a47561e9e5bc42c73721323647957771bbd91e2 /ctdb/packaging | |
| parent | 3161d611bb2931019a7d40c7795c12f0b70a903c (diff) | |
| download | samba-74428e5c1463d6c60880ba593c880bc36a8f1ff4.tar.gz | |
ctdb-scripts: Switch NFS checks to new style
Note that the 60.ganesha RPC checks need to be identical to those in
the nfs-checks.d/ directory. This is because the NFS unit test
infrastructure checks output against what should be produced by the
checks in nfs-checks.d/. This is a minor issue, since one of the aims
of this work is to remove the need for a separate 60.ganesha.
In most cases configuration variable CTDB_NFS_DUMP_STUCK_THREADS is
now ignored. This is now handled by passing the desired number of
threads to the command specified in the service_debug_cmd variable in
a .check file.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/packaging')
| -rw-r--r-- | ctdb/packaging/RPM/ctdb.spec.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index ce7d8a629e9..503670023b8 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -125,6 +125,8 @@ install -m755 config/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb # This is a hack. All documents should be installed in /usr/share/doc. rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events.d/README cp config/events.d/README README.eventscripts +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/nfs-checks.d/README +cp config/nfs-checks.d/README README.nfs-checks.d cp config/notify.d.README README.notify.d # Remove "*.old" files @@ -183,11 +185,11 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/ctdb/events.d/70.iscsi %{_sysconfdir}/ctdb/events.d/91.lvs %{_sysconfdir}/ctdb/events.d/99.timeout -%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/10.statd.check -%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/20.nfsd.check -%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/30.lockd.check -%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/40.mountd.check -%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/50.rquotad.check +%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/10.status.check +%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/20.nfs.check +%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/30.nlockmgr.check +%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/40.mountd.check +%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/50.rquotad.check %{_sysconfdir}/ctdb/statd-callout %{_sbindir}/ctdbd %{_sbindir}/ctdbd_wrapper |