Commit 8dd23148 authored by Klaus Aehlig's avatar Klaus Aehlig

Merge branch 'stable-2.9' into stable-2.10

* stable-2.9
  Revision bump for 2.9.0
  Schedule release of 2.9.0

* stable-2.8
  Improve error message for replace-disks

Conflicts:
	NEWS: trivial
	configure.ac: drop suffix bump of stable-2.9
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarMichele Tartara <mtartara@google.com>
parents 4c5cb91e eb9861d3
......@@ -70,10 +70,10 @@ Python
version 1.0.1. It is still used for testing only.
Version 2.9.0 rc4
-----------------
Version 2.9.0
-------------
*(unreleased)*
*(Released Tue, 5 Nov 2013)*
Incompatible/important changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -144,6 +144,7 @@ Since 2.9.0 rc3
- Correctly start/stop luxid during gnt-cluster master-failover (inherited
from stable-2.8)
- Improved error messsages (inherited from stable-2.8)
Version 2.9.0 rc3
......
......@@ -2188,8 +2188,15 @@ class TLReplaceDisks(Tasklet):
if msg or not result.payload:
if not msg:
msg = "disk not found"
raise errors.OpExecError("Can't find disk/%d on node %s: %s" %
(idx, self.cfg.GetNodeName(node_uuid), msg))
if not self._CheckDisksActivated(self.instance):
extra_hint = ("\nDisks seem to be not properly activated. Try"
" running activate-disks on the instance before"
" using replace-disks.")
else:
extra_hint = ""
raise errors.OpExecError("Can't find disk/%d on node %s: %s%s" %
(idx, self.cfg.GetNodeName(node_uuid), msg,
extra_hint))
def _CheckDisksConsistency(self, node_uuid, on_primary, ldisk):
for idx, dev in enumerate(self.instance.disks):
......
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