Revision 1c3231aa lib/backend.py
b/lib/backend.py | ||
---|---|---|
3777 | 3777 |
shutil.rmtree(status_dir, ignore_errors=True) |
3778 | 3778 |
|
3779 | 3779 |
|
3780 |
def _FindDisks(nodes_ip, disks): |
|
3780 |
def _FindDisks(target_node_uuid, nodes_ip, disks):
|
|
3781 | 3781 |
"""Sets the physical ID on disks and returns the block devices. |
3782 | 3782 |
|
3783 | 3783 |
""" |
3784 | 3784 |
# set the correct physical ID |
3785 |
my_name = netutils.Hostname.GetSysName() |
|
3786 | 3785 |
for cf in disks: |
3787 |
cf.SetPhysicalID(my_name, nodes_ip)
|
|
3786 |
cf.SetPhysicalID(target_node_uuid, nodes_ip)
|
|
3788 | 3787 |
|
3789 | 3788 |
bdevs = [] |
3790 | 3789 |
|
... | ... | |
3796 | 3795 |
return bdevs |
3797 | 3796 |
|
3798 | 3797 |
|
3799 |
def DrbdDisconnectNet(nodes_ip, disks): |
|
3798 |
def DrbdDisconnectNet(target_node_uuid, nodes_ip, disks):
|
|
3800 | 3799 |
"""Disconnects the network on a list of drbd devices. |
3801 | 3800 |
|
3802 | 3801 |
""" |
3803 |
bdevs = _FindDisks(nodes_ip, disks) |
|
3802 |
bdevs = _FindDisks(target_node_uuid, nodes_ip, disks)
|
|
3804 | 3803 |
|
3805 | 3804 |
# disconnect disks |
3806 | 3805 |
for rd in bdevs: |
... | ... | |
3811 | 3810 |
err, exc=True) |
3812 | 3811 |
|
3813 | 3812 |
|
3814 |
def DrbdAttachNet(nodes_ip, disks, instance_name, multimaster): |
|
3813 |
def DrbdAttachNet(target_node_uuid, nodes_ip, disks, instance_name, |
|
3814 |
multimaster): |
|
3815 | 3815 |
"""Attaches the network on a list of drbd devices. |
3816 | 3816 |
|
3817 | 3817 |
""" |
3818 |
bdevs = _FindDisks(nodes_ip, disks) |
|
3818 |
bdevs = _FindDisks(target_node_uuid, nodes_ip, disks)
|
|
3819 | 3819 |
|
3820 | 3820 |
if multimaster: |
3821 | 3821 |
for idx, rd in enumerate(bdevs): |
... | ... | |
3873 | 3873 |
_Fail("Can't change to primary mode: %s", err) |
3874 | 3874 |
|
3875 | 3875 |
|
3876 |
def DrbdWaitSync(nodes_ip, disks): |
|
3876 |
def DrbdWaitSync(target_node_uuid, nodes_ip, disks):
|
|
3877 | 3877 |
"""Wait until DRBDs have synchronized. |
3878 | 3878 |
|
3879 | 3879 |
""" |
... | ... | |
3883 | 3883 |
raise utils.RetryAgain() |
3884 | 3884 |
return stats |
3885 | 3885 |
|
3886 |
bdevs = _FindDisks(nodes_ip, disks) |
|
3886 |
bdevs = _FindDisks(target_node_uuid, nodes_ip, disks)
|
|
3887 | 3887 |
|
3888 | 3888 |
min_resync = 100 |
3889 | 3889 |
alldone = True |
Also available in: Unified diff