summaryrefslogtreecommitdiffstats
path: root/xlators/storage/posix/src/posix.c
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2016-03-31 17:15:37 -0400
committerJeff Darcy <jdarcy@redhat.com>2016-04-07 08:07:55 -0700
commit6602376e3e9e6d9f4f695475569322b61ccc2411 (patch)
tree58d4352c641b43615cccce363ce9f764e4cdd8eb /xlators/storage/posix/src/posix.c
parente6c7da3769105f0e6fc8b6627f3b11727a2a216d (diff)
dht: add "nuke" functionality for efficient server-side deletion
This turns a special xattr into an rmdir with flags set. When that hits the posix translator on the server side, that causes the file/directory to be moved into the special "landfill" directory. From there, the posix janitor thread will take care of deleting it entirely on the server side - traversing it recursively if necessary. A couple of secondary issues were fixed to make this effective. * FUSE now ensures that setxattr values are NUL terminated. * The janitor thread now gets woken up immediately when something is placed in 'landfill' instead of only when file descriptors need to be closed. * The default landfill-emptying interval was reduced to 10s. To use the feature, issue a setxattr something like this: setfattr -n glusterfs.dht.nuke -v "" /mnt/glusterfs/vol/some_dir The value doesn't actually matter; the mere receipt of a request with this key is sufficient. Some day it might be useful to allow setting a required value as a sort of password, so that only those who know it can access the underlying special functionality. Change-Id: I8a343c2cdb40a76d5a06c707191fb67babb8514f Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/13878 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/storage/posix/src/posix.c')
-rw-r--r--xlators/storage/posix/src/posix.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index b5df1d082ee..f72c13d9066 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -1994,6 +1994,7 @@ posix_rmdir (call_frame_t *frame, xlator_t *this,
} else {
sprintf (tmp_path, "%s/%s", priv->trash_path, gfid_str);
op_ret = sys_rename (real_path, tmp_path);
+ pthread_cond_signal (&priv->janitor_cond);
}
} else {
op_ret = sys_rmdir (real_path);
@@ -6528,7 +6529,6 @@ init (xlator_t *this)
int ret = 0;
int op_ret = -1;
ssize_t size = -1;
- int32_t janitor_sleep = 0;
uuid_t old_uuid = {0,};
uuid_t dict_uuid = {0,};
uuid_t gfid = {0,};
@@ -6857,16 +6857,9 @@ init (xlator_t *this)
}
ret = 0;
- _private->janitor_sleep_duration = 600;
+ GF_OPTION_INIT ("janitor-sleep-duration",
+ _private->janitor_sleep_duration, int32, out);
- dict_ret = dict_get_int32 (this->options, "janitor-sleep-duration",
- &janitor_sleep);
- if (dict_ret == 0) {
- gf_msg_debug (this->name, 0, "Setting janitor sleep duration "
- "to %d.", janitor_sleep);
-
- _private->janitor_sleep_duration = janitor_sleep;
- }
/* performing open dir on brick dir locks the brick dir
* and prevents it from being unmounted
*/
@@ -7105,7 +7098,13 @@ struct volume_options options[] = {
{ .key = {"background-unlink"},
.type = GF_OPTION_TYPE_BOOL },
{ .key = {"janitor-sleep-duration"},
- .type = GF_OPTION_TYPE_INT },
+ .type = GF_OPTION_TYPE_INT,
+ .min = 1,
+ .validate = GF_OPT_VALIDATE_MIN,
+ .default_value = "10",
+ .description = "Interval (in seconds) between times the internal "
+ "'landfill' directory is emptied."
+ },
{ .key = {"volume-id"},
.type = GF_OPTION_TYPE_ANY },
{ .key = {"glusterd-uuid"},