Custom Query (894 matches)

I took Metadata out of the plugins list. Now I get this traceback:

error determining client probes Traceback (most recent call last):

File "/usr/sbin/bcfg2-server", line 110, in Bcfg2GetProbes

for probe in plugin.GetProbes?(meta):

File "/usr/lib/python2.5/site-packages/Bcfg2/Server/Plugins/Metadata.py", line 463, in GetProbes?

return self.probes.get_probe_data(meta)

File "/usr/lib/python2.5/site-packages/Bcfg2/Server/Plugins/Metadata.py", line 57, in get_probe_data

My patch in #982 should have sorted the nested elements also:

@@ -75,10 +75,10 @@
         top = lxml.etree.Element("Probed")
         for client, probed in sorted(self.probedata.items()):
             cx = lxml.etree.SubElement(top, 'Client', name=client)
-            for probe in probed:
+            for probe in sorted(probed):
                 lxml.etree.SubElement(cx, 'Probe', name=probe,
                                       value=self.probedata[client][probe])
-            for group in self.cgroups[client]:
+            for group in sorted(self.cgroups[client]):
                 lxml.etree.SubElement(cx, "Group", name=group)
         data = lxml.etree.tostring(top, encoding='UTF-8', xml_declaration=True,
                                    pretty_print='true')

Every time bcfg2-server is restarted, it rewrites probed.xml with all of the clients in a different order.

This makes tracking probe data in a revision control system cumbersome and not very useful, especially when working with branches and alternate/staging bcfg2 servers etc.

This patch for Bcfg2/Server/Plugins/Probes.py solves the problem.

@@ -73,7 +73,7 @@

     def write_data(self):
         """Write probe data out for use with bcfg2-info."""
         top = lxml.etree.Element("Probed")
-        for client, probed in self.probedata.iteritems():
+        for client, probed in sorted(self.probedata.items()):
             cx = lxml.etree.SubElement(top, 'Client', name=client)
             for probe in probed:
                 lxml.etree.SubElement(cx, 'Probe', name=probe,