From 3da7b78ea965e5e1c94cd922eab0ac1d4e3d1b61 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Thu, 13 Nov 2014 22:28:08 -0500 Subject: [PATCH] libafs: remove "Please install afsd with check server daemon" warning Apparently, ancient versions of afsd did not start the check server daemon (AFSOP_START_CS). The afs_Daemon tries to detect when the check server daemon is not running and issues a warning to upgrade afsd. The afs_Daemon waits for the cache initialization to complete (AFSOP_GO) before detecting if the cache server daemon is started. Unfortunately, when running with memcache, the cache initialization is fast enough to race with the start of the check server daemon, and the "Please install afsd with check server daemon" message is sometimes printed to the syslog. Since all modern versions of afsd do start the check server daemon, this error message is no longer needed, so just remove the message and the flag used to print it on only once. Reviewed-on: http://gerrit.openafs.org/11602 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk Reviewed-by: Jeffrey Altman (cherry picked from commit 8ce37d0d4aa4e6107f79efaf5027f31ea5a17604) Change-Id: I292052c9ba629c85ddc4b76c4b3db7d54ce1d852 Reviewed-on: http://gerrit.openafs.org/11680 Reviewed-by: Perry Ruiter Tested-by: BuildBot Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- src/afs/afs_daemons.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c index c26cdee01..e8b8f9d67 100644 --- a/src/afs/afs_daemons.c +++ b/src/afs/afs_daemons.c @@ -140,7 +140,6 @@ afs_Daemon(void) afs_int32 last3MinCheck, last10MinCheck, last60MinCheck, lastNMinCheck; afs_int32 last1MinCheck, last5MinCheck; afs_uint32 lastCBSlotBump; - char cs_warned = 0; AFS_STATCNT(afs_Daemon); last1MinCheck = last3MinCheck = last60MinCheck = last10MinCheck = @@ -226,11 +225,6 @@ afs_Daemon(void) } if (!afs_CheckServerDaemonStarted) { - /* Do the check here if the correct afsd is not installed. */ - if (!cs_warned) { - cs_warned = 1; - afs_warn("Please install afsd with check server daemon.\n"); - } if (lastNMinCheck + afs_probe_interval < now) { /* only check down servers */ afs_CheckServers(1, NULL); -- 2.39.5