diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2014-05-29 11:59:30 +0000 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2014-06-02 04:42:39 -0700 |
| commit | e8c13fa9bd2a838335e923ec48bcb66e2cb5861d (patch) | |
| tree | 8c220e6ae06b790f0092ae0e9a06ccc560b477a8 /xlators/mgmt/glusterd/src/glusterd-replace-brick.c | |
| parent | 4f9314a5eda016d5a03ad637f2c6171794cc9291 (diff) | |
glusterd: Fetching the txn_id before performing glusterd_op_bricks_select in glusterd_brick_op()
In glusterd_brick_op(), the txn_id mut be fetched before
failing the transaction for any other reason. Moving
the fetching of txn_id to the beginning of the function.
Also initializing txn_id to priv->global_txn_id where it
wasn't initialized.
Change-Id: I44d7daa444f00a626f24670c92324725f6c5fb35
BUG: 1102656
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/7926
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-replace-brick.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-replace-brick.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c index 929c86b718c..151d41f4e49 100644 --- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c +++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c @@ -1929,6 +1929,7 @@ glusterd_do_replace_brick (void *data) int32_t op = 0; int32_t src_port = 0; int32_t dst_port = 0; + int32_t ret = 0; dict_t *dict = NULL; char *src_brick = NULL; char *dst_brick = NULL; @@ -1937,16 +1938,16 @@ glusterd_do_replace_brick (void *data) glusterd_brickinfo_t *dst_brickinfo = NULL; glusterd_conf_t *priv = NULL; uuid_t *txn_id = NULL; + xlator_t *this = NULL; - int ret = 0; - - dict = data; - - GF_ASSERT (THIS); - priv = THIS->private; + this = THIS; + GF_ASSERT (this); + priv = this->private; GF_ASSERT (priv); + GF_ASSERT (data); txn_id = &priv->global_txn_id; + dict = data; if (priv->timer) { gf_timer_call_cancel (THIS->ctx, priv->timer); @@ -1959,8 +1960,8 @@ glusterd_do_replace_brick (void *data) "Replace brick operation detected"); ret = dict_get_bin (dict, "transaction_id", (void **)&txn_id); - - gf_log ("", GF_LOG_DEBUG, "transaction ID = %s", uuid_utoa (*txn_id)); + gf_log (this->name, GF_LOG_DEBUG, "transaction ID = %s", + uuid_utoa (*txn_id)); ret = dict_get_int32 (dict, "operation", &op); if (ret) { |