diff options
author | Sheetal Pamecha <sheetal.pamecha08@gmail.com> | 2018-11-19 22:15:25 +0530 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2019-06-03 02:59:17 +0000 |
commit | 950726dfc8e3171bef625b563c0c6dbba1ec2928 (patch) | |
tree | 9f29ddeaa3d93984ffcc0f6620779e0ee8418512 /xlators/storage/posix/src | |
parent | 6fd8281ac9af58609979f660ece58c2ed1100e72 (diff) |
posix: add storage.reserve-size option
storage.reserve-size option will take size as input
instead of percentage. If set, priority will be given to
storage.reserve-size over storage.reserve. Default value
of this option is 0.
fixes: bz#1651445
Change-Id: I7a7342c68e436e8bf65bd39c567512ee04abbcea
Signed-off-by: Sheetal Pamecha <sheetal.pamecha08@gmail.com>
Diffstat (limited to 'xlators/storage/posix/src')
-rw-r--r-- | xlators/storage/posix/src/posix-common.c | 34 | ||||
-rw-r--r-- | xlators/storage/posix/src/posix-helpers.c | 13 | ||||
-rw-r--r-- | xlators/storage/posix/src/posix-inode-fd-ops.c | 10 | ||||
-rw-r--r-- | xlators/storage/posix/src/posix.h | 3 |
4 files changed, 47 insertions, 13 deletions
diff --git a/xlators/storage/posix/src/posix-common.c b/xlators/storage/posix/src/posix-common.c index 06ff6e631bb..31dc9495af1 100644 --- a/xlators/storage/posix/src/posix-common.c +++ b/xlators/storage/posix/src/posix-common.c @@ -344,11 +344,18 @@ posix_reconfigure(xlator_t *this, dict_t *options) " fallback to <hostname>:<export>"); } - GF_OPTION_RECONF("reserve", priv->disk_reserve, options, uint32, out); - if (priv->disk_reserve) { + GF_OPTION_RECONF("reserve-size", priv->disk_reserve_size, options, size, + out); + + GF_OPTION_RECONF("reserve", priv->disk_reserve_percent, options, uint32, + out); + if (priv->disk_reserve_size || priv->disk_reserve_percent) { ret = posix_spawn_disk_space_check_thread(this); - if (ret) + if (ret) { + gf_msg(this->name, GF_LOG_INFO, 0, P_MSG_DISK_SPACE_CHECK_FAILED, + "Getting disk space check from thread failed"); goto out; + } } GF_OPTION_RECONF("health-check-interval", priv->health_check_interval, @@ -966,11 +973,17 @@ posix_init(xlator_t *this) _private->disk_space_check_active = _gf_false; _private->disk_space_full = 0; - GF_OPTION_INIT("reserve", _private->disk_reserve, uint32, out); - if (_private->disk_reserve) { + GF_OPTION_INIT("reserve-size", _private->disk_reserve_size, size, out); + + GF_OPTION_INIT("reserve", _private->disk_reserve_percent, uint32, out); + + if (_private->disk_reserve_size || _private->disk_reserve_percent) { ret = posix_spawn_disk_space_check_thread(this); - if (ret) + if (ret) { + gf_msg(this->name, GF_LOG_INFO, 0, P_MSG_DISK_SPACE_CHECK_FAILED, + "Getting disk space check from thread failed "); goto out; + } } _private->health_check_active = _gf_false; @@ -1214,6 +1227,15 @@ struct volume_options posix_options[] = { " Set to 0 to disable", .op_version = {GD_OP_VERSION_3_13_0}, .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC}, + {.key = {"reserve-size"}, + .type = GF_OPTION_TYPE_SIZET, + .min = 0, + .default_value = "0", + .validate = GF_OPT_VALIDATE_MIN, + .description = "size in megabytes to be reserved for disk space." + " Set to 0 to disable", + .op_version = {GD_OP_VERSION_7_0}, + .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC}, {.key = {"batch-fsync-mode"}, .type = GF_OPTION_TYPE_STR, .default_value = "reverse-fsync", diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index 80f5fb8514c..7296f698db0 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -2265,6 +2265,7 @@ posix_disk_space_check(xlator_t *this) struct posix_private *priv = NULL; char *subvol_path = NULL; int op_ret = 0; + uint64_t size = 0; int percent = 0; struct statvfs buf = {0}; uint64_t totsz = 0; @@ -2275,7 +2276,14 @@ posix_disk_space_check(xlator_t *this) GF_VALIDATE_OR_GOTO(this->name, priv, out); subvol_path = priv->base_path; - percent = priv->disk_reserve; + + if (priv->disk_reserve_size) { + size = priv->disk_reserve_size; + } else { + percent = priv->disk_reserve_percent; + totsz = (buf.f_blocks * buf.f_bsize); + size = ((totsz * percent) / 100); + } op_ret = sys_statvfs(subvol_path, &buf); @@ -2284,10 +2292,9 @@ posix_disk_space_check(xlator_t *this) "statvfs failed on %s", subvol_path); goto out; } - totsz = (buf.f_blocks * buf.f_bsize); freesz = (buf.f_bfree * buf.f_bsize); - if (freesz <= ((totsz * percent) / 100)) { + if (freesz <= size) { priv->disk_space_full = 1; } else { priv->disk_space_full = 0; diff --git a/xlators/storage/posix/src/posix-inode-fd-ops.c b/xlators/storage/posix/src/posix-inode-fd-ops.c index c12856d4764..16f175c21b8 100644 --- a/xlators/storage/posix/src/posix-inode-fd-ops.c +++ b/xlators/storage/posix/src/posix-inode-fd-ops.c @@ -725,7 +725,7 @@ posix_do_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, thread after every 5 sec sleep to working correctly storage.reserve option behaviour */ - if (priv->disk_reserve) + if (priv->disk_reserve_size || priv->disk_reserve_percent) posix_disk_space_check(this); DISK_SPACE_CHECK_AND_GOTO(frame, priv, xdata, ret, ret, out); @@ -2345,8 +2345,12 @@ posix_statfs(call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) goto out; } - percent = priv->disk_reserve; - reserved_blocks = (buf.f_blocks * percent) / 100; + if (priv->disk_reserve_size) { + reserved_blocks = priv->disk_reserve_size / buf.f_bsize; + } else { + percent = priv->disk_reserve_percent; + reserved_blocks = (buf.f_blocks * percent) / 100; + } if (buf.f_bfree > reserved_blocks) { buf.f_bfree = (buf.f_bfree - reserved_blocks); diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h index e807d4a972e..02e7003a57b 100644 --- a/xlators/storage/posix/src/posix.h +++ b/xlators/storage/posix/src/posix.h @@ -224,7 +224,8 @@ struct posix_private { pthread_t health_check; gf_boolean_t health_check_active; - uint32_t disk_reserve; + uint32_t disk_reserve_percent; + uint64_t disk_reserve_size; uint32_t disk_space_full; pthread_t disk_space_check; gf_boolean_t disk_space_check_active; |