diff options
| author | Kotresh H R <khiremat@redhat.com> | 2014-05-05 15:33:25 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2014-06-10 03:35:59 -0700 |
| commit | b97e8f4ef649ed825b4f02b74e33946f6b551cec (patch) | |
| tree | 5a4bd17192b919fd7d19b6b8572f433a36ee56b9 /xlators/mgmt/glusterd | |
| parent | a9cdfa3072f60171a97d9f6af6988b179d45747f (diff) | |
feature/changelog: Add timeout to changelog barrier.
This patch introduces configurable 'changelog-barrier-timeout'
in changelog. The default changelog-barrier-timeout is set to
120 sec which is same as barrier-timeout of barrier translator.
On this timeout, all the barriered fops are unbarriered. It is
safe to have this internal timeout for changelog barrier to
prevent it from indefinite barrierring of fops if barrier
disable notification does not come from snapshot for some
reason.
Change-Id: Iad07807935f88222cdefcd46312b4b6579186dce
BUG: 1094226
Signed-off-by: Kotresh H R <khiremat@redhat.com>
Reviewed-on: http://review.gluster.org/7669
Reviewed-by: Kaushal M <kaushal@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Tested-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 75ec0026ff9..f94c5bca40c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1602,6 +1602,11 @@ struct volopt_map_entry glusterd_volopt_map[] = { .type = NO_DOC, .op_version = 3 }, + { .key = "changelog.changelog-barrier-timeout", + .voltype = "features/changelog", + .value = BARRIER_TIMEOUT, + .op_version = GD_OP_VERSION_3_6_0, + }, { .key = "features.barrier", .voltype = "features/barrier", .value = "disable", @@ -1609,7 +1614,7 @@ struct volopt_map_entry glusterd_volopt_map[] = { }, { .key = "features.barrier-timeout", .voltype = "features/barrier", - .value = "120", + .value = BARRIER_TIMEOUT, .op_version = GD_OP_VERSION_3_6_0, }, { .key = "cluster.op-version", |