Revision cff4c037
b/lib/config.py | ||
---|---|---|
537 | 537 |
|
538 | 538 |
instance.serial_no = 1 |
539 | 539 |
self._config_data.instances[instance.name] = instance |
540 |
self._config_data.cluster.serial_no += 1 |
|
541 | 540 |
self._WriteConfig() |
542 | 541 |
|
543 | 542 |
def _SetInstanceStatus(self, instance_name, status): |
... | ... | |
573 | 572 |
if instance_name not in self._config_data.instances: |
574 | 573 |
raise errors.ConfigurationError("Unknown instance '%s'" % instance_name) |
575 | 574 |
del self._config_data.instances[instance_name] |
576 |
self._config_data.cluster.serial_no += 1 |
|
577 | 575 |
self._WriteConfig() |
578 | 576 |
|
579 | 577 |
@locking.ssynchronized(_config_lock) |
... | ... | |
601 | 599 |
disk.iv_name)) |
602 | 600 |
|
603 | 601 |
self._config_data.instances[inst.name] = inst |
604 |
self._config_data.cluster.serial_no += 1 |
|
605 | 602 |
self._WriteConfig() |
606 | 603 |
|
607 | 604 |
@locking.ssynchronized(_config_lock) |
... | ... | |
957 | 954 |
if self._config_data is None: |
958 | 955 |
raise errors.ProgrammerError("Configuration file not read," |
959 | 956 |
" cannot save.") |
957 |
update_serial = True |
|
960 | 958 |
if isinstance(target, objects.Cluster): |
961 | 959 |
test = target == self._config_data.cluster |
962 | 960 |
elif isinstance(target, objects.Node): |
963 | 961 |
test = target in self._config_data.nodes.values() |
964 | 962 |
elif isinstance(target, objects.Instance): |
965 | 963 |
test = target in self._config_data.instances.values() |
964 |
update_serial = False |
|
966 | 965 |
else: |
967 | 966 |
raise errors.ProgrammerError("Invalid object type (%s) passed to" |
968 | 967 |
" ConfigWriter.Update" % type(target)) |
969 | 968 |
if not test: |
970 | 969 |
raise errors.ConfigurationError("Configuration updated since object" |
971 | 970 |
" has been read or unknown object") |
972 |
target.serial_no += 1 |
|
971 |
if update_serial: |
|
972 |
target.serial_no += 1 |
|
973 | 973 |
|
974 | 974 |
self._WriteConfig() |
Also available in: Unified diff