Skip to content

Commit fd8b61c

Browse files
abhinavdangetidaverigby
authored andcommitted
Address data race identified with DcpProducer's control parameters
WARNING: ThreadSanitizer: data race (pid=69534) Write of size 1 at 0x7d580002fb11 by thread T19: #0 DcpProducer::control(unsigned int, void const*, unsigned short, void const*, unsigned int) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/dcp/producer.cc:530 (ep.so+0x00000006839d) couchbase#1 EvpDcpControl(engine_interface*, void const*, unsigned int, void const*, unsigned short, void const*, unsigned int) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/ep_engine.cc:1731 (ep.so+0x0000000b77c7) couchbase#2 mock_dcp_control(engine_interface*, void const*, unsigned int, void const*, unsigned short, void const*, unsigned int) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/memcached/programs/engine_testapp/engine_testapp.cc:780 (engine_testapp+0x0000004cf364) couchbase#3 TestDcpConsumer::run(engine_interface*, engine_interface_v1*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/tests/ep_testsuite_dcp.cc:198 (ep_testsuite_dcp.so+0x000000005eb2) couchbase#4 continuous_dcp_thread(void*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/tests/ep_testsuite_dcp.cc:812 (ep_testsuite_dcp.so+0x00000003bcbd) couchbase#5 platform_thread_wrap(void*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/platform/src/cb_pthreads.cc:54 (libplatform.so.0.1.0+0x00000000568b) Previous read of size 1 at 0x7d580002fb11 by main thread (mutexes: write M16012, write M1085223645971803896, write M16013): #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:692 (ep.so+0x0000000696cd) couchbase#1 ConnStatBuilder::operator()(SingleThreadedRCPtr<ConnHandler>&) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/src/ep_engine.cc:3880 (ep.so+0x0000000e32b1) couchbase#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:4137 (ep.so+0x0000000c2cca) couchbase#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:4583 (ep.so+0x0000000c67f4) couchbase#4 EvpGetStats(engine_interface*, 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:224 (ep.so+0x0000000b5e5e) couchbase#5 mock_get_stats(engine_interface*, void const*, char const*, int, void (*)(char const*, unsigned short, char const*, unsigned int, void const*)) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/memcached/programs/engine_testapp/engine_testapp.cc:241 (engine_testapp+0x0000004ce06d) #6 get_int_stat(engine_interface*, engine_interface_v1*, char const*, char const*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/tests/ep_test_apis.cc:999 (ep_testsuite_dcp.so+0x000000047992) #7 wait_for_stat_to_be(engine_interface*, engine_interface_v1*, char const*, int, char const*, long) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/tests/ep_test_apis.cc:1134 (ep_testsuite_dcp.so+0x00000004da72) #8 test_dcp_producer_keep_stream_open(engine_interface*, engine_interface_v1*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/ep-engine/tests/ep_testsuite_dcp.cc:1786 (ep_testsuite_dcp.so+0x00000001d287) #9 execute_test(test, char const*, char const*) /home/couchbase/jenkins/workspace/ep-engine-threadsanitizer-master/memcached/programs/engine_testapp/engine_testapp.cc:1135 (engine_testapp+0x0000004cc650) #10 __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 (libc.so.6+0x00000002176c) (cherry picked from commit 79f7e26) Change-Id: Iae57b949c048a35a92112d599643b2eb8d124bff Reviewed-on: http://review.couchbase.org/61155 Reviewed-by: Sriram Ganesan <sriram@couchbase.com> Reviewed-by: abhinav dangeti <abhinav@couchbase.com> Reviewed-by: Chiyoung Seo <chiyoung@couchbase.com> Tested-by: buildbot <build@couchbase.com>
1 parent d23c7ea commit fd8b61c

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/dcp/producer.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,10 @@ class DcpProducer : public Producer {
236236
DcpResponse *rejectResp; // stash response for retry if E2BIG was hit
237237

238238
bool notifyOnly;
239-
bool enableExtMetaData;
240-
bool enableValueCompression;
241-
bool supportsCursorDropping;
239+
240+
Couchbase::RelaxedAtomic<bool> enableExtMetaData;
241+
Couchbase::RelaxedAtomic<bool> enableValueCompression;
242+
Couchbase::RelaxedAtomic<bool> supportsCursorDropping;
242243

243244
Couchbase::RelaxedAtomic<rel_time_t> lastSendTime;
244245
BufferLog log;

0 commit comments

Comments
 (0)