--- /etc/ctdb/functions.orig 2019-03-21 18:40:32.000000000 +0100 +++ /etc/ctdb/functions 2019-03-26 16:12:56.974453412 +0100 @@ -505,7 +505,7 @@ { _ip="$1" - ss -tn state established "src [$_ip]" | awk 'NR > 1 {print $3, $4}' + ss -tn state established "src $_ip" | awk 'NR > 1 {print $3, $4}' } ######################################################## @@ -977,8 +977,8 @@ # Parentheses are needed around the filters for precedence but # the parentheses can't be empty! ss -tn state established \ - "${_ip_filter:+( ${_ip_filter} )}" \ - "${_port_filter:+( ${_port_filter} )}" | + "${_port_filter:+( ${_port_filter} )}" \ + "${_ip_filter}" | awk 'NR > 1 {print $4, $3}' | sort >"$_my_connections" --- /etc/ctdb/nfs-linux-kernel-callout.orig 2019-01-15 11:07:00.000000000 +0100 +++ /etc/ctdb/nfs-linux-kernel-callout 2019-03-26 16:00:49.030174721 +0100 @@ -12,20 +12,33 @@ # hook for testing. nfs_exports_file="${CTDB_NFS_EXPORTS_FILE:-/var/lib/nfs/etab}" -# Red Hat -nfs_service="nfs" -nfslock_service="nfslock" -nfs_config="/etc/sysconfig/nfs" - -# SUSE -#nfs_service="nfsserver" -#nfslock_service="" -#nfs_config="/etc/sysconfig/nfs" - -# Debian -#nfs_service="nfs-kernel-server" -#nfslock_service="" -#nfs_config="/etc/default/nfs-kernel-server" +[ -n "$CTDB_BASE" ] || \ + CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; echo "$PWD") + +. "${CTDB_BASE}/functions" + +detect_init_style + +case $CTDB_INIT_STYLE in + suse) + # SUSE + nfs_service="nfsserver" + nfslock_service="" + nfs_config="/etc/sysconfig/nfs" + ;; + debian) + # Debian + nfs_service="nfs-kernel-server" + nfslock_service="" + nfs_config="/etc/default/nfs-kernel-server" + ;; + *) + # Red Hat + nfs_service="nfs" + nfslock_service="nfslock" + nfs_config="/etc/sysconfig/nfs" + ;; +esac # Override for unit testing if [ -z "$PROCFS_PATH" ] ; then @@ -137,8 +150,8 @@ { basic_stop "nfs" || true basic_start "nfs" - _f="${PROCFS_PATH}/sys/net/ipv4/tcp_tw_recycle" - if [ "$_f" ] ; then + _f="${PROCFS_PATH}/sys/net/ipv4/tcp_tw_reuse" + if [ -w "$_f" ] ; then echo 1 >"$_f" fi } --- /etc/ctdb/statd-callout.orig 2019-01-15 11:07:00.000000000 +0100 +++ /etc/ctdb/statd-callout 2019-03-26 16:33:08.842677303 +0100 @@ -20,7 +20,22 @@ exit 1 } -load_system_config "nfs" +detect_init_style + +case $CTDB_INIT_STYLE in + suse) + # SUSE + load_system_config "nfs" + ;; + debian) + # Debian + load_system_config "nfs-kernel-server" + ;; + *) + # Red Hat + load_system_config "nfs" + ;; +esac [ -n "$NFS_HOSTNAME" ] || \ die "NFS_HOSTNAME is not configured. statd-callout failed" --- /usr/share/ctdb/events/legacy/60.nfs.script.orig 2019-03-26 16:46:27.666965852 +0100 +++ /usr/share/ctdb/events/legacy/60.nfs.script 2019-03-26 16:46:55.927071294 +0100 @@ -8,7 +8,22 @@ service_name="nfs" -load_system_config "nfs" +detect_init_style + +case $CTDB_INIT_STYLE in + suse) + # SUSE + load_system_config "nfs" + ;; + debian) + # Debian + load_system_config "nfs-kernel-server" + ;; + *) + # Red Hat + load_system_config "nfs" + ;; +esac load_script_options