You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/10/03 02:06:22 UTC
[iotdb] branch rel/0.13 updated: [To rel/0.13][IOTDB-4555] Fix File/System metrics in Metric Service. (#7491)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new c6c97b6563 [To rel/0.13][IOTDB-4555] Fix File/System metrics in Metric Service. (#7491)
c6c97b6563 is described below
commit c6c97b6563b865f777689fea376a96055ebc65fc
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Mon Oct 3 10:06:16 2022 +0800
[To rel/0.13][IOTDB-4555] Fix File/System metrics in Metric Service. (#7491)
---
.../db/service/metrics/predefined/FileMetrics.java | 38 ++++------------------
.../service/metrics/predefined/SystemMetrics.java | 2 +-
2 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/predefined/FileMetrics.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/predefined/FileMetrics.java
index f7da8eeb7b..1a8078ad91 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/metrics/predefined/FileMetrics.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/predefined/FileMetrics.java
@@ -97,7 +97,7 @@ public class FileMetrics implements IMetricSet {
"unseq");
// finally start to update the value of some metrics in async way
- if (metricService.isEnable() && null != currentServiceFuture) {
+ if (metricService.isEnable() && null == currentServiceFuture) {
currentServiceFuture =
service.scheduleAtFixedRate(
this::collect,
@@ -149,37 +149,11 @@ public class FileMetrics implements IMetricSet {
return FileUtils.getDirSize(dir);
})
.sum();
- walFileTotalCount =
- Stream.of(walDirs)
- .mapToLong(
- dir -> {
- File walFolder = new File(dir);
- if (walFolder.exists()) {
- File[] walNodeFolders = walFolder.listFiles(File::isDirectory);
- long result = 0L;
- if (null != walNodeFolders) {
- for (File walNodeFolder : walNodeFolders) {
- if (walNodeFolder.exists() && walNodeFolder.isDirectory()) {
- try {
- result +=
- org.apache.commons.io.FileUtils.listFiles(walFolder, null, true)
- .size();
- } catch (UncheckedIOException exception) {
- // do nothing
- logger.debug(
- "Failed when count wal folder {}: ",
- walNodeFolder.getName(),
- exception);
- }
- }
- }
- }
- return result;
- } else {
- return 0L;
- }
- })
- .sum();
+ File walFolder = new File(walDirs);
+ if (walFolder.exists() && walFolder.isDirectory()) {
+ walFileTotalCount =
+ org.apache.commons.io.FileUtils.listFiles(new File(walDirs), null, true).size();
+ }
sequenceFileTotalCount =
Stream.of(dataDirs)
.mapToLong(
diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/predefined/SystemMetrics.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/predefined/SystemMetrics.java
index 8a380e182d..ee81b29161 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/metrics/predefined/SystemMetrics.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/predefined/SystemMetrics.java
@@ -53,7 +53,7 @@ public class SystemMetrics implements IMetricSet {
collectSystemMemInfo(metricService);
// finally start to update the value of some metrics in async way
- if (metricService.isEnable() && null != currentServiceFuture) {
+ if (metricService.isEnable() && null == currentServiceFuture) {
currentServiceFuture =
service.scheduleAtFixedRate(
this::collect,