From 3bc145d8c7a84ad3fa8b90ef8746bfa69e467501 Mon Sep 17 00:00:00 2001
From: Bernardo Dal Seno <bdalseno@google.com>
Date: Sat, 17 Mar 2012 23:08:15 +0100
Subject: [PATCH] Fixed typos, formatting, etc and added a comment
This patch only touches comments and man pages.
Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/bdev.py | 4 ++--
lib/hypervisor/hv_kvm.py | 1 +
man/gnt-cluster.rst | 2 +-
man/gnt-instance.rst | 2 +-
qa/qa_instance.py | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/bdev.py b/lib/bdev.py
index 310ddf877..6c16da425 100644
--- a/lib/bdev.py
+++ b/lib/bdev.py
@@ -1058,7 +1058,7 @@ class BaseDRBD(BlockDev): # pylint: disable=W0223
def _CheckMetaSize(meta_device):
"""Check if the given meta device looks like a valid one.
- This currently only check the size, which must be around
+ This currently only checks the size, which must be around
128MiB.
"""
@@ -1197,7 +1197,7 @@ class DRBD8(BaseDRBD):
def _GetShowParser(cls):
"""Return a parser for `drbd show` output.
- This will either create or return an already-create parser for the
+ This will either create or return an already-created parser for the
output of the command `drbd show`.
"""
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index 2d6e23b7b..087939e95 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -936,6 +936,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
try:
info = self.GetInstanceInfo(name)
except errors.HypervisorError:
+ # Ignore exceptions due to instances being shut down
continue
if info:
data.append(info)
diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst
index fb28646eb..8082d14d9 100644
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@ -654,7 +654,7 @@ The ``continue`` option will let the watcher continue.
The ``info`` option shows whether the watcher is currently paused.
-redist-conf
+REDIST-CONF
~~~~~~~~~~~
**redist-conf** [\--submit]
diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
index 6d3c1bab1..77bec0d54 100644
--- a/man/gnt-instance.rst
+++ b/man/gnt-instance.rst
@@ -1250,7 +1250,7 @@ REPLACE-DISKS
[\--disks *idx*] {*instance*}
**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
-{\--iallocator *name* \| \--node *node* } {*instance*}
+{{-I\|\--iallocator} *name* \| \--node *node* } {*instance*}
**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
{\--auto} {*instance*}
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 65af80e1c..5303f255a 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -513,7 +513,7 @@ def _TestInstanceDiskFailure(instance, node, node2, onmaster):
AssertCommand(" && ".join(cmds), node=[node2, node][int(onmaster)])
print qa_utils.FormatInfo("Write to disks and give some time to notice"
- " to notice the problem")
+ " the problem")
cmds = []
for disk in devpath:
cmds.append(sq(["dd", "count=1", "bs=512", "conv=notrunc",
--
GitLab