Commit 3994f455 authored by Iustin Pop's avatar Iustin Pop

Fix argument checking in LUSetClusterParams

This patch fixes two issues with LUSetClusterParams and argument
checking.

First, this LU used the wrong function name (CheckParameters instead of
CheckArguments), which means that no parameter checking was done at all;
this impacted the candidate_pool_size checks (the only one done at this
stage).

Second, int() can raise both ValueError and TypeError, and we should
correctly handle both.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent d64769a8
......@@ -1418,7 +1418,7 @@ class LUSetClusterParams(LogicalUnit):
_OP_REQP = []
REQ_BGL = False
def CheckParameters(self):
def CheckArguments(self):
"""Check parameters
"""
......@@ -1427,7 +1427,7 @@ class LUSetClusterParams(LogicalUnit):
if self.op.candidate_pool_size is not None:
try:
self.op.candidate_pool_size = int(self.op.candidate_pool_size)
except ValueError, err:
except (ValueError, TypeError), err:
raise errors.OpPrereqError("Invalid candidate_pool_size value: %s" %
str(err))
if self.op.candidate_pool_size < 1:
......
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