From 2945fd2d3e61f94d827b48bcd239f752393964f6 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 13 Aug 2009 13:45:17 +0200
Subject: [PATCH] TLReplaceDisks: Refuse changing secondary for specific disks
We move all disks anyway.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 4bd2a8fc8..1c07c1f87 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5883,10 +5883,11 @@ class TLReplaceDisks(Tasklet):
raise errors.OpPrereqError("The specified node is already the"
" secondary node of the instance.")
- if self.mode == constants.REPLACE_DISK_AUTO:
- if self.disks:
- raise errors.OpPrereqError("Cannot specify disks to be replaced")
+ if self.disks and self.mode in (constants.REPLACE_DISK_AUTO,
+ constants.REPLACE_DISK_CHG):
+ raise errors.OpPrereqError("Cannot specify disks to be replaced")
+ if self.mode == constants.REPLACE_DISK_AUTO:
faulty_primary = self._FindFaultyDisks(self.instance.primary_node)
faulty_secondary = self._FindFaultyDisks(secondary_node)
--
GitLab