sanlock-devel March 2026

sanlock-devel@lists.fedorahosted.org

4 participants
16 discussions

[sanlock] branch master updated: sanlock: add mailing list to README
by pagure＠pagure.io 10 Mar '26

10 Mar '26

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 a1e9d2f sanlock: add mailing list to README a1e9d2f is described below commit a1e9d2f7b97396543eef6457d32787aaeefb1cb3 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Mar 10 12:38:40 2026 -0500 sanlock: add mailing list to README --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 9fcccca..1cc9b8b 100644 --- a/README.md +++ b/README.md @@ -543,3 +543,9 @@ has not been renewed for host_dead_seconds, the resource lock is considered expired and can be acquired. Before this time, the resource lock remains owned by the other host, even if that host has stopped renewing its host_id lease. + +Mailing list +------------ + +https://lists.fedorahosted.org/admin/lists/sanlock-devel.lists.fedorahosted.org/ + -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 06/07: sanlock: disable rindex code
by pagure＠pagure.io 10 Mar '26

10 Mar '26

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit c5b925c97074813c47c0ed89a9fff4404b895625 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Mar 3 11:11:28 2026 -0600 sanlock: disable rindex code The rindex feature has never been used, and is untested, so disable it until there is an actual need for it. --- src/Makefile | 2 -- src/client.c | 33 +++++++++++++++++++++++++++++++++ src/cmd.c | 5 ++++- src/direct.c | 28 ++++++++++++++++------------ src/direct_lib.c | 2 ++ src/main.c | 10 +++++++++- 6 files changed, 64 insertions(+), 16 deletions(-) diff --git a/src/Makefile b/src/Makefile index 49e819f..e3ed69d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -36,7 +36,6 @@ CMD_SOURCE = \ task.c \ timeouts.c \ resource.c \ - rindex.c \ watchdog.c \ monotime.c \ cmd.c \ @@ -53,7 +52,6 @@ LIB_ENTIRE_SOURCE = \ sizeflags.c \ delta_lease.c \ paxos_lease.c \ - rindex.c \ direct.c \ task.c \ timeouts.c \ diff --git a/src/client.c b/src/client.c index ec91104..09ae10a 100644 --- a/src/client.c +++ b/src/client.c @@ -1885,6 +1885,7 @@ int sanlock_get_lvb(uint32_t flags, struct sanlk_resource *res, char *lvb, int l return rv; } +#if 0 int sanlock_format_rindex(struct sanlk_rindex *rx, uint32_t flags) { int rv, fd; @@ -2168,6 +2169,38 @@ int sanlock_delete_resource(struct sanlk_rindex *rx, uint32_t flags, close(fd); return rv; } +#endif + +int sanlock_format_rindex(struct sanlk_rindex *rx, uint32_t flags) +{ + return -EOPNOTSUPP; +} +int sanlock_rebuild_rindex(struct sanlk_rindex *rx, uint32_t flags) +{ + return -EOPNOTSUPP; +} +int sanlock_update_rindex(struct sanlk_rindex *rx, uint32_t flags, + struct sanlk_rentry *re) +{ + return -EOPNOTSUPP; +} +int sanlock_lookup_rindex(struct sanlk_rindex *rx, uint32_t flags, + struct sanlk_rentry *re) +{ + return -EOPNOTSUPP; +} +int sanlock_create_resource(struct sanlk_rindex *rx, uint32_t flags, + struct sanlk_rentry *re, + int max_hosts, int num_hosts) +{ + return -EOPNOTSUPP; +} +int sanlock_delete_resource(struct sanlk_rindex *rx, uint32_t flags, + struct sanlk_rentry *re) +{ + return -EOPNOTSUPP; +} + /* * src may have colons/spaces escaped (with backslash) or unescaped. diff --git a/src/cmd.c b/src/cmd.c index 33f2c84..a483451 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -46,7 +46,6 @@ #include "direct.h" #include "task.h" #include "cmd.h" -#include "rindex.h" /* from main.c */ void client_resume(int ci); @@ -2344,6 +2343,7 @@ reply: client_resume(ca->ci_in); } +#if 0 static void cmd_format_rindex(struct task *task, struct cmd_args *ca, uint32_t cmd) { struct sanlk_rindex ri; @@ -2455,6 +2455,7 @@ static void rindex_op(struct task *task, struct cmd_args *ca, const char *ri_cmd client_resume(ca->ci_in); } +#endif void call_cmd_thread(struct task *task, struct cmd_args *ca) { @@ -2533,6 +2534,7 @@ void call_cmd_thread(struct task *task, struct cmd_args *ca) case SM_CMD_SET_EVENT: cmd_set_event(task, ca, cmd); break; +#if 0 case SM_CMD_FORMAT_RINDEX: cmd_format_rindex(task, ca, cmd); break; @@ -2551,6 +2553,7 @@ void call_cmd_thread(struct task *task, struct cmd_args *ca) case SM_CMD_DELETE_RESOURCE: rindex_op(task, ca, "cmd_delete_resource", RX_OP_DELETE, cmd); break; +#endif }; } diff --git a/src/direct.c b/src/direct.c index fad8797..b3ced0e 100644 --- a/src/direct.c +++ b/src/direct.c @@ -32,7 +32,6 @@ #include "paxos_lease.h" #include "delta_lease.h" #include "timeouts.h" -#include "rindex.h" /* * the caller sets sd.offset to the location from the start of disk (in bytes) where @@ -617,12 +616,6 @@ int direct_dump(struct task *task, char *dump_path, int force_mode) char *data, *bitmap; char *colon1 = NULL, *colon2 = NULL, *off_str = NULL, *size_str = NULL, *m; uint32_t magic; - struct rindex_header *rh_end; - struct rindex_header *rh; - struct rindex_header rh_in; - struct rindex_entry *re_end; - struct rindex_entry *re; - struct rindex_entry re_in; struct leader_record *lr_end; struct leader_record *lr; struct leader_record lr_in; @@ -639,7 +632,16 @@ int direct_dump(struct task *task, char *dump_path, int force_mode) int sector_size = 0; int align_size = 0; int sector_count, datalen, max_hosts; - int i, j, rv, b; + int i, rv, b; +#if 0 + struct rindex_header *rh_end; + struct rindex_header *rh; + struct rindex_header rh_in; + struct rindex_entry *re_end; + struct rindex_entry *re; + struct rindex_entry re_in; + int j; +#endif memset(&sd, 0, sizeof(struct sync_disk)); @@ -862,7 +864,8 @@ int direct_dump(struct task *task, char *dump_path, int force_mode) printf(" "); printf("%04u %04llu SH\n", i+1, (unsigned long long)mb.generation); } - } else if (magic == RINDEX_DISK_MAGIC) { +#if 0 + else if (magic == RINDEX_DISK_MAGIC) { rh_end = (struct rindex_header *)data; rindex_header_in(rh_end, &rh_in); rh = &rh_in; @@ -898,13 +901,12 @@ int direct_dump(struct task *task, char *dump_path, int force_mode) re->name, (unsigned long long)re->res_offset); } } - - +#endif } else { if (end_sector_nr == 0) break; } - next: +/* next: */ sector_nr += sector_count; } @@ -991,6 +993,7 @@ int direct_next_free(struct task *task, char *path) } +#if 0 int direct_rindex_format(struct task *task, struct sanlk_rindex *ri) { return rindex_format(task, ri); @@ -1029,4 +1032,5 @@ int direct_rindex_update(struct task *task, struct sanlk_rindex *ri, return rv; } +#endif diff --git a/src/direct_lib.c b/src/direct_lib.c index 9fd6d22..eaedf80 100644 --- a/src/direct_lib.c +++ b/src/direct_lib.c @@ -33,6 +33,7 @@ void log_level(uint32_t space_id GNUC_UNUSED, uint32_t res_id GNUC_UNUSED, { } +#if 0 int lockspace_begin_rindex_op(char *space_name GNUC_UNUSED, int rindex_op GNUC_UNUSED, struct space_info *spi GNUC_UNUSED); int lockspace_begin_rindex_op(char *space_name GNUC_UNUSED, int rindex_op GNUC_UNUSED, struct space_info *spi GNUC_UNUSED) { @@ -44,6 +45,7 @@ int lockspace_clear_rindex_op(char *space_name GNUC_UNUSED) { return -1; } +#endif int lockspace_disk(char *space_name GNUC_UNUSED, struct sync_disk *disk GNUC_UNUSED); diff --git a/src/main.c b/src/main.c index 6bd6d9a..cb5a0de 100644 --- a/src/main.c +++ b/src/main.c @@ -2331,22 +2331,26 @@ static void print_usage(void) printf("sanlock client inquire -p|-C <id>\n"); printf("sanlock client request -r RESOURCE -f <force_mode>\n"); printf("sanlock client examine -r RESOURCE | -s LOCKSPACE\n"); +#if 0 printf("sanlock client format -x RINDEX [-Z 512|4096 -A 1M|2M|4M|8M]\n"); printf("sanlock client create -x RINDEX -e <resource_name>\n"); printf("sanlock client delete -x RINDEX -e <resource_name>[:<offset>]\n"); printf("sanlock client lookup -x RINDEX [-e <resource_name>:<offset>]\n"); printf("sanlock client update -x RINDEX -e <resource_name>[:<offset>] [-z 0|1]\n"); printf("sanlock client rebuild -x RINDEX\n"); +#endif printf("\n"); printf("sanlock direct <action> [-a 0|1] [-o 0|1] [-Z 512|4096 -A 1M|2M|4M|8M]\n"); printf("sanlock direct init -s LOCKSPACE | -r RESOURCE [-Z 512|4096 -A 1M|2M|4M|8M] [-C 0|1]\n"); printf("sanlock direct init_host -s LOCKSPACE [-g <generation>] [-t <timestamp>] [-N 1] [-Z 512|4096 -A 1M|2M|4M|8M] [-C 0|1]\n"); printf("sanlock direct read_leader -s LOCKSPACE | -r RESOURCE\n"); printf("sanlock direct dump <path>[:<offset>[:<size>]]\n"); +#if 0 printf("sanlock direct format -x RINDEX [-Z 512|4096 -A 1M|2M|4M|8M]\n"); printf("sanlock direct lookup -x RINDEX [-e <resource_name>:<offset>]\n"); printf("sanlock direct update -x RINDEX -e <resource_name>[:<offset>] [-z 0|1]\n"); printf("sanlock direct rebuild -x RINDEX\n"); +#endif printf("\n"); printf("LOCKSPACE = <lockspace_name>:<host_id>:<path>:<offset>\n"); printf(" <lockspace_name> name of lockspace\n"); @@ -2361,11 +2365,13 @@ static void print_usage(void) printf(" <offset> offset on path (bytes)\n"); printf(" <lver> optional leader version or SH for shared lease\n"); printf("\n"); +#if 0 printf("RINDEX = <lockspace_name>:<path>:<offset>\n"); printf(" <lockspace_name> name of lockspace\n"); printf(" <path> path to storage reserved for leases\n"); printf(" <offset> offset on path (bytes)\n"); printf("\n"); +#endif printf("Limits:\n"); printf("valid sector/align size combinations: 512/1M, 4K/1M, 4K/2M, 4K/4M, 4K/8M\n"); printf("maximum host_id for sector/align sizes: 2000, 250, 500, 1000, 2000\n"); @@ -4356,7 +4362,6 @@ static int do_direct_init(int action) static int do_direct(void) { struct leader_record leader; - uint32_t cmd_flags = 0; int rv; /* @@ -4396,6 +4401,7 @@ static int do_direct(void) rv = do_direct_read(); break; +#if 0 case ACT_FORMAT: if (com.sector_size) com.rindex.flags |= sanlk_rif_sector_size_to_flag(com.sector_size); @@ -4427,6 +4433,7 @@ static int do_direct(void) break; case ACT_UPDATE: + uint32_t cmd_flags = 0; if (com.clear_arg) cmd_flags |= SANLK_RXUP_REM; else @@ -4434,6 +4441,7 @@ static int do_direct(void) rv = direct_rindex_update(&main_task, &com.rindex, &com.rentry, cmd_flags); log_tool("update done %d", rv); break; +#endif case ACT_ACQUIRE: syslog(LOG_WARNING, "acquire"); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 04/07: add use_aio arg to more functions
by pagure＠pagure.io 10 Mar '26

10 Mar '26

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit e6414eaa6b25f1f314c5a527d8f28e61229c0d55 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jan 15 11:27:57 2026 -0600 add use_aio arg to more functions have callers pass task->use_aio instead of the functions accessing task->use_aio themselves. --- src/cmd.c | 2 +- src/delta_lease.c | 5 +++-- src/delta_lease.h | 3 ++- src/direct.c | 4 ++-- src/lockspace.c | 2 +- src/paxos_lease.c | 19 +++++++++++-------- src/paxos_lease.h | 1 + src/resource.c | 2 +- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/cmd.c b/src/cmd.c index d405ddf..9df3840 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1712,7 +1712,7 @@ static void cmd_read_lockspace(struct task *task, struct cmd_args *ca, uint32_t align_size = sanlk_lsf_align_flag_to_size(lockspace.flags); if (!sector_size) { - result = delta_read_lockspace_sizes(task, &sd, host_id, com.io_timeout, &sector_size, &align_size); + result = delta_read_lockspace_sizes(task, &sd, host_id, task->use_aio, com.io_timeout, &sector_size, &align_size); if (result < 0) { log_cmd(cmd, "cmd_read_lockspace%s %d,%d host_id %llu delta_read_lockspace_sizes error %d", with_host ? "_host" : "", ca->ci_in, fd, (unsigned long long)host_id, result); diff --git a/src/delta_lease.c b/src/delta_lease.c index c017855..c37f41e 100644 --- a/src/delta_lease.c +++ b/src/delta_lease.c @@ -217,6 +217,7 @@ int delta_read_lockspace(struct task *task, int delta_read_lockspace_sizes(struct task *task, struct sync_disk *disk, uint64_t host_id, + int use_aio, int io_timeout, int *sector_size, int *align_size) @@ -232,7 +233,7 @@ int delta_read_lockspace_sizes(struct task *task, host_id = 1; rv = read_sector(disk, 512, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), - task, task->use_aio, io_timeout, "read_lockspace_sector_size"); + task, use_aio, io_timeout, "read_lockspace_sector_size"); if (rv < 0) goto next; @@ -260,7 +261,7 @@ int delta_read_lockspace_sizes(struct task *task, next: rv = read_sector(disk, 4096, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), - task, task->use_aio, io_timeout, "read_lockspace_sector_size"); + task, use_aio, io_timeout, "read_lockspace_sector_size"); if (rv < 0) return rv; diff --git a/src/delta_lease.h b/src/delta_lease.h index 45d8222..fae64b2 100644 --- a/src/delta_lease.h +++ b/src/delta_lease.h @@ -70,7 +70,8 @@ int delta_read_lockspace(struct task *task, int delta_read_lockspace_sizes(struct task *task, struct sync_disk *disk, - uint64_t host_id, + uint64_t host_id, + int use_aio, int io_timeout, int *sector_size, int *align_size); diff --git a/src/direct.c b/src/direct.c index f9f5b4a..a88b51d 100644 --- a/src/direct.c +++ b/src/direct.c @@ -210,7 +210,7 @@ static int do_paxos_action(int action, struct task *task, int io_timeout, struct token->sector_size = sector_size; token->align_size = align_size; - rv = paxos_lease_leader_read(task, token, &leader, "direct_release"); + rv = paxos_lease_leader_read(task, task->use_aio, token, &leader, "direct_release"); if (rv < 0) break; @@ -252,7 +252,7 @@ static int do_paxos_action(int action, struct task *task, int io_timeout, struct token->sector_size = sector_size; token->align_size = align_size; - rv = paxos_lease_leader_read(task, token, &leader, "direct_read_leader"); + rv = paxos_lease_leader_read(task, task->use_aio, token, &leader, "direct_read_leader"); break; case ACT_WRITE_LEADER: diff --git a/src/lockspace.c b/src/lockspace.c index b908cef..54febce 100644 --- a/src/lockspace.c +++ b/src/lockspace.c @@ -928,7 +928,7 @@ static void *lockspace_thread(void *arg_in) } opened = 1; - rv = delta_read_lockspace_sizes(&task, &sp->host_id_disk, sp->host_id, sp->io_timeout, &sector_size, &align_size); + rv = delta_read_lockspace_sizes(&task, &sp->host_id_disk, sp->host_id, task.use_aio, sp->io_timeout, &sector_size, &align_size); if (rv < 0) { log_erros(sp, "failed to read device to find sector size for host_id %llu error %d %s", (unsigned long long)sp->host_id, rv, sp->host_id_disk.path); diff --git a/src/paxos_lease.c b/src/paxos_lease.c index 0c4f9cc..79aa1cf 100644 --- a/src/paxos_lease.c +++ b/src/paxos_lease.c @@ -395,6 +395,7 @@ static int read_dblocks(struct task *task, #endif static int read_leader(struct task *task, + int use_aio, struct token *token, struct sync_disk *disk, struct leader_record *lr, @@ -411,7 +412,7 @@ static int read_leader(struct task *task, /* 0 = leader record is first sector */ rv = read_sector(disk, token->sector_size, 0, (char *)&lr_end, sizeof(struct leader_record), - task, task->use_aio, token->io_timeout, "leader"); + task, use_aio, token->io_timeout, "leader"); /* N.B. checksum is computed while the data is in ondisk format. */ *checksum = leader_checksum(&lr_end); @@ -1198,7 +1199,7 @@ int paxos_read_resource(struct task *task, tmp_sector_size = 1; } - rv = read_leader(task, token, &token->disks[0], &leader, &checksum); + rv = read_leader(task, task->use_aio, token, &token->disks[0], &leader, &checksum); if (rv < 0) return rv; @@ -1281,6 +1282,7 @@ int paxos_read_buf(struct task *task, } static int _leader_read_one(struct task *task, + int use_aio, struct token *token, struct leader_record *leader_ret, const char *caller) @@ -1291,7 +1293,7 @@ static int _leader_read_one(struct task *task, memset(&leader, 0, sizeof(struct leader_record)); - rv = read_leader(task, token, &token->disks[0], &leader, &checksum); + rv = read_leader(task, use_aio, token, &token->disks[0], &leader, &checksum); if (rv < 0) return rv; @@ -1304,13 +1306,14 @@ static int _leader_read_one(struct task *task, } int paxos_lease_leader_read(struct task *task, + int use_aio, struct token *token, struct leader_record *leader_ret, const char *caller) { int rv; - rv = _leader_read_one(task, token, leader_ret, caller); + rv = _leader_read_one(task, use_aio, token, leader_ret, caller); if (rv == SANLK_OK) log_token(token, "%s leader %llu owner %llu %llu %llu", caller, @@ -2057,7 +2060,7 @@ int paxos_lease_acquire(struct task *task, * process. */ - error = paxos_lease_leader_read(task, token, &tmp_leader, "paxos_acquire"); + error = paxos_lease_leader_read(task, task->use_aio, token, &tmp_leader, "paxos_acquire"); if (error < 0) goto out; @@ -2113,7 +2116,7 @@ int paxos_lease_acquire(struct task *task, memcpy(&tmp_leader, &cur_leader, sizeof(struct leader_record)); } else { /* acquire io: read 1 (for retry) */ - error = paxos_lease_leader_read(task, token, &tmp_leader, "paxos_acquire"); + error = paxos_lease_leader_read(task, task->use_aio, token, &tmp_leader, "paxos_acquire"); if (error < 0) goto out; } @@ -2341,7 +2344,7 @@ int paxos_lease_renew(struct task *task, for (d = 0; d < token->r.num_disks; d++) { memset(&new_leader, 0, sizeof(struct leader_record)); - rv = read_leader(task, token, &token->disks[d], &new_leader); + rv = read_leader(task, task->use_aio, token, &token->disks[d], &new_leader); if (rv < 0) continue; @@ -2375,7 +2378,7 @@ int paxos_lease_release(struct task *task, struct leader_record *last; int error; - error = paxos_lease_leader_read(task, token, &leader, "paxos_release"); + error = paxos_lease_leader_read(task, task->use_aio, token, &leader, "paxos_release"); if (error < 0) { log_errot(token, "paxos_release leader_read error %d", error); goto out; diff --git a/src/paxos_lease.h b/src/paxos_lease.h index 2a0843a..03be0ce 100644 --- a/src/paxos_lease.h +++ b/src/paxos_lease.h @@ -20,6 +20,7 @@ uint32_t leader_checksum(struct leader_record *lr); uint32_t dblock_checksum(struct paxos_dblock *pd); int paxos_lease_leader_read(struct task *task, + int use_aio, struct token *token, struct leader_record *leader_ret, const char *caller); diff --git a/src/resource.c b/src/resource.c index 321fec9..b052ff0 100644 --- a/src/resource.c +++ b/src/resource.c @@ -2241,7 +2241,7 @@ int request_token(struct task *task, struct token *token, uint32_t force_mode, * the values in the token. */ - rv = paxos_lease_leader_read(task, token, &leader, "request"); + rv = paxos_lease_leader_read(task, task->use_aio, token, &leader, "request"); if (rv < 0) goto out; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 03/07: diskio: pass use_aio arg to io functions
by pagure＠pagure.io 10 Mar '26

10 Mar '26

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit 53667d5b144d6874e061ef4bcfd378319a0fd388 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jan 14 16:14:48 2026 -0600 diskio: pass use_aio arg to io functions should be no functional change, the callers all pass task->use_aio which is what the diskio functions used --- src/delta_lease.c | 30 +++++++++++++++--------------- src/direct.c | 6 +++--- src/diskio.c | 36 ++++++++++++++++++++---------------- src/diskio.h | 12 ++++++------ src/paxos_lease.c | 30 +++++++++++++++--------------- src/resource.c | 8 ++++---- src/rindex.c | 10 +++++----- src/sanlock_internal.h | 3 +++ src/sanlock_rv.h | 1 + 9 files changed, 72 insertions(+), 64 deletions(-) diff --git a/src/delta_lease.c b/src/delta_lease.c index ba841be..c017855 100644 --- a/src/delta_lease.c +++ b/src/delta_lease.c @@ -137,7 +137,7 @@ static int verify_leader(struct sync_disk *disk, rv = read_sector(disk, lr->sector_size, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), - NULL, "delta_verify"); + NULL, NO_AIO, "delta_verify"); leader_record_in(&leader_end, &leader_rr); @@ -167,7 +167,7 @@ int delta_read_lockspace(struct task *task, memset(&leader_end, 0, sizeof(struct leader_record)); rv = read_sector(disk, sector_size, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), - task, io_timeout, "read_lockspace"); + task, task->use_aio, io_timeout, "read_lockspace"); if (rv < 0) return rv; @@ -232,7 +232,7 @@ int delta_read_lockspace_sizes(struct task *task, host_id = 1; rv = read_sector(disk, 512, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), - task, io_timeout, "read_lockspace_sector_size"); + task, task->use_aio, io_timeout, "read_lockspace_sector_size"); if (rv < 0) goto next; @@ -260,7 +260,7 @@ int delta_read_lockspace_sizes(struct task *task, next: rv = read_sector(disk, 4096, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), - task, io_timeout, "read_lockspace_sector_size"); + task, task->use_aio, io_timeout, "read_lockspace_sector_size"); if (rv < 0) return rv; @@ -310,7 +310,7 @@ int delta_lease_leader_read(struct task *task, int sector_size, int io_timeout, memset(leader_ret, 0, sizeof(struct leader_record)); rv = read_sector(disk, sector_size, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), - task, io_timeout, "delta_leader"); + task, task->use_aio, io_timeout, "delta_leader"); if (rv < 0) return rv; @@ -348,7 +348,7 @@ int delta_lease_leader_clobber(struct task *task, int io_timeout, 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); + task, task->use_aio, io_timeout, caller); if (rv < 0) return rv; return SANLK_OK; @@ -675,7 +675,7 @@ int delta_lease_acquire(struct task *task, leader_end.checksum = cpu_to_le32(checksum); rv = write_sector(disk, sp->sector_size, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), - task, sp->io_timeout, "delta_leader"); + task, task->use_aio, sp->io_timeout, "delta_leader"); if (rv < 0) { log_space(sp, "delta_acquire write error %d", rv); return rv; @@ -895,7 +895,7 @@ int delta_lease_renew(struct task *task, if (log_renewal_level != -1) log_level(sp->space_id, 0, NULL, log_renewal_level, "delta_renew begin read"); - rv = read_iobuf(disk->fd, disk->offset, task->iobuf, read_len, task, sp->io_timeout, rd_ms); + rv = read_iobuf(disk->fd, disk->offset, task->iobuf, read_len, task, task->use_aio, sp->io_timeout, rd_ms); if (rv) { /* the next time delta_lease_renew() is called, prev_result will be this rv. If this rv is SANLK_AIO_TIMEOUT, we'll @@ -1031,7 +1031,7 @@ write_renew: out. there's nothing we would do but retry it, and timing out and retrying unnecessarily would probably be counter productive. */ - rv = write_iobuf(disk->fd, disk->offset+id_offset, wbuf, sector_size, task, + rv = write_iobuf(disk->fd, disk->offset+id_offset, wbuf, sector_size, task, task->use_aio, calc_host_dead_seconds(sp->io_timeout), wr_ms); if (rv != SANLK_AIO_TIMEOUT) @@ -1091,7 +1091,7 @@ int delta_lease_release(struct task *task, leader_end.checksum = cpu_to_le32(checksum); rv = write_sector(disk, sp->sector_size, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), - task, sp->io_timeout, "delta_leader"); + task, task->use_aio, sp->io_timeout, "delta_leader"); if (rv < 0) { log_space(sp, "delta_release write error %d", rv); return rv; @@ -1203,7 +1203,7 @@ int delta_lease_init_host(struct task *task, offset = disk->offset + (sector_size * (ls->host_id - 1)); - rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, write_io_timeout, NULL); + rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, task->use_aio, write_io_timeout, NULL); if (rv < 0) goto out; out: @@ -1307,7 +1307,7 @@ int delta_lease_init(struct task *task, else write_io_timeout = io_timeout; - rv = write_iobuf(disk->fd, disk->offset, iobuf, iobuf_len, task, write_io_timeout, NULL); + rv = write_iobuf(disk->fd, disk->offset, iobuf, iobuf_len, task, task->use_aio, write_io_timeout, NULL); if (rv < 0) goto out; @@ -1327,7 +1327,7 @@ int delta_lease_init(struct task *task, memcpy(iobuf, &leader_end, sizeof(struct leader_record)); - rv = write_iobuf(disk->fd, disk->offset, iobuf, sector_size, task, write_io_timeout, NULL); + rv = write_iobuf(disk->fd, disk->offset, iobuf, sector_size, task, task->use_aio, write_io_timeout, NULL); out: if (rv != SANLK_AIO_TIMEOUT) free(iobuf); @@ -1382,7 +1382,7 @@ int delta_lease_update_lockspace(struct task *task, memset(iobuf, 0, iobuf_len); - rv = read_iobuf(disk->fd, disk->offset, iobuf, iobuf_len, task, io_timeout, NULL); + rv = read_iobuf(disk->fd, disk->offset, iobuf, iobuf_len, task, task->use_aio, io_timeout, NULL); if (rv < 0) goto out; @@ -1420,7 +1420,7 @@ int delta_lease_update_lockspace(struct task *task, else write_io_timeout = io_timeout; - rv = write_iobuf(disk->fd, disk->offset, iobuf, iobuf_len, task, write_io_timeout, NULL); + rv = write_iobuf(disk->fd, disk->offset, iobuf, iobuf_len, task, task->use_aio, write_io_timeout, NULL); if (rv < 0) goto out; diff --git a/src/direct.c b/src/direct.c index fe44097..f9f5b4a 100644 --- a/src/direct.c +++ b/src/direct.c @@ -55,7 +55,7 @@ static int direct_read_leader_sizes(struct task *task, struct sync_disk *sd, memset(data, 0, datalen); - rv = read_sector(sd, 4096, 0, data, datalen, task, com.io_timeout, "read_sector_size"); + rv = read_sector(sd, 4096, 0, data, datalen, task, task->use_aio, com.io_timeout, "read_sector_size"); if (rv < 0) { free(data); return rv; @@ -767,7 +767,7 @@ int direct_dump(struct task *task, char *dump_path, int force_mode) memset(data, 0, sector_size); rv = read_sectors(&sd, sector_size, sector_nr, sector_count, data, datalen, - task, com.io_timeout, "dump"); + task, task->use_aio, com.io_timeout, "dump"); magic_in(data, &magic); @@ -968,7 +968,7 @@ int direct_next_free(struct task *task, char *path) memset(data, 0, sector_size); rv = read_sector(&sd, sector_size, sector_nr, data, datalen, - task, com.io_timeout, "next_free"); + task, task->use_aio, com.io_timeout, "next_free"); lr_end = (struct leader_record *)data; diff --git a/src/diskio.c b/src/diskio.c index a67f4c2..5e51322 100644 --- a/src/diskio.c +++ b/src/diskio.c @@ -816,18 +816,20 @@ static int do_read_aio_linux(int fd, uint64_t offset, char *buf, int len, /* write aligned io buffer */ int write_iobuf(int fd, uint64_t offset, char *iobuf, int iobuf_len, - struct task *task, int ioto, int *wr_ms) + struct task *task, int use_aio, int ioto, int *wr_ms) { - if (task && task->use_aio) + if (use_aio == USE_AIO) return do_write_aio_linux(fd, offset, iobuf, iobuf_len, task, ioto, wr_ms); - else + else if (use_aio == NO_AIO) return do_write(fd, offset, iobuf, iobuf_len, task, wr_ms); + else + return -SANLK_IOTYPE; } static int _write_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, uint32_t sector_count GNUC_UNUSED, const char *data, int data_len, int iobuf_len, - struct task *task, int ioto, + struct task *task, int use_aio, int ioto, const char *blktype) { char *iobuf, **p_iobuf; @@ -849,7 +851,7 @@ static int _write_sectors(const struct sync_disk *disk, int sector_size, uint64_ memset(iobuf, 0, iobuf_len); memcpy(iobuf, data, data_len); - rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, ioto, NULL); + rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, use_aio, ioto, NULL); if (rv < 0) { log_error("write_sectors %s offset %llu rv %d %s", blktype, (unsigned long long)offset, rv, disk->path); @@ -868,7 +870,7 @@ static int _write_sectors(const struct sync_disk *disk, int sector_size, uint64_ int write_sector(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, const char *data, int data_len, - struct task *task, int ioto, + struct task *task, int use_aio, int ioto, const char *blktype) { int iobuf_len = sector_size; @@ -885,14 +887,14 @@ int write_sector(const struct sync_disk *disk, int sector_size, uint64_t sector_ } return _write_sectors(disk, sector_size, sector_nr, 1, data, data_len, - iobuf_len, task, ioto, blktype); + iobuf_len, task, use_aio, ioto, blktype); } /* write multiple complete sectors, data_len must be multiple of sector size */ int write_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, uint32_t sector_count, const char *data, int data_len, - struct task *task, int ioto, + struct task *task, int use_aio, int ioto, const char *blktype) { int iobuf_len = data_len; @@ -909,18 +911,20 @@ int write_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector } return _write_sectors(disk, sector_size, sector_nr, sector_count, data, data_len, - iobuf_len, task, ioto, blktype); + iobuf_len, task, use_aio, ioto, blktype); } /* read aligned io buffer */ int read_iobuf(int fd, uint64_t offset, char *iobuf, int len, - struct task *task, int ioto, int *rd_ms) + struct task *task, int use_aio, int ioto, int *rd_ms) { - if (task && task->use_aio) + if (use_aio == USE_AIO) return do_read_aio_linux(fd, offset, iobuf, len, task, ioto, rd_ms); - else + else if (use_aio == NO_AIO) return do_read(fd, offset, iobuf, len, task, rd_ms); + else + return -SANLK_IOTYPE; } /* read sector_count sectors starting with sector_nr, where sector_nr @@ -931,7 +935,7 @@ int read_iobuf(int fd, uint64_t offset, char *iobuf, int len, int read_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, uint32_t sector_count, char *data, int data_len, - struct task *task, int ioto, + struct task *task, int use_aio, int ioto, const char *blktype) { char *iobuf, **p_iobuf; @@ -959,7 +963,7 @@ int read_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector_ memset(iobuf, 0, iobuf_len); - rv = read_iobuf(disk->fd, offset, iobuf, iobuf_len, task, ioto, NULL); + rv = read_iobuf(disk->fd, offset, iobuf, iobuf_len, task, use_aio, ioto, NULL); if (!rv) { memcpy(data, iobuf, data_len); } else { @@ -975,11 +979,11 @@ int read_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector_ int read_sector(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, char *data, int data_len, - struct task *task, int ioto, + struct task *task, int use_aio, int ioto, const char *blktype) { return read_sectors(disk, sector_size, sector_nr, 1, - data, data_len, task, ioto, blktype); + data, data_len, task, use_aio, ioto, blktype); } /* Try to reap the event of a previously timed out read_iobuf. diff --git a/src/diskio.h b/src/diskio.h index 23c1143..d05ceec 100644 --- a/src/diskio.h +++ b/src/diskio.h @@ -29,10 +29,10 @@ int write_sysfs_uint(char *path, unsigned int val); */ int write_iobuf(int fd, uint64_t offset, char *iobuf, int iobuf_len, - struct task *task, int ioto, int *wr_ms); + struct task *task, int use_aio, int ioto, int *wr_ms); int read_iobuf(int fd, uint64_t offset, char *iobuf, int iobuf_len, - struct task *task, int ioto, int *rd_ms); + struct task *task, int use_aio, int ioto, int *rd_ms); int read_iobuf_reap(int fd, uint64_t offset, char *iobuf, int iobuf_len, struct task *task, uint32_t ioto_msec); @@ -44,22 +44,22 @@ int read_iobuf_reap(int fd, uint64_t offset, char *iobuf, int iobuf_len, int write_sector(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, const char *data, int data_len, - struct task *task, int ioto, + struct task *task, int use_aio, int ioto, const char *blktype); int write_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, uint32_t sector_count, const char *data, int data_len, - struct task *task, int ioto, + struct task *task, int use_aio, int ioto, const char *blktype); int read_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, uint32_t sector_count, char *data, int data_len, - struct task *task, int ioto, + struct task *task, int use_aio, int ioto, const char *blktype); int read_sector(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, char *data, int data_len, - struct task *task, int ioto, + struct task *task, int use_aio, int ioto, const char *blktype); #endif diff --git a/src/paxos_lease.c b/src/paxos_lease.c index 3349af9..0c4f9cc 100644 --- a/src/paxos_lease.c +++ b/src/paxos_lease.c @@ -115,7 +115,7 @@ int paxos_lease_request_read(struct task *task, struct token *token, rv = read_sector(&token->disks[0], token->sector_size, 1, (char *)&rr_end, sizeof(struct request_record), - task, token->io_timeout, "request"); + task, task->use_aio, token->io_timeout, "request"); if (rv < 0) return rv; @@ -134,7 +134,7 @@ int paxos_lease_request_write(struct task *task, struct token *token, rv = write_sector(&token->disks[0], token->sector_size, 1, (char *)&rr_end, sizeof(struct request_record), - task, token->io_timeout, "request"); + task, task->use_aio, token->io_timeout, "request"); if (rv < 0) return rv; @@ -231,7 +231,7 @@ static int write_dblock_mblock_sh(struct task *task, memcpy(iobuf, (char *)&pd_end, sizeof(struct paxos_dblock)); memcpy(iobuf + MBLOCK_OFFSET, (char *)&mb_end, sizeof(struct mode_block)); - rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, token->io_timeout, NULL); + rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, task->use_aio, token->io_timeout, NULL); if (rv < 0) { log_errot(token, "write_dblock_mblock_sh host_id %llu gen %llu rv %d", @@ -273,7 +273,7 @@ static int write_dblock(struct task *task, pd_end.checksum = cpu_to_le32(checksum); rv = write_sector(disk, token->sector_size, 2 + host_id - 1, (char *)&pd_end, sizeof(struct paxos_dblock), - task, token->io_timeout, "dblock"); + task, task->use_aio, token->io_timeout, "dblock"); return rv; } @@ -296,7 +296,7 @@ static int write_leader(struct task *task, lr_end.checksum = cpu_to_le32(checksum); rv = write_sector(disk, token->sector_size, 0, (char *)&lr_end, sizeof(struct leader_record), - task, token->io_timeout, "leader"); + task, task->use_aio, token->io_timeout, "leader"); return rv; } @@ -325,7 +325,7 @@ int paxos_lease_leader_clobber(struct task *task, lr_end.checksum = cpu_to_le32(checksum); rv = write_sector(&token->disks[0], token->sector_size, 0, (char *)&lr_end, sizeof(struct leader_record), - task, token->io_timeout, caller); + task, task->use_aio, token->io_timeout, caller); return rv; } @@ -341,7 +341,7 @@ static int read_dblock(struct task *task, /* 1 leader block + 1 request block; host_id N is block offset N-1 */ rv = read_sector(disk, token->sector_size, 2 + host_id - 1, (char *)&pd_end, sizeof(struct paxos_dblock), - task, token->io_timeout, "dblock"); + task, task->use_aio, token->io_timeout, "dblock"); paxos_dblock_in(&pd_end, pd); @@ -370,7 +370,7 @@ static int read_dblocks(struct task *task, /* 2 = 1 leader block + 1 request block */ rv = read_sectors(disk, token->sector_size, 2, pds_count, data, data_len, - task, "dblocks"); + task, task->use_aio, token->io_timeout, "dblocks"); if (rv < 0) goto out_free; @@ -411,7 +411,7 @@ static int read_leader(struct task *task, /* 0 = leader record is first sector */ rv = read_sector(disk, token->sector_size, 0, (char *)&lr_end, sizeof(struct leader_record), - task, token->io_timeout, "leader"); + task, task->use_aio, token->io_timeout, "leader"); /* N.B. checksum is computed while the data is in ondisk format. */ *checksum = leader_checksum(&lr_end); @@ -626,7 +626,7 @@ static int run_ballot(struct task *task, struct token *token, uint32_t flags, memset(iobuf, 0, read_len); /* acquire io: read 2 (lease area) */ - rv = read_iobuf(disk->fd, disk->offset, iobuf, read_len, task, token->io_timeout, NULL); + rv = read_iobuf(disk->fd, disk->offset, iobuf, read_len, task, task->use_aio, token->io_timeout, NULL); if (rv == SANLK_AIO_TIMEOUT) { iobuf_array[d] = NULL; if (use_task_hugebuf) { @@ -851,7 +851,7 @@ static int run_ballot(struct task *task, struct token *token, uint32_t flags, memset(iobuf, 0, read_len); /* acquire io: read 3 (lease area) */ - rv = read_iobuf(disk->fd, disk->offset, iobuf, read_len, task, token->io_timeout, NULL); + rv = read_iobuf(disk->fd, disk->offset, iobuf, read_len, task, task->use_aio, token->io_timeout, NULL); if (rv == SANLK_AIO_TIMEOUT) { iobuf_array[d] = NULL; if (use_task_hugebuf) { @@ -1136,7 +1136,7 @@ static int _verify_leader(struct token *token, rv = read_sector(disk, token->sector_size, 0, (char *)&leader_end, sizeof(struct leader_record), - NULL, 1, "paxos_verify"); + NULL, NO_AIO, 1, "paxos_verify"); leader_record_in(&leader_end, &leader_rr); @@ -1273,7 +1273,7 @@ int paxos_read_buf(struct task *task, memset(iobuf, 0, iobuf_len); - rv = read_iobuf(disk->fd, disk->offset, iobuf, iobuf_len, task, token->io_timeout, NULL); + rv = read_iobuf(disk->fd, disk->offset, iobuf, iobuf_len, task, task->use_aio, token->io_timeout, NULL); *buf_out = iobuf; @@ -1404,7 +1404,7 @@ static int _lease_read_one(struct task *task, mem_done: - rv = read_iobuf(disk->fd, disk->offset, iobuf, read_len, task, token->io_timeout, NULL); + rv = read_iobuf(disk->fd, disk->offset, iobuf, read_len, task, task->use_aio, token->io_timeout, NULL); if (rv < 0) goto out; @@ -2639,7 +2639,7 @@ int paxos_lease_init(struct task *task, write_io_timeout = token->io_timeout; rv = write_iobuf(token->disks[d].fd, token->disks[d].offset, - iobuf, iobuf_len, task, write_io_timeout, NULL); + iobuf, iobuf_len, task, task->use_aio, write_io_timeout, NULL); if (rv == SANLK_AIO_TIMEOUT) aio_timeout = 1; diff --git a/src/resource.c b/src/resource.c index de71962..321fec9 100644 --- a/src/resource.c +++ b/src/resource.c @@ -647,7 +647,7 @@ static int write_host_block(struct task *task, struct token *token, offset = disk->offset + ((2 + host_id - 1) * token->sector_size); - rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, token->io_timeout, NULL); + rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, task->use_aio, token->io_timeout, NULL); if (rv < 0) break; } @@ -729,7 +729,7 @@ static int read_mode_block(struct task *task, struct token *token, offset = disk->offset + ((2 + host_id - 1) * token->sector_size); - rv = read_iobuf(disk->fd, offset, iobuf, iobuf_len, task, token->io_timeout, NULL); + rv = read_iobuf(disk->fd, offset, iobuf, iobuf_len, task, task->use_aio, token->io_timeout, NULL); if (rv < 0) break; @@ -846,7 +846,7 @@ static int read_lvb_block(struct task *task, struct token *token) if (!r->lvb) return 0; - rv = read_iobuf(disk->fd, offset, iobuf, iobuf_len, task, token->io_timeout, NULL); + rv = read_iobuf(disk->fd, offset, iobuf, iobuf_len, task, task->use_aio, token->io_timeout, NULL); /* for io timeout, lvb iobuf is freed when the aio completes, not by free_resource */ if (rv == SANLK_AIO_TIMEOUT) @@ -870,7 +870,7 @@ static int write_lvb_block(struct task *task, struct resource *r, struct token * if (!r->lvb) return 0; - rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, token->io_timeout, NULL); + rv = write_iobuf(disk->fd, offset, iobuf, iobuf_len, task, task->use_aio, token->io_timeout, NULL); /* for io timeout, lvb iobuf is freed when the aio completes, not by free_resource */ if (rv == SANLK_AIO_TIMEOUT) diff --git a/src/rindex.c b/src/rindex.c index a4196d2..240f795 100644 --- a/src/rindex.c +++ b/src/rindex.c @@ -236,7 +236,7 @@ static int update_rindex(struct task *task, /* replace the specific entry */ memcpy(sector_iobuf + entry_offset_in_sector, &re_end, sizeof(struct rindex_entry)); - rv = write_iobuf(rx->disk->fd, rx->disk->offset + sector_offset, sector_iobuf, iobuf_len, task, spi->io_timeout, NULL); + rv = write_iobuf(rx->disk->fd, rx->disk->offset + sector_offset, sector_iobuf, iobuf_len, task, task->use_aio, spi->io_timeout, NULL); if (rv != SANLK_AIO_TIMEOUT) free(sector_iobuf); @@ -266,7 +266,7 @@ static int read_rindex(struct task *task, memset(iobuf, 0, iobuf_len); - rv = read_iobuf(rx->disk->fd, rx->disk->offset, iobuf, iobuf_len, task, spi->io_timeout, NULL); + rv = read_iobuf(rx->disk->fd, rx->disk->offset, iobuf, iobuf_len, task, task->use_aio, spi->io_timeout, NULL); if (rv < 0) { if (rv != SANLK_AIO_TIMEOUT) { free(iobuf); @@ -312,7 +312,7 @@ static int read_rindex_header(struct task *task, if (rv) return -ENOMEM; - rv = read_iobuf(rx->disk->fd, rx->disk->offset, iobuf, iobuf_len, task, io_timeout, NULL); + rv = read_iobuf(rx->disk->fd, rx->disk->offset, iobuf, iobuf_len, task, task->use_aio, io_timeout, NULL); if (rv < 0) goto out; @@ -452,7 +452,7 @@ int rindex_format(struct task *task, struct sanlk_rindex *ri) else write_io_timeout = com.io_timeout; - rv = write_iobuf(rx.disk->fd, rx.disk->offset, iobuf, iobuf_len, task, write_io_timeout, NULL); + rv = write_iobuf(rx.disk->fd, rx.disk->offset, iobuf, iobuf_len, task, task->use_aio, write_io_timeout, NULL); if (rv < 0) { log_error("rindex_format write failed %d %s", rv, rx.disk->path); goto out_iobuf; @@ -1123,7 +1123,7 @@ int rindex_rebuild(struct task *task, struct sanlk_rindex *ri, uint32_t cmd_flag res_offset += align_size; } - rv = write_iobuf(rx.disk->fd, rx.disk->offset, rindex_iobuf, align_size, task, spi.io_timeout, NULL); + rv = write_iobuf(rx.disk->fd, rx.disk->offset, rindex_iobuf, align_size, task, task->use_aio, spi.io_timeout, NULL); if (rv < 0) { if (rv != SANLK_AIO_TIMEOUT) free(rindex_iobuf); diff --git a/src/sanlock_internal.h b/src/sanlock_internal.h index b58144b..466ac4c 100644 --- a/src/sanlock_internal.h +++ b/src/sanlock_internal.h @@ -267,6 +267,9 @@ struct space_info { #define RX_OP_UPDATE 5 #define RX_OP_REBUILD 6 +#define USE_AIO 1 +#define NO_AIO 0 + #define HOSTID_AIO_CB_SIZE 4 #define WORKER_AIO_CB_SIZE 2 #define DIRECT_AIO_CB_SIZE 1 diff --git a/src/sanlock_rv.h b/src/sanlock_rv.h index a768ee7..f97d543 100644 --- a/src/sanlock_rv.h +++ b/src/sanlock_rv.h @@ -80,5 +80,6 @@ #define SANLK_RINDEX_DIFF -278 #define SANLK_WRONG_GENERATION -280 +#define SANLK_IOTYPE -285 #endif -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 02/07: use read_sector in place of read_sectors 1
by pagure＠pagure.io 10 Mar '26

10 Mar '26

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit a8beb9777021da12a1627c0838b0085b6e7815b9 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jan 14 15:51:36 2026 -0600 use read_sector in place of read_sectors 1 --- src/delta_lease.c | 22 +++++++++++----------- src/direct.c | 6 +++--- src/diskio.c | 9 +++++++++ src/diskio.h | 6 ++++++ src/paxos_lease.c | 20 ++++++++++---------- 5 files changed, 39 insertions(+), 24 deletions(-) diff --git a/src/delta_lease.c b/src/delta_lease.c index e5396c6..ba841be 100644 --- a/src/delta_lease.c +++ b/src/delta_lease.c @@ -135,9 +135,9 @@ static int verify_leader(struct sync_disk *disk, memset(&leader_end, 0, sizeof(leader_end)); - rv = read_sectors(disk, lr->sector_size, host_id - 1, 1, (char *)&leader_end, - sizeof(struct leader_record), - NULL, "delta_verify"); + rv = read_sector(disk, lr->sector_size, host_id - 1, (char *)&leader_end, + sizeof(struct leader_record), + NULL, "delta_verify"); leader_record_in(&leader_end, &leader_rr); @@ -166,8 +166,8 @@ int delta_read_lockspace(struct task *task, memset(&leader_end, 0, sizeof(struct leader_record)); - rv = read_sectors(disk, sector_size, host_id - 1, 1, (char *)&leader_end, sizeof(struct leader_record), - task, io_timeout, "read_lockspace"); + rv = read_sector(disk, sector_size, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), + task, io_timeout, "read_lockspace"); if (rv < 0) return rv; @@ -231,8 +231,8 @@ int delta_read_lockspace_sizes(struct task *task, if (!host_id) host_id = 1; - rv = read_sectors(disk, 512, host_id - 1, 1, (char *)&leader_end, sizeof(struct leader_record), - task, io_timeout, "read_lockspace_sector_size"); + rv = read_sector(disk, 512, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), + task, io_timeout, "read_lockspace_sector_size"); if (rv < 0) goto next; @@ -259,8 +259,8 @@ int delta_read_lockspace_sizes(struct task *task, return SANLK_OK; next: - rv = read_sectors(disk, 4096, host_id - 1, 1, (char *)&leader_end, sizeof(struct leader_record), - task, io_timeout, "read_lockspace_sector_size"); + rv = read_sector(disk, 4096, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), + task, io_timeout, "read_lockspace_sector_size"); if (rv < 0) return rv; @@ -309,8 +309,8 @@ int delta_lease_leader_read(struct task *task, int sector_size, int io_timeout, memset(&leader_end, 0, sizeof(struct leader_record)); memset(leader_ret, 0, sizeof(struct leader_record)); - rv = read_sectors(disk, sector_size, host_id - 1, 1, (char *)&leader_end, sizeof(struct leader_record), - task, io_timeout, "delta_leader"); + rv = read_sector(disk, sector_size, host_id - 1, (char *)&leader_end, sizeof(struct leader_record), + task, io_timeout, "delta_leader"); if (rv < 0) return rv; diff --git a/src/direct.c b/src/direct.c index 40e7093..fe44097 100644 --- a/src/direct.c +++ b/src/direct.c @@ -55,7 +55,7 @@ static int direct_read_leader_sizes(struct task *task, struct sync_disk *sd, memset(data, 0, datalen); - rv = read_sectors(sd, 4096, 0, 1, data, datalen, task, com.io_timeout, "read_sector_size"); + rv = read_sector(sd, 4096, 0, data, datalen, task, com.io_timeout, "read_sector_size"); if (rv < 0) { free(data); return rv; @@ -967,8 +967,8 @@ int direct_next_free(struct task *task, char *path) while (1) { memset(data, 0, sector_size); - rv = read_sectors(&sd, sector_size, sector_nr, 1, data, datalen, - task, com.io_timeout, "next_free"); + rv = read_sector(&sd, sector_size, sector_nr, data, datalen, + task, com.io_timeout, "next_free"); lr_end = (struct leader_record *)data; diff --git a/src/diskio.c b/src/diskio.c index 158bfd7..a67f4c2 100644 --- a/src/diskio.c +++ b/src/diskio.c @@ -973,6 +973,15 @@ int read_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector_ return rv; } +int read_sector(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, + char *data, int data_len, + struct task *task, int ioto, + const char *blktype) +{ + return read_sectors(disk, sector_size, sector_nr, 1, + data, data_len, task, ioto, blktype); +} + /* Try to reap the event of a previously timed out read_iobuf. The aicb used in a task's last timed out read_iobuf is task->read_iobuf_timeout_aicb . */ diff --git a/src/diskio.h b/src/diskio.h index db5fe3a..23c1143 100644 --- a/src/diskio.h +++ b/src/diskio.h @@ -56,4 +56,10 @@ int read_sectors(const struct sync_disk *disk, int sector_size, uint64_t sector_ uint32_t sector_count, char *data, int data_len, struct task *task, int ioto, const char *blktype); + +int read_sector(const struct sync_disk *disk, int sector_size, uint64_t sector_nr, + char *data, int data_len, + struct task *task, int ioto, + const char *blktype); + #endif diff --git a/src/paxos_lease.c b/src/paxos_lease.c index d2b6483..3349af9 100644 --- a/src/paxos_lease.c +++ b/src/paxos_lease.c @@ -113,9 +113,9 @@ int paxos_lease_request_read(struct task *task, struct token *token, /* 1 = request record is second sector */ - rv = read_sectors(&token->disks[0], token->sector_size, 1, 1, (char *)&rr_end, - sizeof(struct request_record), - task, token->io_timeout, "request"); + rv = read_sector(&token->disks[0], token->sector_size, 1, (char *)&rr_end, + sizeof(struct request_record), + task, token->io_timeout, "request"); if (rv < 0) return rv; @@ -340,8 +340,8 @@ static int read_dblock(struct task *task, /* 1 leader block + 1 request block; host_id N is block offset N-1 */ - rv = read_sectors(disk, token->sector_size, 2 + host_id - 1, 1, (char *)&pd_end, sizeof(struct paxos_dblock), - task, token->io_timeout, "dblock"); + rv = read_sector(disk, token->sector_size, 2 + host_id - 1, (char *)&pd_end, sizeof(struct paxos_dblock), + task, token->io_timeout, "dblock"); paxos_dblock_in(&pd_end, pd); @@ -410,8 +410,8 @@ static int read_leader(struct task *task, /* 0 = leader record is first sector */ - rv = read_sectors(disk, token->sector_size, 0, 1, (char *)&lr_end, sizeof(struct leader_record), - task, token->io_timeout, "leader"); + rv = read_sector(disk, token->sector_size, 0, (char *)&lr_end, sizeof(struct leader_record), + task, token->io_timeout, "leader"); /* N.B. checksum is computed while the data is in ondisk format. */ *checksum = leader_checksum(&lr_end); @@ -1134,9 +1134,9 @@ static int _verify_leader(struct token *token, memset(&leader_end, 0, sizeof(struct leader_record)); - rv = read_sectors(disk, token->sector_size, 0, 1, (char *)&leader_end, - sizeof(struct leader_record), - NULL, 1, "paxos_verify"); + rv = read_sector(disk, token->sector_size, 0, (char *)&leader_end, + sizeof(struct leader_record), + NULL, 1, "paxos_verify"); leader_record_in(&leader_end, &leader_rr); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 01/07: remove _leader_read_num and _lease_read_num functions
by pagure＠pagure.io 10 Mar '26

10 Mar '26

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit ac38fb489095de33030a7e5fba3b71e7991d100b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jan 14 13:52:24 2026 -0600 remove _leader_read_num and _lease_read_num functions These functions were marked as "TODO: completely untested" and were only used for multi-disk configurations. Simplified the calling code to use _leader_read_one and _lease_read_one directly. Co-Authored-By: Claude Sonnet 4.5 <noreply(a)anthropic.com> --- src/paxos_lease.c | 222 +----------------------------------------------------- 1 file changed, 3 insertions(+), 219 deletions(-) diff --git a/src/paxos_lease.c b/src/paxos_lease.c index 410f505..d2b6483 100644 --- a/src/paxos_lease.c +++ b/src/paxos_lease.c @@ -1172,13 +1172,6 @@ int paxos_verify_leader(struct token *token, return verify_leader(token, disk, lr, checksum, caller); } -static int leaders_match(struct leader_record *a, struct leader_record *b) -{ - if (!memcmp(a, b, LEADER_COMPARE_LEN)) - return 1; - return 0; -} - /* read the lockspace name and resource name given the disk location */ int paxos_read_resource(struct task *task, @@ -1310,106 +1303,6 @@ static int _leader_read_one(struct task *task, return rv; } -/* TODO: completely untested */ - -static int _leader_read_num(struct task *task, - struct token *token, - struct leader_record *leader_ret, - const char *caller) -{ - struct leader_record leader; - struct leader_record *leaders; - uint32_t checksum; - int *leader_reps; - int leaders_len, leader_reps_len; - int num_reads; - int num_disks = token->r.num_disks; - int rv = 0, d, i, found; - int error; - - leaders_len = num_disks * sizeof(struct leader_record); - leader_reps_len = num_disks * sizeof(int); - - leaders = malloc(leaders_len); - if (!leaders) - return -ENOMEM; - - leader_reps = malloc(leader_reps_len); - if (!leader_reps) { - free(leaders); - return -ENOMEM; - } - - /* - * find a leader block that's consistent on the majority of disks, - * so we can use as the basis for the new leader - */ - - memset(&leader, 0, sizeof(struct leader_record)); - memset(leaders, 0, leaders_len); - memset(leader_reps, 0, leader_reps_len); - - num_reads = 0; - - for (d = 0; d < num_disks; d++) { - rv = read_leader(task, token, &token->disks[d], &leaders[d], &checksum); - if (rv < 0) - continue; - - rv = verify_leader(token, &token->disks[d], &leaders[d], checksum, caller); - if (rv < 0) - continue; - - num_reads++; - - leader_reps[d] = 1; - - /* count how many times the same leader block repeats */ - - for (i = 0; i < d; i++) { - if (leaders_match(&leaders[d], &leaders[i])) { - leader_reps[i]++; - break; - } - } - } - - if (!majority_disks(num_disks, num_reads)) { - log_errot(token, "%s leader read error %d", caller, rv); - error = SANLK_LEADER_READ; - goto out; - } - - /* check that a majority of disks have the same leader */ - - found = 0; - - for (d = 0; d < num_disks; d++) { - if (!majority_disks(num_disks, leader_reps[d])) - continue; - - /* leader on d is the same on a majority of disks, - leader becomes the prototype for new_leader */ - - memcpy(&leader, &leaders[d], sizeof(struct leader_record)); - found = 1; - break; - } - - if (!found) { - log_errot(token, "%s leader inconsistent", caller); - error = SANLK_LEADER_DIFF; - goto out; - } - - error = SANLK_OK; - out: - memcpy(leader_ret, &leader, sizeof(struct leader_record)); - free(leaders); - free(leader_reps); - return error; -} - int paxos_lease_leader_read(struct task *task, struct token *token, struct leader_record *leader_ret, @@ -1417,13 +1310,7 @@ int paxos_lease_leader_read(struct task *task, { int rv; - /* _leader_read_num works fine for the single disk case, but - we can cut out a bunch of stuff when we know there's one disk */ - - if (token->r.num_disks > 1) - rv = _leader_read_num(task, token, leader_ret, caller); - else - rv = _leader_read_one(task, token, leader_ret, caller); + rv = _leader_read_one(task, token, leader_ret, caller); if (rv == SANLK_OK) log_token(token, "%s leader %llu owner %llu %llu %llu", caller, @@ -1605,105 +1492,6 @@ static int _lease_read_one(struct task *task, return rv; } -/* TODO: completely untested */ - -static int _lease_read_num(struct task *task, - struct token *token, - uint32_t flags, - struct leader_record *leader_ret, - struct paxos_dblock *our_dblock, - uint64_t *max_mbal, - int *max_q, - const char *caller) -{ - struct paxos_dblock dblock_one; - struct leader_record leader_one; - struct leader_record *leaders; - uint64_t tmp_mbal = 0; - uint64_t mbal_one; - int *leader_reps; - int num_disks = token->r.num_disks; - int leaders_len, leader_reps_len; - int i, d, rv = 0, found, num_reads, q_one, tmp_q = -1; - - leaders_len = num_disks * sizeof(struct leader_record); - leader_reps_len = num_disks * sizeof(int); - - leaders = malloc(leaders_len); - if (!leaders) - return -ENOMEM; - - leader_reps = malloc(leader_reps_len); - if (!leader_reps) { - free(leaders); - return -ENOMEM; - } - - memset(leaders, 0, leaders_len); - memset(leader_reps, 0, leader_reps_len); - - num_reads = 0; - - for (d = 0; d < num_disks; d++) { - rv = _lease_read_one(task, token, flags, &token->disks[d], &leader_one, - &dblock_one, &mbal_one, &q_one, caller, 0); - if (rv < 0) - continue; - - num_reads++; - - if (!tmp_mbal || mbal_one > tmp_mbal) { - tmp_mbal = mbal_one; - tmp_q = q_one; - memcpy(our_dblock, &dblock_one, sizeof(struct paxos_dblock)); - } - - memcpy(&leaders[d], &leader_one, sizeof(struct leader_record)); - - leader_reps[d] = 1; - - /* count how many times the same leader block repeats */ - - for (i = 0; i < d; i++) { - if (leaders_match(&leaders[d], &leaders[i])) { - leader_reps[i]++; - break; - } - } - } - *max_mbal = tmp_mbal; - *max_q = tmp_q; - - if (!num_reads) { - log_errot(token, "%s lease_read_num cannot read disks %d", caller, rv); - rv = SANLK_DBLOCK_READ; - goto out; - } - - found = 0; - - for (d = 0; d < num_disks; d++) { - if (!majority_disks(num_disks, leader_reps[d])) - continue; - - /* leader on d is the same on a majority of disks, - leader becomes the prototype for new_leader */ - - memcpy(leader_ret, &leaders[d], sizeof(struct leader_record)); - found = 1; - break; - } - - if (!found) { - log_errot(token, "%s lease_read_num leader inconsistent", caller); - rv = SANLK_LEADER_DIFF; - } - out: - free(leaders); - free(leader_reps); - return rv; -} - /* * read all the initial values needed to start disk paxos: * - the leader record @@ -1721,12 +1509,8 @@ int paxos_lease_read(struct task *task, struct token *token, uint32_t flags, struct paxos_dblock our_dblock; int rv, q = -1; - if (token->r.num_disks > 1) - rv = _lease_read_num(task, token, flags, - leader_ret, &our_dblock, max_mbal, &q, caller); - else - rv = _lease_read_one(task, token, flags, &token->disks[0], - leader_ret, &our_dblock, max_mbal, &q, caller, log_bk_vals); + rv = _lease_read_one(task, token, flags, &token->disks[0], + leader_ret, &our_dblock, max_mbal, &q, caller, log_bk_vals); if (rv == SANLK_OK) log_token(token, "%s leader %llu owner %llu %llu %llu max mbal[%d] %llu " -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

sanlock-devel March 2026