summaryrefslogtreecommitdiffstats
path: root/xlators/features/changelog/src/changelog-helpers.c
diff options
context:
space:
mode:
authorVenky Shankar <vshankar@redhat.com>2015-06-04 08:50:48 +0530
committerRaghavendra Bhat <raghavendra@redhat.com>2015-07-09 03:13:25 -0700
commit2874ee4d65185a607f1f646fc88ba8eb400aaa9a (patch)
tree3f4e47fbf09c2505e5ef7558d9fbb8ffcc684148 /xlators/features/changelog/src/changelog-helpers.c
parent291aba1f1ba33831569acd879e3357c1fd01a5c8 (diff)
features/bitrot: cleanup, v2
Backport of http://review.gluster.org/11148 This patch uses "cleanup, v1" infrastrcuture to cleanup scrubber (data structures, threads, timers, etc..) on brick disconnection. Signer is not cleaned up yet: probably would be done as part of another patch. Change-Id: I78a92b8a7f02b2f39078aa9a5a6b101fc499fd70 BUG: 1226666 Signed-off-by: Venky Shankar <vshankar@redhat.com> Reviewed-on: http://review.gluster.org/11540 Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/features/changelog/src/changelog-helpers.c')
-rw-r--r--xlators/features/changelog/src/changelog-helpers.c30
1 files changed, 4 insertions, 26 deletions
diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c
index 2c0a6457e8e..144bf542186 100644
--- a/xlators/features/changelog/src/changelog-helpers.c
+++ b/xlators/features/changelog/src/changelog-helpers.c
@@ -27,28 +27,6 @@
#include "changelog-rpc-common.h"
#include <pthread.h>
-static inline void
-__mask_cancellation (xlator_t *this)
-{
- int ret = 0;
-
- ret = pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL);
- if (ret)
- gf_log (this->name, GF_LOG_WARNING,
- "failed to disable thread cancellation");
-}
-
-static inline void
-__unmask_cancellation (xlator_t *this)
-{
- int ret = 0;
-
- ret = pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL);
- if (ret)
- gf_log (this->name, GF_LOG_WARNING,
- "failed to enable thread cancellation");
-}
-
static void
changelog_cleanup_free_mutex (void *arg_mutex)
{
@@ -1338,7 +1316,7 @@ changelog_rollover (void *data)
continue;
}
- __mask_cancellation (this);
+ _mask_cancellation ();
LOCK (&priv->lock);
{
@@ -1348,7 +1326,7 @@ changelog_rollover (void *data)
}
UNLOCK (&priv->lock);
- __unmask_cancellation (this);
+ _unmask_cancellation ();
}
return NULL;
@@ -1376,14 +1354,14 @@ changelog_fsync_thread (void *data)
if (ret)
continue;
- __mask_cancellation (this);
+ _mask_cancellation ();
ret = changelog_inject_single_event (this, priv, &cld);
if (ret)
gf_log (this->name, GF_LOG_ERROR,
"failed to inject fsync event");
- __unmask_cancellation (this);
+ _unmask_cancellation ();
}
return NULL;