Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/server/plugins/structures/bundler/index.txt
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Plugins/GroupLogic.py
	src/lib/Bcfg2/Server/Plugins/Properties.py
	src/lib/Bcfg2/Server/Plugins/Reporting.py

3 files changed, 29 insertions, 9 deletions

diff --git a/doc/server/plugins/structures/bundler/index.txt b/doc/server/plugins/structures/bundler/index.txt
index 0b6b8eb50..5bcf467e7 100644
--- a/doc/server/plugins/structures/bundler/index.txt
+++ b/doc/server/plugins/structures/bundler/index.txt
@@ -1,4 +1,5 @@
 .. -*- mode: rst -*-
+.. vim: ft=rst
 
 .. _server-plugins-structures-bundler-index:
 
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index b5ab1c18b..456038c2f 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -647,7 +647,13 @@ class XMLFileBacked(FileBacked):
                 if el.findall('./%sfallback' % Bcfg2.Server.XI_NAMESPACE):
                     self.logger.debug(msg)
                 else:
-                    self.logger.warning(msg)
+                    self.logger.error(msg)
+                # add a FAM monitor for this path.  this isn't perfect
+                # -- if there's an xinclude of "*.xml", we'll watch
+                # the literal filename "*.xml".  but for non-globbing
+                # filenames, it works fine.
+                if fpath not in self.extra_monitors:
+                    self.add_monitor(fpath)
 
             parent = el.getparent()
             parent.remove(el)
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 4c1c31307..5bb5e8ee9 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -805,6 +805,11 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
     def _handle_clients_xml_event(self, _):  # pylint: disable=R0912
         """ handle all events for clients.xml and files xincluded from
         clients.xml """
+        # disable metadata builds during parsing.  this prevents
+        # clients from getting bogus metadata during the brief time it
+        # takes to rebuild the clients.xml data
+        self.states['clients.xml'] = False
+
         xdata = self.clients_xml.xdata
         self.clients = []
         self.clientgroups = {}
@@ -866,8 +871,9 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
                 self.clientgroups[clname].append(profile)
             except KeyError:
                 self.clientgroups[clname] = [profile]
-        self.states['clients.xml'] = True
         self.update_client_list()
+        self.expire_cache()
+        self.states['clients.xml'] = True
 
     def _get_condition(self, element):
         """ Return a predicate that returns True if a client meets
@@ -895,7 +901,15 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
 
     def _handle_groups_xml_event(self, _):  # pylint: disable=R0912
         """ re-read groups.xml on any event on it """
+        # disable metadata builds during parsing.  this prevents
+        # clients from getting bogus metadata during the brief time it
+        # takes to rebuild the groups.xml data
+        self.states['groups.xml'] = False
+
         self.groups = {}
+        self.group_membership = dict()
+        self.negated_groups = dict()
+        self.ordered_groups = []
 
         # first, we get a list of all of the groups declared in the
         # file.  we do this in two stages because the old way of
@@ -920,10 +934,6 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
             if grp.get('default', 'false') == 'true':
                 self.default = grp.get('name')
 
-        self.group_membership = dict()
-        self.negated_groups = dict()
-        self.ordered_groups = []
-
         # confusing loop condition; the XPath query asks for all
         # elements under a Group tag under a Groups tag; that is
         # infinitely recursive, so "all" elements really means _all_
@@ -956,6 +966,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
                 self.group_membership.setdefault(gname, [])
                 self.group_membership[gname].append(
                     self._aggregate_conditions(conditions))
+        self.expire_cache()
         self.states['groups.xml'] = True
 
     def HandleEvent(self, event):
@@ -1466,6 +1477,10 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
             self.logger.debug("Metadata: Re-reading client list from database")
             old = set(self.clients)
             self.clients = self.list_clients()
+
+            # we could do this with set.symmetric_difference(), but we
+            # want detailed numbers of added/removed clients for
+            # logging
             new = set(self.clients)
             added = new - old
             removed = old - new
@@ -1473,9 +1488,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
                               (len(added), added))
             self.logger.debug("Metadata: Removed %s clients: %s" %
                               (len(removed), removed))
-            # we could do this with set.symmetric_difference(), but we
-            # want detailed numbers of added/removed clients for
-            # logging
+
             for client in added.union(removed):
                 self.cache.expire(client)