cluster/afr: Fix bugs in quorum implementation

- Have common place to perform quorum fop wind check
- Check if fop succeeded in a way that matches quorum
  to avoid marking changelog in split-brain.

BUG: 1066996
Change-Id: Ibc5b80e01dc206b2abbea2d29e26f3c60ff4f204
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/7600
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>

1 files changed, 1 insertions, 61 deletions

diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c
index 00e0d26768b..0c3ba920937 100644
--- a/xlators/cluster/afr/src/afr-inode-write.c
+++ b/xlators/cluster/afr/src/afr-inode-write.c
@@ -229,7 +229,7 @@ afr_writev_handle_short_writes (call_frame_t *frame, xlator_t *this)
                         continue;
 
                 if (local->replies[i].op_ret < local->op_ret)
-                        afr_transaction_fop_failed(frame, this, i);
+                        afr_transaction_fop_failed (frame, this, i);
         }
 }
 
@@ -402,14 +402,9 @@ afr_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
             struct iovec *vector, int32_t count, off_t offset,
             uint32_t flags, struct iobref *iobref, dict_t *xdata)
 {
-        afr_private_t *priv = NULL;
         afr_local_t *local = NULL;
         int op_errno = ENOMEM;
 
-        priv = this->private;
-
-        QUORUM_CHECK(writev,out);
-
 	local = AFR_FRAME_INIT (frame, op_errno);
 	if (!local)
 		goto out;
@@ -528,16 +523,11 @@ int
 afr_truncate (call_frame_t *frame, xlator_t *this,
               loc_t *loc, off_t offset, dict_t *xdata)
 {
-        afr_private_t * priv  = NULL;
         afr_local_t   * local = NULL;
         call_frame_t   *transaction_frame = NULL;
 	int ret = -1;
         int op_errno = ENOMEM;
 
-        priv = this->private;
-
-        QUORUM_CHECK(truncate,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame)
                 goto out;
@@ -652,16 +642,11 @@ int
 afr_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
 	       dict_t *xdata)
 {
-        afr_private_t *priv = NULL;
         afr_local_t *local = NULL;
 	call_frame_t *transaction_frame = NULL;
 	int ret = -1;
         int op_errno = ENOMEM;
 
-        priv = this->private;
-
-        QUORUM_CHECK(ftruncate,out);
-
 	transaction_frame = copy_frame (frame);
 	if (!frame)
 		goto out;
@@ -769,16 +754,11 @@ int
 afr_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, struct iatt *buf,
 	     int32_t valid, dict_t *xdata)
 {
-        afr_private_t *priv = NULL;
         afr_local_t *local = NULL;
         call_frame_t *transaction_frame = NULL;
         int ret = -1;
         int op_errno = ENOMEM;
 
-        priv = this->private;
-
-        QUORUM_CHECK(setattr,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame)
                 goto out;
@@ -879,16 +859,11 @@ int
 afr_fsetattr (call_frame_t *frame, xlator_t *this,
               fd_t *fd, struct iatt *buf, int32_t valid, dict_t *xdata)
 {
-        afr_private_t *priv = NULL;
         afr_local_t *local = NULL;
         call_frame_t *transaction_frame = NULL;
         int ret = -1;
         int op_errno = ENOMEM;
 
-        priv = this->private;
-
-        QUORUM_CHECK(fsetattr,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame)
                 goto out;
@@ -991,7 +966,6 @@ int
 afr_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict,
 	      int32_t flags, dict_t *xdata)
 {
-        afr_private_t  *priv              = NULL;
         afr_local_t    *local             = NULL;
         call_frame_t   *transaction_frame = NULL;
         int             ret               = -1;
@@ -1003,10 +977,6 @@ afr_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict,
         GF_IF_INTERNAL_XATTR_GOTO ("trusted.glusterfs.afr.*", dict,
                                    op_errno, out);
 
-        priv = this->private;
-
-        QUORUM_CHECK(setxattr,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame)
                 goto out;
@@ -1107,7 +1077,6 @@ int
 afr_fsetxattr (call_frame_t *frame, xlator_t *this,
                fd_t *fd, dict_t *dict, int32_t flags, dict_t *xdata)
 {
-        afr_private_t    *priv              = NULL;
         afr_local_t      *local             = NULL;
         call_frame_t     *transaction_frame = NULL;
         int               ret               = -1;
@@ -1119,10 +1088,6 @@ afr_fsetxattr (call_frame_t *frame, xlator_t *this,
         GF_IF_INTERNAL_XATTR_GOTO ("trusted.glusterfs.afr.*", dict,
                                    op_errno, out);
 
-        priv = this->private;
-
-        QUORUM_CHECK(fsetxattr,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame)
                 goto out;
@@ -1226,7 +1191,6 @@ int
 afr_removexattr (call_frame_t *frame, xlator_t *this,
                  loc_t *loc, const char *name, dict_t *xdata)
 {
-        afr_private_t   *priv              = NULL;
         afr_local_t     *local             = NULL;
         call_frame_t    *transaction_frame = NULL;
         int              ret               = -1;
@@ -1238,10 +1202,6 @@ afr_removexattr (call_frame_t *frame, xlator_t *this,
         GF_IF_NATIVE_XATTR_GOTO ("trusted.glusterfs.afr.*",
                                  name, op_errno, out);
 
-        priv = this->private;
-
-        QUORUM_CHECK(removexattr,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame)
                 goto out;
@@ -1339,7 +1299,6 @@ int
 afr_fremovexattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
 		  const char *name, dict_t *xdata)
 {
-	afr_private_t *priv = NULL;
         afr_local_t *local = NULL;
         call_frame_t *transaction_frame = NULL;
         int ret = -1;
@@ -1351,10 +1310,6 @@ afr_fremovexattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
         GF_IF_NATIVE_XATTR_GOTO ("trusted.glusterfs.afr.*",
                                  name, op_errno, out);
 
-	priv = this->private;
-
-        QUORUM_CHECK(fremovexattr, out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame)
                 goto out;
@@ -1455,16 +1410,11 @@ int
 afr_fallocate (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t mode,
                off_t offset, size_t len, dict_t *xdata)
 {
-	afr_private_t *priv = NULL;
         call_frame_t *transaction_frame = NULL;
         afr_local_t *local = NULL;
         int ret = -1;
         int op_errno = ENOMEM;
 
-	priv = this->private;
-
-        QUORUM_CHECK(fallocate,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame)
                 goto out;
@@ -1573,16 +1523,11 @@ int
 afr_discard (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
              size_t len, dict_t *xdata)
 {
-        afr_private_t *priv  = NULL;
         afr_local_t *local = NULL;
         call_frame_t *transaction_frame = NULL;
         int ret = -1;
         int op_errno = ENOMEM;
 
-        priv = this->private;
-
-        QUORUM_CHECK(discard, out);
-
 	transaction_frame = copy_frame (frame);
 	if (!transaction_frame)
 		goto out;
@@ -1687,16 +1632,11 @@ int
 afr_zerofill (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
              size_t len, dict_t *xdata)
 {
-        afr_private_t *priv  = NULL;
         afr_local_t *local = NULL;
         call_frame_t *transaction_frame = NULL;
         int ret = -1;
         int op_errno = ENOMEM;
 
-        priv = this->private;
-
-        QUORUM_CHECK(discard, out);
-
 	transaction_frame = copy_frame (frame);
 	if (!transaction_frame)
 		goto out;