diff options
Diffstat (limited to 'xlators/storage/posix/src/posix.c')
| -rw-r--r-- | xlators/storage/posix/src/posix.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index 3ffeb5b30ba..474c47c911f 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -1,11 +1,11 @@ /* Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com> - This file is part of GlusterFS. + This file is part of GlusterFS This file is licensed to you under your choice of the GNU Lesser General Public License, version 3 or any later version (LGPLv3 or later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. + cases as published by the Free Software Foundation */ #ifndef _CONFIG_H #define _CONFIG_H @@ -2027,6 +2027,7 @@ posix_rmdir (call_frame_t *frame, xlator_t *this, } else { sprintf (tmp_path, "%s/%s", priv->trash_path, gfid_str); op_ret = rename (real_path, tmp_path); + pthread_cond_signal (&priv->janitor_cond); } } else { op_ret = rmdir (real_path); @@ -6554,7 +6555,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,}; @@ -6883,16 +6883,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 */ @@ -7128,7 +7121,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"}, |