Revision bb3011ad lib/masterd/instance.py
b/lib/masterd/instance.py | ||
---|---|---|
1166 | 1166 |
src_node = instance.primary_node |
1167 | 1167 |
src_node_name = self._lu.cfg.GetNodeName(src_node) |
1168 | 1168 |
|
1169 |
for idx, disk in enumerate(instance.disks): |
|
1169 |
inst_disks = self._lu.cfg.GetInstanceDisks(instance) |
|
1170 |
for idx, disk in enumerate(inst_disks): |
|
1170 | 1171 |
self._feedback_fn("Creating a snapshot of disk/%s on node %s" % |
1171 | 1172 |
(idx, src_node_name)) |
1172 | 1173 |
|
... | ... | |
1287 | 1288 |
|
1288 | 1289 |
""" |
1289 | 1290 |
instance = self._instance |
1291 |
inst_disks = self._lu.cfg.GetInstanceDisks(instance) |
|
1290 | 1292 |
|
1291 | 1293 |
assert len(disk_info) == len(instance.disks) |
1292 | 1294 |
|
... | ... | |
1294 | 1296 |
|
1295 | 1297 |
ieloop = ImportExportLoop(self._lu) |
1296 | 1298 |
try: |
1297 |
for idx, (dev, (host, port, magic)) in enumerate(zip(instance.disks,
|
|
1299 |
for idx, (dev, (host, port, magic)) in enumerate(zip(inst_disks,
|
|
1298 | 1300 |
disk_info)): |
1299 | 1301 |
# Decide whether to use IPv6 |
1300 | 1302 |
ipv6 = netutils.IP6Address.IsValid(host) |
... | ... | |
1482 | 1484 |
len(instance.disks), pnode.primary_ip) |
1483 | 1485 |
|
1484 | 1486 |
ieloop = ImportExportLoop(lu) |
1487 |
inst_disks = lu.cfg.GetInstanceDisks(instance) |
|
1485 | 1488 |
try: |
1486 |
for idx, dev in enumerate(instance.disks):
|
|
1489 |
for idx, dev in enumerate(inst_disks):
|
|
1487 | 1490 |
magic = _GetInstDiskMagic(magic_base, instance.name, idx) |
1488 | 1491 |
|
1489 | 1492 |
# Import daemon options |
Also available in: Unified diff