MB-21685: Use EWOULDBLOCK variant of delVBucket 82/70082/7
authorJim Walker <jim@couchbase.com>
Tue, 15 Nov 2016 16:04:23 +0000 (16:04 +0000)
committerDave Rigby <daver@couchbase.com>
Mon, 21 Nov 2016 08:56:43 +0000 (08:56 +0000)
The test can occasionally fail because a delete overlaps
the test code which has set the VB active and written data.
The data in the overlap gets deleted from disk.

MB-21687 covers the overlap issue for delVBucket without the async=0
parameter.

Change-Id: I74666d087aab65456110d7815f701e4193fc71b9
Reviewed-on: http://review.couchbase.org/70082
Reviewed-by: Dave Rigby <daver@couchbase.com>
Tested-by: buildbot <build@couchbase.com>
tests/ep_testsuite_basic.cc

index a38ba69..09a614b 100644 (file)
@@ -2115,7 +2115,7 @@ static enum test_result test_bug7023(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1) {
     for (int j = 0; j < 5; ++j) {
         check(set_vbucket_state(h, h1, 0, vbucket_state_dead),
               "Failed set set vbucket 0 dead.");
-        vbucketDelete(h, h1, 0);
+        vbucketDelete(h, h1, 0, "async=0");
         checkeq(PROTOCOL_BINARY_RESPONSE_SUCCESS,
                 last_status.load(),
                 "Expected vbucket deletion to work.");