diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/commands/variable.c | 6 | ||||
| -rw-r--r-- | src/backend/storage/aio/aio_callback.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc_tables.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index a9f2a3a3062..608f10d9412 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -1163,14 +1163,12 @@ assign_maintenance_io_concurrency(int newval, void *extra) void assign_io_max_combine_limit(int newval, void *extra) { - io_max_combine_limit = newval; - io_combine_limit = Min(io_max_combine_limit, io_combine_limit_guc); + io_combine_limit = Min(newval, io_combine_limit_guc); } void assign_io_combine_limit(int newval, void *extra) { - io_combine_limit_guc = newval; - io_combine_limit = Min(io_max_combine_limit, io_combine_limit_guc); + io_combine_limit = Min(io_max_combine_limit, newval); } /* diff --git a/src/backend/storage/aio/aio_callback.c b/src/backend/storage/aio/aio_callback.c index bf42778a48c..0ad9795bb7e 100644 --- a/src/backend/storage/aio/aio_callback.c +++ b/src/backend/storage/aio/aio_callback.c @@ -124,6 +124,7 @@ pgaio_io_set_handle_data_64(PgAioHandle *ioh, uint64 *data, uint8 len) Assert(ioh->state == PGAIO_HS_HANDED_OUT); Assert(ioh->handle_data_len == 0); Assert(len <= PG_IOV_MAX); + Assert(len <= io_max_combine_limit); for (int i = 0; i < len; i++) pgaio_ctl->handle_data[ioh->iovec_off + i] = data[i]; @@ -141,6 +142,7 @@ pgaio_io_set_handle_data_32(PgAioHandle *ioh, uint32 *data, uint8 len) Assert(ioh->state == PGAIO_HS_HANDED_OUT); Assert(ioh->handle_data_len == 0); Assert(len <= PG_IOV_MAX); + Assert(len <= io_max_combine_limit); for (int i = 0; i < len; i++) pgaio_ctl->handle_data[ioh->iovec_off + i] = data[i]; diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index 60b12446a1c..2f8cbd86759 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -3287,7 +3287,7 @@ struct config_int ConfigureNamesInt[] = NULL, GUC_UNIT_BLOCKS }, - &io_combine_limit, + &io_combine_limit_guc, DEFAULT_IO_COMBINE_LIMIT, 1, MAX_IO_COMBINE_LIMIT, NULL, assign_io_combine_limit, NULL |