From c42e8a5cecfb0c1146a21906317146eda2aa3e40 Mon Sep 17 00:00:00 2001 From: HÃ¥vard Flaget Aasen Date: Oct 12 2020 21:37:39 +0000 Subject: Fix typo's --- diff --git a/python/sanlock.c b/python/sanlock.c index d616008..6cdbbc9 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -689,7 +689,7 @@ finally: PyDoc_STRVAR(pydoc_add_lockspace, "\ add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, wait=True)\n\ Add a lockspace, acquiring a host_id in it. If wait is False the function\n\ -will return immediatly and the status can be checked using inq_lockspace.\n\ +will return immediately and the status can be checked using inq_lockspace.\n\ The iotimeout option configures the io timeout for the specific lockspace,\n\ overriding the default value (see the sanlock daemon parameter -o)."); @@ -983,7 +983,7 @@ PyDoc_STRVAR(pydoc_acquire, "\ acquire(lockspace, resource, disks \ [, slkfd=fd, pid=owner, shared=False, version=None])\n\ Acquire a resource lease for the current process (using the slkfd argument\n\ -to specify the sanlock file descriptor) or for an other process (using the\n\ +to specify the sanlock file descriptor) or for another process (using the\n\ pid argument). If shared is True the resource will be acquired in the shared\n\ mode. The version is the version of the lease that must be acquired or fail.\n\ The disks must be in the format: [(path, offset), ... ]\n"); diff --git a/src/paxos_lease.c b/src/paxos_lease.c index 4850347..ce265e7 100644 --- a/src/paxos_lease.c +++ b/src/paxos_lease.c @@ -2024,8 +2024,8 @@ int paxos_lease_acquire(struct task *task, if (tmp_leader.lver == next_lver) { /* - * another host has commited a leader_record for next_lver, - * check which inp (owner_id) they commited (possibly us). + * another host has committed a leader_record for next_lver, + * check which inp (owner_id) they committed (possibly us). */ if (tmp_leader.owner_id == token->host_id && @@ -2033,7 +2033,7 @@ int paxos_lease_acquire(struct task *task, /* not a problem, but interesting to see */ log_warnt(token, "paxos_acquire %llu owner is our inp " - "%llu %llu %llu commited by %llu", + "%llu %llu %llu committed by %llu", (unsigned long long)next_lver, (unsigned long long)tmp_leader.owner_id, (unsigned long long)tmp_leader.owner_generation, diff --git a/src/sanlock.8 b/src/sanlock.8 index f33d5be..a9126a4 100644 --- a/src/sanlock.8 +++ b/src/sanlock.8 @@ -112,7 +112,7 @@ host_id, e.g. joining the lockspace with host_id 1 acquires delta lease 1. .IP \[bu] The terms delta lease, lockspace lease, and host_id lease are used -interchangably. +interchangeably. .IP \[bu] sanlock acquires a delta lease by writing the host's unique name to the @@ -168,7 +168,7 @@ by an application. .IP \[bu] sanlock uses paxos leases to implement leases on resources. The terms -paxos lease and resource lease are used interchangably. +paxos lease and resource lease are used interchangeably. .IP \[bu] A paxos lease exists on shared storage and requires 1MB of space. @@ -1055,13 +1055,13 @@ read_ms/write_ms are the milliseconds taken for the renewal read/write ios. .IP \[bu] 2 -next_timeouts are the number of io timeouts that occured +next_timeouts are the number of io timeouts that occurred after the renewal recorded on that line, and before the next successful renewal on the following line. .IP \[bu] 2 next_errors are the number of io errors (not timeouts) that -occured after renewal recorded on that line, and before the +occurred after renewal recorded on that line, and before the next successful renewal on the following line. .P