summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2016-11-08 17:24:41 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-11-11 04:23:39 -0800
commit6a401f152b109e1d9efb5a7801648d79eba06d3b (patch)
tree1d6fbe03122dddf98e484c77f05da5f839b5da34
parent6c7e87cd2871ee2db0519a4598f6d15bbf3df5d2 (diff)
cluster/afr: When failing fop due to lack of quorum, also log error string
Backport of: http://review.gluster.org/#/c/15800 Change-Id: I1e73b4518bcf26196d6326065ad404f878e70bd4 BUG: 1393631 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/15814 CentOS-regression: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
-rw-r--r--xlators/cluster/afr/src/afr-transaction.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c
index be388ab..b464104 100644
--- a/xlators/cluster/afr/src/afr-transaction.c
+++ b/xlators/cluster/afr/src/afr-transaction.c
@@ -776,6 +776,16 @@ afr_handle_quorum (call_frame_t *frame)
if (afr_has_fop_cbk_quorum (frame))
return;
+ for (i = 0; i < priv->child_count; i++) {
+ if (local->transaction.pre_op[i])
+ afr_transaction_fop_failed (frame, frame->this, i);
+ }
+
+ local->op_ret = -1;
+ local->op_errno = afr_final_errno (local, priv);
+ if (local->op_errno == 0)
+ local->op_errno = afr_quorum_errno (priv);
+
if (local->fd) {
gf_uuid_copy (gfid, local->fd->inode->gfid);
file = uuid_utoa (gfid);
@@ -784,19 +794,10 @@ afr_handle_quorum (call_frame_t *frame)
file = local->loc.path;
}
- gf_msg (frame->this->name, GF_LOG_WARNING, 0, AFR_MSG_QUORUM_FAIL,
- "%s: Failing %s as quorum is not met",
+ gf_msg (frame->this->name, GF_LOG_WARNING, local->op_errno,
+ AFR_MSG_QUORUM_FAIL, "%s: Failing %s as quorum is not met",
file, gf_fop_list[local->op]);
- for (i = 0; i < priv->child_count; i++) {
- if (local->transaction.pre_op[i])
- afr_transaction_fop_failed (frame, frame->this, i);
- }
-
- local->op_ret = -1;
- local->op_errno = afr_final_errno (local, priv);
- if (local->op_errno == 0)
- local->op_errno = afr_quorum_errno (priv);
switch (local->transaction.type) {
case AFR_ENTRY_TRANSACTION:
case AFR_ENTRY_RENAME_TRANSACTION: