This is an automated email from the ASF dual-hosted git repository.
JackieTien97 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 03a28bace35 [Pipe] Make two pipe fields thread-safe for SonarCloud's
reliability gate (#19109)
03a28bace35 is described below
commit 03a28bace3589ff5d9d45c0f20c7a5686b6d8dab
Author: Christofer Dutz <[email protected]>
AuthorDate: Thu Nov 5 02:35:52 2026 +0100
[Pipe] Make two pipe fields thread-safe for SonarCloud's reliability gate
(#19109)
---
.../iotdb/confignode/persistence/pipe/PipeTaskInfo.java | 10 ++++++----
.../iotdb/db/pipe/metric/overview/PipeResourceMetrics.java | 11 +++++++----
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
index cb6994ed44f..28f29c2cb94 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
@@ -100,7 +100,7 @@ public class PipeTaskInfo implements SnapshotProcessor {
private final PipeMetaKeeper pipeMetaKeeper;
// Tracks runtime exception changes that have not yet been persisted through
consensus.
- private volatile boolean pipeMetaExceptionPersistencePending;
+ private final AtomicBoolean pipeMetaExceptionPersistencePending = new
AtomicBoolean(false);
// Pure in-memory object, not involved in snapshot serialization and
deserialization.
private final PipeTaskInfoVersion pipeTaskInfoVersion;
@@ -1171,7 +1171,9 @@ public class PipeTaskInfo implements SnapshotProcessor {
try {
final boolean hasException =
recordDataNodePushPipeMetaExceptionsInternal(respMap,
fallbackPipeStaticMeta);
- pipeMetaExceptionPersistencePending |= hasException;
+ if (hasException) {
+ pipeMetaExceptionPersistencePending.set(true);
+ }
return hasException;
} finally {
releaseWriteLock();
@@ -1179,11 +1181,11 @@ public class PipeTaskInfo implements SnapshotProcessor {
}
public boolean hasPendingPipeMetaExceptionPersistence() {
- return pipeMetaExceptionPersistencePending;
+ return pipeMetaExceptionPersistencePending.get();
}
public void markPipeMetaExceptionsPersisted() {
- pipeMetaExceptionPersistencePending = false;
+ pipeMetaExceptionPersistencePending.set(false);
}
private boolean recordDataNodePushPipeMetaExceptionsInternal(
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeResourceMetrics.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeResourceMetrics.java
index 5c8f13cdd0b..1ac7dd1d894 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeResourceMetrics.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeResourceMetrics.java
@@ -37,6 +37,7 @@ import java.util.Collections;
import java.util.EnumMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
public class PipeResourceMetrics implements IMetricSet {
@@ -65,8 +66,9 @@ public class PipeResourceMetrics implements IMetricSet {
}
}
- private volatile Map<TsFileParserAdmissionRejectReason, Counter>
- tsFileParserAdmissionRejectCounters = Collections.emptyMap();
+ // Replaced as a whole on bind/unbind; the published map is never modified.
+ private final AtomicReference<Map<TsFileParserAdmissionRejectReason,
Counter>>
+ tsFileParserAdmissionRejectCounters = new
AtomicReference<>(Collections.emptyMap());
private volatile Counter tsFileParserAdmissionYieldCounter =
DoNothingMetricManager.DO_NOTHING_COUNTER;
private volatile Timer tsFileParserAdmissionWaitTimer =
DoNothingMetricManager.DO_NOTHING_TIMER;
@@ -144,7 +146,7 @@ public class PipeResourceMetrics implements IMetricSet {
Tag.REASON.toString(),
reason.tag));
}
- tsFileParserAdmissionRejectCounters = rejectCounters;
+
tsFileParserAdmissionRejectCounters.set(Collections.unmodifiableMap(rejectCounters));
tsFileParserAdmissionYieldCounter =
metricService.getOrCreateCounter(
Metric.PIPE_TSFILE_PARSER_ADMISSION_YIELD.toString(),
MetricLevel.IMPORTANT);
@@ -210,7 +212,7 @@ public class PipeResourceMetrics implements IMetricSet {
metricService.remove(MetricType.TIMER,
Metric.PIPE_TSFILE_PARSER_ADMISSION_WAIT.toString());
metricService.remove(MetricType.AUTO_GAUGE,
Metric.PIPE_TSFILE_PARSER_IN_FLIGHT.toString());
metricService.remove(MetricType.AUTO_GAUGE,
Metric.PIPE_TSFILE_PARSER_WAITING.toString());
- tsFileParserAdmissionRejectCounters = Collections.emptyMap();
+ tsFileParserAdmissionRejectCounters.set(Collections.emptyMap());
tsFileParserAdmissionRejectCounter =
DoNothingMetricManager.DO_NOTHING_COUNTER;
tsFileParserAdmissionYieldCounter =
DoNothingMetricManager.DO_NOTHING_COUNTER;
tsFileParserAdmissionWaitTimer = DoNothingMetricManager.DO_NOTHING_TIMER;
@@ -223,6 +225,7 @@ public class PipeResourceMetrics implements IMetricSet {
public void recordTsFileParserAdmissionReject(final
TsFileParserAdmissionRejectReason reason) {
tsFileParserAdmissionRejectCounter.inc();
tsFileParserAdmissionRejectCounters
+ .get()
.getOrDefault(reason, DoNothingMetricManager.DO_NOTHING_COUNTER)
.inc();
}