From 06b888bbeac61aa1234b43e398431529988c28b6 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Tue, 10 Nov 2015 09:06:54 +0530 Subject: cluster/ec: fix bug in update_good Backport of http://review.gluster.com/12561 Problem: Bricks that didn't participate in the fops are considered to be good. This is happening two fold. Examples: Case-1: 1) 2+1 volume. 'd1' directory on Brick-0 is bad. 2) readdir takes locks and lock->good_mask is '7' 3) readdir does xattrop and fop->mask is '6'. 4) because fop->expected is '1' lock->good_mask remains '7' Case-2: 1) when all the bricks are up, it does lock + xattrop before op and figures out all the bricks are good. 2) By the time second operation starts brick-0 is down. Now lock->good_mask will always have the '0' bit set as long as the operations are happening on it. because: "lock->good_mask &= ~fop->mask | fop->remaining" fop->mask doesn't have '0' th bit. 3) When it comes time to perform the final xattrop in update_size_version brick-0 comes online because of which it gives the same version to brick-0 as well thinking it has participated in all the transactions till then, even when it didn't participate in the transactions. Fix: Case-1's fix: Update lock->good_mask in ec_prepare_update_cbk with latest good/bad bricks Case-2's fix: Consider non-participating brick as bad. BUG: 1278744 Change-Id: I5c2b07005107f3c067bac69da3b37ff39688bd69 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/12562 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Xavier Hernandez --- run-tests.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'run-tests.sh') diff --git a/run-tests.sh b/run-tests.sh index 4074b549ddc..f5253fb214f 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -205,7 +205,6 @@ function is_bad_test () ./tests/basic/tier/tier.t \ ./tests/bugs/glusterd/bug-1238706-daemons-stop-on-peer-cleanup.t \ ./tests/bugs/glusterd/bug-948686.t \ - ./tests/basic/ec/ec-readdir.t \ ; do [ x"$name" = x"$bt" ] && return 0 # bash: zero means true/success done -- cgit