sanlock-devel February 2025

sanlock-devel@lists.fedorahosted.org

2 participants
2 discussions

[PATCH] misc: Typo fixes, courtesy of Codespell
by Eric Blake 26 Feb '25

26 Feb '25

While I mostly followed Codespell's suggestions, I did not choose to shorten 'pre-emptively' to 'preemptively'. I also noticed a couple of s/loose/lose/ not spotted by Codespell. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Noticed while fixing similar problems in lvm2. README.rst | 4 ++-- fence_sanlock/fence_sanlock.in | 2 +- python/sanlock.c | 12 ++++++------ reset/sanlk_reset.c | 4 ++-- src/cmd.c | 2 +- src/delta_lease.c | 2 +- src/direct.c | 2 +- src/diskio.c | 2 +- src/lockspace.c | 4 ++-- src/main.c | 4 ++-- src/paxos_lease.c | 16 ++++++++-------- src/resource.c | 2 +- src/sanlock.8 | 4 ++-- src/sanlock.conf | 2 +- src/sanlock_resource.h | 2 +- src/timeouts.h | 2 +- tests/conftest.py | 2 +- tests/daemon_test.py | 2 +- tests/python_test.py | 12 ++++++------ tests/sanlk_path.c | 2 +- tests/util.py | 2 +- 21 files changed, 43 insertions(+), 43 deletions(-) diff --git a/README.rst b/README.rst index a3feb1e..67675ea 100644 --- a/README.rst +++ b/README.rst @@ -264,7 +264,7 @@ DESCRIPTION Expiration - â¢ If a host fails to renew its delta lease, e.g. it looses access to + â¢ If a host fails to renew its delta lease, e.g. it loses access to the storage, its delta lease will eventually expire and another host will be able to take over any resource leases held by the host. sanâ? lock must ensure that the application on two different hosts is not @@ -686,7 +686,7 @@ OPTIONS Look up the offset of an existing resource lease by name on disk, using the rindex. With no -e option, lookup returns the next free lease offâ? - set. If -e specifes both name and offset, the lookup verifies both are + set. If -e specifies both name and offset, the lookup verifies both are correct. sanlock client update -x RINDEX -e resource_name[:offset] [-z 0|1] diff --git a/fence_sanlock/fence_sanlock.in b/fence_sanlock/fence_sanlock.in index a46773c..7cb43e9 100755 --- a/fence_sanlock/fence_sanlock.in +++ b/fence_sanlock/fence_sanlock.in @@ -311,7 +311,7 @@ action_off() { sanlock client request -r fence:h$host_id:$path:$offset:$((ver + 1)) -f 2 > /dev/null 2>&1 [ "$?" != 0 ] && { - loggger -t $prog "request $host_id error $?" + logger -t $prog "request $host_id error $?" } fi diff --git a/python/sanlock.c b/python/sanlock.c index c481464..1b533c0 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -63,7 +63,7 @@ set_sanlock_error(int en, char *msg) /* * Converts a unicode path into PyBytes object. * If conversion succeeds addr will hold a reference to a new - * PyBytes object containing bytes represenation of the system path + * PyBytes object containing bytes representation of the system path * given in arg object. * Returns 1 on successful operation, 0 otherwise. * Py2 implementation is based on Py3's PyUnicode_FSConverter[1]. @@ -106,7 +106,7 @@ pypath_converter(PyObject* arg, void* addr) #else /* python 3 call wrapper */ int rv = PyUnicode_FSConverter(arg, addr); - /* python 2 does not suppot cleanups - same applies here */ + /* python 2 does not support cleanups - same applies here */ if (rv == Py_CLEANUP_SUPPORTED) rv = 1; return rv; @@ -130,7 +130,7 @@ pyinteger_as_unsigned_long_long_mask(PyObject *obj) * and raises TypeError.[1][2] * * The returned pointer refers to the internal buffer of string, not a copy. It must not be - * deallocated, and the object must be kept alive as long as the retruned pointer is used. + * deallocated, and the object must be kept alive as long as the returned pointer is used. * [1] https://docs.python.org/2/c-api/string.html#c.PyString_AsString * [2] https://docs.python.org/3/c-api/unicode.html#c.PyUnicode_AsUTF8 * @@ -415,7 +415,7 @@ py_register(PyObject *self __unused, PyObject *args) { int sanlockfd; - /* This sholdn't block, but we don't want to take any chance, as blocking + /* This shouldn't block, but we don't want to take any chance, as blocking * hangs all threads in the caller process. */ Py_BEGIN_ALLOW_THREADS sanlockfd = sanlock_register(); @@ -470,7 +470,7 @@ finally: * For Python 2: * If arg is unicode onject, ascii encode it to new PyBytes object passed by addr. * If arg is a bytes object, inc its refcount and pass it in addr. - * Set TypeError and return 0 if arg doens not comply to any of the above. + * Set TypeError and return 0 if arg does not comply to any of the above. * Return 1 on a successful conversion. * For Python 3: * If arg is a bytes object, inc its refcount and pass it in addr. @@ -1179,7 +1179,7 @@ py_inquire(PyObject *self __unused, PyObject *args, PyObject *keywds) int res_count = 0; char *res_state = NULL; - /* Array of resoruces parsed from res_state. */ + /* Array of resources parsed from res_state. */ struct sanlk_resource **res_arr = NULL; /* List of resource dicts. */ diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c index 9e952ab..6186746 100644 --- a/reset/sanlk_reset.c +++ b/reset/sanlk_reset.c @@ -48,7 +48,7 @@ static socklen_t update_addrlen; * host status states. The host status states are based on a * lockspace failing to renew a lease, and determining the * latest possible watchdog firing based on that. The reset - * case is based on lockspace storage remaining accessable, + * case is based on lockspace storage remaining accessible, * and a host acknowledging through a RESETTING event that * its watchdog has been set to expire. Until the watchdog * fires, the host will continue renewing its lease. We can @@ -322,7 +322,7 @@ static int reset_fail(void) * If the watchdog failed to reset the host (or * use_watchdog was turned off in sanlk-reset), * then we'll continue coming through here - * indefinately. We want to eventually fail + * indefinitely. We want to eventually fail * in this case, so put a large upper bound * on the time we'll wait for the host state * to become DEAD. diff --git a/src/cmd.c b/src/cmd.c index 47656bb..b00f9de 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -477,7 +477,7 @@ static void cmd_acquire(struct task *task, struct cmd_args *ca, uint32_t cmd) * Prior to inserting the new_tokens into the client, if the lockspace * fails, kill_pids/client_using_pid would not find this pid (assuming * it doesn't already hold other tokens using the lockspace). If - * the lockspace failed while we were acquring the tokens, kill_pids + * the lockspace failed while we were acquiring the tokens, kill_pids * has already run and not found us, so we must revert what we've done * in acquire. * diff --git a/src/delta_lease.c b/src/delta_lease.c index 144c0ea..1143dd1 100644 --- a/src/delta_lease.c +++ b/src/delta_lease.c @@ -756,7 +756,7 @@ int delta_lease_renew(struct task *task, /* We can't always memcmp(&leader, leader_last) because previous writes may have timed out and we don't know if they were actually written - or not. We can definately verify that we're still the owner, + or not. We can definitely verify that we're still the owner, though, which is the main thing we need to know. */ if (leader.owner_id != leader_last->owner_id || diff --git a/src/direct.c b/src/direct.c index 1f40647..920fd72 100644 --- a/src/direct.c +++ b/src/direct.c @@ -588,7 +588,7 @@ int direct_dump(struct task *task, char *dump_path, int force_mode) * /path[:<offset>[:<size>]] * * If path contains a colon, the user would escape it with \\, e.g. - * device named /dev/foo:32 using offset 0 and lenth 1M would be + * device named /dev/foo:32 using offset 0 and length 1M would be * /dev/foo\\:32:0:1M */ diff --git a/src/diskio.c b/src/diskio.c index 1d84a6c..158bfd7 100644 --- a/src/diskio.c +++ b/src/diskio.c @@ -764,7 +764,7 @@ static int do_linux_aio(int fd, uint64_t offset, char *buf, int len, } /* Timed out waiting for result. If cancel fails, we could try retry - io_getevents indefinately, but that removes the whole point of using + io_getevents indefinitely, but that removes the whole point of using aio, which is the timeout. So, we need to be prepared to reap the event the next time we call io_getevents for a different i/o. We can't reuse the iocb for this timed out io until we get an event for diff --git a/src/lockspace.c b/src/lockspace.c index 1cea79d..0756241 100644 --- a/src/lockspace.c +++ b/src/lockspace.c @@ -1562,7 +1562,7 @@ int get_lockspaces(char *buf, int *len, int *count, int maxlen) * * * Hosts that are failing and don't recover would be the same as prev. * - * * For hosts thet are failing but recover, we'd return: + * * For hosts that are failing but recover, we'd return: * UNKNOWN then FAIL then LIVE * * @@ -1852,7 +1852,7 @@ static int _clean_event_fds(struct space *sp) /* * end_event/reg_event don't need to worry about sp being freed - * beause the main daemon thread processes end_event/reg_event, + * because the main daemon thread processes end_event/reg_event, * and the main thread is also the only thread that will free * sp structs. */ diff --git a/src/main.c b/src/main.c index 6f63bf8..9e9d19e 100644 --- a/src/main.c +++ b/src/main.c @@ -125,7 +125,7 @@ static void send_helper_kill(struct space *sp, struct client *cl, int sig) * We come through here once a second while the pid still has * leases. We only send a single RUNPATH message, so after * the first RUNPATH goes through we set CL_RUNPATH_SENT to - * avoid futher RUNPATH's. + * avoid further RUNPATH's. */ if ((cl->flags & CL_RUNPATH_SENT) && (sig == SIGRUNPATH)) @@ -1264,7 +1264,7 @@ static void process_cmd_thread_registered(int ci_in, struct sm_header *h_recv) cl->cmd_active = h_recv->cmd; /* once cmd_active is set, client_pid_dead() will not clear cl->tokens - or call client_free, so it's the responsiblity of cmd_a,r,i_thread + or call client_free, so it's the responsibility of cmd_a,r,i_thread to check if pid_dead when clearing cmd_active, and doing the cleanup if pid is dead */ out: diff --git a/src/paxos_lease.c b/src/paxos_lease.c index 8f7d816..07e0114 100644 --- a/src/paxos_lease.c +++ b/src/paxos_lease.c @@ -177,7 +177,7 @@ int paxos_erase_dblock(struct task *task, * well with the way the code has been written. It's used when we want to * convert sh to ex, which requires acquiring the lease owner, but we don't * want to clobber our SHARED mblock by writing a plain dblock in the process - * in case there's a problem with the acquiring, we don't want to loose our + * in case there's a problem with the acquiring, we don't want to lose our * shared mode lease. * * NB. this assumes the only mblock flag we want is MBLOCK_SHARED and that @@ -437,7 +437,7 @@ static int verify_dblock(struct token *token, struct paxos_dblock *pd, uint32_t /* * It's possible that we pick a bk_max from another host which has our own - * inp values in it, and we can end up commiting our own inp values, copied + * inp values in it, and we can end up committing our own inp values, copied * from another host's dblock: * * host2 leader free @@ -1786,7 +1786,7 @@ static int write_new_leader(struct task *task, /* * If we hang or crash after completing a ballot successfully, but before - * commiting the leader_record, then the next host that runs a ballot (with the + * committing the leader_record, then the next host that runs a ballot (with the * same lver since we did not commit the new lver to the leader_record) will * commit the same inp values that we were about to commit. If the inp values * they commit indicate we (who crashed or hung) are the new owner, then the @@ -2364,8 +2364,8 @@ int paxos_lease_acquire(struct task *task, * The LFL_SHORT_HOLD flag is just a "hint" to help * other nodes be more intelligent about retrying * due to transient failures when acquiring shared - * leases. Only modify SHORT_HOLD if we're commiting - * ourself as the new owner. If we're commiting another + * leases. Only modify SHORT_HOLD if we're committing + * ourself as the new owner. If we're committing another * host as owner, we don't know if they are acquiring * shared or not. */ @@ -2486,9 +2486,9 @@ int paxos_lease_release(struct task *task, /* * This will happen when two hosts finish the same ballot - * successfully, the second commiting the same inp values + * successfully, the second committing the same inp values * that the first did, as it should. But the second will - * write it's own write_id/gen/timestap, which will differ + * write its own write_id/gen/timestamp, which will differ * from what the first host wrote. So when the first host * rereads here in the release, it will find different * write_id/gen/timestamp from what it wrote. This is @@ -2529,7 +2529,7 @@ int paxos_lease_release(struct task *task, /* * When we were the writer of our own leader record, then - * releasing the lease includes both setting the REALEASED flag + * releasing the lease includes both setting the RELEASED flag * in our dblock and clearing out timestamp in the leader. * When we reread the leader here in release, we should find * it the same as we last saw in acquire. diff --git a/src/resource.c b/src/resource.c index 6cbfbf0..5fb5183 100644 --- a/src/resource.c +++ b/src/resource.c @@ -1077,7 +1077,7 @@ static int release_disk(struct task *task, struct token *token, * happening from this point forward. However, another host contending for the * lease at the same time we failed, could already have read our dblock values * from before we cleared them. In the worst case, that host could commit our - * dblock values as the new leader, and that new leader write could apppear on + * dblock values as the new leader, and that new leader write could appear on * disk up to host_dead_seconds later. So it seems that technically we would * need to monitor the leader for up to host_dead_seconds after clearing our * dblock to check if we become the on-disk owner of the lease. The chances diff --git a/src/sanlock.8 b/src/sanlock.8 index 23774a1..8b7b89b 100644 --- a/src/sanlock.8 +++ b/src/sanlock.8 @@ -308,7 +308,7 @@ testing or repairs. .I Expiration .IP \[bu] 2 -If a host fails to renew its delta lease, e.g. it looses access to the +If a host fails to renew its delta lease, e.g. it loses access to the storage, its delta lease will eventually expire and another host will be able to take over any resource leases held by the host. sanlock must ensure that the application on two different hosts is not holding and @@ -806,7 +806,7 @@ Delete an existing resource lease on disk. Look up the offset of an existing resource lease by name on disk, using the rindex. With no -e option, lookup returns the next free lease offset. -If -e specifes both name and offset, the lookup verifies both are correct. +If -e specifies both name and offset, the lookup verifies both are correct. \fBsanlock client update -x\fP RINDEX \fB-e\fP \fIresource_name\fP[:\fIoffset\fP] [\fB-z 0|1\fP] diff --git a/src/sanlock.conf b/src/sanlock.conf index 325c37d..8574250 100644 --- a/src/sanlock.conf +++ b/src/sanlock.conf @@ -1,6 +1,6 @@ # sanlock config file # -# Values set here can be overriden on the command line. +# Values set here can be overridden on the command line. # See 'man sanlock' and 'sanlock -h' for more information. # # Example settings: diff --git a/src/sanlock_resource.h b/src/sanlock_resource.h index ed27130..e4cf682 100644 --- a/src/sanlock_resource.h +++ b/src/sanlock_resource.h @@ -116,7 +116,7 @@ * multiple hosts are making requests, this flag can * produce unexpected results, and it would be safer * to read the resource, check that the current owner - * is the one being targetted, and use that owner's + * is the one being targeted, and use that owner's * lver + 1 as the specifically requested lver. */ diff --git a/src/timeouts.h b/src/timeouts.h index 73b02f1..7d8b140 100644 --- a/src/timeouts.h +++ b/src/timeouts.h @@ -695,7 +695,7 @@ * * id_renewal_warn_seconds = 3 * delta_renew_max (6N) * . time from last successful renewal until warning about renewal length - * . allows for two consecutive max len renewal failues + * . allows for two consecutive max len renewal failures * * T time in seconds * 0 renewal ok diff --git a/tests/conftest.py b/tests/conftest.py index 79c514b..fa708bd 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -35,7 +35,7 @@ def sanlock_daemon(): util.wait_for_daemon(0.5) yield finally: - # Killing sanlock allows terminating without reomving the lockspace, + # Killing sanlock allows terminating without removing the lockspace, # which takes about 3 seconds, slowing down the tests. p.kill() p.wait() diff --git a/tests/daemon_test.py b/tests/daemon_test.py index 1b484f2..0a85cc4 100644 --- a/tests/daemon_test.py +++ b/tests/daemon_test.py @@ -176,7 +176,7 @@ def test_delete(tmpdir, sanlock_daemon): f.seek(MiB + 512) util.check_rindex_entry(f.read(RINDEX_ENTRY_SIZE), b"", 0, 0) - # Rest of entires should not be modified. + # Rest of entries should not be modified. rest = 512 * RINDEX_ENTRIES_SECTORS - RINDEX_ENTRY_SIZE assert f.read(rest) == b"\0" * rest diff --git a/tests/python_test.py b/tests/python_test.py index caf2f3e..ea550f7 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -338,14 +338,14 @@ def test_add_rem_lockspace(tmpdir, sanlock_daemon, size, offset): sanlock.write_lockspace(b"ls_name", path, offset=offset, iotimeout=1) - # Since the lockspace is not acquired, we exepect to get False. + # Since the lockspace is not acquired, we expect to get False. acquired = sanlock.inq_lockspace( b"ls_name", 1, path, offset=offset, wait=False) assert acquired is False sanlock.add_lockspace(b"ls_name", 1, path, offset=offset, iotimeout=1) - # Once the lockspace is acquired, we exepect to get True. + # Once the lockspace is acquired, we expect to get True. acquired = sanlock.inq_lockspace( b"ls_name", 1, path, offset=offset, wait=False) assert acquired is True @@ -361,7 +361,7 @@ def test_add_rem_lockspace(tmpdir, sanlock_daemon, size, offset): sanlock.rem_lockspace(b"ls_name", 1, path, offset=offset) - # Once the lockspace is released, we exepect to get False. + # Once the lockspace is released, we expect to get False. acquired = sanlock.inq_lockspace( b"ls_name", 1, path, offset=offset, wait=False) assert acquired is False @@ -381,12 +381,12 @@ def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): # This will take 3 seconds. sanlock.add_lockspace(b"ls_name", 1, path, iotimeout=1, wait=False) - # While the lockspace is being aquired, we expect to get None. + # While the lockspace is being acquired, we expect to get None. time.sleep(1) acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=False) assert acquired is None - # Once the lockspace is acquired, we exepect to get True. + # Once the lockspace is acquired, we expect to get True. acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=True) assert acquired is True @@ -861,7 +861,7 @@ def test_lvb(tmpdir, sanlock_daemon): assert result == lvb_data - # Test failure to write more then sector size. + # Test failure to write more than sector size. sanlock.acquire(b"ls_name", b"res_name", disks, slkfd=fd, lvb=True) with raises_sanlock_errno(errno.E2BIG): diff --git a/tests/sanlk_path.c b/tests/sanlk_path.c index 6befa68..0b88f96 100644 --- a/tests/sanlk_path.c +++ b/tests/sanlk_path.c @@ -126,6 +126,6 @@ int main(int argc __attribute__ ((unused)), { test_sanlock_path_export(); test_sanlock_path_import(); - printf("OK, %i tests sucessfully passed.\n", __test_passed); + printf("OK, %i tests successfully passed.\n", __test_passed); return 0; } diff --git a/tests/util.py b/tests/util.py index df36ebb..f6dbadd 100644 --- a/tests/util.py +++ b/tests/util.py @@ -62,7 +62,7 @@ def start_daemon(): def wait_for_daemon(timeout): """ - Wait until deamon is accepting connections + Wait until daemon is accepting connections """ deadline = time.time() + timeout path = os.path.join(os.environ["SANLOCK_RUN_DIR"], "sanlock.sock") base-commit: 6240d633b229e15d445868a8b1463fb8ee6ddbc6 -- 2.48.1

1 0

[sanlock] branch master updated: sanlock: fix setting checksum for direct write_leader
by pagure＠pagure.io 26 Feb '25

26 Feb '25

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. The following commit(s) were added to refs/heads/master by this push: new 5e42f1e sanlock: fix setting checksum for direct write_leader 5e42f1e is described below commit 5e42f1e458b304a469e15a3254a7ef9a7d88982d Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Feb 25 16:43:40 2025 -0600 sanlock: fix setting checksum for direct write_leader --- src/delta_lease.c | 7 ++++++- src/main.c | 17 +++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/delta_lease.c b/src/delta_lease.c index 144c0ea..fa69ed1 100644 --- a/src/delta_lease.c +++ b/src/delta_lease.c @@ -299,11 +299,16 @@ int delta_lease_leader_clobber(struct task *task, int io_timeout, struct leader_record *leader, const char *caller) { - struct leader_record leader_end; + struct leader_record leader_end = { 0 }; + uint32_t checksum; int rv; leader_record_out(leader, &leader_end); + checksum = leader_checksum(&leader_end); + + leader_end.checksum = cpu_to_le32(checksum); + rv = write_sector(disk, leader->sector_size, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), task, io_timeout, caller); if (rv < 0) diff --git a/src/main.c b/src/main.c index 6f63bf8..32f7df4 100644 --- a/src/main.c +++ b/src/main.c @@ -3785,7 +3785,6 @@ static int read_file_leader(struct leader_record *leader, int is_ls) char field[MAX_LINE]; char val[MAX_LINE]; uint32_t checksum = 0; - uint32_t new_checksum; struct leader_record lr; int rv; @@ -3806,7 +3805,7 @@ static int read_file_leader(struct leader_record *leader, int is_ls) rv = sscanf(line, "%s %s", field, val); if (rv != 2) { - log_tool("ignore line: \"%s\"", line); + log_tool("ignoring empty field \"%s\"", field); continue; } @@ -3848,6 +3847,7 @@ static int read_file_leader(struct leader_record *leader, int is_ls) } else if (!strcmp(field, "checksum")) { sscanf(val, "0x%x", &checksum); + log_tool("ignoring checksum, will be recalculated."); } else if (!strcmp(field, "io_timeout")) { sscanf(val, "%hu", &lr.io_timeout); @@ -3870,24 +3870,13 @@ static int read_file_leader(struct leader_record *leader, int is_ls) } else if (!is_ls && !strcmp(field, "write_timestamp")) { sscanf(val, "%llu", (unsigned long long *)&lr.write_timestamp); } else { - log_tool("ignore field: \"%s\"", field); + log_tool("ignoring unknown field \"%s\"", field); } memset(line, 0, sizeof(line)); } fclose(file); - new_checksum = leader_checksum(&lr); - - if (!com.force_mode) { - lr.checksum = new_checksum; - log_tool("use new generated checksum %x", new_checksum); - } else { - lr.checksum = checksum; - log_tool("warning: using specified checksum %x (generated is %x)", - checksum, new_checksum); - } - memcpy(leader, &lr, sizeof(lr)); return 0; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

sanlock-devel February 2025