Commit df1f3c62 authored by Guido Trotter's avatar Guido Trotter

Merge remote branch 'stable-2.4' into devel-2.4

* origin/stable-2.4:
  Fix typo in kvm-ifup script
  NEWS: Replace smartquotes, start lines with uppercase
  Update NEWS and release 2.4.0 rc3
  Fix potential data-loss bug in disk wipe routines
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 3ae70d76 99e92fa0
News
====
Version 2.4.0 rc3
-----------------
*(Released Mon, 28 Feb 2011)*
A critical fix for the ``prealloc_wipe_disks`` feature: it is possible
that this feature wiped the disks of the wrong instance, leading to loss
of data.
Other changes:
- Fixed title of query field containing instance name
- Expanded the glossary in the documentation
- Fixed one unittest (internal issue)
Version 2.4.0 rc2
-----------------
......@@ -9,14 +25,14 @@ Version 2.4.0 rc2
A number of bug fixes plus just a couple functionality changes.
On the user-visible side, the ``gnt-* list`` command output has changed
with respect to special field states. The current rc1 style of display
can be re-enabled by passing a new ``-v, --verbose`` flag, but in the
default output mode special fields are displayed as follows:
with respect to "special" field states. The current rc1 style of display
can be re-enabled by passing a new ``--verbose`` (``-v``) flag, but in
the default output mode special fields states are displayed as follows:
- offline field: ``*``
- unavailable/not applicable: ``-``
- data missing (RPC failure): ``?``
- unknown field: ``??``
- Offline resource: ``*``
- Unavailable/not applicable: ``-``
- Data missing (RPC failure): ``?``
- Unknown field: ``??``
Another user-visible change is the addition of ``--force-join`` to
``gnt-node add``.
......@@ -24,16 +40,16 @@ Another user-visible change is the addition of ``--force-join`` to
As for bug fixes:
- ``tools/cluster-merge`` has seen many fixes and is now enabled again
- fixed regression in RAPI/instance reinstall where all parameters were
- Fixed regression in RAPI/instance reinstall where all parameters were
required (instead of optional)
- fixed ``gnt-cluster repair-disk-sizes``, was broken since Ganeti 2.2
- fixed iallocator usage (offline nodes were not considered offline)
- fixed ``gnt-node list`` with respect to non-vm_capable nodes
- fixed hypervisor and OS parameter validation with respect to
- Fixed ``gnt-cluster repair-disk-sizes``, was broken since Ganeti 2.2
- Fixed iallocator usage (offline nodes were not considered offline)
- Fixed ``gnt-node list`` with respect to non-vm_capable nodes
- Fixed hypervisor and OS parameter validation with respect to
non-vm_capable nodes
- fixed ``gnt-cluster verify`` with respect to offline nodes (mostly
- Fixed ``gnt-cluster verify`` with respect to offline nodes (mostly
cosmetic)
- fixed ``tools/listrunner`` with respect to agent-based usage
- Fixed ``tools/listrunner`` with respect to agent-based usage
Version 2.4.0 rc1
......@@ -151,7 +167,7 @@ Integration
~~~~~~~~~~~
- Moved ``rapi_users`` file into separate directory, now named
``/ganeti/rapi/users``, ``cfgupgrade`` moves the file and creates a
``.../ganeti/rapi/users``, ``cfgupgrade`` moves the file and creates a
symlink
- Added new tool for running commands on many machines,
``tools/ganeti-listrunner``
......@@ -336,7 +352,7 @@ Version 2.2.1 rc0
*(Released Thu, 7 Oct 2010)*
- Fixed issue 125, replace hardcoded xenvg in ``gnt-cluster`` with
- Fixed issue 125, replace hardcoded "xenvg" in ``gnt-cluster`` with
value retrieved from master
- Added support for blacklisted or hidden OS definitions
- Added simple lock monitor (accessible via (``gnt-debug locks``)
......@@ -510,7 +526,7 @@ Some more bugfixes. Unless critical bugs occur, this will be the last
- Fix case of MAC special-values
- Fix mac checker regex
- backend: Fix typo causing out of range error
- backend: Fix typo causing "out of range" error
- Add missing --units in gnt-instance list man page
......@@ -807,7 +823,7 @@ Bug fixes
directory (e.g. read-only file-system where we can't open the files
read-write, etc.)
- Fixed the behaviour of gnt-node modify for master candidate demotion;
now it either aborts cleanly or, if given the new auto_promote
now it either aborts cleanly or, if given the new "auto_promote"
parameter, will automatically promote other nodes as needed
- Fixed compatibility with (unreleased yet) Python 2.6.5 that would
completely prevent Ganeti from working
......@@ -836,7 +852,7 @@ Bug fixes
New features
~~~~~~~~~~~~
- Added an early_release more for instance replace disks and node
- Added an "early_release" more for instance replace disks and node
evacuate, where we release locks earlier and thus allow higher
parallelism within the cluster
- Added watcher hooks, intended to allow the watcher to restart other
......
......@@ -2,7 +2,7 @@
m4_define([gnt_version_major], [2])
m4_define([gnt_version_minor], [4])
m4_define([gnt_version_revision], [0])
m4_define([gnt_version_suffix], [~rc2])
m4_define([gnt_version_suffix], [~rc3])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
gnt_version_major, gnt_version_minor,
......
......@@ -6629,6 +6629,10 @@ def _WipeDisks(lu, instance):
"""
node = instance.primary_node
for device in instance.disks:
lu.cfg.SetDiskID(device, node)
logging.info("Pause sync of instance %s disks", instance.name)
result = lu.rpc.call_blockdev_pause_resume_sync(node, instance.disks, True)
......@@ -6640,7 +6644,8 @@ def _WipeDisks(lu, instance):
try:
for idx, device in enumerate(instance.disks):
lu.LogInfo("* Wiping disk %d", idx)
logging.info("Wiping disk %d for instance %s", idx, instance.name)
logging.info("Wiping disk %d for instance %s, node %s",
idx, instance.name, node)
# The wipe size is MIN_WIPE_CHUNK_PERCENT % of the instance disk but
# MAX_WIPE_CHUNK at max
......
......@@ -34,7 +34,7 @@ fi
ip link set $INTERFACE up
if [ "$MODE" == "bridged" ]; then
if [ "$MODE" = "bridged" ]; then
# Connect the interface to the bridge
brctl addif $BRIDGE $INTERFACE
else
......
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