On Tue, Feb 15, 2011 at 14:45, Iustin Pop <[email protected]> wrote:
> This LU was introduced before the RPC result conversion from .data to
> .payload, and it has managed to keep the old-style usage (how? it's
> the only LU that does so). Fix by changing to payload, and add some
> extra logging for easier diagnose.
> ---
>  lib/cmdlib.py |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/lib/cmdlib.py b/lib/cmdlib.py
> index 05cf991..fa8becd 100644
> --- a/lib/cmdlib.py
> +++ b/lib/cmdlib.py
> @@ -2579,11 +2579,13 @@ class LUClusterRepairDiskSizes(NoHooksLU):
>         self.LogWarning("Failure in blockdev_getsize call to node"
>                         " %s, ignoring", node)
>         continue
> -      if len(result.data) != len(dskl):
> +      if len(result.payload) != len(dskl):
> +        logging.warning("Invalid result from node %s: len(dksl)=%d,"
> +                        " result.payload=%s", node, len(dskl), 
> result.payload)
>         self.LogWarning("Invalid result from node %s, ignoring node results",
>                         node)
>         continue
> -      for ((instance, idx, disk), size) in zip(dskl, result.data):
> +      for ((instance, idx, disk), size) in zip(dskl, result.payload):
>         if size is None:
>           self.LogWarning("Disk %d of instance %s did not return size"
>                           " information, ignoring", idx, instance.name)
> --
> 1.7.3.1
>
>

LGTM

Steve

Reply via email to