From: Kefu Chai Date: Tue, 18 Sep 2018 03:22:14 +0000 (+0800) Subject: ceph-volume: fix typos X-Git-Tag: v13.2.7~9^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbac1139c55de5c9031119ef582b86eacb40a8f4;p=ceph.git ceph-volume: fix typos Signed-off-by: Kefu Chai (cherry picked from commit a4ece9cae60c437b7e01db21c9c42363865c295c) --- diff --git a/src/ceph-volume/ceph_volume/api/lvm.py b/src/ceph-volume/ceph_volume/api/lvm.py index 5a9fd97a091..d5df10b3c01 100644 --- a/src/ceph-volume/ceph_volume/api/lvm.py +++ b/src/ceph-volume/ceph_volume/api/lvm.py @@ -40,7 +40,7 @@ def _output_parser(output, fields): if not line: continue - # spliting on ';' because that is what the lvm call uses as + # splitting on ';' because that is what the lvm call uses as # '--separator' output_items = [i.strip() for i in line.split(';')] # map the output to the fiels @@ -945,7 +945,7 @@ class PVolumes(list): if matches: tag_filtered.append(pvolume) # return the tag_filtered pvolumes here, the `filtered` list is no - # longer useable + # longer usable return tag_filtered return filtered diff --git a/src/ceph-volume/ceph_volume/decorators.py b/src/ceph-volume/ceph_volume/decorators.py index d0be938172f..f6777281795 100644 --- a/src/ceph-volume/ceph_volume/decorators.py +++ b/src/ceph-volume/ceph_volume/decorators.py @@ -41,7 +41,7 @@ def catches(catch=None, handler=None, exit=True): some_call() print "Success!" - If multiple exceptions need to be catched they need to be provided as a + If multiple exceptions need to be caught they need to be provided as a tuple:: @catches((TypeError, AttributeError)) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py index 2ff5a094365..d46db9edfa5 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py @@ -32,7 +32,7 @@ def activate_filestore(lvs, no_systemd=False): # blow up with a KeyError if this doesn't exist osd_fsid = osd_lv.tags['ceph.osd_fsid'] if not osd_journal_lv: - # must be a disk partition, by quering blkid by the uuid we are ensuring that the + # must be a disk partition, by querying blkid by the uuid we are ensuring that the # device path is always correct journal_uuid = osd_lv.tags['ceph.journal_uuid'] osd_journal = disk.get_device_from_partuuid(journal_uuid) diff --git a/src/ceph-volume/ceph_volume/devices/simple/scan.py b/src/ceph-volume/ceph_volume/devices/simple/scan.py index df3ff2bca49..c9202482658 100644 --- a/src/ceph-volume/ceph_volume/devices/simple/scan.py +++ b/src/ceph-volume/ceph_volume/devices/simple/scan.py @@ -271,7 +271,7 @@ class Scan(object): ) ) terminal.success( - 'To take over managment of this scanned OSD, and disable ceph-disk and udev, run:' + 'To take over management of this scanned OSD, and disable ceph-disk and udev, run:' ) terminal.success(' ceph-volume simple activate %s %s' % (osd_id, osd_fsid)) diff --git a/src/ceph-volume/ceph_volume/util/disk.py b/src/ceph-volume/ceph_volume/util/disk.py index 2d382606ba2..fbf30050c8c 100644 --- a/src/ceph-volume/ceph_volume/util/disk.py +++ b/src/ceph-volume/ceph_volume/util/disk.py @@ -570,7 +570,7 @@ class Size(object): for k, v in kw.items(): self._convert(v, k) - # only pursue the first occurence + # only pursue the first occurrence break def _convert(self, size, unit): diff --git a/src/ceph-volume/ceph_volume/util/encryption.py b/src/ceph-volume/ceph_volume/util/encryption.py index df7eb69d860..72a0ccf121e 100644 --- a/src/ceph-volume/ceph_volume/util/encryption.py +++ b/src/ceph-volume/ceph_volume/util/encryption.py @@ -152,7 +152,7 @@ def write_lockbox_keyring(osd_id, osd_fsid, secret): For filestore: The path for the OSD would exist at this point even if no OSD data device is mounted, so the keyring is written to fetch the key, and then the data device is mounted on that directory, making the keyring - "dissapear". + "disappear". """ if os.path.exists('/var/lib/ceph/osd/%s-%s/lockbox.keyring' % (conf.cluster, osd_id)): return diff --git a/src/ceph-volume/ceph_volume/util/prepare.py b/src/ceph-volume/ceph_volume/util/prepare.py index e39bbb37ba9..027b4c08184 100644 --- a/src/ceph-volume/ceph_volume/util/prepare.py +++ b/src/ceph-volume/ceph_volume/util/prepare.py @@ -385,7 +385,7 @@ def osd_mkfs_bluestore(osd_id, fsid, keyring=None, wal=False, db=False): --setuser ceph --setgroup ceph In some cases it is required to use the keyring, when it is passed in as - a keywork argument it is used as part of the ceph-osd command + a keyword argument it is used as part of the ceph-osd command """ path = '/var/lib/ceph/osd/%s-%s/' % (conf.cluster, osd_id) monmap = os.path.join(path, 'activate.monmap')