From 7f70d38b66ce755f848ff0197814457a28b321df Mon Sep 17 00:00:00 2001
From: Atin Mukherjee <amukherj@redhat.com>
Date: Thu, 7 Sep 2017 19:14:23 +0530
Subject: glusterd: disallow replace brick for dist only volumes

Allowing replace-brick on dist only volumes will lead to data loss. This
patch blocks replace brick commit force to fail if a volume is dist
only.

Also removing tests/basic/pump.t as its of no use as per the discussion
in
http://lists.gluster.org/pipermail/gluster-devel/2017-September/053652.html

Change-Id: Iabb0c16f865f3fc361b64a19bfcf0c0fbb5c2682
BUG: 1489432
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: https://review.gluster.org/18226
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: N Balachandran <nbalacha@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
---
 tests/basic/pump.t | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 tests/basic/pump.t

(limited to 'tests/basic')

diff --git a/tests/basic/pump.t b/tests/basic/pump.t
deleted file mode 100644
index ab62f77224f..00000000000
--- a/tests/basic/pump.t
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-START_TIMESTAMP=`date +%s`
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}0
-TEST $CLI volume start $V0
-TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
-cd $M0
-for i in {1..3}
-do
-        for j in {1..10}
-        do
-                dd if=/dev/urandom of=file$j bs=128K count=10 2>/dev/null 1>/dev/null
-        done
-        mkdir dir$i && cd dir$i
-done
-cd
-EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
-TEST $CLI volume replace-brick $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 commit force
-TEST $CLI volume stop $V0
-
-files=""
-
-cd $B0/${V0}0
-for f in `find . -path ./.glusterfs -prune  -o -print`;
-do
-        if [ -d $f ]; then continue; fi
-        cmp $f $B0/${V0}1/$f
-        if [ $? -ne 0 ]; then
-                files="$files $f"
-        fi
-done
-
-EXPECT "" echo $files
-
-# Check for non Linux systems that we did not mess with directory offsets
-TEST ! log_newer $START_TIMESTAMP "offset reused from another DIR"
-
-cleanup
-- 
cgit