mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
Eventscripts: fix regression in 60.nfs export checking.
Commit 35a60a63a9b5c7d98dde514ae552239506b691c9 introduced a regression, reported by "Jonathan Buzzard" <J.Buzzard@dundee.ac.uk>, as follows: Basically the use of sed in the following code snippet does not work for long exports where exportfs wraps the host or network onto the next line. exportfs | grep -v '^#' | grep '^/' | sed -e 's/[[:space:]]*[^[:space:]]*$//' | ctdb_check_directories The result is that the you get lots of blank lines being sent to ctdb_check_directories which causes the host to be marked as unhealthy and then thrashing sets in of the managed IP's making the whole cluster unusable. This tightens up the sed expression so that it is less likely to produce a spurious empty line. It also removes an unnecessary "grep -v". Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit bd39b91ad12fd05271a7fced0e6f9d8c4eba92e6)
This commit is contained in:
parent
f9e58b502f
commit
1971336200
@ -61,9 +61,9 @@ case "$1" in
|
||||
monitor)
|
||||
# and that its directories are available
|
||||
[ "$CTDB_NFS_SKIP_SHARE_CHECK" = "yes" ] || {
|
||||
exportfs | grep -v '^#' | grep '^/' |
|
||||
sed -e 's/[[:space:]]\+[^[:space:]]*$//' |
|
||||
ctdb_check_directories
|
||||
exportfs -v | grep '^/' |
|
||||
sed -r -e 's@[[:space:]]+[^[:space:]()]+\([^[:space:]()]+\)$@@' |
|
||||
ctdb_check_directories
|
||||
} || exit $?
|
||||
|
||||
update_tickles 2049
|
||||
|
Loading…
Reference in New Issue
Block a user