Commit 2dd7e038 authored by Petr Pudlak's avatar Petr Pudlak

Merge branch 'stable-2.11' into stable-2.12

* stable-2.11
  Postpone release of 2.11.4 by one day
  Remove known issues section for 2.11.4
  Add known issue to 2.11.4 NEWS file
  Bump version to 2.11.4
  Prepare NEWS file for 2.11.4

* stable-2.10
  Add non-cherry-pickable changes related to state "rb----"
  Add Xen nothing state '------'
  Add Xen paused state as a Ganeti running state
  Update usage string for 'gnt-network connect'

Conflicts:
	NEWS
	configure.ac
	lib/hypervisor/hv_xen.py
Resolution:
  NEWS - include additions from 2.11
  configure.ac - keep the 2.12 version
  lib/hypervisor/hv_xen.py - keep enhanced comments from 2.11
Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parents d7418fff 537126fc
......@@ -72,6 +72,30 @@ before rc1:
inresponsive
Version 2.11.4
--------------
*(Released Thu, 31 Jul 2014)*
- Improved documentation of the instance shutdown behavior.
Inherited from the 2.10 branch:
- KVM: fix NIC configuration with absent NIC VLAN (Issue 893)
- Adapt relative path expansion in PATH to new environment
- Exclude archived jobs from configuration backup
- Expose early_release for ReplaceInstanceDisks
- Add backup directory for configuration backups for upgrades
- Fix BlockdevSnapshot in case of non lvm-based disk
- Improve RAPI error handling for queries in non-existing items
- Allow disk hot-remove even with chroot or SM
- Remove superflous loop in instance queries (Issue 875)
Inherited from the 2.9 branch:
- Make ganeti-cleaner switch to save working directory (Issue 880)
Version 2.11.3
--------------
......
......@@ -346,7 +346,7 @@ commands = {
[ArgNetwork(min=1, max=1),
ArgGroup()],
[NOCONFLICTSCHECK_OPT, PRIORITY_OPT, NIC_PARAMS_OPT],
"<network_name> <mode> <link> [<node_group>...]",
"<network_name> [<node_group>...]",
"Map a given network to the specified node group"
" with given mode and link (netparams)"),
"disconnect": (
......
......@@ -169,16 +169,27 @@ def _GetAllInstanceList(fn, include_node, _timeout=5):
return _ParseInstanceList(lines, include_node)
# Determine whether an instance is running
#
# An instance is running if it is in the following Xen states:
# running, blocked, or paused.
#
# A state of nothing '------' means that the domain is runnable but it
# is not currently running. That means it is in the queue behind
# other domains waiting to be scheduled to run.
# http://old-list-archives.xenproject.org/xen-users/2007-06/msg00849.html
def _IsInstanceRunning(instance_info):
"""Determine whether an instance is running.
An instance is running if it is in the following Xen states:
running, blocked, or paused.
For some strange reason, Xen once printed 'rb----' which does not make any
sense because an instance cannot be both running and blocked. Fortunately,
for Ganeti 'running' or 'blocked' is the same as 'running'.
A state of nothing '------' means that the domain is runnable but it is not
currently running. That means it is in the queue behind other domains waiting
to be scheduled to run.
http://old-list-archives.xenproject.org/xen-users/2007-06/msg00849.html
@type instance_info: string
@param instance_info: Information about instance, as supplied by Xen.
@rtype: bool
@return: Whether an instance is running.
"""
return instance_info == "r-----" \
or instance_info == "rb----" \
or instance_info == "-b----" \
......
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