Revision 6ccce5d4 lib/cmdlib/instance_storage.py
b/lib/cmdlib/instance_storage.py | ||
---|---|---|
1303 | 1303 |
instance.name, False, idx) |
1304 | 1304 |
msg = result.fail_msg |
1305 | 1305 |
if msg: |
1306 |
is_offline_secondary = (node_uuid in instance.secondary_nodes and |
|
1306 |
secondary_nodes = lu.cfg.GetInstanceSecondaryNodes(instance) |
|
1307 |
is_offline_secondary = (node_uuid in secondary_nodes and |
|
1307 | 1308 |
result.offline) |
1308 | 1309 |
lu.LogWarning("Could not prepare block device %s on node %s" |
1309 | 1310 |
" (is_primary=False, pass=1): %s", |
... | ... | |
1661 | 1662 |
|
1662 | 1663 |
""" |
1663 | 1664 |
instance = self.replacer.instance |
1665 |
secondary_nodes = self.cfg.GetInstanceSecondaryNodes(instance) |
|
1664 | 1666 |
env = { |
1665 | 1667 |
"MODE": self.op.mode, |
1666 | 1668 |
"NEW_SECONDARY": self.op.remote_node, |
1667 |
"OLD_SECONDARY": self.cfg.GetNodeName(instance.secondary_nodes[0]),
|
|
1669 |
"OLD_SECONDARY": self.cfg.GetNodeName(secondary_nodes[0]), |
|
1668 | 1670 |
} |
1669 | 1671 |
env.update(BuildInstanceHookEnvByObject(self, instance)) |
1670 | 1672 |
return env |
... | ... | |
1954 | 1956 |
raise errors.OpPrereqError("Can only run replace disks for DRBD8-based" |
1955 | 1957 |
" instances", errors.ECODE_INVAL) |
1956 | 1958 |
|
1957 |
if len(self.instance.secondary_nodes) != 1: |
|
1959 |
secondary_nodes = self.cfg.GetInstanceSeconaryNodes(self.instance) |
|
1960 |
if len(secondary_nodes) != 1: |
|
1958 | 1961 |
raise errors.OpPrereqError("The instance has a strange layout," |
1959 | 1962 |
" expected one secondary but found %d" % |
1960 |
len(self.instance.secondary_nodes),
|
|
1963 |
len(secondary_nodes), |
|
1961 | 1964 |
errors.ECODE_FAULT) |
1962 | 1965 |
|
1963 |
secondary_node_uuid = self.instance.secondary_nodes[0]
|
|
1966 |
secondary_node_uuid = secondary_nodes[0] |
|
1964 | 1967 |
|
1965 | 1968 |
if self.iallocator_name is None: |
1966 | 1969 |
remote_node_uuid = self.remote_node_uuid |
1967 | 1970 |
else: |
1968 | 1971 |
remote_node_uuid = self._RunAllocator(self.lu, self.iallocator_name, |
1969 | 1972 |
self.instance.uuid, |
1970 |
self.instance.secondary_nodes)
|
|
1973 |
secondary_nodes) |
|
1971 | 1974 |
|
1972 | 1975 |
if remote_node_uuid is None: |
1973 | 1976 |
self.remote_node_info = None |
... | ... | |
2126 | 2129 |
(utils.CommaJoin(self.disks), self.instance.name)) |
2127 | 2130 |
feedback_fn("Current primary node: %s" % |
2128 | 2131 |
self.cfg.GetNodeName(self.instance.primary_node)) |
2132 |
secondary_nodes = self.cfg.GetInstanceSecondaryNodes(self.instance) |
|
2129 | 2133 |
feedback_fn("Current seconary node: %s" % |
2130 |
utils.CommaJoin(self.cfg.GetNodeNames( |
|
2131 |
self.instance.secondary_nodes))) |
|
2134 |
utils.CommaJoin(self.cfg.GetNodeNames(secondary_nodes))) |
|
2132 | 2135 |
|
2133 | 2136 |
activate_disks = not self.instance.disks_active |
2134 | 2137 |
|
Also available in: Unified diff