Revision 79b26a7a
b/lib/config.py | ||
---|---|---|
441 | 441 |
|
442 | 442 |
duplicates = [] |
443 | 443 |
my_dict = dict((node, {}) for node in self._config_data.nodes) |
444 |
for instance in self._config_data.instances.itervalues(): |
|
445 |
for disk in instance.disks: |
|
446 |
duplicates.extend(_AppendUsedPorts(instance.name, disk, my_dict)) |
|
444 | 447 |
for (node, minor), instance in self._temporary_drbds.iteritems(): |
445 |
if minor in my_dict[node]: |
|
448 |
if minor in my_dict[node] and my_dict[node][minor] != instance:
|
|
446 | 449 |
duplicates.append((node, minor, instance, my_dict[node][minor])) |
447 | 450 |
else: |
448 | 451 |
my_dict[node][minor] = instance |
449 |
for instance in self._config_data.instances.itervalues(): |
|
450 |
for disk in instance.disks: |
|
451 |
duplicates.extend(_AppendUsedPorts(instance.name, disk, my_dict)) |
|
452 | 452 |
return my_dict, duplicates |
453 | 453 |
|
454 | 454 |
@locking.ssynchronized(_config_lock) |
Also available in: Unified diff