diff options
| author | Martin Schwenke <martin@meltin.net> | 2009-07-30 13:57:40 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2009-07-30 13:57:40 +1000 |
| commit | aed71a760ddcb030630f20ead366b446fe7e9d37 (patch) | |
| tree | 3ac11b95c3f6ccbd2c624a04baccd0bfd5b2b38a /ctdb/tests | |
| parent | e47328742de751e389048539b5c633fa3ef15648 (diff) | |
| download | samba-aed71a760ddcb030630f20ead366b446fe7e9d37.tar.gz samba-aed71a760ddcb030630f20ead366b446fe7e9d37.tar.xz samba-aed71a760ddcb030630f20ead366b446fe7e9d37.zip | |
Test suite: complex/31_nfs_tickle.sh should use NFS_TICKLE_SHARED_DIRECTORY.
Rather than hardcoding the location of the shared tickle directory,
attempt to use the value of NFS_TICKLE_SHARED_DIRECTORY from
/etc/sysconfig/nfs on node 0.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 878437a909ea44dfc3635f082e34741ee256e505)
Diffstat (limited to 'ctdb/tests')
| -rwxr-xr-x | ctdb/tests/complex/31_nfs_tickle.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ctdb/tests/complex/31_nfs_tickle.sh b/ctdb/tests/complex/31_nfs_tickle.sh index 45734cc7cd..18df17bf97 100755 --- a/ctdb/tests/complex/31_nfs_tickle.sh +++ b/ctdb/tests/complex/31_nfs_tickle.sh @@ -74,10 +74,15 @@ echo "Source socket is $src_socket" echo "Sleeping for MonitorInterval..." sleep_for $monitor_interval +echo "Trying to determine NFS_TICKLE_SHARED_DIRECTORY..." +try_command_on_node 0 "sed -n -e s@^NFS_TICKLE_SHARED_DIRECTORY=@@p /etc/sysconfig/nfs" || true + +nfs_tickle_shared_directory="${out:-/gpfs/.ctdb/nfs-tickles}" + try_command_on_node $test_node hostname test_hostname=$out -try_command_on_node -v 0 cat /gpfs/.ctdb/nfs-tickles/$test_hostname/$test_ip +try_command_on_node -v 0 cat "${nfs_tickle_shared_directory}/$test_hostname/$test_ip" if [ "${out/${src_socket}/}" != "$out" ] ; then echo "GOOD: NFS connection tracked OK in tickles file." |