Commit e4640214 authored by Guido Trotter's avatar Guido Trotter
Browse files

ConfigWriter.AddInstance check instance mac

There is a race condition in CreateInstance, since the mac address is
generated early and only added to the config (and thus really assured to
be unique) only at this point. Since it's possible that another instance
gets the same mac address in the meantime with this check we'll make the
instance creation fail before modifying the config data and thus having
a wrong in-memory config (which is bad!!).

Note that the same race condition exists, for example, in
SetInstanceParams, and should be fully addressed by a way to revert
config changes if writing them fails!

Reviewed-by: iustin
parent 295728df
......@@ -687,6 +687,12 @@ class ConfigWriter:
all_lvs = instance.MapLVsByNode()"Instance '%s' DISK_LAYOUT: %s",, all_lvs)
all_macs = self._AllMACs()
for nic in instance.nics:
if nic.mac in all_macs:
raise errors.ConfigurationError("Cannot add instance %s:"
" MAC address '%s' already in use." % (, nic.mac))
instance.serial_no = 1
self._config_data.instances[] = instance
self._config_data.cluster.serial_no += 1
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