summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr/src/pump.c
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2010-10-08 07:06:57 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-10-08 06:05:10 -0700
commitcd5c9df4b67073089a5502d5e4c2e2e7d2141e4a (patch)
tree9a4717a1916d41b540d4b5fb57a6b6ee0a3e316f /xlators/cluster/afr/src/pump.c
parent09914c02f24b4cc74cb6aad9994ae590cf8b76bf (diff)
mgmt/glusterd: Fix replace brick to pass src-brick and dst-brick port nos properly.v3.1.0qa42
Fix also contains patch from shishir ng for maintaining replace-brick states in glusterd. Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1235 (Bug for all pump/migrate commits) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1235
Diffstat (limited to 'xlators/cluster/afr/src/pump.c')
-rw-r--r--xlators/cluster/afr/src/pump.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c
index 9a3a25af39a..a499cbb330d 100644
--- a/xlators/cluster/afr/src/pump.c
+++ b/xlators/cluster/afr/src/pump.c
@@ -1096,14 +1096,23 @@ out:
int
pump_execute_abort (call_frame_t *frame, xlator_t *this)
{
- afr_private_t *priv = NULL;
- afr_local_t *local = NULL;
+ afr_private_t *priv = NULL;
+ pump_private_t *pump_priv = NULL;
+ afr_local_t *local = NULL;
- priv = this->private;
- local = frame->local;
+ priv = this->private;
+ pump_priv = priv->pump_private;
+ local = frame->local;
pump_change_state (this, PUMP_STATE_ABORT);
+ LOCK (&pump_priv->resume_path_lock);
+ {
+ pump_priv->number_files_pumped = 0;
+ pump_priv->current_file[0] = '\0';
+ }
+ UNLOCK (&pump_priv->resume_path_lock);
+
local->op_ret = 0;
pump_command_reply (frame, this);