Skip to content

Commit a23254d

Browse files
authored
Merge pull request ceph#58735 from yuvalif/wip-yuval-63786
test/cls_2pc_queue: fix multi-threaded access to non-atomic counter Reviewed-by: Casey Bodley <[email protected]>
2 parents 5d7d1af + 6f9f520 commit a23254d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/test/cls_2pc_queue/test_cls_2pc_queue.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ TEST_F(TestCls2PCQueue, MultiProducer)
803803
cls_2pc_queue_init(op, queue_name, max_size);
804804
ASSERT_EQ(0, ioctx.operate(queue_name, &op));
805805

806-
auto producer_count = max_producer_count;
806+
std::atomic<int> producer_count = max_producer_count;
807807

808808
std::vector<std::thread> producers(max_producer_count);
809809
for (auto& p : producers) {
@@ -925,9 +925,9 @@ TEST_F(TestCls2PCQueue, MultiProducerConsumer)
925925
cls_2pc_queue_init(op, queue_name, max_size);
926926
ASSERT_EQ(0, ioctx.operate(queue_name, &op));
927927

928-
auto producer_count = max_workers;
928+
std::atomic<int> producer_count = max_workers;
929929

930-
auto retry_happened = false;
930+
std::atomic<bool> retry_happened = false;
931931

932932
std::vector<std::thread> producers(max_workers);
933933
for (auto& p : producers) {

0 commit comments

Comments
 (0)