The Samba-Bugzilla – Attachment 11841 Details for
Bug 11719
CTDB 11.natgw and 49.winbind scripts contain unnecessary smbcontrol commands
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for 4.2, 4.3 and 4.4 cherry-picked from master
0001-ctdb-scripts-Drop-use-of-smbcontrol-winbindd-ip-drop.patch (text/plain), 2.00 KB, created by
Martin Schwenke
on 2016-02-16 01:03:37 UTC
(
hide
)
Description:
Patch for 4.2, 4.3 and 4.4 cherry-picked from master
Filename:
MIME Type:
Creator:
Martin Schwenke
Created:
2016-02-16 01:03:37 UTC
Size:
2.00 KB
patch
obsolete
>From bbeae5542b44245e784663361cbc4ba8d3c593e6 Mon Sep 17 00:00:00 2001 >From: Martin Schwenke <martin@meltin.net> >Date: Mon, 8 Feb 2016 15:55:17 +1100 >Subject: [PATCH] ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped > ..." >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >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 <martin@meltin.net> >Reviewed-by: Ralph Boehme <slow@samba.org> > >Autobuild-User(master): Ralph Böhme <slow@samba.org> >Autobuild-Date(master): Wed Feb 10 14:08:17 CET 2016 on sn-devel-144 > >(cherry picked from commit 519564bb35a0f840bc4d7c8c5a92441c97b49791) >--- > ctdb/config/events.d/11.natgw | 4 ---- > ctdb/config/events.d/49.winbind | 7 ------- > 2 files changed, 11 deletions(-) > >diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw >index aef302c..5e10d1d 100755 >--- a/ctdb/config/events.d/11.natgw >+++ b/ctdb/config/events.d/11.natgw >@@ -98,10 +98,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 () >diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind >index dee3c90..a1ea787 100755 >--- a/ctdb/config/events.d/49.winbind >+++ b/ctdb/config/events.d/49.winbind >@@ -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 "$@" > ;; >-- >2.7.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
amitay
:
review+
Actions:
View
Attachments on
bug 11719
: 11841