X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/be3a4b145fbb80d50df7d9e743a301dd735daa60..c4929a8bcca4a43dc6434394a91a8ea67d854844:/lib/query.py diff --git a/lib/query.py b/lib/query.py index a462b7b..2091190 100644 --- a/lib/query.py +++ b/lib/query.py @@ -83,7 +83,8 @@ from ganeti.constants import (QFT_UNKNOWN, QFT_TEXT, QFT_BOOL, QFT_NUMBER, (IQ_CONFIG, IQ_LIVE, IQ_DISKUSAGE, - IQ_CONSOLE) = range(100, 104) + IQ_CONSOLE, + IQ_NODES) = range(100, 105) (LQ_MODE, LQ_OWNER, @@ -110,7 +111,7 @@ _VERIFY_FN = { QFT_BOOL: ht.TBool, QFT_NUMBER: ht.TInt, QFT_UNIT: ht.TInt, - QFT_TIMESTAMP: ht.TOr(ht.TInt, ht.TFloat), + QFT_TIMESTAMP: ht.TNumber, QFT_OTHER: lambda _: True, } @@ -136,7 +137,7 @@ _VTToQFT = { _SERIAL_NO_DOC = "%s object serial number, incremented on each modification" -def _GetUnknownField(ctx, item): # pylint: disable-msg=W0613 +def _GetUnknownField(ctx, item): # pylint: disable=W0613 """Gets the contents of an unknown field. """ @@ -259,7 +260,7 @@ class _FilterHints: if op != qlang.OP_OR: self._NeedAllNames() - def NoteUnaryOp(self, op): # pylint: disable-msg=W0613 + def NoteUnaryOp(self, op): # pylint: disable=W0613 """Called when handling an unary operation. @type op: string @@ -322,11 +323,21 @@ def _WrapNot(fn, lhs, rhs): return not fn(lhs, rhs) +def _PrepareRegex(pattern): + """Compiles a regular expression. + + """ + try: + return re.compile(pattern) + except re.error, err: + raise errors.ParameterError("Invalid regex pattern (%s)" % err) + + class _FilterCompilerHelper: """Converts a query filter to a callable usable for filtering. """ - # String statement has no effect, pylint: disable-msg=W0105 + # String statement has no effect, pylint: disable=W0105 #: How deep filters can be nested _LEVELS_MAX = 10 @@ -349,8 +360,9 @@ class _FilterCompilerHelper: _EQUALITY_CHECKS = [ (QFF_HOSTNAME, lambda lhs, rhs: utils.MatchNameComponent(rhs, [lhs], - case_sensitive=False)), - (None, operator.eq), + case_sensitive=False), + None), + (None, operator.eq, None), ] """Known operators @@ -377,12 +389,13 @@ class _FilterCompilerHelper: # Binary operators qlang.OP_EQUAL: (_OPTYPE_BINARY, _EQUALITY_CHECKS), qlang.OP_NOT_EQUAL: - (_OPTYPE_BINARY, [(flags, compat.partial(_WrapNot, fn)) - for (flags, fn) in _EQUALITY_CHECKS]), - qlang.OP_GLOB: (_OPTYPE_BINARY, NotImplemented), - qlang.OP_REGEXP: (_OPTYPE_BINARY, NotImplemented), + (_OPTYPE_BINARY, [(flags, compat.partial(_WrapNot, fn), valprepfn) + for (flags, fn, valprepfn) in _EQUALITY_CHECKS]), + qlang.OP_REGEXP: (_OPTYPE_BINARY, [ + (None, lambda lhs, rhs: rhs.search(lhs), _PrepareRegex), + ]), qlang.OP_CONTAINS: (_OPTYPE_BINARY, [ - (None, operator.contains), + (None, operator.contains, None), ]), } @@ -396,13 +409,13 @@ class _FilterCompilerHelper: self._hints = None self._op_handler = None - def __call__(self, hints, filter_): + def __call__(self, hints, qfilter): """Converts a query filter into a callable function. @type hints: L{_FilterHints} or None @param hints: Callbacks doing analysis on filter - @type filter_: list - @param filter_: Filter structure + @type qfilter: list + @param qfilter: Filter structure @rtype: callable @return: Function receiving context and item as parameters, returning boolean as to whether item matches filter @@ -418,20 +431,20 @@ class _FilterCompilerHelper: } try: - filter_fn = self._Compile(filter_, 0) + filter_fn = self._Compile(qfilter, 0) finally: self._op_handler = None return filter_fn - def _Compile(self, filter_, level): + def _Compile(self, qfilter, level): """Inner function for converting filters. Calls the correct handler functions for the top-level operator. This function is called recursively (e.g. for logic operators). """ - if not (isinstance(filter_, (list, tuple)) and filter_): + if not (isinstance(qfilter, (list, tuple)) and qfilter): raise errors.ParameterError("Invalid filter on level %s" % level) # Limit recursion @@ -440,7 +453,7 @@ class _FilterCompilerHelper: " nested too deep)" % self._LEVELS_MAX) # Create copy to be modified - operands = filter_[:] + operands = qfilter[:] op = operands.pop(0) try: @@ -533,7 +546,7 @@ class _FilterCompilerHelper: @param operands: List of operands """ - # Unused arguments, pylint: disable-msg=W0613 + # Unused arguments, pylint: disable=W0613 try: (name, value) = operands except (ValueError, TypeError): @@ -556,15 +569,19 @@ class _FilterCompilerHelper: if hints_fn: hints_fn(op, datakind, name, value) - for (fn_flags, fn) in op_data: + for (fn_flags, fn, valprepfn) in op_data: if fn_flags is None or fn_flags & field_flags: + # Prepare value if necessary (e.g. compile regular expression) + if valprepfn: + value = valprepfn(value) + return compat.partial(_WrapBinaryOp, fn, retrieval_fn, value) raise errors.ProgrammerError("Unable to find operator implementation" " (op '%s', flags %s)" % (op, field_flags)) -def _CompileFilter(fields, hints, filter_): +def _CompileFilter(fields, hints, qfilter): """Converts a query filter into a callable function. See L{_FilterCompilerHelper} for details. @@ -572,11 +589,11 @@ def _CompileFilter(fields, hints, filter_): @rtype: callable """ - return _FilterCompilerHelper(fields)(hints, filter_) + return _FilterCompilerHelper(fields)(hints, qfilter) class Query: - def __init__(self, fieldlist, selected, filter_=None, namefield=None): + def __init__(self, fieldlist, selected, qfilter=None, namefield=None): """Initializes this class. The field definition is a dictionary with the field's name as a key and a @@ -603,7 +620,7 @@ class Query: self._requested_names = None self._filter_datakinds = frozenset() - if filter_ is not None: + if qfilter is not None: # Collect requested names if wanted if namefield: hints = _FilterHints(namefield) @@ -611,7 +628,7 @@ class Query: hints = None # Build filter function - self._filter_fn = _CompileFilter(fieldlist, hints, filter_) + self._filter_fn = _CompileFilter(fieldlist, hints, qfilter) if hints: self._requested_names = hints.RequestedNames() self._filter_datakinds = hints.ReferencedData() @@ -746,7 +763,23 @@ def _VerifyResultRow(fields, row): elif value is not None: errs.append("abnormal field %s has a non-None value" % fdef.name) assert not errs, ("Failed validation: %s in row %s" % - (utils.CommaJoin(errors), row)) + (utils.CommaJoin(errs), row)) + + +def _FieldDictKey((fdef, _, flags, fn)): + """Generates key for field dictionary. + + """ + assert fdef.name and fdef.title, "Name and title are required" + assert FIELD_NAME_RE.match(fdef.name) + assert TITLE_RE.match(fdef.title) + assert (DOC_RE.match(fdef.doc) and len(fdef.doc.splitlines()) == 1 and + fdef.doc.strip() == fdef.doc), \ + "Invalid description for field '%s'" % fdef.name + assert callable(fn) + assert (flags & ~QFF_ALL) == 0, "Unknown flags for field '%s'" % fdef.name + + return fdef.name def _PrepareFieldList(fields, aliases): @@ -770,23 +803,7 @@ def _PrepareFieldList(fields, aliases): for (fdef, _, _, _) in fields) assert not duplicates, "Duplicate title(s) found: %r" % duplicates - result = {} - - for field in fields: - (fdef, _, flags, fn) = field - - assert fdef.name and fdef.title, "Name and title are required" - assert FIELD_NAME_RE.match(fdef.name) - assert TITLE_RE.match(fdef.title) - assert (DOC_RE.match(fdef.doc) and len(fdef.doc.splitlines()) == 1 and - fdef.doc.strip() == fdef.doc), \ - "Invalid description for field '%s'" % fdef.name - assert callable(fn) - assert fdef.name not in result, \ - "Duplicate field name '%s' found" % fdef.name - assert (flags & ~QFF_ALL) == 0, "Unknown flags for field '%s'" % fdef.name - - result[fdef.name] = field + result = utils.SequenceToDict(fields, key=_FieldDictKey) for alias, target in aliases: assert alias not in result, "Alias %s overrides an existing field" % alias @@ -1045,7 +1062,7 @@ def _GetGroup(cb): return fn -def _GetNodeGroup(ctx, node, ng): # pylint: disable-msg=W0613 +def _GetNodeGroup(ctx, node, ng): # pylint: disable=W0613 """Returns the name of a node's group. @type ctx: L{NodeQueryData} @@ -1123,6 +1140,32 @@ def _GetLiveNodeField(field, kind, ctx, node): return _FS_UNAVAIL +def _GetNodeHvState(_, node): + """Converts node's hypervisor state for query result. + + """ + hv_state = node.hv_state + + if hv_state is None: + return _FS_UNAVAIL + + return dict((name, value.ToDict()) for (name, value) in hv_state.items()) + + +def _GetNodeDiskState(_, node): + """Converts node's disk state for query result. + + """ + disk_state = node.disk_state + + if disk_state is None: + return _FS_UNAVAIL + + return dict((disk_kind, dict((name, value.ToDict()) + for (name, value) in kind_state.items())) + for (disk_kind, kind_state) in disk_state.items()) + + def _BuildNodeFields(): """Builds list of fields for node queries. @@ -1149,6 +1192,10 @@ def _BuildNodeFields(): (_MakeField("custom_ndparams", "CustomNodeParameters", QFT_OTHER, "Custom node parameters"), NQ_GROUP, 0, _GetItemAttr("ndparams")), + (_MakeField("hv_state", "HypervisorState", QFT_OTHER, "Hypervisor state"), + NQ_CONFIG, 0, _GetNodeHvState), + (_MakeField("disk_state", "DiskState", QFT_OTHER, "Disk state"), + NQ_CONFIG, 0, _GetNodeDiskState), ] # Node role @@ -1207,7 +1254,7 @@ class InstanceQueryData: """ def __init__(self, instances, cluster, disk_usage, offline_nodes, bad_nodes, - live_data, wrongnode_inst, console): + live_data, wrongnode_inst, console, nodes, groups): """Initializes this class. @param instances: List of instance objects @@ -1224,6 +1271,8 @@ class InstanceQueryData: @param wrongnode_inst: Set of instances running on wrong node(s) @type console: dict; instance name as key @param console: Per-instance console information + @type nodes: dict; node name as key + @param nodes: Node objects """ assert len(set(bad_nodes) & set(offline_nodes)) == len(offline_nodes), \ @@ -1239,10 +1288,13 @@ class InstanceQueryData: self.live_data = live_data self.wrongnode_inst = wrongnode_inst self.console = console + self.nodes = nodes + self.groups = groups # Used for individual rows self.inst_hvparams = None self.inst_beparams = None + self.inst_osparams = None self.inst_nicparams = None def __iter__(self): @@ -1255,6 +1307,7 @@ class InstanceQueryData: for inst in self.instances: self.inst_hvparams = self.cluster.FillHV(inst, skip_globals=True) self.inst_beparams = self.cluster.FillBE(inst) + self.inst_osparams = self.cluster.SimpleFillOS(inst.os, inst.osparams) self.inst_nicparams = [self.cluster.SimpleFillNIC(nic.nicparams) for nic in inst.nics] @@ -1325,15 +1378,17 @@ def _GetInstStatus(ctx, inst): if bool(ctx.live_data.get(inst.name)): if inst.name in ctx.wrongnode_inst: return constants.INSTST_WRONGNODE - elif inst.admin_up: + elif inst.admin_state == constants.ADMINST_UP: return constants.INSTST_RUNNING else: return constants.INSTST_ERRORUP - if inst.admin_up: + if inst.admin_state == constants.ADMINST_UP: return constants.INSTST_ERRORDOWN + elif inst.admin_state == constants.ADMINST_DOWN: + return constants.INSTST_ADMINDOWN - return constants.INSTST_ADMINDOWN + return constants.INSTST_ADMINOFFLINE def _GetInstDiskSize(index): @@ -1385,7 +1440,7 @@ def _GetInstNic(index, cb): return fn -def _GetInstNicIp(ctx, _, nic): # pylint: disable-msg=W0613 +def _GetInstNicIp(ctx, _, nic): # pylint: disable=W0613 """Get a NIC's IP address. @type ctx: L{InstanceQueryData} @@ -1601,7 +1656,8 @@ def _GetInstanceParameterFields(): # TODO: Consider moving titles closer to constants be_title = { constants.BE_AUTO_BALANCE: "Auto_balance", - constants.BE_MEMORY: "ConfigMemory", + constants.BE_MAXMEM: "ConfigMaxMem", + constants.BE_MINMEM: "ConfigMinMem", constants.BE_VCPUS: "ConfigVCPUs", } @@ -1620,11 +1676,14 @@ def _GetInstanceParameterFields(): fields = [ # Filled parameters (_MakeField("hvparams", "HypervisorParameters", QFT_OTHER, - "Hypervisor parameters"), + "Hypervisor parameters (merged)"), IQ_CONFIG, 0, lambda ctx, _: ctx.inst_hvparams), (_MakeField("beparams", "BackendParameters", QFT_OTHER, - "Backend parameters"), + "Backend parameters (merged)"), IQ_CONFIG, 0, lambda ctx, _: ctx.inst_beparams), + (_MakeField("osparams", "OpSysParameters", QFT_OTHER, + "Operating system parameters (merged)"), + IQ_CONFIG, 0, lambda ctx, _: ctx.inst_osparams), # Unfilled parameters (_MakeField("custom_hvparams", "CustomHypervisorParameters", QFT_OTHER, @@ -1633,6 +1692,9 @@ def _GetInstanceParameterFields(): (_MakeField("custom_beparams", "CustomBackendParameters", QFT_OTHER, "Custom backend parameters",), IQ_CONFIG, 0, _GetItemAttr("beparams")), + (_MakeField("custom_osparams", "CustomOpSysParameters", QFT_OTHER, + "Custom operating system parameters",), + IQ_CONFIG, 0, _GetItemAttr("osparams")), (_MakeField("custom_nicparams", "CustomNicParameters", QFT_OTHER, "Custom network interface parameters"), IQ_CONFIG, 0, lambda ctx, inst: [nic.nicparams for nic in inst.nics]), @@ -1677,6 +1739,45 @@ _INST_SIMPLE_FIELDS = { } +def _GetInstNodeGroup(ctx, default, node_name): + """Gets group UUID of an instance node. + + @type ctx: L{InstanceQueryData} + @param default: Default value + @type node_name: string + @param node_name: Node name + + """ + try: + node = ctx.nodes[node_name] + except KeyError: + return default + else: + return node.group + + +def _GetInstNodeGroupName(ctx, default, node_name): + """Gets group name of an instance node. + + @type ctx: L{InstanceQueryData} + @param default: Default value + @type node_name: string + @param node_name: Node name + + """ + try: + node = ctx.nodes[node_name] + except KeyError: + return default + + try: + group = ctx.groups[node.group] + except KeyError: + return default + + return group.name + + def _BuildInstanceFields(): """Builds list of fields for instance queries. @@ -1684,14 +1785,35 @@ def _BuildInstanceFields(): fields = [ (_MakeField("pnode", "Primary_node", QFT_TEXT, "Primary node"), IQ_CONFIG, QFF_HOSTNAME, _GetItemAttr("primary_node")), + (_MakeField("pnode.group", "PrimaryNodeGroup", QFT_TEXT, + "Primary node's group"), + IQ_NODES, 0, + lambda ctx, inst: _GetInstNodeGroupName(ctx, _FS_UNAVAIL, + inst.primary_node)), + (_MakeField("pnode.group.uuid", "PrimaryNodeGroupUUID", QFT_TEXT, + "Primary node's group UUID"), + IQ_NODES, 0, + lambda ctx, inst: _GetInstNodeGroup(ctx, _FS_UNAVAIL, inst.primary_node)), # TODO: Allow filtering by secondary node as hostname (_MakeField("snodes", "Secondary_Nodes", QFT_OTHER, "Secondary nodes; usually this will just be one node"), IQ_CONFIG, 0, lambda ctx, inst: list(inst.secondary_nodes)), - (_MakeField("admin_state", "Autostart", QFT_BOOL, - "Desired state of instance (if set, the instance should be" - " up)"), - IQ_CONFIG, 0, _GetItemAttr("admin_up")), + (_MakeField("snodes.group", "SecondaryNodesGroups", QFT_OTHER, + "Node groups of secondary nodes"), + IQ_NODES, 0, + lambda ctx, inst: map(compat.partial(_GetInstNodeGroupName, ctx, None), + inst.secondary_nodes)), + (_MakeField("snodes.group.uuid", "SecondaryNodesGroupsUUID", QFT_OTHER, + "Node group UUIDs of secondary nodes"), + IQ_NODES, 0, + lambda ctx, inst: map(compat.partial(_GetInstNodeGroup, ctx, None), + inst.secondary_nodes)), + (_MakeField("admin_state", "InstanceState", QFT_TEXT, + "Desired state of instance"), + IQ_CONFIG, 0, _GetItemAttr("admin_state")), + (_MakeField("admin_up", "Autostart", QFT_BOOL, + "Desired state of instance"), + IQ_CONFIG, 0, lambda ctx, inst: inst.admin_state == constants.ADMINST_UP), (_MakeField("tags", "Tags", QFT_OTHER, "Tags"), IQ_CONFIG, 0, lambda ctx, inst: list(inst.GetTags())), (_MakeField("console", "Console", QFT_OTHER, @@ -1721,15 +1843,16 @@ def _BuildInstanceFields(): status_values = (constants.INSTST_RUNNING, constants.INSTST_ADMINDOWN, constants.INSTST_WRONGNODE, constants.INSTST_ERRORUP, constants.INSTST_ERRORDOWN, constants.INSTST_NODEDOWN, - constants.INSTST_NODEOFFLINE) + constants.INSTST_NODEOFFLINE, constants.INSTST_ADMINOFFLINE) status_doc = ("Instance status; \"%s\" if instance is set to be running" " and actually is, \"%s\" if instance is stopped and" " is not running, \"%s\" if instance running, but not on its" " designated primary node, \"%s\" if instance should be" " stopped, but is actually running, \"%s\" if instance should" " run, but doesn't, \"%s\" if instance's primary node is down," - " \"%s\" if instance's primary node is marked offline" % - status_values) + " \"%s\" if instance's primary node is marked offline," + " \"%s\" if instance is offline and does not use dynamic" + " resources" % status_values) fields.append((_MakeField("status", "Status", QFT_TEXT, status_doc), IQ_LIVE, 0, _GetInstStatus)) assert set(status_values) == constants.INSTST_ALL, \ @@ -1744,6 +1867,7 @@ def _BuildInstanceFields(): aliases = [ ("vcpus", "be/vcpus"), + ("be/memory", "be/maxmem"), ("sda_size", "disk.size/0"), ("sdb_size", "disk.size/1"), ] + network_aliases @@ -1817,9 +1941,10 @@ class GroupQueryData: """Data container for node group data queries. """ - def __init__(self, groups, group_to_nodes, group_to_instances): + def __init__(self, cluster, groups, group_to_nodes, group_to_instances): """Initializes this class. + @param cluster: Cluster object @param groups: List of node group objects @type group_to_nodes: dict; group UUID as key @param group_to_nodes: Per-group list of nodes @@ -1830,12 +1955,21 @@ class GroupQueryData: self.groups = groups self.group_to_nodes = group_to_nodes self.group_to_instances = group_to_instances + self.cluster = cluster + + # Used for individual rows + self.group_ipolicy = None def __iter__(self): """Iterate over all node groups. + This function has side-effects and only one instance of the resulting + generator should be used at a time. + """ - return iter(self.groups) + for group in self.groups: + self.group_ipolicy = self.cluster.SimpleFillIPolicy(group.ipolicy) + yield group _GROUP_SIMPLE_FIELDS = { @@ -1883,6 +2017,18 @@ def _BuildGroupFields(): GQ_INST, 0, _GetSortedList(group_to_instances)), ]) + # Other fields + fields.extend([ + (_MakeField("tags", "Tags", QFT_OTHER, "Tags"), GQ_CONFIG, 0, + lambda ctx, group: list(group.GetTags())), + (_MakeField("ipolicy", "InstancePolicy", QFT_OTHER, + "Instance policy limitations (merged)"), + GQ_CONFIG, 0, lambda ctx, _: ctx.group_ipolicy), + (_MakeField("custom_ipolicy", "CustomInstancePolicy", QFT_OTHER, + "Custom instance policy limitations"), + GQ_CONFIG, 0, _GetItemAttr("ipolicy")), + ]) + fields.extend(_GetItemTimestampFields(GQ_CONFIG)) return _PrepareFieldList(fields, []) @@ -1925,7 +2071,8 @@ def _BuildOsFields(): None, 0, _ConvWrap(sorted, _GetItemAttr("api_versions"))), (_MakeField("parameters", "Parameters", QFT_OTHER, "Operating system parameters"), - None, 0, _ConvWrap(utils.NiceSort, _GetItemAttr("parameters"))), + None, 0, _ConvWrap(compat.partial(utils.NiceSort, key=compat.fst), + _GetItemAttr("parameters"))), (_MakeField("node_status", "NodeStatus", QFT_OTHER, "Status from node"), None, 0, _GetItemAttr("node_status")),