diff options
| -rwxr-xr-x | run-tests.sh | 1 | ||||
| -rw-r--r-- | xlators/cluster/ec/src/ec-common.c | 12 |
2 files changed, 7 insertions, 6 deletions
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 diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index 152611f876f..be2df64d630 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -154,11 +154,12 @@ void ec_lock_update_good(ec_lock_t *lock, ec_fop_data_t *fop) return; } - /* When updating the good mask of the lock, we only take into - * consideration those bits corresponding to the bricks where - * the fop has been executed. */ - lock->good_mask &= ~fop->mask | fop->remaining; - lock->good_mask |= fop->good; + /* When updating the good mask of the lock, we only take into consideration + * those bits corresponding to the bricks where the fop has been executed. + * Bad bricks are removed from good_mask, but once marked as bad it's never + * set to good until the lock is released and reacquired */ + + lock->good_mask &= fop->good | fop->remaining; } void __ec_fop_set_error(ec_fop_data_t * fop, int32_t error) @@ -967,6 +968,7 @@ out: /* We don't allow the main fop to be executed on bricks that have not * succeeded the initial xattrop. */ parent->mask &= fop->good; + ec_lock_update_good (lock, fop); /*As of now only data healing marks bricks as healing*/ lock->healing |= fop->healing; |