From 733139551322e49e7e5617356cf96e30780d2749 Mon Sep 17 00:00:00 2001
From: Amar Tumballi <amarts@redhat.com>
Date: Wed, 3 Oct 2018 15:30:10 +0530
Subject: stripe: remove the translator from build and glusterd

Based on the proposal to remove few features as they are not
actively maintained [1], removing stripe translator from the
build. Also make sure there are no regression tests involving
stripe translator.

[1] https://lists.gluster.org/pipermail/gluster-users/2018-July/034400.html

Note that this patch aims at removing the translator from build, and
a followup patch is needed to remove the code from repository.

Updates: bz#1364707
Change-Id: I235b305338f138e29e9f30cba65bc0dadbebbbd5
Signed-off-by: Amar Tumballi <amarts@redhat.com>
---
 cli/src/cli-cmd-parser.c                           |  72 +-------
 cli/src/cli-rpc-ops.c                              |  12 +-
 configure.ac                                       |   2 -
 tests/basic/geo-replication/marker-xattrs.t        |  33 +---
 tests/basic/glusterd/arbiter-volume.t              |   3 -
 tests/basic/glusterd/disperse-create.t             |  15 +-
 tests/basic/glusterd/heald.t                       |   6 -
 tests/basic/meta.t                                 |   2 +-
 tests/basic/mount.t                                |   2 +-
 tests/basic/nufa.t                                 |   4 +-
 tests/basic/op_errnos.t                            |   4 -
 tests/basic/volume-status.t                        |   6 +-
 tests/basic/volume.t                               |  12 +-
 tests/bugs/cli/bug-770655.t                        | 168 ------------------
 tests/bugs/cli/bug-822830.t                        |   2 +-
 tests/bugs/error-gen/bug-767095.t                  |   2 +-
 tests/bugs/fuse/bug-858215.t                       |   2 +-
 tests/bugs/glusterd/bug-824753.t                   |   2 +-
 .../validating-options-for-replicated-volume.t     | 137 +++++++++++++++
 ...idating-options-for-striped-replicated-volume.t | 144 ----------------
 tests/bugs/glusterfs-server/bug-852147.t           |   4 +-
 tests/bugs/glusterfs-server/bug-912297.t           |   2 +-
 tests/bugs/glusterfs/bug-879490.t                  |   2 +-
 tests/bugs/glusterfs/bug-879494.t                  |   2 +-
 tests/bugs/glusterfs/bug-893338.t                  |   2 +-
 tests/bugs/glusterfs/bug-896431.t                  |  37 +---
 ...bug-1040275-brick-uid-reset-on-volume-restart.t |   6 +-
 tests/bugs/protocol/bug-762989.t                   |   2 +-
 tests/bugs/protocol/bug-808400-stripe.t            |  32 ----
 xlators/cluster/Makefile.am                        |   2 +-
 xlators/mgmt/glusterd/src/glusterd-brick-ops.c     | 190 +--------------------
 xlators/mgmt/glusterd/src/glusterd-store.c         |  11 --
 xlators/mgmt/glusterd/src/glusterd-tier.c          |   4 -
 xlators/mgmt/glusterd/src/glusterd-utils.c         |   5 +-
 xlators/mgmt/glusterd/src/glusterd-volgen.c        |  35 +---
 xlators/mgmt/glusterd/src/glusterd-volume-ops.c    |  51 ------
 xlators/mgmt/glusterd/src/glusterd-volume-set.c    |  43 -----
 37 files changed, 178 insertions(+), 882 deletions(-)
 delete mode 100755 tests/bugs/cli/bug-770655.t
 create mode 100644 tests/bugs/glusterd/validating-options-for-replicated-volume.t
 delete mode 100644 tests/bugs/glusterd/validating-options-for-striped-replicated-volume.t
 delete mode 100755 tests/bugs/protocol/bug-808400-stripe.t

diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index bbed960efbf..c6d6232b638 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -392,21 +392,11 @@ cli_validate_disperse_volume(char *word, gf1_cluster_type type,
                 ret = 2;
             }
             break;
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
-            cli_err(
-                "striped-replicated-dispersed volume "
-                "is not supported");
-            goto out;
         case GF_CLUSTER_TYPE_TIER:
             cli_err(
                 "tier-dispersed volume is not "
                 "supported");
             goto out;
-        case GF_CLUSTER_TYPE_STRIPE:
-            cli_err(
-                "striped-dispersed volume is not "
-                "supported");
-            goto out;
         case GF_CLUSTER_TYPE_REPLICATE:
             cli_err(
                 "replicated-dispersed volume is not "
@@ -550,8 +540,8 @@ cli_cmd_volume_create_parse(struct cli_state *state, const char **words,
                     type = GF_CLUSTER_TYPE_REPLICATE;
                     break;
                 case GF_CLUSTER_TYPE_STRIPE:
-                    type = GF_CLUSTER_TYPE_STRIPE_REPLICATE;
-                    break;
+                    cli_err("stripe option not supported");
+                    goto out;
                 case GF_CLUSTER_TYPE_TIER:
                     cli_err(
                         "replicated-tiered volume is not "
@@ -637,49 +627,8 @@ cli_cmd_volume_create_parse(struct cli_state *state, const char **words,
                 goto out;
 
         } else if ((strcmp(w, "stripe")) == 0) {
-            switch (type) {
-                case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
-                case GF_CLUSTER_TYPE_STRIPE:
-                    cli_err("stripe option given twice");
-                    goto out;
-                case GF_CLUSTER_TYPE_NONE:
-                    type = GF_CLUSTER_TYPE_STRIPE;
-                    break;
-                case GF_CLUSTER_TYPE_REPLICATE:
-                    type = GF_CLUSTER_TYPE_STRIPE_REPLICATE;
-                    break;
-                case GF_CLUSTER_TYPE_DISPERSE:
-                    cli_err(
-                        "striped-dispersed volume is not "
-                        "supported");
-                    goto out;
-                case GF_CLUSTER_TYPE_TIER:
-                    cli_err(
-                        "striped-tier volume is not "
-                        "supported");
-                    goto out;
-                default:
-                    cli_err("Invalid type given");
-                    goto out;
-            }
-            if (wordcount < (index + 2)) {
-                ret = -1;
-                goto out;
-            }
-            stripe_count = strtol(words[index + 1], NULL, 0);
-            if (stripe_count < 2) {
-                cli_err(
-                    "stripe count should be greater"
-                    " than 1");
-                ret = -1;
-                goto out;
-            }
-            ret = dict_set_int32(dict, "stripe-count", stripe_count);
-            if (ret)
-                goto out;
-
-            index += 2;
-
+            cli_err("stripe option not supported");
+            goto out;
         } else if ((strcmp(w, "transport")) == 0) {
             if (trans_type) {
                 cli_err(
@@ -1867,17 +1816,8 @@ cli_cmd_volume_add_brick_parse(struct cli_state *state, const char **words,
             }
         }
     } else if ((strcmp(w, "stripe")) == 0) {
-        type = GF_CLUSTER_TYPE_STRIPE;
-        count = strtol(words[4], NULL, 0);
-        if (!count || (count < 2)) {
-            cli_err("stripe count should be greater than 1");
-            ret = -1;
-            goto out;
-        }
-        ret = dict_set_int32(dict, "stripe-count", count);
-        if (ret)
-            goto out;
-        index = 5;
+        cli_err("stripe option not supported");
+        goto out;
     } else {
         GF_ASSERT(!"opword mismatch");
         ret = -1;
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index f03c5813ee5..e7cca8d2e00 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -694,17 +694,7 @@ gf_cli_print_number_of_bricks(int type, int brick_count, int dist_count,
                               int disperse_count, int redundancy_count,
                               int arbiter_count)
 {
-    if (type == GF_CLUSTER_TYPE_STRIPE_REPLICATE) {
-        if (arbiter_count == 0) {
-            cli_out("Number of Bricks: %d x %d x %d = %d",
-                    (brick_count / dist_count), stripe_count, replica_count,
-                    brick_count);
-        } else {
-            cli_out("Number of Bricks: %d x %d x (%d + %d) = %d",
-                    (brick_count / dist_count), stripe_count,
-                    replica_count - arbiter_count, arbiter_count, brick_count);
-        }
-    } else if (type == GF_CLUSTER_TYPE_NONE || type == GF_CLUSTER_TYPE_TIER) {
+    if (type == GF_CLUSTER_TYPE_NONE || type == GF_CLUSTER_TYPE_TIER) {
         cli_out("Number of Bricks: %d", brick_count);
     } else if (type == GF_CLUSTER_TYPE_DISPERSE) {
         cli_out("Number of Bricks: %d x (%d + %d) = %d",
diff --git a/configure.ac b/configure.ac
index afba73e18cf..cf45a500fe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,8 +69,6 @@ AC_CONFIG_FILES([Makefile
                 xlators/cluster/Makefile
                 xlators/cluster/afr/Makefile
                 xlators/cluster/afr/src/Makefile
-                xlators/cluster/stripe/Makefile
-                xlators/cluster/stripe/src/Makefile
                 xlators/cluster/dht/Makefile
                 xlators/cluster/dht/src/Makefile
                 xlators/cluster/ec/Makefile
diff --git a/tests/basic/geo-replication/marker-xattrs.t b/tests/basic/geo-replication/marker-xattrs.t
index e5b26a6bd5b..7e5ea8eebec 100755
--- a/tests/basic/geo-replication/marker-xattrs.t
+++ b/tests/basic/geo-replication/marker-xattrs.t
@@ -7,7 +7,7 @@ TEST glusterd
 TEST pidof glusterd
 
 ## Start and create a replicated volume
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}-{0,1,2,3}
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}-{0,1,2,3,4,5}
 
 TEST $CLI volume set $V0 indexing on
 
@@ -78,34 +78,3 @@ TEST $CLI volume stop $V0;
 TEST $CLI volume delete $V0;
 
 cleanup
-TEST glusterd
-TEST pidof glusterd
-## Start and create a stripe volume
-TEST $CLI volume create $V0 stripe 2 $H0:$B0/${V0}-{0,1}
-
-TEST $CLI volume set $V0 indexing on
-
-TEST $CLI volume start $V0;
-
-## Mount native
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-
-## Mount client-pid=-1
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 --client-pid=-1 $M1
-
-TEST touch $M0
-
-vol_uuid=$(get_volume_mark $M1)
-xtime=trusted.glusterfs.$vol_uuid.xtime
-
-TEST "getfattr -n $xtime $B0/${V0}-0 | grep -q ${xtime}="
-
-TEST "getfattr -n $xtime $B0/${V0}-1 | grep -q ${xtime}="
-
-EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
-EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M1
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup
diff --git a/tests/basic/glusterd/arbiter-volume.t b/tests/basic/glusterd/arbiter-volume.t
index 03f9aca2daf..e9edf046905 100644
--- a/tests/basic/glusterd/arbiter-volume.t
+++ b/tests/basic/glusterd/arbiter-volume.t
@@ -17,10 +17,7 @@ TEST $CLI volume create $V0 replica 3 arbiter 1 $H0:$B0/b{4..9}
 EXPECT "2 x \(2 \+ 1\) = 6" volinfo_field $V0 "Number of Bricks"
 
 TEST $CLI volume delete $V0
-TEST $CLI volume create $V0 stripe 2 replica 3 arbiter 1 $H0:$B0/b{10..15}
-EXPECT "1 x 2 x \(2 \+ 1\) = 6" volinfo_field $V0 "Number of Bricks"
 
-TEST $CLI volume delete $V0
 TEST rm -rf $B0/b{1..3}
 TEST $CLI volume create $V0 replica 3 arbiter 1 $H0:$B0/b1 $H0:$B0/b2 $H0:$B0/b3
 EXPECT "1 x \(2 \+ 1\) = 3" volinfo_field $V0 "Number of Bricks"
diff --git a/tests/basic/glusterd/disperse-create.t b/tests/basic/glusterd/disperse-create.t
index 5b3ed138e3e..384c675c882 100644
--- a/tests/basic/glusterd/disperse-create.t
+++ b/tests/basic/glusterd/disperse-create.t
@@ -65,18 +65,5 @@ TEST ! $CLI volume create $V0 redundancy 2 replica 2 $H0:$B0/b20 $H0:$B0/b21 $H0
 TEST ! $CLI volume create $V0 replica 2 disperse 4 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
 TEST ! $CLI volume create $V0 replica 2 disperse-data 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22 $H0:$B0/b23
 TEST ! $CLI volume create $V0 replica 2 redundancy 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
-#Stripe + Disperse
-TEST ! $CLI volume create $V0 disperse 4 stripe 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
-TEST ! $CLI volume create $V0 disperse-data 2 stripe 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22 $H0:$B0/b23
-TEST ! $CLI volume create $V0 redundancy 2 stripe 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
-TEST ! $CLI volume create $V0 stripe 2 disperse 4 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
-TEST ! $CLI volume create $V0 stripe 2 disperse-data 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22 $H0:$B0/b23
-TEST ! $CLI volume create $V0 stripe 2 redundancy 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
-#Stripe + Replicate + Disperse, It is failing with striped-dispersed volume.
-TEST ! $CLI volume create $V0 disperse 4 stripe 2 replica 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
-TEST ! $CLI volume create $V0 disperse-data 2 stripe 2 replica 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22 $H0:$B0/b23
-TEST ! $CLI volume create $V0 redundancy 2 stripe 2 replica 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
-TEST ! $CLI volume create $V0 stripe 2 disperse 4 replica 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
-TEST ! $CLI volume create $V0 stripe 2 disperse-data 2 replica 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22 $H0:$B0/b23
-TEST ! $CLI volume create $V0 stripe 2 redundancy 2 replica 2 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b22
+
 cleanup
diff --git a/tests/basic/glusterd/heald.t b/tests/basic/glusterd/heald.t
index bdfda8ff0d6..ca112ad0b75 100644
--- a/tests/basic/glusterd/heald.t
+++ b/tests/basic/glusterd/heald.t
@@ -16,7 +16,6 @@ volfile=$(gluster system:: getwd)"/glustershd/glustershd-server.vol"
 TEST ! $CLI volume heal non-existent-volume enable
 TEST ! $CLI volume heal non-existent-volume disable
 
-# Commands should fail when volume is of distribute/stripe type.
 # Glustershd shouldn't be running as long as there are no replicate/disperse
 # volumes
 TEST $CLI volume create dist $H0:$B0/dist
@@ -24,11 +23,6 @@ TEST $CLI volume start dist
 TEST "[ -z $(get_shd_process_pid)]"
 TEST ! $CLI volume heal dist enable
 TEST ! $CLI volume heal dist disable
-TEST $CLI volume create st stripe 3 $H0:$B0/st1 $H0:$B0/st2 $H0:$B0/st3
-TEST $CLI volume start st
-TEST "[ -z $(get_shd_process_pid)]"
-TEST ! $CLI volume heal st
-TEST ! $CLI volume heal st disable
 
 # Commands should work on replicate/disperse volume.
 TEST $CLI volume create r2 replica 2 $H0:$B0/r2_0 $H0:$B0/r2_1
diff --git a/tests/basic/meta.t b/tests/basic/meta.t
index 55ca005824b..0bac3c6797d 100755
--- a/tests/basic/meta.t
+++ b/tests/basic/meta.t
@@ -9,7 +9,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 4 $H0:$B0/${V0}{1..16};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1..9};
 
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
diff --git a/tests/basic/mount.t b/tests/basic/mount.t
index 52e760d048d..26feeb9be0e 100755
--- a/tests/basic/mount.t
+++ b/tests/basic/mount.t
@@ -11,7 +11,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6,7,8,9};
 TEST $CLI volume set $V0 nfs.disable false
 
 function volinfo_field()
diff --git a/tests/basic/nufa.t b/tests/basic/nufa.t
index 1d74d376b7d..6221fb16a8f 100644
--- a/tests/basic/nufa.t
+++ b/tests/basic/nufa.t
@@ -10,12 +10,12 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 TEST $CLI volume set $V0 nfs.disable false
 
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '8' brick_count $V0
+EXPECT '6' brick_count $V0
 
 TEST $CLI volume set $V0 nufa on;
 
diff --git a/tests/basic/op_errnos.t b/tests/basic/op_errnos.t
index 8b16267cb50..9c48d7a02ad 100755
--- a/tests/basic/op_errnos.t
+++ b/tests/basic/op_errnos.t
@@ -17,8 +17,6 @@ TEST setup_lvm 1
 
 TEST $CLI volume create $V0 $H0:$L1
 TEST $CLI volume start $V0
-TEST $CLI volume create $V1 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-TEST $CLI volume start $V1
 
 EXPECT 0 get-op_errno-xml "snapshot create snap1 $V0 no-timestamp"
 EXPECT 30806 get-op_errno-xml "snapshot create snap1 imaginary_volume"
@@ -29,10 +27,8 @@ EXPECT 30810 get-op_errno-xml "snapshot create snap1 $V0"
 TEST $CLI volume start $V0
 EXPECT 30811 get-op_errno-xml "snapshot clone $V0 snap1"
 EXPECT 30812 get-op_errno-xml "snapshot create snap1 $V0 no-timestamp"
-EXPECT 30815 get-op_errno-xml "snapshot create snap2 $V1 no-timestamp"
 
 EXPECT 0 get-op_errno-xml "snapshot delete snap1"
 TEST $CLI volume stop $V0
-TEST $CLI volume stop $V1
 
 cleanup;
diff --git a/tests/basic/volume-status.t b/tests/basic/volume-status.t
index 8cea5c7530a..d0d0b90250f 100644
--- a/tests/basic/volume-status.t
+++ b/tests/basic/volume-status.t
@@ -22,7 +22,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 TEST $CLI volume set $V0 nfs.disable false
 
 TEST $CLI volume start $V0;
@@ -33,9 +33,9 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" nfs_up_status
 ## Mount FUSE
 TEST $GFS -s $H0 --volfile-id $V0 $M0;
 
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "8" gluster_fd_status
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "6" gluster_fd_status
 
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1024" gluster_inode_status
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "768" gluster_inode_status
 
 ##Disabling this test until the client-list command works for brick-multiplexing
 #EXPECT_WITHIN $PROCESS_UP_TIMEOUT "7" gluster_client_list_status
diff --git a/tests/basic/volume.t b/tests/basic/volume.t
index 23b740af1ed..35ad55c3c5c 100755
--- a/tests/basic/volume.t
+++ b/tests/basic/volume.t
@@ -9,21 +9,21 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '8' brick_count $V0
+EXPECT '6' brick_count $V0
 
 TEST $CLI volume start $V0;
 EXPECT 'Started' volinfo_field $V0 'Status';
 
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}{9,10,11,12};
-EXPECT '12' brick_count $V0
+TEST $CLI volume add-brick $V0 $H0:$B0/${V0}{9,10,11};
+EXPECT '9' brick_count $V0
 
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}{1,2,3,4} force;
-EXPECT '8' brick_count $V0
+TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}{1,2,3} force;
+EXPECT '6' brick_count $V0
 
 TEST $CLI volume stop $V0;
 EXPECT 'Stopped' volinfo_field $V0 'Status';
diff --git a/tests/bugs/cli/bug-770655.t b/tests/bugs/cli/bug-770655.t
deleted file mode 100755
index 4e0b20d62da..00000000000
--- a/tests/bugs/cli/bug-770655.t
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-cleanup;
-
-## Start and create a distribute-replicate volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Distributed-Replicate' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST ! $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a replicate volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 8 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Replicate' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST ! $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a distribute volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Distribute' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST ! $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a stripe volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 stripe 8 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Stripe' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '10MB' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a distributed stripe volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 stripe 4 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Distributed-Stripe' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '10MB' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a distributed stripe replicate volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 stripe 2 replica 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Distributed-Striped-Replicate' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '10MB' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/cli/bug-822830.t b/tests/bugs/cli/bug-822830.t
index b66aa4f8981..a9904854110 100755
--- a/tests/bugs/cli/bug-822830.t
+++ b/tests/bugs/cli/bug-822830.t
@@ -8,7 +8,7 @@ cleanup;
 ## Start and create a volume
 TEST glusterd;
 TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 ## Verify volume is is created
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
diff --git a/tests/bugs/error-gen/bug-767095.t b/tests/bugs/error-gen/bug-767095.t
index 4649a783b23..6cc254f559d 100755
--- a/tests/bugs/error-gen/bug-767095.t
+++ b/tests/bugs/error-gen/bug-767095.t
@@ -9,7 +9,7 @@ TEST glusterd;
 TEST pidof glusterd;
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 function volinfo_field()
 {
diff --git a/tests/bugs/fuse/bug-858215.t b/tests/bugs/fuse/bug-858215.t
index 92389829077..d2719a6e1d4 100755
--- a/tests/bugs/fuse/bug-858215.t
+++ b/tests/bugs/fuse/bug-858215.t
@@ -10,7 +10,7 @@ TEST glusterd;
 TEST pidof glusterd;
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 TEST $CLI volume set $V0 nfs.disable off
 
 function volinfo_field()
diff --git a/tests/bugs/glusterd/bug-824753.t b/tests/bugs/glusterd/bug-824753.t
index 2ce4a07c5bd..b969e28f35e 100755
--- a/tests/bugs/glusterd/bug-824753.t
+++ b/tests/bugs/glusterd/bug-824753.t
@@ -9,7 +9,7 @@ TEST glusterd;
 TEST pidof glusterd;
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 function volinfo_field()
 {
diff --git a/tests/bugs/glusterd/validating-options-for-replicated-volume.t b/tests/bugs/glusterd/validating-options-for-replicated-volume.t
new file mode 100644
index 00000000000..ee231338ff1
--- /dev/null
+++ b/tests/bugs/glusterd/validating-options-for-replicated-volume.t
@@ -0,0 +1,137 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup;
+
+TEST glusterd
+
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
+
+## start volume and verify
+TEST $CLI volume start $V0;
+EXPECT 'Started' volinfo_field $V0 'Status';
+
+#bug-1314649 - validate group virt
+TEST $CLI volume set $V0 group virt;
+
+#bug-765230 - remove-quota-related-option-after-disabling-quota
+## setting soft-timeout as 20
+TEST $CLI volume set $V0 features.soft-timeout 20
+EXPECT '20' volinfo_field $V0 'features.soft-timeout';
+
+## enabling features.quota-deem-statfs
+TEST ! $CLI volume set $V0 features.quota-deem-statfs on
+EXPECT '' volinfo_field $V0 'features.quota-deem-statfs'
+
+## enabling quota
+TEST $CLI volume quota $V0 enable
+EXPECT 'on' volinfo_field $V0 'features.quota'
+
+## eetting soft-timeout as 20
+TEST $CLI volume set $V0 features.soft-timeout 20
+EXPECT '20' volinfo_field $V0 'features.soft-timeout';
+
+## enabling features.quota-deem-statfs
+TEST $CLI volume set $V0 features.quota-deem-statfs on
+EXPECT 'on' volinfo_field $V0 'features.quota-deem-statfs'
+
+## disabling quota
+TEST $CLI volume quota $V0 disable
+EXPECT 'off' volinfo_field $V0 'features.quota'
+EXPECT '' volinfo_field $V0 'features.quota-deem-statfs'
+EXPECT '' volinfo_field $V0 'features.soft-timeout'
+
+## setting soft-timeout as 30
+TEST $CLI volume set $V0 features.soft-timeout 30
+EXPECT '30' volinfo_field $V0 'features.soft-timeout';
+
+## disabling features.quota-deem-statfs
+TEST ! $CLI volume set $V0 features.quota-deem-statfs off
+EXPECT '' volinfo_field $V0 'features.quota-deem-statfs'
+
+TEST ! $CLI volume set $V0 statedump-path ""
+TEST ! $CLI volume set $V0 statedump-path "     "
+TEST   $CLI volume set $V0 statedump-path "/home/"
+EXPECT "/home/" volume_option $V0 server.statedump-path
+
+TEST ! $CLI volume set $V0 background-self-heal-count ""
+TEST ! $CLI volume set $V0 background-self-heal-count "      "
+TEST   $CLI volume set $V0 background-self-heal-count 10
+EXPECT "10" volume_option $V0 cluster.background-self-heal-count
+
+TEST ! $CLI volume set $V0 cache-size ""
+TEST ! $CLI volume set $V0 cache-size "    "
+TEST   $CLI volume set $V0 cache-size 512MB
+EXPECT "512MB" volume_option $V0 performance.cache-size
+
+TEST ! $CLI volume set $V0 self-heal-daemon ""
+TEST ! $CLI volume set $V0 self-heal-daemon "    "
+TEST   $CLI volume set $V0 self-heal-daemon on
+EXPECT "on" volume_option $V0 cluster.self-heal-daemon
+
+TEST ! $CLI volume set $V0 read-subvolume ""
+TEST ! $CLI volume set $V0 read-subvolume "    "
+TEST   $CLI volume set $V0 read-subvolume $V0-client-0
+EXPECT "$V0-client-0" volume_option  $V0 cluster.read-subvolume
+
+TEST ! $CLI volume set $V0 data-self-heal-algorithm ""
+TEST ! $CLI volume set $V0 data-self-heal-algorithm "     "
+TEST ! $CLI volume set $V0 data-self-heal-algorithm on
+TEST   $CLI volume set $V0 data-self-heal-algorithm full
+EXPECT "full" volume_option $V0 cluster.data-self-heal-algorithm
+
+TEST ! $CLI volume set $V0 min-free-inodes ""
+TEST ! $CLI volume set $V0 min-free-inodes "     "
+TEST  $CLI volume set $V0 min-free-inodes 60%
+EXPECT "60%" volume_option $V0 cluster.min-free-inodes
+
+TEST ! $CLI volume set $V0 min-free-disk ""
+TEST ! $CLI volume set $V0 min-free-disk "     "
+TEST  $CLI volume set $V0 min-free-disk 60%
+EXPECT "60%" volume_option $V0 cluster.min-free-disk
+
+TEST  $CLI volume set $V0 min-free-disk 120
+EXPECT "120" volume_option $V0 cluster.min-free-disk
+
+TEST ! $CLI volume set $V0 frame-timeout ""
+TEST ! $CLI volume set $V0 frame-timeout "      "
+TEST  $CLI volume set $V0 frame-timeout 0
+EXPECT "0" volume_option $V0 network.frame-timeout
+
+TEST ! $CLI volume set $V0 auth.allow ""
+TEST ! $CLI volume set $V0 auth.allow "       "
+TEST   $CLI volume set $V0 auth.allow 192.168.122.1
+EXPECT "192.168.122.1" volume_option $V0 auth.allow
+
+#bug-782095 - validate performance cache min/max size value
+
+## setting performance cache min size as 2MB
+TEST $CLI volume set $V0 performance.cache-min-file-size 2MB
+EXPECT '2MB' volinfo_field $V0 'performance.cache-min-file-size';
+
+## setting performance cache max size as 20MB
+TEST $CLI volume set $V0 performance.cache-max-file-size 20MB
+EXPECT '20MB' volinfo_field $V0 'performance.cache-max-file-size';
+
+## trying to set performance cache min size as 25MB
+TEST ! $CLI volume set $V0 performance.cache-min-file-size 25MB
+EXPECT '2MB' volinfo_field $V0 'performance.cache-min-file-size';
+
+## able to set performance cache min size as long as its lesser than max size
+TEST $CLI volume set $V0 performance.cache-min-file-size 15MB
+EXPECT '15MB' volinfo_field $V0 'performance.cache-min-file-size';
+
+## trying it out with only cache-max-file-size in CLI as 10MB
+TEST ! $CLI volume set $V0 cache-max-file-size 10MB
+EXPECT '20MB' volinfo_field $V0 'performance.cache-max-file-size';
+
+## finish up
+TEST $CLI volume stop $V0;
+EXPECT 'Stopped' volinfo_field $V0 'Status';
+
+TEST $CLI volume delete $V0;
+TEST ! $CLI volume info $V0;
+
+cleanup
diff --git a/tests/bugs/glusterd/validating-options-for-striped-replicated-volume.t b/tests/bugs/glusterd/validating-options-for-striped-replicated-volume.t
deleted file mode 100644
index 8a6772b402b..00000000000
--- a/tests/bugs/glusterd/validating-options-for-striped-replicated-volume.t
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-#bug-1314649 - validate group virt
-TEST $CLI volume set $V0 group virt;
-
-#bug-765230 - remove-quota-related-option-after-disabling-quota
-## setting soft-timeout as 20
-TEST $CLI volume set $V0 features.soft-timeout 20
-EXPECT '20' volinfo_field $V0 'features.soft-timeout';
-
-## enabling features.quota-deem-statfs
-TEST ! $CLI volume set $V0 features.quota-deem-statfs on
-EXPECT '' volinfo_field $V0 'features.quota-deem-statfs'
-
-## enabling quota
-TEST $CLI volume quota $V0 enable
-EXPECT 'on' volinfo_field $V0 'features.quota'
-
-## eetting soft-timeout as 20
-TEST $CLI volume set $V0 features.soft-timeout 20
-EXPECT '20' volinfo_field $V0 'features.soft-timeout';
-
-## enabling features.quota-deem-statfs
-TEST $CLI volume set $V0 features.quota-deem-statfs on
-EXPECT 'on' volinfo_field $V0 'features.quota-deem-statfs'
-
-## disabling quota
-TEST $CLI volume quota $V0 disable
-EXPECT 'off' volinfo_field $V0 'features.quota'
-EXPECT '' volinfo_field $V0 'features.quota-deem-statfs'
-EXPECT '' volinfo_field $V0 'features.soft-timeout'
-
-## setting soft-timeout as 30
-TEST $CLI volume set $V0 features.soft-timeout 30
-EXPECT '30' volinfo_field $V0 'features.soft-timeout';
-
-## disabling features.quota-deem-statfs
-TEST ! $CLI volume set $V0 features.quota-deem-statfs off
-EXPECT '' volinfo_field $V0 'features.quota-deem-statfs'
-
-#bug-859927 - validate different options for striped replicated volume
-
-TEST ! $CLI volume set $V0 statedump-path ""
-TEST ! $CLI volume set $V0 statedump-path "     "
-TEST   $CLI volume set $V0 statedump-path "/home/"
-EXPECT "/home/" volume_option $V0 server.statedump-path
-
-TEST ! $CLI volume set $V0 background-self-heal-count ""
-TEST ! $CLI volume set $V0 background-self-heal-count "      "
-TEST   $CLI volume set $V0 background-self-heal-count 10
-EXPECT "10" volume_option $V0 cluster.background-self-heal-count
-
-TEST ! $CLI volume set $V0 cache-size ""
-TEST ! $CLI volume set $V0 cache-size "    "
-TEST   $CLI volume set $V0 cache-size 512MB
-EXPECT "512MB" volume_option $V0 performance.cache-size
-
-TEST ! $CLI volume set $V0 self-heal-daemon ""
-TEST ! $CLI volume set $V0 self-heal-daemon "    "
-TEST   $CLI volume set $V0 self-heal-daemon on
-EXPECT "on" volume_option $V0 cluster.self-heal-daemon
-
-TEST ! $CLI volume set $V0 read-subvolume ""
-TEST ! $CLI volume set $V0 read-subvolume "    "
-TEST   $CLI volume set $V0 read-subvolume $V0-client-0
-EXPECT "$V0-client-0" volume_option  $V0 cluster.read-subvolume
-
-TEST ! $CLI volume set $V0 data-self-heal-algorithm ""
-TEST ! $CLI volume set $V0 data-self-heal-algorithm "     "
-TEST ! $CLI volume set $V0 data-self-heal-algorithm on
-TEST   $CLI volume set $V0 data-self-heal-algorithm full
-EXPECT "full" volume_option $V0 cluster.data-self-heal-algorithm
-
-TEST ! $CLI volume set $V0 min-free-inodes ""
-TEST ! $CLI volume set $V0 min-free-inodes "     "
-TEST  $CLI volume set $V0 min-free-inodes 60%
-EXPECT "60%" volume_option $V0 cluster.min-free-inodes
-
-TEST ! $CLI volume set $V0 min-free-disk ""
-TEST ! $CLI volume set $V0 min-free-disk "     "
-TEST  $CLI volume set $V0 min-free-disk 60%
-EXPECT "60%" volume_option $V0 cluster.min-free-disk
-
-TEST  $CLI volume set $V0 min-free-disk 120
-EXPECT "120" volume_option $V0 cluster.min-free-disk
-
-TEST ! $CLI volume set $V0 frame-timeout ""
-TEST ! $CLI volume set $V0 frame-timeout "      "
-TEST  $CLI volume set $V0 frame-timeout 0
-EXPECT "0" volume_option $V0 network.frame-timeout
-
-TEST ! $CLI volume set $V0 auth.allow ""
-TEST ! $CLI volume set $V0 auth.allow "       "
-TEST   $CLI volume set $V0 auth.allow 192.168.122.1
-EXPECT "192.168.122.1" volume_option $V0 auth.allow
-
-TEST ! $CLI volume set $V0 stripe-block-size ""
-TEST ! $CLI volume set $V0 stripe-block-size "      "
-TEST  $CLI volume set $V0 stripe-block-size 512MB
-EXPECT "512MB" volume_option $V0 cluster.stripe-block-size
-
-#bug-782095 - validate performance cache min/max size value
-
-## setting performance cache min size as 2MB
-TEST $CLI volume set $V0 performance.cache-min-file-size 2MB
-EXPECT '2MB' volinfo_field $V0 'performance.cache-min-file-size';
-
-## setting performance cache max size as 20MB
-TEST $CLI volume set $V0 performance.cache-max-file-size 20MB
-EXPECT '20MB' volinfo_field $V0 'performance.cache-max-file-size';
-
-## trying to set performance cache min size as 25MB
-TEST ! $CLI volume set $V0 performance.cache-min-file-size 25MB
-EXPECT '2MB' volinfo_field $V0 'performance.cache-min-file-size';
-
-## able to set performance cache min size as long as its lesser than max size
-TEST $CLI volume set $V0 performance.cache-min-file-size 15MB
-EXPECT '15MB' volinfo_field $V0 'performance.cache-min-file-size';
-
-## trying it out with only cache-max-file-size in CLI as 10MB
-TEST ! $CLI volume set $V0 cache-max-file-size 10MB
-EXPECT '20MB' volinfo_field $V0 'performance.cache-max-file-size';
-
-## finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup
diff --git a/tests/bugs/glusterfs-server/bug-852147.t b/tests/bugs/glusterfs-server/bug-852147.t
index 8cb5fd13f85..c644cfa62dc 100755
--- a/tests/bugs/glusterfs-server/bug-852147.t
+++ b/tests/bugs/glusterfs-server/bug-852147.t
@@ -11,7 +11,7 @@ TEST glusterd;
 TEST pidof glusterd;
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 ## Verify volume is is created
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
@@ -42,7 +42,7 @@ function vol_prof_info()
 {
     $CLI volume profile $V0 info | grep Brick | wc -l
 }
-EXPECT "8" vol_prof_info
+EXPECT "6" vol_prof_info
 
 EXPECT "Stopping volume profile on $V0 has been successful " $CLI volume profile $V0 stop
 
diff --git a/tests/bugs/glusterfs-server/bug-912297.t b/tests/bugs/glusterfs-server/bug-912297.t
index f1f4147e6aa..08f5dcea9b9 100755
--- a/tests/bugs/glusterfs-server/bug-912297.t
+++ b/tests/bugs/glusterfs-server/bug-912297.t
@@ -8,7 +8,7 @@ cleanup;
 ## Start and create a volume
 TEST glusterd;
 TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 ## Verify volume is is created
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
diff --git a/tests/bugs/glusterfs/bug-879490.t b/tests/bugs/glusterfs/bug-879490.t
index c254b4f59eb..fb8d4263919 100755
--- a/tests/bugs/glusterfs/bug-879490.t
+++ b/tests/bugs/glusterfs/bug-879490.t
@@ -10,7 +10,7 @@ TEST glusterd;
 TEST pidof glusterd;
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 ## Verify volume is is created
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
diff --git a/tests/bugs/glusterfs/bug-879494.t b/tests/bugs/glusterfs/bug-879494.t
index 06a5e5d876d..12ee466b33a 100755
--- a/tests/bugs/glusterfs/bug-879494.t
+++ b/tests/bugs/glusterfs/bug-879494.t
@@ -10,7 +10,7 @@ TEST glusterd;
 TEST pidof glusterd;
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 ## Verify volume is is created
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
diff --git a/tests/bugs/glusterfs/bug-893338.t b/tests/bugs/glusterfs/bug-893338.t
index 0df1b9af2fe..b915d3e791e 100644
--- a/tests/bugs/glusterfs/bug-893338.t
+++ b/tests/bugs/glusterfs/bug-893338.t
@@ -10,7 +10,7 @@ TEST glusterd;
 TEST pidof glusterd;
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 stripe 2 $H0:$B0/${V0}{1,2,3,4};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 ## Verify volume is is created
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
diff --git a/tests/bugs/glusterfs/bug-896431.t b/tests/bugs/glusterfs/bug-896431.t
index 7764a88d896..61f71141713 100755
--- a/tests/bugs/glusterfs/bug-896431.t
+++ b/tests/bugs/glusterfs/bug-896431.t
@@ -8,7 +8,7 @@ cleanup;
 ## Start and create a volume
 TEST glusterd;
 TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 ## Verify volume is created
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
@@ -87,38 +87,3 @@ TEST $CLI volume delete $V0;
 TEST ! $CLI volume info $V0;
 
 cleanup;
-
-## Start and create a pure stripe volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 stripe 8 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Stripe' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting cluster.subvols-per-directory as 8 for a stripe volume
-TEST ! $CLI volume set $V0 cluster.subvols-per-directory 8
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-TEST ! $CLI volume set $V0 subvols-per-directory 8
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Setting cluster.subvols-per-directory as 1 for a stripe volume
-TEST $CLI volume set $V0 cluster.subvols-per-directory 1
-EXPECT '1' volinfo_field $V0 'cluster.subvols-per-directory';
-TEST $CLI volume set $V0 subvols-per-directory 1
-EXPECT '1' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/posix/bug-1040275-brick-uid-reset-on-volume-restart.t b/tests/bugs/posix/bug-1040275-brick-uid-reset-on-volume-restart.t
index e67616db618..016e637dd0d 100755
--- a/tests/bugs/posix/bug-1040275-brick-uid-reset-on-volume-restart.t
+++ b/tests/bugs/posix/bug-1040275-brick-uid-reset-on-volume-restart.t
@@ -17,11 +17,11 @@ cleanup;
 TEST glusterd
 TEST pidof glusterd
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '8' brick_count $V0
+EXPECT '6' brick_count $V0
 
 TEST $CLI volume start $V0;
 EXPECT 'Started' volinfo_field $V0 'Status';
@@ -45,8 +45,6 @@ EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 2
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 3
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 4
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 5
-EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 6
-EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 7
 
 EXPECT 100 get_uid $M0;
 EXPECT 101 get_gid $M0;
diff --git a/tests/bugs/protocol/bug-762989.t b/tests/bugs/protocol/bug-762989.t
index 1607fcf57f8..7d201b78b58 100755
--- a/tests/bugs/protocol/bug-762989.t
+++ b/tests/bugs/protocol/bug-762989.t
@@ -21,7 +21,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info;
 
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
 
 TEST $CLI volume start $V0;
 
diff --git a/tests/bugs/protocol/bug-808400-stripe.t b/tests/bugs/protocol/bug-808400-stripe.t
deleted file mode 100755
index 6d6c7271852..00000000000
--- a/tests/bugs/protocol/bug-808400-stripe.t
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 stripe 2 $H0:$B0/brick1 $H0:$B0/brick2;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-MOUNTDIR=$M0;
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR;
-
-build_tester $(dirname $0)/bug-808400-flock.c
-build_tester $(dirname $0)/bug-808400-fcntl.c
-
-TEST $(dirname $0)/bug-808400-flock $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind off\'
-TEST $(dirname $0)/bug-808400-fcntl $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind on\'
-
-TEST rm -rf $MOUNTDIR/*
-TEST rm -rf $(dirname $0)/bug-808400-flock $(dirname $0)/bug-808400-fcntl $(dirname $0)/glusterfs.log
-
-EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $MOUNTDIR
-
-cleanup;
diff --git a/xlators/cluster/Makefile.am b/xlators/cluster/Makefile.am
index 903fbb39f12..8e067d5ab58 100644
--- a/xlators/cluster/Makefile.am
+++ b/xlators/cluster/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = stripe afr dht ec
+SUBDIRS = afr dht ec
 
 CLEANFILES = 
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index e6ea9c9881d..3079f1990e7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -117,110 +117,6 @@ insert_brick:
     return 0;
 }
 
-static int
-gd_addbr_validate_stripe_count(glusterd_volinfo_t *volinfo, int stripe_count,
-                               int total_bricks, int *type, char *err_str,
-                               size_t err_len)
-{
-    int ret = -1;
-
-    switch (volinfo->type) {
-        case GF_CLUSTER_TYPE_NONE:
-            if ((volinfo->brick_count * stripe_count) == total_bricks) {
-                /* Change the volume type */
-                *type = GF_CLUSTER_TYPE_STRIPE;
-                gf_msg(THIS->name, GF_LOG_INFO, 0,
-                       GD_MSG_VOL_TYPE_CHANGING_INFO,
-                       "Changing the type of volume %s from "
-                       "'distribute' to 'stripe'",
-                       volinfo->volname);
-                ret = 0;
-                goto out;
-            } else {
-                snprintf(err_str, err_len,
-                         "Incorrect number of "
-                         "bricks (%d) supplied for stripe count (%d).",
-                         (total_bricks - volinfo->brick_count), stripe_count);
-                gf_msg(THIS->name, GF_LOG_ERROR, EINVAL, GD_MSG_INVALID_ENTRY,
-                       "%s", err_str);
-                goto out;
-            }
-            break;
-        case GF_CLUSTER_TYPE_REPLICATE:
-            if (!(total_bricks % (volinfo->replica_count * stripe_count))) {
-                /* Change the volume type */
-                *type = GF_CLUSTER_TYPE_STRIPE_REPLICATE;
-                gf_msg(THIS->name, GF_LOG_INFO, 0,
-                       GD_MSG_VOL_TYPE_CHANGING_INFO,
-                       "Changing the type of volume %s from "
-                       "'replicate' to 'replicate-stripe'",
-                       volinfo->volname);
-                ret = 0;
-                goto out;
-            } else {
-                snprintf(err_str, err_len,
-                         "Incorrect number of "
-                         "bricks (%d) supplied for changing volume's "
-                         "stripe count to %d, need at least %d bricks",
-                         (total_bricks - volinfo->brick_count), stripe_count,
-                         (volinfo->replica_count * stripe_count));
-                gf_msg(THIS->name, GF_LOG_ERROR, EINVAL, GD_MSG_INVALID_ENTRY,
-                       "%s", err_str);
-                goto out;
-            }
-            break;
-        case GF_CLUSTER_TYPE_STRIPE:
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
-            if (stripe_count < volinfo->stripe_count) {
-                snprintf(err_str, err_len,
-                         "Incorrect stripe count (%d) supplied. "
-                         "Volume already has stripe count (%d)",
-                         stripe_count, volinfo->stripe_count);
-                gf_msg(THIS->name, GF_LOG_ERROR, EINVAL, GD_MSG_INVALID_ENTRY,
-                       "%s", err_str);
-                goto out;
-            }
-            if (stripe_count == volinfo->stripe_count) {
-                if (!(total_bricks % volinfo->dist_leaf_count)) {
-                    /* its same as the one which exists */
-                    ret = 1;
-                    goto out;
-                }
-            }
-            if (stripe_count > volinfo->stripe_count) {
-                /* We have to make sure before and after 'add-brick',
-                   the number or subvolumes for distribute will remain
-                   same, when stripe count is given */
-                if ((volinfo->brick_count *
-                     (stripe_count * volinfo->replica_count)) ==
-                    (total_bricks * volinfo->dist_leaf_count)) {
-                    /* Change the dist_leaf_count */
-                    gf_msg(THIS->name, GF_LOG_INFO, 0,
-                           GD_MSG_STRIPE_COUNT_CHANGE_INFO,
-                           "Changing the stripe count of "
-                           "volume %s from %d to %d",
-                           volinfo->volname, volinfo->stripe_count,
-                           stripe_count);
-                    ret = 0;
-                    goto out;
-                }
-            }
-            break;
-        case GF_CLUSTER_TYPE_DISPERSE:
-            snprintf(err_str, err_len,
-                     "Volume %s cannot be converted "
-                     "from dispersed to striped-"
-                     "dispersed",
-                     volinfo->volname);
-            gf_msg(THIS->name, GF_LOG_ERROR, EPERM, GD_MSG_OP_NOT_PERMITTED,
-                   "%s", err_str);
-            goto out;
-    }
-
-out:
-    return ret;
-}
-
 static int
 gd_addbr_validate_replica_count(glusterd_volinfo_t *volinfo, int replica_count,
                                 int arbiter_count, int total_bricks, int *type,
@@ -252,32 +148,7 @@ gd_addbr_validate_replica_count(glusterd_volinfo_t *volinfo, int replica_count,
                 goto out;
             }
             break;
-        case GF_CLUSTER_TYPE_STRIPE:
-            if (!(total_bricks % (volinfo->dist_leaf_count * replica_count))) {
-                /* Change the volume type */
-                *type = GF_CLUSTER_TYPE_STRIPE_REPLICATE;
-                gf_msg(THIS->name, GF_LOG_INFO, 0,
-                       GD_MSG_VOL_TYPE_CHANGING_INFO,
-                       "Changing the type of volume %s from "
-                       "'stripe' to 'replicate-stripe'",
-                       volinfo->volname);
-                ret = 0;
-                goto out;
-            } else {
-                snprintf(err_str, err_len,
-                         "Incorrect number of "
-                         "bricks (%d) supplied for changing volume's "
-                         "replica count to %d, need at least %d "
-                         "bricks",
-                         (total_bricks - volinfo->brick_count), replica_count,
-                         (volinfo->dist_leaf_count * replica_count));
-                gf_msg(THIS->name, GF_LOG_ERROR, EINVAL, GD_MSG_INVALID_ENTRY,
-                       "%s", err_str);
-                goto out;
-            }
-            break;
         case GF_CLUSTER_TYPE_REPLICATE:
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
             if (replica_count < volinfo->replica_count) {
                 snprintf(err_str, err_len,
                          "Incorrect replica count (%d) supplied. "
@@ -348,7 +219,6 @@ gd_rmbr_validate_replica_count(glusterd_volinfo_t *volinfo,
             goto out;
 
         case GF_CLUSTER_TYPE_NONE:
-        case GF_CLUSTER_TYPE_STRIPE:
         case GF_CLUSTER_TYPE_DISPERSE:
             snprintf(err_str, err_len,
                      "replica count (%d) option given for non replicate "
@@ -359,7 +229,6 @@ gd_rmbr_validate_replica_count(glusterd_volinfo_t *volinfo,
             goto out;
 
         case GF_CLUSTER_TYPE_REPLICATE:
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
             /* in remove brick, you can only reduce the replica count */
             if (replica_count > volinfo->replica_count) {
                 snprintf(err_str, err_len,
@@ -601,31 +470,6 @@ __glusterd_handle_add_brick(rpcsvc_request_t *req)
            count is given */
     }
 
-    /* These bricks needs to be added one per a replica or stripe volume */
-    if (stripe_count) {
-        ret = gd_addbr_validate_stripe_count(volinfo, stripe_count,
-                                             total_bricks, &type, err_str,
-                                             sizeof(err_str));
-        if (ret == -1) {
-            gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_COUNT_VALIDATE_FAILED,
-                   "%s", err_str);
-            goto out;
-        }
-
-        /* if stripe count is same as earlier, set it back to 0 */
-        if (ret == 1)
-            stripe_count = 0;
-
-        ret = dict_set_int32n(dict, "stripe-count", SLEN("stripe-count"),
-                              stripe_count);
-        if (ret) {
-            gf_msg(this->name, GF_LOG_ERROR, errno, GD_MSG_DICT_GET_FAILED,
-                   "failed to set the stripe-count in dict");
-            goto out;
-        }
-        goto brick_val;
-    }
-
     ret = gd_addbr_validate_replica_count(volinfo, replica_count, arbiter_count,
                                           total_bricks, &type, err_str,
                                           sizeof(err_str));
@@ -829,8 +673,7 @@ glusterd_remove_brick_validate_arbiters(glusterd_volinfo_t *volinfo,
     glusterd_brickinfo_t *last = NULL;
     char *arbiter_array = NULL;
 
-    if ((volinfo->type != GF_CLUSTER_TYPE_REPLICATE) &&
-        (volinfo->type != GF_CLUSTER_TYPE_STRIPE_REPLICATE))
+    if (volinfo->type != GF_CLUSTER_TYPE_REPLICATE)
         goto out;
 
     if (!replica_count || !volinfo->arbiter_count)
@@ -1028,39 +871,12 @@ __glusterd_handle_remove_brick(rpcsvc_request_t *req)
     /* 'vol_type' is used for giving the meaning full error msg for user */
     if (volinfo->type == GF_CLUSTER_TYPE_REPLICATE) {
         strcpy(vol_type, "replica");
-    } else if (volinfo->type == GF_CLUSTER_TYPE_STRIPE) {
-        strcpy(vol_type, "stripe");
-    } else if (volinfo->type == GF_CLUSTER_TYPE_STRIPE_REPLICATE) {
-        strcpy(vol_type, "stripe-replicate");
     } else if (volinfo->type == GF_CLUSTER_TYPE_DISPERSE) {
         strcpy(vol_type, "disperse");
     } else {
         strcpy(vol_type, "distribute");
     }
 
-    /* Do not allow remove-brick if the volume is a stripe volume*/
-    if ((volinfo->type == GF_CLUSTER_TYPE_STRIPE) &&
-        (volinfo->brick_count == volinfo->stripe_count)) {
-        snprintf(err_str, sizeof(err_str),
-                 "Removing brick from a stripe volume is not allowed");
-        gf_msg(this->name, GF_LOG_ERROR, EPERM, GD_MSG_OP_NOT_PERMITTED, "%s",
-               err_str);
-        ret = -1;
-        goto out;
-    }
-
-    if (!replica_count && (volinfo->type == GF_CLUSTER_TYPE_STRIPE_REPLICATE) &&
-        (volinfo->brick_count == volinfo->dist_leaf_count)) {
-        snprintf(err_str, sizeof(err_str),
-                 "Removing bricks from stripe-replicate"
-                 " configuration is not allowed without reducing "
-                 "replica or stripe count explicitly.");
-        gf_msg(this->name, GF_LOG_ERROR, EPERM, GD_MSG_OP_NOT_PERMITTED_AC_REQD,
-               "%s", err_str);
-        ret = -1;
-        goto out;
-    }
-
     if (!replica_count && (volinfo->type == GF_CLUSTER_TYPE_REPLICATE) &&
         (volinfo->brick_count == volinfo->dist_leaf_count)) {
         snprintf(err_str, sizeof(err_str),
@@ -3013,10 +2829,6 @@ glusterd_op_remove_brick(dict_t *dict, char **op_errstr)
                 volinfo->type = GF_CLUSTER_TYPE_NONE;
                 /* backward compatibility */
                 volinfo->sub_count = 0;
-            } else {
-                volinfo->type = GF_CLUSTER_TYPE_STRIPE;
-                /* backward compatibility */
-                volinfo->sub_count = volinfo->dist_leaf_count;
             }
         }
     }
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index a05fd6d0c98..3e12b61b71b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -3180,22 +3180,11 @@ glusterd_store_update_volinfo(glusterd_volinfo_t *volinfo)
                 volinfo->replica_count = 1;
                 break;
 
-            case GF_CLUSTER_TYPE_STRIPE:
-                volinfo->stripe_count = volinfo->sub_count;
-                volinfo->replica_count = 1;
-                break;
-
             case GF_CLUSTER_TYPE_REPLICATE:
                 volinfo->stripe_count = 1;
                 volinfo->replica_count = volinfo->sub_count;
                 break;
 
-            case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
-                /* Introduced in 3.3 */
-                GF_ASSERT(volinfo->stripe_count > 0);
-                GF_ASSERT(volinfo->replica_count > 0);
-                break;
-
             case GF_CLUSTER_TYPE_DISPERSE:
                 GF_ASSERT(volinfo->disperse_count > 0);
                 GF_ASSERT(volinfo->redundancy_count > 0);
diff --git a/xlators/mgmt/glusterd/src/glusterd-tier.c b/xlators/mgmt/glusterd/src/glusterd-tier.c
index e980026d8ec..9cc1b4a225e 100644
--- a/xlators/mgmt/glusterd/src/glusterd-tier.c
+++ b/xlators/mgmt/glusterd/src/glusterd-tier.c
@@ -593,10 +593,6 @@ glusterd_op_remove_tier_brick(dict_t *dict, char **op_errstr, dict_t *rsp_dict)
                 volinfo->type = GF_CLUSTER_TYPE_NONE;
                 /* backward compatibility */
                 volinfo->sub_count = 0;
-            } else {
-                volinfo->type = GF_CLUSTER_TYPE_STRIPE;
-                /* backward compatibility */
-                volinfo->sub_count = volinfo->dist_leaf_count;
             }
         }
     }
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 757560e68d1..7b8369f623b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -8265,8 +8265,7 @@ out:
 static inline int
 glusterd_is_replica_volume(int type)
 {
-    if (type == GF_CLUSTER_TYPE_REPLICATE ||
-        type == GF_CLUSTER_TYPE_STRIPE_REPLICATE)
+    if (type == GF_CLUSTER_TYPE_REPLICATE)
         return 1;
     return 0;
 }
@@ -8287,7 +8286,6 @@ glusterd_is_shd_compatible_type(int type)
 {
     switch (type) {
         case GF_CLUSTER_TYPE_REPLICATE:
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
         case GF_CLUSTER_TYPE_DISPERSE:
             return _gf_true;
     }
@@ -13814,7 +13812,6 @@ gd_get_shd_key(int type)
 
     switch (type) {
         case GF_CLUSTER_TYPE_REPLICATE:
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
             key = "cluster.self-heal-daemon";
             break;
         case GF_CLUSTER_TYPE_DISPERSE:
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 13b289fdcb8..57b0fccac3b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -2207,8 +2207,7 @@ brick_graph_add_index(volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
         if (ret)
             goto out;
     }
-    if ((volinfo->type == GF_CLUSTER_TYPE_STRIPE_REPLICATE ||
-         volinfo->type == GF_CLUSTER_TYPE_REPLICATE ||
+    if ((volinfo->type == GF_CLUSTER_TYPE_REPLICATE ||
          volinfo->type == GF_CLUSTER_TYPE_NONE)) {
         ret = xlator_set_option(xl, "xattrop-dirty-watchlist",
                                 "trusted.afr.dirty");
@@ -2881,8 +2880,7 @@ perfxl_option_handler(volgen_graph_t *graph, struct volopt_map_entry *vme,
          * performance
          */
         if (!strcmp(vme->key, "performance.client-io-threads") &&
-            (GF_CLUSTER_TYPE_STRIPE_REPLICATE == volinfo->type ||
-             GF_CLUSTER_TYPE_REPLICATE == volinfo->type))
+            (GF_CLUSTER_TYPE_REPLICATE == volinfo->type))
             return 0;
     }
 
@@ -3894,8 +3892,6 @@ volume_volgen_graph_build_clusters(volgen_graph_t *graph,
                                    gf_boolean_t is_quotad)
 {
     char *tier_args[] = {"cluster/tier", "%s-tier-%d"};
-    char *stripe_args[] = {"cluster/stripe", "%s-stripe-%d"};
-    int rclusters = 0;
     int clusters = 0;
     int dist_count = 0;
     int ret = -1;
@@ -3916,35 +3912,11 @@ volume_volgen_graph_build_clusters(volgen_graph_t *graph,
             if (clusters < 0)
                 goto out;
             break;
-        case GF_CLUSTER_TYPE_STRIPE:
-            clusters = volgen_link_bricks_from_list_tail(
-                graph, volinfo, stripe_args[0], stripe_args[1],
-                volinfo->brick_count, volinfo->stripe_count);
-            if (clusters < 0)
-                goto out;
-            break;
         case GF_CLUSTER_TYPE_TIER:
             ret = volgen_link_bricks_from_list_head(
                 graph, volinfo, tier_args[0], tier_args[1],
                 volinfo->brick_count, volinfo->replica_count);
             break;
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
-            /* Replicate after the clients, then stripe */
-            if (volinfo->replica_count == 0)
-                goto out;
-            clusters = volgen_graph_build_afr_clusters(graph, volinfo);
-            if (clusters < 0)
-                goto out;
-
-            rclusters = volinfo->brick_count / volinfo->replica_count;
-            GF_ASSERT(rclusters == clusters);
-            clusters = volgen_link_bricks_from_list_tail(
-                graph, volinfo, stripe_args[0], stripe_args[1], rclusters,
-                volinfo->stripe_count);
-            if (clusters < 0)
-                goto out;
-            break;
-
         case GF_CLUSTER_TYPE_DISPERSE:
             clusters = volgen_graph_build_ec_clusters(graph, volinfo);
             if (clusters < 0)
@@ -4867,7 +4839,6 @@ volgen_get_shd_key(int type)
 
     switch (type) {
         case GF_CLUSTER_TYPE_REPLICATE:
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
             key = "cluster.self-heal-daemon";
             break;
         case GF_CLUSTER_TYPE_DISPERSE:
@@ -4971,7 +4942,6 @@ build_afr_ec_clusters(volgen_graph_t *graph, glusterd_volinfo_t *volinfo)
     int clusters = -1;
     switch (volinfo->type) {
         case GF_CLUSTER_TYPE_REPLICATE:
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
             clusters = volgen_graph_build_afr_clusters(graph, volinfo);
             break;
 
@@ -5061,7 +5031,6 @@ gd_is_self_heal_enabled(glusterd_volinfo_t *volinfo, dict_t *dict)
 
     switch (volinfo->type) {
         case GF_CLUSTER_TYPE_REPLICATE:
-        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
         case GF_CLUSTER_TYPE_DISPERSE:
             shd_key = volgen_get_shd_key(volinfo->type);
             shd_enabled = dict_get_str_boolean(dict, shd_key, _gf_true);
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
index 53c3591d4f8..d65a1f9f977 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
@@ -1433,7 +1433,6 @@ glusterd_op_stage_create_volume(dict_t *dict, char **op_errstr,
 
         if (!is_force) {
             if ((type == GF_CLUSTER_TYPE_REPLICATE) ||
-                (type == GF_CLUSTER_TYPE_STRIPE_REPLICATE) ||
                 (type == GF_CLUSTER_TYPE_DISPERSE)) {
                 ret = glusterd_check_brick_order(dict, msg);
                 if (ret) {
@@ -2372,56 +2371,6 @@ glusterd_op_create_volume(dict_t *dict, char **op_errstr)
             goto out;
         }
 
-        /* coverity[unused_value] arbiter count is optional */
-        ret = dict_get_int32n(dict, "arbiter-count", SLEN("arbiter-count"),
-                              &volinfo->arbiter_count);
-    } else if (GF_CLUSTER_TYPE_STRIPE == volinfo->type) {
-        ret = dict_get_int32n(dict, "stripe-count", SLEN("stripe-count"),
-                              &volinfo->stripe_count);
-        if (ret) {
-            gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED,
-                   "Failed to get stripe"
-                   " count for volume %s",
-                   volname);
-            goto out;
-        }
-    } else if (GF_CLUSTER_TYPE_STRIPE_REPLICATE == volinfo->type) {
-        /* performance.client-io-threads is turned on to default,
-         * however this has adverse effects on replicate volumes due to
-         * replication design issues, till that get addressed
-         * performance.client-io-threads option is turned off for all
-         * replicate volumes
-         */
-        if (priv->op_version >= GD_OP_VERSION_3_12_2) {
-            ret = dict_set_nstrn(volinfo->dict, "performance.client-io-threads",
-                                 SLEN("performance.client-io-threads"), "off",
-                                 SLEN("off"));
-            if (ret) {
-                gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_SET_FAILED,
-                       "Failed to set "
-                       "performance.client-io-threads to off");
-                goto out;
-            }
-        }
-        ret = dict_get_int32n(dict, "stripe-count", SLEN("stripe-count"),
-                              &volinfo->stripe_count);
-        if (ret) {
-            gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED,
-                   "Failed to get stripe"
-                   " count for volume %s",
-                   volname);
-            goto out;
-        }
-        ret = dict_get_int32n(dict, "replica-count", SLEN("replica-count"),
-                              &volinfo->replica_count);
-        if (ret) {
-            gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED,
-                   "Failed to get "
-                   "replica count for volume %s",
-                   volname);
-            goto out;
-        }
-
         /* coverity[unused_value] arbiter count is optional */
         ret = dict_get_int32n(dict, "arbiter-count", SLEN("arbiter-count"),
                               &volinfo->arbiter_count);
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index dab515d7161..988d547e14e 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -765,36 +765,6 @@ out:
     return ret;
 }
 
-static int
-validate_stripe(glusterd_volinfo_t *volinfo, dict_t *dict, char *key,
-                char *value, char **op_errstr)
-{
-    char errstr[2048] = "";
-    glusterd_conf_t *priv = NULL;
-    int ret = 0;
-    xlator_t *this = NULL;
-
-    this = THIS;
-    GF_ASSERT(this);
-    priv = this->private;
-    GF_ASSERT(priv);
-
-    if (volinfo->stripe_count == 1) {
-        snprintf(errstr, sizeof(errstr),
-                 "Cannot set %s for a non-stripe volume.", key);
-        gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_NON_STRIPE_VOL, "%s",
-               errstr);
-        *op_errstr = gf_strdup(errstr);
-        ret = -1;
-        goto out;
-    }
-
-out:
-    gf_msg_debug(this->name, 0, "Returning %d", ret);
-
-    return ret;
-}
-
 static int
 validate_disperse(glusterd_volinfo_t *volinfo, dict_t *dict, char *key,
                   char *value, char **op_errstr)
@@ -1539,19 +1509,6 @@ struct volopt_map_entry glusterd_volopt_map[] = {
      .op_version = GD_OP_VERSION_3_13_2,
      .flags = VOLOPT_FLAG_CLIENT_OPT},
 
-    /* stripe xlator options */
-    {.key = "cluster.stripe-block-size",
-     .voltype = "cluster/stripe",
-     .option = "block-size",
-     .op_version = 1,
-     .validate_fn = validate_stripe,
-     .flags = VOLOPT_FLAG_CLIENT_OPT},
-    {.key = "cluster.stripe-coalesce",
-     .voltype = "cluster/stripe",
-     .option = "coalesce",
-     .op_version = 1,
-     .flags = VOLOPT_FLAG_CLIENT_OPT},
-
     /* IO-stats xlator options */
     {.key = VKEY_DIAG_LAT_MEASUREMENT,
      .voltype = "debug/io-stats",
-- 
cgit