Commit 04db1880 authored by Bernardo Dal Seno's avatar Bernardo Dal Seno
Browse files

Configuration is verified on load

If there are errors in the configuration when master daemon is started,
they are now logged and reported. Previously they were logged sometimes at
startup, and when performing any change to the configuration.
Signed-off-by: default avatarBernardo Dal Seno <>
Reviewed-by: default avatarHelga Velroyen <>
parent d948c101
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Google Inc.
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Google Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -2104,6 +2104,12 @@ class ConfigWriter:
# This is ok even if it acquires the internal lock, as _UpgradeConfig is
# only called at config init time, without the lock held
config_errors = self._UnlockedVerifyConfig()
if config_errors:
errmsg = ("Loaded configuration data is not consistent: %s" %
def _DistributeConfig(self, feedback_fn):
"""Distribute the configuration to the other nodes.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment