Revision 0c3d9c7c lib/cmdlib/instance_migration.py
b/lib/cmdlib/instance_migration.py | ||
---|---|---|
480 | 480 |
while not all_done: |
481 | 481 |
all_done = True |
482 | 482 |
result = self.rpc.call_drbd_wait_sync(self.all_node_uuids, |
483 |
self.nodes_ip, |
|
484 | 483 |
(self.instance.disks, |
485 | 484 |
self.instance)) |
486 | 485 |
min_percent = 100 |
... | ... | |
507 | 506 |
self.cfg.SetDiskID(dev, node_uuid) |
508 | 507 |
|
509 | 508 |
result = self.rpc.call_blockdev_close(node_uuid, self.instance.name, |
510 |
self.instance.disks)
|
|
509 |
(self.instance.disks, self.instance))
|
|
511 | 510 |
result.Raise("Cannot change disk to secondary on node %s" % |
512 | 511 |
self.cfg.GetNodeName(node_uuid)) |
513 | 512 |
|
... | ... | |
516 | 515 |
|
517 | 516 |
""" |
518 | 517 |
self.feedback_fn("* changing into standalone mode") |
519 |
result = self.rpc.call_drbd_disconnect_net(self.all_node_uuids, |
|
520 |
self.nodes_ip, |
|
521 |
self.instance.disks) |
|
518 |
result = self.rpc.call_drbd_disconnect_net( |
|
519 |
self.all_node_uuids, (self.instance.disks, self.instance)) |
|
522 | 520 |
for node_uuid, nres in result.items(): |
523 | 521 |
nres.Raise("Cannot disconnect disks node %s" % |
524 | 522 |
self.cfg.GetNodeName(node_uuid)) |
... | ... | |
532 | 530 |
else: |
533 | 531 |
msg = "single-master" |
534 | 532 |
self.feedback_fn("* changing disks into %s mode" % msg) |
535 |
result = self.rpc.call_drbd_attach_net(self.all_node_uuids, self.nodes_ip,
|
|
533 |
result = self.rpc.call_drbd_attach_net(self.all_node_uuids, |
|
536 | 534 |
(self.instance.disks, self.instance), |
537 | 535 |
self.instance.name, multimaster) |
538 | 536 |
for node_uuid, nres in result.items(): |
Also available in: Unified diff