afs: Throttle byte-range locks warnings per-file

Currently, the warning messages about byte-range locks are throttled
only according to what the last PID of the locking process was. So, if
that same process performs a bunch of byte-range locks a bunch of
times, we log this warning message at most once every 2 minutes.

However, if we have even just one other process also performing
byte-range locks, the throttling can become pretty useless as
lastWarnPid ping-pongs back and forth between the two different PIDs.
This can happen if multiple unrelated byte-range-lock-using pieces of
software just happen to be running on the same machine, or if a piece
of software uses byte-range locks after forking into separate
processes.

To avoid flooding the log in situations like this, keep track of the
last warn time in the relevant vcache, so we don't get frequent
warnings for byte-range lock requests on the same file.

Change-Id: I446cf6a438a75aa741c5543b93f74f4184ee6508
Reviewed-on: http://gerrit.openafs.org/10796
Reviewed-by: D Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c
index fed0bcc5a9b38a0ca18baf2a695ea0e347c21b25..f11c60c107277f0d3e5493e9d97642812ba19550 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -525,6 +525,9 @@ DoLockWarning(struct vcache *avc, afs_ucred_t * acred)
     if ((now < lastWarnTime + 120) && (lastWarnPid == pid)) {
        return;
     }
+    if (now < avc->lastBRLWarnTime + 120) {
+       return;
+    }
 
     procname = afs_osi_Alloc(256);
 
@@ -535,7 +538,7 @@ DoLockWarning(struct vcache *avc, afs_ucred_t * acred)
     osi_procname(procname, 256);
     procname[255] = '\0';
 
-    lastWarnTime = now;
+    lastWarnTime = avc->lastBRLWarnTime = now;
     lastWarnPid = pid;
 
 #ifdef AFS_LINUX26_ENV

diff --git a/src/afs/afs.h b/src/afs/afs.h
index 3d7e461834a8aa28da056ba1fbfe5eb32ac3c8e6..fd1c54d8819fdab4f3b63b1f8c30c8622c2b04e3 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -949,6 +949,7 @@ struct vcache {
 #if !defined(UKERNEL)
     void *vpacRock;            /* used to read or write in visible partitions */
 #endif
+    afs_uint32 lastBRLWarnTime; /* last time we warned about byte-range locks */
 };
 
 #define        DONT_CHECK_MODE_BITS    0