kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ConsumeDriver running status (#748)

This commit is contained in:
jiangyuan 2025-01-19 18:44:47 +08:00 committed by GitHub
parent 35495375d0
commit affbaa8bfd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -28,6 +28,7 @@ Release Notes.
* Add Caffeine plugin as optional.
* Add Undertow 2.1.7.final+ worker thread pool metrics.
* Support for tracking in spring gateway versions 4.1.2 and above.
* Fix `ConsumeDriver` running status concurrency issues.
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/222?closed=1)

11
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumeDriver.java
View File

@ -27,7 +27,7 @@ import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
* Pool of consumers <p> Created by wusheng on 2016/10/25.
*/
public class ConsumeDriver<T> implements IDriver {
private boolean running;
private volatile boolean running;
private ConsumerThread[] consumerThreads;
private Channels<T> channels;
private ReentrantLock lock;
@ -88,6 +88,9 @@ public class ConsumeDriver<T> implements IDriver {
}
lock.lock();
try {
if (running) {
return;
}
this.allocateBuffer2Thread();
for (ConsumerThread consumerThread : consumerThreads) {
consumerThread.start();
@ -124,8 +127,14 @@ public class ConsumeDriver<T> implements IDriver {
@Override
public void close(Channels channels) {
if (!running) {
return;
}
lock.lock();
try {
if (!running) {
return;
}
this.running = false;
for (ConsumerThread consumerThread : consumerThreads) {
consumerThread.shutdown();