File autofs-5.0.7-dont-reschedule-alarm-after-signal... of Package autofs

Overview Repositories Revisions Requests Users Attributes Meta

File autofs-5.0.7-dont-reschedule-alarm-after-signals.patch of Package autofs (Revision 2a8aa647c1af732e4e3f6d4f19a764db)

Currently displaying revision 2a8aa647c1af732e4e3f6d4f19a764db , Show latest

Don't schedule new alarms after handling SIGHUP and SIGUSR1

Currently, a new alarm is scheduled every time the daemon receives
a SIGHUP (map re-read) or SIGUSR1 (forced expiration). Besides that,
map re-reads started on demand when a map is found to be outdated
also generate a new alarm.

Once added, these alarms are never deleted and hence increase the
number of times the daemon wakes up to run the expiration procedure.
After a couple of months, in setups with many mount points, it's
normal to see automount waking up every second to handle the
expiration timer.

This patch removes the alarm scheduling from the readmap cleanup
routine and makes sure the alarm is re-added after the expiration
process only when it was not triggered by SIGUSR1.

I couldn't think of any use case to justify keeping these alarms:
it's critical to have the alarm ticking every timeout/4 seconds,
but more than one periodic alarm running doesn't seem to make
sense.

Index: autofs-5.0.7/daemon/state.c
===================================================================
--- autofs-5.0.7.orig/daemon/state.c
+++ autofs-5.0.7/daemon/state.c
@@ -144,7 +144,7 @@ void expire_cleanup(void *arg)
 					ap->submount = 2;
 			}
 
-			if (!ap->submount)
+			if (ap->state == ST_EXPIRE && !ap->submount)
 				alarm_add(ap, ap->exp_runfreq);
 
 			/* FALLTHROUGH */
@@ -326,17 +326,12 @@ static void do_readmap_cleanup(void *arg
 	struct autofs_point *ap;
 
 	ra = (struct readmap_args *) arg;
-
 	ap = ra->ap;
 
 	st_mutex_lock();
-
 	ap->readmap_thread = 0;
 	st_set_done(ap);
-	if (!ap->submount)
-		alarm_add(ap, ap->exp_runfreq);
 	st_ready(ap);
-
 	st_mutex_unlock();
 
 	free(ra);
Index: autofs-5.0.7/CHANGELOG
===================================================================
--- autofs-5.0.7.orig/CHANGELOG
+++ autofs-5.0.7/CHANGELOG
@@ -15,6 +15,7 @@
 - fix recursive mount deadlock.
 - increase file map read buffer size.
 - handle new location of systemd.
+- don't reschedule alarm after signals.
 
 25/07/2012 autofs-5.0.7
 =======================

Places

File autofs-5.0.7-dont-reschedule-alarm-after-signals.patch of Package autofs (Revision 2a8aa647c1af732e4e3f6d4f19a764db)

Places