From 1c2cbba783b2c64ccca543bf8e0bbd7a66e64123 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Fri, 7 Aug 2020 11:18:48 -0400 Subject: [PATCH] rpc.idmapd: Turn down the verbosity in flush_inotify() (bz 1867172) Signed-off-by: Steve Dickson --- nfs-utils-2.5.1-rpcidmap-nodebug-msg.patch | 29 ++++++++++++++++++++++ nfs-utils.spec | 6 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 nfs-utils-2.5.1-rpcidmap-nodebug-msg.patch diff --git a/nfs-utils-2.5.1-rpcidmap-nodebug-msg.patch b/nfs-utils-2.5.1-rpcidmap-nodebug-msg.patch new file mode 100644 index 0000000..967ca0c --- /dev/null +++ b/nfs-utils-2.5.1-rpcidmap-nodebug-msg.patch @@ -0,0 +1,29 @@ +commit 841abefc91ee870fe7cc8a4e36905b1655410c54 +Author: Steve Dickson +Date: Wed Aug 5 14:59:23 2020 -0400 + + rpc.idmapd: Turn down the verbosity in flush_inotify() + + Commit 27a8e146 introduce a debugging message + that was not cover by a check if verbose + is set, which cause a large number of message + to be logged on every kerberos mount + + Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1867172 + + Signed-off-by: Steve Dickson + +diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c +index 8631414..7d1096d 100644 +--- a/utils/idmapd/idmapd.c ++++ b/utils/idmapd/idmapd.c +@@ -500,7 +500,8 @@ flush_inotify(int fd) + ptr += sizeof(struct inotify_event) + ev->len) { + + ev = (const struct inotify_event *)ptr; +- xlog_warn("pipefs inotify: wd=%i, mask=0x%08x, len=%i, name=%s", ++ if (verbose > 1) ++ xlog_warn("pipefs inotify: wd=%i, mask=0x%08x, len=%i, name=%s", + ev->wd, ev->mask, ev->len, ev->len ? ev->name : ""); + } + } diff --git a/nfs-utils.spec b/nfs-utils.spec index 91a2995..561526c 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser Name: nfs-utils URL: http://linux-nfs.org/ Version: 2.5.1 -Release: 1.rc3%{?dist} +Release: 2.rc3%{?dist} Epoch: 1 # group all 32bit related archs @@ -17,6 +17,7 @@ Source5: nfsconvert.sh Source6: nfs-convert.service Patch001: nfs-utils-2.5.2-rc3.patch +Patch002: nfs-utils-2.5.1-rpcidmap-nodebug-msg.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch @@ -367,6 +368,9 @@ fi %{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount %changelog +* Fri Aug 07 2020 Steve Dickson 2.5.2-1.rc3 +- rpc.idmapd: Turn down the verbosity in flush_inotify() (bz 1867172) + * Tue Aug 04 2020 Steve Dickson 2.5.1-1.rc3 - Updated to the latest RC release: nfs-utils-2-5-2-rc3 (bz 1856958)