Skip to content

Commit

Permalink
ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped ..."
Browse files Browse the repository at this point in the history
This is unnecessary in Samba >= 4.0 because winbindd monitors IP
address itself and no longer needs to be told when they are dropped.
The smbcontrol commands can hang if a node has recovery mode active
because smbcontrol is unable to connect to the registry.  Therefore,
the smbcontrol commands should be removed.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11719

Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>

Autobuild-User(master): Ralph Böhme <[email protected]>
Autobuild-Date(master): Wed Feb 10 14:08:17 CET 2016 on sn-devel-144
  • Loading branch information
martin-schwenke authored and slowfranklin committed Feb 10, 2016
1 parent 574313a commit 519564b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
4 changes: 0 additions & 4 deletions ctdb/config/events.d/11.natgw
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,6 @@ natgw_set_slave ()
_net="${_net_gw%@*}"
ip route add "$_net" via "$_natgwip" metric 10
done

# Make sure winbindd does not stay bound to this address if we are
# no longer NATGW master
smbcontrol winbindd ip-dropped $CTDB_NATGW_PUBLIC_IP >/dev/null 2>&1
}

natgw_ensure_master ()
Expand Down
7 changes: 0 additions & 7 deletions ctdb/config/events.d/49.winbind
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,6 @@ case "$1" in
ctdb_check_command wbinfo -p
;;

takeip|releaseip)
iface=$2
ip=$3
maskbits=$4

smbcontrol winbindd ip-dropped $ip >/dev/null 2>/dev/null
;;
*)
ctdb_standard_event_handler "$@"
;;
Expand Down

0 comments on commit 519564b

Please sign in to comment.