summaryrefslogtreecommitdiffstats
path: root/xlators/features/barrier
diff options
context:
space:
mode:
authorKotresh H R <khiremat@redhat.com>2014-05-05 15:33:25 +0530
committerVenky Shankar <vshankar@redhat.com>2014-06-10 03:35:59 -0700
commitb97e8f4ef649ed825b4f02b74e33946f6b551cec (patch)
tree5a4bd17192b919fd7d19b6b8572f433a36ee56b9 /xlators/features/barrier
parenta9cdfa3072f60171a97d9f6af6988b179d45747f (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/features/barrier')
-rw-r--r--xlators/features/barrier/src/barrier.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/features/barrier/src/barrier.c b/xlators/features/barrier/src/barrier.c
index 7497349..f2d8d96 100644
--- a/xlators/features/barrier/src/barrier.c
+++ b/xlators/features/barrier/src/barrier.c
@@ -654,7 +654,7 @@ struct volume_options options[] = {
},
{ .key = {"barrier-timeout"},
.type = GF_OPTION_TYPE_TIME,
- .default_value = "120",
+ .default_value = BARRIER_TIMEOUT,
.description = "After 'timeout' seconds since the time 'barrier' "
"option was set to \"on\", acknowledgements to file "
"operations are no longer blocked and previously "