summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJiffin Tony Thottan <jthottan@redhat.com>2015-09-28 17:20:19 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2017-01-23 11:07:29 -0500
commit71b3664c5d740f931759b99adfb41e6d2abf5ea3 (patch)
treef1e3ccc85a16f12987fe42d5d2f0a66a312e3228 /tests
parentd256989adf2c98037914c5b0aef7274b5a70f276 (diff)
features/trash: Create trash directory only when it is enabled
Previously trash directory was being created as part of volume start operation. And also the user/admin could not delete this directory from volume even if it is not needed. This patch will fix the same. From now onwards creation and enforcement on trash directory will come into pictrure only when trash translator is enabled. Similarly exact same behaviour is reflected on internal-op directory inside trash directory. Upstream reference : >Change-Id: I3e58316a7b299a691885e458c960438bec2220fb >BUG: 1264849 >Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> >Reviewed-on: http://review.gluster.org/12256 >Smoke: Gluster Build System <jenkins@build.gluster.org> >Tested-by: Anoop C S <anoopcs@redhat.com> >NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> >CentOS-regression: Gluster Build System <jenkins@build.gluster.org> >Reviewed-by: Anoop C S <anoopcs@redhat.com> >Reviewed-by: Jeff Darcy <jdarcy@redhat.com> >(cherry picked from commit 07b9853ad0c92b341be33a6cd632013c416221c8) Change-Id: I3e58316a7b299a691885e458c960438bec2220fb BUG: 1415581 Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> Reviewed-on: https://review.gluster.org/16454 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/bugs/quota/bug-1288474.t5
-rw-r--r--tests/bugs/unclassified/bug-1357397.t3
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/bugs/quota/bug-1288474.t b/tests/bugs/quota/bug-1288474.t
index bd64df9e45c..ea6bca6cb07 100755
--- a/tests/bugs/quota/bug-1288474.t
+++ b/tests/bugs/quota/bug-1288474.t
@@ -22,6 +22,9 @@ TEST glusterd
#Create and start a tiered volume
create_dist_tier_vol $NUM_BRICKS
+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0
+touch $M0/foobar
+
TEST $CLI volume quota $V0 enable
TEST $CLI volume quota $V0 limit-usage / 10MB
@@ -39,5 +42,7 @@ mkdir $B0/hot
TEST $CLI volume tier $V0 attach $H0:$B0/hot/${V0}{0..$1}
EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "10.0MB" quota_list_field "/" 5
+TEST umount $M0
+
cleanup;
diff --git a/tests/bugs/unclassified/bug-1357397.t b/tests/bugs/unclassified/bug-1357397.t
index dc76787b505..129a208e278 100644
--- a/tests/bugs/unclassified/bug-1357397.t
+++ b/tests/bugs/unclassified/bug-1357397.t
@@ -12,6 +12,9 @@ TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2}
TEST $CLI volume start $V0
+TEST $CLI volume set $V0 features.trash on
+TEST $CLI volume set $V0 features.trash-internal-op on
+
TEST [ -e $B0/${V0}1/.trashcan ]
TEST [ -e $B0/${V0}1/.trashcan/internal_op ]