On Wed, Aug 05, 2015 at 12:52:17PM +0200, 'BSRK Aditya' via ganeti-devel wrote: > to take into account diagnose data collector > > Signed-off-by: BSRK Aditya <[email protected]> > --- > lib/tools/cfgupgrade.py | 9 +++++++++ > test/py/cfgupgrade_unittest.py | 2 ++ > 2 files changed, 11 insertions(+) > > diff --git a/lib/tools/cfgupgrade.py b/lib/tools/cfgupgrade.py > index 90fe2c9..2f92711 100644 > --- a/lib/tools/cfgupgrade.py > +++ b/lib/tools/cfgupgrade.py > @@ -331,6 +331,7 @@ class CfgUpgrade(object): > cluster["data_collectors"].get( > name, dict(active=True, > interval=constants.MOND_TIME_INTERVAL * 1e6)) > + cluster["diagnose_data_collector_filename"] = ""
Cluster upgrade on a configuration already at the correct version should not modify it. Here you are, however, unconditionally setting the diagnose_data_collector to its default value even on cluster configurations that already contain a set value. -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
