Skip to content

Commit e9a945d

Browse files
committed
rollback remaining
1 parent d9acbaf commit e9a945d

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeSinglePipeMetrics.java

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import java.util.Objects;
4343
import java.util.concurrent.ConcurrentHashMap;
4444
import java.util.concurrent.TimeUnit;
45-
import java.util.concurrent.atomic.AtomicBoolean;
4645

4746
public class PipeDataNodeSinglePipeMetrics implements IMetricSet {
4847

@@ -229,33 +228,27 @@ private void removeAutoGauge(final String pipeID) {
229228
public void register(final IoTDBDataRegionExtractor extractor) {
230229
// The metric is global thus the regionId is omitted
231230
final String pipeID = extractor.getPipeName() + "_" + extractor.getCreationTime();
232-
final AtomicBoolean first = new AtomicBoolean(false);
233231
remainingEventAndTimeOperatorMap.computeIfAbsent(
234232
pipeID,
235-
k -> {
236-
first.set(true);
237-
return new PipeDataNodeRemainingEventAndTimeOperator(
238-
extractor.getPipeName(), extractor.getCreationTime());
239-
});
240-
if (Objects.nonNull(metricService) && first.get()) {
233+
k ->
234+
new PipeDataNodeRemainingEventAndTimeOperator(
235+
extractor.getPipeName(), extractor.getCreationTime()));
236+
if (Objects.nonNull(metricService)) {
241237
createMetrics(pipeID);
242238
}
243239
}
244240

245241
public void register(final IoTDBSchemaRegionExtractor extractor) {
246242
// The metric is global thus the regionId is omitted
247243
final String pipeID = extractor.getPipeName() + "_" + extractor.getCreationTime();
248-
final AtomicBoolean first = new AtomicBoolean(false);
249244
remainingEventAndTimeOperatorMap
250245
.computeIfAbsent(
251246
pipeID,
252-
k -> {
253-
first.set(true);
254-
return new PipeDataNodeRemainingEventAndTimeOperator(
255-
extractor.getPipeName(), extractor.getCreationTime());
256-
})
247+
k ->
248+
new PipeDataNodeRemainingEventAndTimeOperator(
249+
extractor.getPipeName(), extractor.getCreationTime()))
257250
.register(extractor);
258-
if (Objects.nonNull(metricService) && first.get()) {
251+
if (Objects.nonNull(metricService)) {
259252
createMetrics(pipeID);
260253
}
261254
}

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeTsFileToTabletsMetrics.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ private void removeMetrics(final String pipeID) {
104104

105105
public void register(final IoTDBDataRegionExtractor extractor) {
106106
final String pipeID = extractor.getPipeName() + "_" + extractor.getCreationTime();
107-
if (Objects.nonNull(metricService) && pipe.add(pipeID)) {
107+
pipe.add(pipeID);
108+
if (Objects.nonNull(metricService)) {
108109
createMetrics(pipeID);
109110
}
110111
}

0 commit comments

Comments
 (0)