From accbb1831ae88e57baabf01a783fe7a8ee0a0ccb Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 9 Jul 2013 08:49:54 -0400
Subject: Core: apply FAM blocking option to all commands that start a server

---
 src/lib/Bcfg2/Server/Core.py | 26 +++++++++++++++++++++-----
 src/sbin/bcfg2-info          |  2 +-
 src/sbin/bcfg2-lint          |  2 +-
 src/sbin/bcfg2-test          |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index ecd68e1e4..a22531d2d 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -728,6 +728,26 @@ class BaseCore(object):
         self.setup.reparse()
         self.metadata_cache.expire()
 
+    def block_for_fam_events(self, handle_events=False):
+        """ Block until all fam events have been handleed, optionally
+        handling events as well.  (Setting ``handle_events=True`` is
+        useful for local server cores that don't spawn an event
+        handling thread.)"""
+        slept = 0
+        log_interval = 3
+        if handle_events:
+            self.fam.handle_events_in_interval(1)
+            slept += 1
+        if self.setup['fam_blocking']:
+            time.sleep(1)
+            slept += 1
+            while self.fam.pending() != 0:
+                time.sleep(1)
+                slept += 1
+                if slept % log_interval == 0:
+                    self.logger.debug("Sleeping to handle FAM events...")
+        self.logger.debug("Slept %s seconds while handling FAM events" % slept)
+
     def run(self):
         """ Run the server core. This calls :func:`_daemonize`,
         :func:`_run`, starts the :attr:`fam_thread`, and calls
@@ -777,13 +797,9 @@ class BaseCore(object):
             self.shutdown()
             raise
 
-        if self.setup['fam_blocking']:
-            time.sleep(1)
-            while self.fam.pending() != 0:
-                time.sleep(1)
-
         if self.debug_flag:
             self.set_debug(None, self.debug_flag)
+        self.block_for_fam_events()
         self._block()
 
     def _daemonize(self):
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 406e7e003..cc9b03b80 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -717,7 +717,7 @@ Bcfg2 client itself.""")
     def run(self, args):  # pylint: disable=W0221
         try:
             self.load_plugins()
-            self.fam.handle_events_in_interval(1)
+            self.block_for_fam_events(handle_events=True)
             if args:
                 self.onecmd(" ".join(args))
             else:
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index ab3b6450f..9ceb1dd04 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -73,7 +73,7 @@ def load_server(setup):
     """ load server """
     core = Bcfg2.Server.Core.BaseCore(setup)
     core.load_plugins()
-    core.fam.handle_events_in_interval(0.1)
+    core.block_for_fam_events(handle_events=True)
     return core
 
 
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test
index a7a6781a9..7c38a65d8 100755
--- a/src/sbin/bcfg2-test
+++ b/src/sbin/bcfg2-test
@@ -157,7 +157,7 @@ def get_core(setup):
     """ Get a server core, with events handled """
     core = Bcfg2.Server.Core.BaseCore(setup)
     core.load_plugins()
-    core.fam.handle_events_in_interval(0.1)
+    core.block_for_fam_events(handle_events=True)
     return core
 
 
-- 
cgit v1.2.3-1-g7c22