X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/d63bd54036cea89ec48219b8c2ef1e68097d3a18..e85d8982477abfc025edb9f7f40f343afa9e89be:/lib/query.py diff --git a/lib/query.py b/lib/query.py index 84a8607..8d8b667 100644 --- a/lib/query.py +++ b/lib/query.py @@ -63,8 +63,8 @@ from ganeti import ht from ganeti.constants import (QFT_UNKNOWN, QFT_TEXT, QFT_BOOL, QFT_NUMBER, QFT_UNIT, QFT_TIMESTAMP, QFT_OTHER, - QRFS_NORMAL, QRFS_UNKNOWN, QRFS_NODATA, - QRFS_UNAVAIL, QRFS_OFFLINE) + RS_NORMAL, RS_UNKNOWN, RS_NODATA, + RS_UNAVAIL, RS_OFFLINE) # Constants for requesting data from the caller/data provider. Each property @@ -79,7 +79,8 @@ from ganeti.constants import (QFT_UNKNOWN, QFT_TEXT, QFT_BOOL, QFT_NUMBER, (IQ_CONFIG, IQ_LIVE, - IQ_DISKUSAGE) = range(100, 103) + IQ_DISKUSAGE, + IQ_CONSOLE) = range(100, 104) (LQ_MODE, LQ_OWNER, @@ -244,15 +245,15 @@ def _ProcessResult(value): """ if value is _FS_UNKNOWN: - return (QRFS_UNKNOWN, None) + return (RS_UNKNOWN, None) elif value is _FS_NODATA: - return (QRFS_NODATA, None) + return (RS_NODATA, None) elif value is _FS_UNAVAIL: - return (QRFS_UNAVAIL, None) + return (RS_UNAVAIL, None) elif value is _FS_OFFLINE: - return (QRFS_OFFLINE, None) + return (RS_OFFLINE, None) else: - return (QRFS_NORMAL, value) + return (RS_NORMAL, value) def _VerifyResultRow(fields, row): @@ -267,7 +268,7 @@ def _VerifyResultRow(fields, row): assert len(row) == len(fields) errs = [] for ((status, value), (fdef, _, _)) in zip(row, fields): - if status == QRFS_NORMAL: + if status == RS_NORMAL: if not _VERIFY_FN[fdef.kind](value): errs.append("normal field %s fails validation (value is %s)" % (fdef.name, value)) @@ -664,7 +665,7 @@ class InstanceQueryData: """ def __init__(self, instances, cluster, disk_usage, offline_nodes, bad_nodes, - live_data): + live_data, wrongnode_inst, console): """Initializes this class. @param instances: List of instance objects @@ -677,6 +678,10 @@ class InstanceQueryData: @param bad_nodes: List of faulty nodes @type live_data: dict; instance name as key @param live_data: Per-instance live data + @type wrongnode_inst: set + @param wrongnode_inst: Set of instances running on wrong node(s) + @type console: dict; instance name as key + @param console: Per-instance console information """ assert len(set(bad_nodes) & set(offline_nodes)) == len(offline_nodes), \ @@ -690,6 +695,8 @@ class InstanceQueryData: self.offline_nodes = offline_nodes self.bad_nodes = bad_nodes self.live_data = live_data + self.wrongnode_inst = wrongnode_inst + self.console = console # Used for individual rows self.inst_hvparams = None @@ -720,7 +727,7 @@ def _GetInstOperState(ctx, inst): @param inst: Instance object """ - # Can't use QRFS_OFFLINE here as it would describe the instance to + # Can't use RS_OFFLINE here as it would describe the instance to # be offline when we actually don't know due to missing data if inst.primary_node in ctx.bad_nodes: return _FS_NODATA @@ -745,7 +752,7 @@ def _GetInstLiveData(name): """ if (inst.primary_node in ctx.bad_nodes or inst.primary_node in ctx.offline_nodes): - # Can't use QRFS_OFFLINE here as it would describe the instance to be + # Can't use RS_OFFLINE here as it would describe the instance to be # offline when we actually don't know due to missing data return _FS_NODATA @@ -774,7 +781,9 @@ def _GetInstStatus(ctx, inst): return "ERROR_nodedown" if bool(ctx.live_data.get(inst.name)): - if inst.admin_up: + if inst.name in ctx.wrongnode_inst: + return "ERROR_wrongnode" + elif inst.admin_up: return "running" else: return "ERROR_up" @@ -986,6 +995,22 @@ def _GetInstDiskUsage(ctx, inst): return usage +def _GetInstanceConsole(ctx, inst): + """Get console information for instance. + + @type ctx: L{InstanceQueryData} + @type inst: L{objects.Instance} + @param inst: Instance object + + """ + consinfo = ctx.console[inst.name] + + if consinfo is None: + return _FS_UNAVAIL + + return consinfo + + def _GetInstanceDiskFields(): """Get instance fields involving disks. @@ -995,10 +1020,6 @@ def _GetInstanceDiskFields(): fields = [ (_MakeField("disk_usage", "DiskUsage", QFT_UNIT), IQ_DISKUSAGE, _GetInstDiskUsage), - (_MakeField("sda_size", "LegacyDisk/0", QFT_UNIT), IQ_CONFIG, - _GetInstDiskSize(0)), - (_MakeField("sdb_size", "LegacyDisk/1", QFT_UNIT), IQ_CONFIG, - _GetInstDiskSize(1)), (_MakeField("disk.count", "Disks", QFT_NUMBER), IQ_CONFIG, lambda ctx, inst: len(inst.disks)), (_MakeField("disk.sizes", "Disk_sizes", QFT_OTHER), IQ_CONFIG, @@ -1046,8 +1067,6 @@ def _GetInstanceParameterFields(): IQ_CONFIG, lambda ctx, _: ctx.inst_hvparams), (_MakeField("beparams", "BackendParameters", QFT_OTHER), IQ_CONFIG, lambda ctx, _: ctx.inst_beparams), - (_MakeField("vcpus", "LegacyVCPUs", QFT_NUMBER), IQ_CONFIG, - lambda ctx, _: ctx.inst_beparams[constants.BE_VCPUS]), # Unfilled parameters (_MakeField("custom_hvparams", "CustomHypervisorParameters", QFT_OTHER), @@ -1109,6 +1128,8 @@ def _BuildInstanceFields(): _GetItemAttr("admin_up")), (_MakeField("tags", "Tags", QFT_OTHER), IQ_CONFIG, lambda ctx, inst: list(inst.GetTags())), + (_MakeField("console", "Console", QFT_OTHER), IQ_CONSOLE, + _GetInstanceConsole), ] # Add simple fields @@ -1131,7 +1152,13 @@ def _BuildInstanceFields(): fields.extend(_GetInstanceNetworkFields()) fields.extend(_GetItemTimestampFields(IQ_CONFIG)) - return _PrepareFieldList(fields, []) + aliases = [ + ("vcpus", "be/vcpus"), + ("sda_size", "disk.size/0"), + ("sdb_size", "disk.size/1"), + ] + + return _PrepareFieldList(fields, aliases) class LockQueryData: