Skip to content

Commit c8f6dbf

Browse files
abhinavdangetichiyoung
authored andcommitted
MB-19404: [BP] Address data race in DCP-Producer seen while making a stats request
WARNING: ThreadSanitizer: data race (pid=82258) Read of size 1 at 0x7d4c0000a208 by thread T11 (mutexes: write M2483, write M19044): #0 DcpProducer::addStats(void (*)(char const*, unsigned short, char const*, unsigned int, void const*), void const*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/dcp/producer.cc:601 (ep.so+0x000000063e2d) #1 ConnStatBuilder::operator()(SingleThreadedRCPtr<ConnHandler>&) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/ep_engine.cc:3903 (ep.so+0x0000000d6931) #2 EventuallyPersistentEngine::doDcpStats(void const*, void (*)(char const*, unsigned short, char const*, unsigned int, void const*)) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/ep_engine.cc:4160 (ep.so+0x0000000b904a) #3 EventuallyPersistentEngine::getStats(void const*, char const*, int, void (*)(char const*, unsigned short, char const*, unsigned int, void const*)) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/ep_engine.cc:4580 (ep.so+0x0000000bcba4) #4 EventuallyPersistentStore::snapshotStats() /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/ep.cc:1700 (ep.so+0x000000088386) #5 StatSnap::run() /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/tasks.cc:98 (ep.so+0x00000012ba26) #6 ExecutorThread::run() /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/executorthread.cc:115 (ep.so+0x0000000eaeed) #7 launch_executor_thread(void*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/executorthread.cc:33 (ep.so+0x0000000eaab5) #8 platform_thread_wrap(void*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/platform/src/cb_pthreads.cc:53 (libplatform.so.0.1.0+0x0000000048bb) Previous write of size 1 at 0x7d4c0000a208 by main thread: #0 DcpProducer::handleResponse(protocol_binary_response_header*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/dcp/producer.cc:547 (ep.so+0x000000063231) #1 EvpDcpResponseHandler(engine_interface*, void const*, protocol_binary_response_header*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/ep_engine.cc:1765 (ep.so+0x0000000ae08b) #2 mock_dcp_response_handler(engine_interface*, void const*, protocol_binary_response_header*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/memcached/programs/engine_testapp/engine_testapp.cc:796 (engine_testapp+0x0000004c68e5) #3 sendDcpAck(engine_interface*, engine_interface_v1*, void const*, protocol_binary_command, protocol_binary_response_status, unsigned int) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/tests/ep_test_apis.cc:983 (ep_testsuite.so+0x0000000a6a22) #4 test_dcp_noop(engine_interface*, engine_interface_v1*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/tests/ep_testsuite.cc:3975 (ep_testsuite.so+0x000000068deb) #5 execute_test(test, char const*, char const*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/memcached/programs/engine_testapp/engine_testapp.cc:1090 (engine_testapp+0x0000004c4192) #6 __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 (libc.so.6+0x00000002176c) (Reviewed-on: http://review.couchbase.org/56306) Change-Id: Ice7236da5cc885d9e7612894ba3d37e357e13b4a Reviewed-on: http://review.couchbase.org/63440 Well-Formed: buildbot <build@couchbase.com> Reviewed-by: Dave Rigby <daver@couchbase.com> Tested-by: buildbot <build@couchbase.com> Reviewed-by: Chiyoung Seo <chiyoung@couchbase.com>
1 parent 8f529bf commit c8f6dbf

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/dcp-producer.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include "tapconnection.h"
2424
#include "dcp-stream.h"
2525

26+
#include <relaxed_atomic.h>
27+
2628
class DcpResponse;
2729

2830
class DcpProducer : public Producer {
@@ -283,8 +285,8 @@ class DcpProducer : public Producer {
283285
rel_time_t sendTime;
284286
uint32_t opaque;
285287
uint32_t noopInterval;
286-
bool pendingRecv;
287-
bool enabled;
288+
Couchbase::RelaxedAtomic<bool> pendingRecv;
289+
Couchbase::RelaxedAtomic<bool> enabled;
288290
} noopCtx;
289291

290292
DcpResponse *rejectResp; // stash response for retry if E2BIG was hit

tests/ep_testsuite.cc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3314,15 +3314,14 @@ static enum test_result test_dcp_noop(ENGINE_HANDLE *h, ENGINE_HANDLE_V1 *h1) {
33143314
if (err == ENGINE_DISCONNECT) {
33153315
done = true;
33163316
} else {
3317-
std::string stat;
33183317
if (dcp_last_op == PROTOCOL_BINARY_CMD_DCP_NOOP) {
33193318
done = true;
3320-
stat = get_str_stat(h, h1, "eq_dcpq:unittest:noop_wait", "dcp");
3321-
check(stat.compare("true") == 0, "Didn't send noop");
3319+
checkeq(1, get_int_stat(h, h1, "eq_dcpq:unittest:noop_wait", "dcp"),
3320+
"Didn't send noop");
33223321
sendDcpAck(h, h1, cookie, PROTOCOL_BINARY_CMD_DCP_NOOP,
33233322
PROTOCOL_BINARY_RESPONSE_SUCCESS, dcp_last_opaque);
3324-
stat = get_str_stat(h, h1, "eq_dcpq:unittest:noop_wait", "dcp");
3325-
check(stat.compare("false") == 0, "Didn't ack noop");
3323+
checkeq(0, get_int_stat(h, h1, "eq_dcpq:unittest:noop_wait", "dcp"),
3324+
"Didn't send noop");
33263325
} else if (dcp_last_op != 0) {
33273326
abort();
33283327
}
@@ -3365,10 +3364,9 @@ static enum test_result test_dcp_noop_fail(ENGINE_HANDLE *h,
33653364
done = true;
33663365
disconnected = true;
33673366
} else {
3368-
std::string stat;
33693367
if (dcp_last_op == PROTOCOL_BINARY_CMD_DCP_NOOP) {
3370-
stat = get_str_stat(h, h1, "eq_dcpq:unittest:noop_wait", "dcp");
3371-
check(stat.compare("true") == 0, "Didn't send noop");
3368+
checkeq(1, get_int_stat(h, h1, "eq_dcpq:unittest:noop_wait", "dcp"),
3369+
"Didn't send noop");
33723370
testHarness.time_travel(201);
33733371
} else if (dcp_last_op != 0) {
33743372
abort();

0 commit comments

Comments
 (0)