Commit 3429a076 authored by Apollon Oikonomopoulos's avatar Apollon Oikonomopoulos Committed by Iustin Pop

Rename DTS_NET_MIRROR to DTS_INT_MIRROR

DTS_INT_MIRROR better contrasts DTS_EXT_MIRROR.
Signed-off-by: default avatarApollon Oikonomopoulos <apollon@noc.grnet.gr>
[iustin@google.com: updated patch for changed context]
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 9869360c
...@@ -303,7 +303,7 @@ def BatchCreate(opts, args): ...@@ -303,7 +303,7 @@ def BatchCreate(opts, args):
required_field, errors.ECODE_INVAL) required_field, errors.ECODE_INVAL)
# Validate special fields # Validate special fields
if spec['primary_node'] is not None: if spec['primary_node'] is not None:
if (spec['template'] in constants.DTS_NET_MIRROR and if (spec['template'] in constants.DTS_INT_MIRROR and
spec['secondary_node'] is None): spec['secondary_node'] is None):
raise errors.OpPrereqError('Template requires secondary node, but' raise errors.OpPrereqError('Template requires secondary node, but'
' there was no secondary provided.', ' there was no secondary provided.',
...@@ -1259,7 +1259,7 @@ def SetInstanceParams(opts, args): ...@@ -1259,7 +1259,7 @@ def SetInstanceParams(opts, args):
disk_dict['size'] = utils.ParseUnit(disk_dict['size']) disk_dict['size'] = utils.ParseUnit(disk_dict['size'])
if (opts.disk_template and if (opts.disk_template and
opts.disk_template in constants.DTS_NET_MIRROR and opts.disk_template in constants.DTS_INT_MIRROR and
not opts.node): not opts.node):
ToStderr("Changing the disk template to a mirrored one requires" ToStderr("Changing the disk template to a mirrored one requires"
" specifying a secondary node") " specifying a secondary node")
......
...@@ -2323,7 +2323,7 @@ class LUClusterVerify(LogicalUnit): ...@@ -2323,7 +2323,7 @@ class LUClusterVerify(LogicalUnit):
utils.CommaJoin(inst_config.secondary_nodes), utils.CommaJoin(inst_config.secondary_nodes),
code=self.ETYPE_WARNING) code=self.ETYPE_WARNING)
if inst_config.disk_template in constants.DTS_NET_MIRROR: if inst_config.disk_template in constants.DTS_INT_MIRROR:
pnode = inst_config.primary_node pnode = inst_config.primary_node
instance_nodes = utils.NiceSort(inst_config.all_nodes) instance_nodes = utils.NiceSort(inst_config.all_nodes)
instance_groups = {} instance_groups = {}
...@@ -4394,7 +4394,7 @@ class LUNodeSetParams(LogicalUnit): ...@@ -4394,7 +4394,7 @@ class LUNodeSetParams(LogicalUnit):
if self.needed_locks[locking.LEVEL_NODE] is not locking.ALL_SET: if self.needed_locks[locking.LEVEL_NODE] is not locking.ALL_SET:
for instance_name in self.acquired_locks[locking.LEVEL_INSTANCE]: for instance_name in self.acquired_locks[locking.LEVEL_INSTANCE]:
instance = self.context.cfg.GetInstanceInfo(instance_name) instance = self.context.cfg.GetInstanceInfo(instance_name)
i_mirrored = instance.disk_template in constants.DTS_NET_MIRROR i_mirrored = instance.disk_template in constants.DTS_INT_MIRROR
if i_mirrored and self.op.node_name in instance.all_nodes: if i_mirrored and self.op.node_name in instance.all_nodes:
instances_keep.append(instance_name) instances_keep.append(instance_name)
self.affected_instances.append(instance) self.affected_instances.append(instance)
...@@ -5749,7 +5749,7 @@ class LUInstanceFailover(LogicalUnit): ...@@ -5749,7 +5749,7 @@ class LUInstanceFailover(LogicalUnit):
"NEW_PRIMARY": self.op.target_node, "NEW_PRIMARY": self.op.target_node,
} }
if instance.disk_template in constants.DTS_NET_MIRROR: if instance.disk_template in constants.DTS_INT_MIRROR:
env["OLD_SECONDARY"] = instance.secondary_nodes[0] env["OLD_SECONDARY"] = instance.secondary_nodes[0]
env["NEW_SECONDARY"] = source_node env["NEW_SECONDARY"] = source_node
else: else:
...@@ -5975,7 +5975,7 @@ class LUInstanceMigrate(LogicalUnit): ...@@ -5975,7 +5975,7 @@ class LUInstanceMigrate(LogicalUnit):
"NEW_PRIMARY": target_node, "NEW_PRIMARY": target_node,
}) })
if instance.disk_template in constants.DTS_NET_MIRROR: if instance.disk_template in constants.DTS_INT_MIRROR:
env["OLD_SECONDARY"] = target_node env["OLD_SECONDARY"] = target_node
env["NEW_SECONDARY"] = source_node env["NEW_SECONDARY"] = source_node
else: else:
...@@ -6474,7 +6474,7 @@ class TLMigrateInstance(Tasklet): ...@@ -6474,7 +6474,7 @@ class TLMigrateInstance(Tasklet):
" primary node (%s)" % source_node) " primary node (%s)" % source_node)
demoted_node = target_node demoted_node = target_node
if instance.disk_template in constants.DTS_NET_MIRROR: if instance.disk_template in constants.DTS_INT_MIRROR:
self._EnsureSecondary(demoted_node) self._EnsureSecondary(demoted_node)
try: try:
self._WaitUntilSync() self._WaitUntilSync()
...@@ -6634,7 +6634,7 @@ class TLMigrateInstance(Tasklet): ...@@ -6634,7 +6634,7 @@ class TLMigrateInstance(Tasklet):
self.source_node = self.instance.primary_node self.source_node = self.instance.primary_node
# FIXME: if we implement migrate-to-any in DRBD, this needs fixing # FIXME: if we implement migrate-to-any in DRBD, this needs fixing
if self.instance.disk_template in constants.DTS_NET_MIRROR: if self.instance.disk_template in constants.DTS_INT_MIRROR:
self.target_node = self.instance.secondary_nodes[0] self.target_node = self.instance.secondary_nodes[0]
# Otherwise self.target_node has been populated either # Otherwise self.target_node has been populated either
# directly, or through an iallocator. # directly, or through an iallocator.
...@@ -7244,7 +7244,7 @@ class LUInstanceCreate(LogicalUnit): ...@@ -7244,7 +7244,7 @@ class LUInstanceCreate(LogicalUnit):
_CheckIAllocatorOrNode(self, "iallocator", "pnode") _CheckIAllocatorOrNode(self, "iallocator", "pnode")
if self.op.pnode is not None: if self.op.pnode is not None:
if self.op.disk_template in constants.DTS_NET_MIRROR: if self.op.disk_template in constants.DTS_INT_MIRROR:
if self.op.snode is None: if self.op.snode is None:
raise errors.OpPrereqError("The networked disk templates need" raise errors.OpPrereqError("The networked disk templates need"
" a mirror node", errors.ECODE_INVAL) " a mirror node", errors.ECODE_INVAL)
...@@ -7794,7 +7794,7 @@ class LUInstanceCreate(LogicalUnit): ...@@ -7794,7 +7794,7 @@ class LUInstanceCreate(LogicalUnit):
self.secondaries = [] self.secondaries = []
# mirror node verification # mirror node verification
if self.op.disk_template in constants.DTS_NET_MIRROR: if self.op.disk_template in constants.DTS_INT_MIRROR:
if self.op.snode == pnode.name: if self.op.snode == pnode.name:
raise errors.OpPrereqError("The secondary node cannot be the" raise errors.OpPrereqError("The secondary node cannot be the"
" primary node.", errors.ECODE_INVAL) " primary node.", errors.ECODE_INVAL)
...@@ -8001,7 +8001,7 @@ class LUInstanceCreate(LogicalUnit): ...@@ -8001,7 +8001,7 @@ class LUInstanceCreate(LogicalUnit):
if self.op.wait_for_sync: if self.op.wait_for_sync:
disk_abort = not _WaitForSync(self, iobj) disk_abort = not _WaitForSync(self, iobj)
elif iobj.disk_template in constants.DTS_NET_MIRROR: elif iobj.disk_template in constants.DTS_INT_MIRROR:
# make sure the disks are not degraded (still sync-ing is ok) # make sure the disks are not degraded (still sync-ing is ok)
time.sleep(15) time.sleep(15)
feedback_fn("* checking mirrors status") feedback_fn("* checking mirrors status")
...@@ -9326,7 +9326,7 @@ class LUInstanceSetParams(LogicalUnit): ...@@ -9326,7 +9326,7 @@ class LUInstanceSetParams(LogicalUnit):
errors.ECODE_INVAL) errors.ECODE_INVAL)
if (self.op.disk_template and if (self.op.disk_template and
self.op.disk_template in constants.DTS_NET_MIRROR and self.op.disk_template in constants.DTS_INT_MIRROR and
self.op.remote_node is None): self.op.remote_node is None):
raise errors.OpPrereqError("Changing the disk template to a mirrored" raise errors.OpPrereqError("Changing the disk template to a mirrored"
" one requires specifying a secondary node", " one requires specifying a secondary node",
...@@ -9486,7 +9486,7 @@ class LUInstanceSetParams(LogicalUnit): ...@@ -9486,7 +9486,7 @@ class LUInstanceSetParams(LogicalUnit):
self.op.disk_template), self.op.disk_template),
errors.ECODE_INVAL) errors.ECODE_INVAL)
_CheckInstanceDown(self, instance, "cannot change disk template") _CheckInstanceDown(self, instance, "cannot change disk template")
if self.op.disk_template in constants.DTS_NET_MIRROR: if self.op.disk_template in constants.DTS_INT_MIRROR:
if self.op.remote_node == pnode: if self.op.remote_node == pnode:
raise errors.OpPrereqError("Given new secondary node %s is the same" raise errors.OpPrereqError("Given new secondary node %s is the same"
" as the primary node of the instance" % " as the primary node of the instance" %
...@@ -10475,7 +10475,7 @@ class LUGroupAssignNodes(NoHooksLU): ...@@ -10475,7 +10475,7 @@ class LUGroupAssignNodes(NoHooksLU):
In particular, it returns information about newly split instances, and In particular, it returns information about newly split instances, and
instances that were already split, and remain so after the change. instances that were already split, and remain so after the change.
Only instances whose disk template is listed in constants.DTS_NET_MIRROR are Only instances whose disk template is listed in constants.DTS_INT_MIRROR are
considered. considered.
@type changes: list of (node_name, new_group_uuid) pairs. @type changes: list of (node_name, new_group_uuid) pairs.
...@@ -10498,7 +10498,7 @@ class LUGroupAssignNodes(NoHooksLU): ...@@ -10498,7 +10498,7 @@ class LUGroupAssignNodes(NoHooksLU):
return [instance.primary_node] + list(instance.secondary_nodes) return [instance.primary_node] + list(instance.secondary_nodes)
for inst in instance_data.values(): for inst in instance_data.values():
if inst.disk_template not in constants.DTS_NET_MIRROR: if inst.disk_template not in constants.DTS_INT_MIRROR:
continue continue
instance_nodes = InstanceNodes(inst) instance_nodes = InstanceNodes(inst)
...@@ -11405,7 +11405,7 @@ class IAllocator(object): ...@@ -11405,7 +11405,7 @@ class IAllocator(object):
""" """
disk_space = _ComputeDiskSize(self.disk_template, self.disks) disk_space = _ComputeDiskSize(self.disk_template, self.disks)
if self.disk_template in constants.DTS_NET_MIRROR: if self.disk_template in constants.DTS_INT_MIRROR:
self.required_nodes = 2 self.required_nodes = 2
else: else:
self.required_nodes = 1 self.required_nodes = 1
...@@ -11442,7 +11442,7 @@ class IAllocator(object): ...@@ -11442,7 +11442,7 @@ class IAllocator(object):
raise errors.OpPrereqError("Can't relocate non-mirrored instances", raise errors.OpPrereqError("Can't relocate non-mirrored instances",
errors.ECODE_INVAL) errors.ECODE_INVAL)
if instance.disk_template in constants.DTS_NET_MIRROR and \ if instance.disk_template in constants.DTS_INT_MIRROR and \
len(instance.secondary_nodes) != 1: len(instance.secondary_nodes) != 1:
raise errors.OpPrereqError("Instance has not exactly one secondary node", raise errors.OpPrereqError("Instance has not exactly one secondary node",
errors.ECODE_STATE) errors.ECODE_STATE)
......
...@@ -367,7 +367,7 @@ DT_SHARED_FILE = "sharedfile" ...@@ -367,7 +367,7 @@ DT_SHARED_FILE = "sharedfile"
DT_BLOCK = "blockdev" DT_BLOCK = "blockdev"
# the set of network-mirrored disk templates # the set of network-mirrored disk templates
DTS_NET_MIRROR = frozenset([DT_DRBD8]) DTS_INT_MIRROR = frozenset([DT_DRBD8])
# the set of externally-mirrored disk templates (e.g. SAN, NAS) # the set of externally-mirrored disk templates (e.g. SAN, NAS)
DTS_EXT_MIRROR = frozenset([DT_SHARED_FILE, DT_BLOCK]) DTS_EXT_MIRROR = frozenset([DT_SHARED_FILE, DT_BLOCK])
...@@ -385,7 +385,7 @@ DTS_MAY_ADOPT = frozenset([DT_PLAIN, DT_BLOCK]) ...@@ -385,7 +385,7 @@ DTS_MAY_ADOPT = frozenset([DT_PLAIN, DT_BLOCK])
DTS_MUST_ADOPT = frozenset([DT_BLOCK]) DTS_MUST_ADOPT = frozenset([DT_BLOCK])
# the set of disk templates that allow migrations # the set of disk templates that allow migrations
DTS_MIRRORED = frozenset.union(DTS_NET_MIRROR, DTS_EXT_MIRROR) DTS_MIRRORED = frozenset.union(DTS_INT_MIRROR, DTS_EXT_MIRROR)
# logical disk types # logical disk types
......
...@@ -552,7 +552,7 @@ class Burner(object): ...@@ -552,7 +552,7 @@ class Burner(object):
if self.opts.iallocator: if self.opts.iallocator:
pnode = snode = None pnode = snode = None
msg = "with iallocator %s" % self.opts.iallocator msg = "with iallocator %s" % self.opts.iallocator
elif self.opts.disk_template not in constants.DTS_NET_MIRROR: elif self.opts.disk_template not in constants.DTS_INT_MIRROR:
snode = None snode = None
msg = "on %s" % pnode msg = "on %s" % pnode
else: else:
...@@ -700,7 +700,7 @@ class Burner(object): ...@@ -700,7 +700,7 @@ class Burner(object):
import_log_msg = ("import from %s" import_log_msg = ("import from %s"
" with iallocator %s" % " with iallocator %s" %
(enode, self.opts.iallocator)) (enode, self.opts.iallocator))
elif self.opts.disk_template not in constants.DTS_NET_MIRROR: elif self.opts.disk_template not in constants.DTS_INT_MIRROR:
snode = None snode = None
import_log_msg = ("import from %s to %s" % import_log_msg = ("import from %s to %s" %
(enode, pnode)) (enode, pnode))
...@@ -990,10 +990,10 @@ class Burner(object): ...@@ -990,10 +990,10 @@ class Burner(object):
has_err = True has_err = True
try: try:
self.BurnCreateInstances() self.BurnCreateInstances()
if opts.do_replace1 and opts.disk_template in constants.DTS_NET_MIRROR: if opts.do_replace1 and opts.disk_template in constants.DTS_INT_MIRROR:
self.BurnReplaceDisks1D8() self.BurnReplaceDisks1D8()
if (opts.do_replace2 and len(self.nodes) > 2 and if (opts.do_replace2 and len(self.nodes) > 2 and
opts.disk_template in constants.DTS_NET_MIRROR) : opts.disk_template in constants.DTS_INT_MIRROR) :
self.BurnReplaceDisks2() self.BurnReplaceDisks2()
if (opts.disk_template in constants.DTS_GROWABLE and if (opts.disk_template in constants.DTS_GROWABLE and
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment