summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr
diff options
context:
space:
mode:
authorAnand Avati <avati@gluster.com>2010-10-07 05:58:06 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-10-07 05:08:56 -0700
commit32b62dd42fc479d19211a3c223b665d28d2207f2 (patch)
tree34bb31209e792aaf574a3594b8902ee2e1b43a8a /xlators/cluster/afr
parent0c0c82729b947256beefcd3999d230302faef1fd (diff)
lock recovery: temporarily disable lock healing
Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 865 (Add locks recovery support in GlusterFS) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=865
Diffstat (limited to 'xlators/cluster/afr')
-rw-r--r--xlators/cluster/afr/src/afr-common.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index bd4e9d66d35..8d2a4f99776 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -2329,7 +2329,7 @@ afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
{
afr_local_t *local = NULL;
afr_private_t *priv = NULL;
- int ret = 0;
+/* int ret = 0; */
int child_index = -1;
@@ -2369,6 +2369,7 @@ afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
} else {
/* locking has succeeded on all nodes that are up */
+ /* temporarily
ret = afr_mark_locked_nodes (this, local->fd,
local->cont.lk.locked_nodes);
if (ret)
@@ -2380,6 +2381,7 @@ afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
gf_log (this->name, GF_LOG_DEBUG,
"Could not save locked fd");
+ */
AFR_STACK_UNWIND (lk, frame, local->op_ret, local->op_errno,
&local->cont.lk.ret_flock);
}
@@ -2539,10 +2541,9 @@ afr_notify (xlator_t *this, int32_t event,
case GF_EVENT_CHILD_UP:
i = find_child_index (this, data);
- gf_log (this->name, GF_LOG_DEBUG,
- "child=%d up", i);
-
+ /* temporarily
afr_attempt_lock_recovery (this, i);
+ */
child_up[i] = 1;