summaryrefslogtreecommitdiffstats
path: root/tests/basic/geo-replication
diff options
context:
space:
mode:
authorAshish Pandey <aspandey@redhat.com>2015-04-09 17:27:46 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2015-05-04 19:43:42 -0700
commit582b252e3a418ee332cf3d4b1a415520e242b599 (patch)
treec6f9973ada652cfad1977fd97253cdda6f58b61f /tests/basic/geo-replication
parent2d3bfc6b53974c80c347d1285b6a5a7cd60d7a13 (diff)
cluster/ec: Use fd instead of loc for get_size_version
Change-Id: Ia7d43cb3b222db34ecb0e35424f1766715ed8e6a BUG: 1188242 Signed-off-by: Ashish Pandey <aspandey@redhat.com> Reviewed-on: http://review.gluster.org/10176 Reviewed-by: Xavier Hernandez <xhernandez@datalab.es> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'tests/basic/geo-replication')
0 files changed, 0 insertions, 0 deletions
generated by cgit (git 2.34.1) at 2026-02-16 05:44:39 +0000
<shishirng@gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-brick-ops.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index c61d18f664d..3bac37310a8 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -842,6 +842,9 @@ glusterd_remove_brick_migrate_cbk (glusterd_volinfo_t *volinfo,
gf_defrag_status_t status)
{
int ret = 0;
+
+#if 0 /* TODO: enable this behavior once cluster-wide awareness comes for
+ defrag cbk function */
glusterd_brickinfo_t *brickinfo = NULL;
glusterd_brickinfo_t *tmp = NULL;
@@ -903,8 +906,10 @@ glusterd_remove_brick_migrate_cbk (glusterd_volinfo_t *volinfo,
"Unable to start nfs process (%d)", ret);
}
+#endif
+
volinfo->decommission_in_progress = 0;
- return 0;
+ return ret;
}
@@ -995,6 +1000,8 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr)
int need_rebalance = 0;
int force = 0;
gf1_op_commands cmd = 0;
+ glusterd_brickinfo_t *brickinfo = NULL;
+ glusterd_brickinfo_t *tmp = NULL;
ret = dict_get_str (dict, "volname", &volname);
@@ -1037,7 +1044,7 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr)
}
}
- /* rebalance '_cbk()' will take care of volume file updates */
+ /* no need to update anything */
ret = 0;
goto out;
}
@@ -1054,9 +1061,14 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr)
}
}
- /* rebalance '_cbk()' will take care of volume file updates */
+ /* Fall back to the old vo