This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/fix_remove_node_problem_1123 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f50a87112475cf91346465fe1266a33df14f2876 Merge: 65b6eee421 633cf37b1c Author: Beyyes <cgf1...@foxmail.com> AuthorDate: Wed Nov 23 23:23:35 2022 +0800 Merge branch 'master' of github.com:apache/iotdb .../resources/conf/iotdb-confignode.properties | 4 - .../manager/load/LoadManagerMetrics.java | 10 +- .../persistence/metric/NodeInfoMetrics.java | 4 +- .../persistence/metric/PartitionInfoMetrics.java | 14 +- .../persistence/partition/PartitionInfo.java | 1 - .../thrift/ConfigNodeRPCServiceHandlerMetrics.java | 2 +- .../thrift/ConfigNodeRPCServiceMetrics.java | 2 +- .../multileader/MultiLeaderServerMetrics.java | 4 +- .../logdispatcher/LogDispatcherThreadMetrics.java | 4 +- .../MultiLeaderMemoryManagerMetrics.java | 2 +- docs/UserGuide/API/RestService.md | 60 ++--- docs/UserGuide/Write-Data/REST-API.md | 6 +- docs/zh/UserGuide/API/RestService.md | 74 +++--- docs/zh/UserGuide/Write-Data/REST-API.md | 6 +- grafana-plugin/go.sum | 2 +- .../dropwizard/DropwizardMetricManager.java | 3 +- .../dropwizard/type/DropwizardAutoGauge.java | 19 +- .../iotdb/metrics/AbstractMetricManager.java | 134 +++++++--- .../iotdb/metrics/AbstractMetricService.java | 204 +++++++++++---- .../iotdb/metrics/DoNothingMetricService.java | 8 +- .../apache/iotdb/metrics/config/MetricConfig.java | 255 +++++++++--------- .../metrics/config/MetricConfigDescriptor.java | 61 ++--- .../apache/iotdb/metrics/config/ReloadLevel.java | 6 +- .../DoNothingAutoGauge.java} | 13 +- .../iotdb/metrics/impl/DoNothingCounter.java | 2 +- .../apache/iotdb/metrics/impl/DoNothingGauge.java | 2 +- .../iotdb/metrics/impl/DoNothingHistogram.java | 2 +- .../metrics/impl/DoNothingHistogramSnapshot.java | 2 +- .../DoNothingMetric.java} | 14 +- .../iotdb/metrics/impl/DoNothingMetricManager.java | 11 +- .../apache/iotdb/metrics/impl/DoNothingRate.java | 2 +- .../apache/iotdb/metrics/impl/DoNothingTimer.java | 2 +- .../metricsets/jvm/JvmClassLoaderMetrics.java | 4 +- .../metrics/metricsets/jvm/JvmCompileMetrics.java | 2 +- .../iotdb/metrics/metricsets/jvm/JvmGcMetrics.java | 4 +- .../metrics/metricsets/jvm/JvmMemoryMetrics.java | 12 +- .../metrics/metricsets/jvm/JvmThreadMetrics.java | 8 +- .../iotdb/metrics/reporter/CompositeReporter.java | 22 +- .../iotdb/metrics/reporter/InternalReporter.java | 104 ++++++++ .../MemoryInternalReporter.java} | 43 ++- .../apache/iotdb/metrics/reporter/Reporter.java | 8 +- .../OutPutFormat.java => type/AutoGauge.java} | 15 +- .../org/apache/iotdb/metrics/type/Counter.java | 6 +- .../java/org/apache/iotdb/metrics/type/Gauge.java | 8 +- .../org/apache/iotdb/metrics/type/Histogram.java | 6 +- .../iotdb/metrics/type/HistogramSnapshot.java | 18 +- .../org/apache/iotdb/metrics/type/IMetric.java | 10 +- .../java/org/apache/iotdb/metrics/type/Rate.java | 14 +- .../java/org/apache/iotdb/metrics/type/Timer.java | 10 +- ...OutPutFormat.java => InternalReporterType.java} | 8 +- .../iotdb/metrics/utils/IoTDBMetricsUtils.java | 27 ++ .../org/apache/iotdb/metrics/utils/MetricInfo.java | 11 +- .../iotdb/metrics/config/MetricConfigTest.java | 118 +++++---- .../micrometer/MicrometerMetricManager.java | 3 +- .../micrometer/type/MicrometerAutoGauge.java | 19 +- .../commons/service/metric/MetricService.java | 105 ++++---- openapi/src/main/openapi3/iotdb-rest.yaml | 17 +- .../resources/conf/iotdb-datanode.properties | 11 +- .../tools/tsfile/print-tsfile-visdata.bat | 62 ----- .../resources/tools/tsfile/print-tsfile-visdata.sh | 51 ---- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 18 +- .../iotdb/db/engine/cache/ChunkCacheMetrics.java | 2 +- .../cache/TimeSeriesMetadataCacheMetrics.java | 4 +- .../iotdb/db/engine/flush/FlushManagerMetrics.java | 4 +- .../db/engine/storagegroup/DataRegionMetrics.java | 2 +- .../storagegroup/TsFileProcessorInfoMetrics.java | 2 +- .../metadata/cache/DataNodeSchemaCacheMetrics.java | 2 +- .../rescon/SchemaStatisticsManagerMetrics.java | 2 +- .../exchange/MPPDataExchangeServiceMetrics.java | 2 +- ...MppDataExchangeServiceThriftHandlerMetrics.java | 2 +- .../plan/planner/plan/node/write/InsertNode.java | 7 +- .../rest/handler/RequestValidationHandler.java | 14 +- .../rest/handler/StatementConstructionHandler.java | 2 +- .../pool/RawQueryReadTaskPoolManagerMetrics.java | 4 +- .../java/org/apache/iotdb/db/service/DataNode.java | 13 + .../service/DataNodeInternalRPCServiceMetrics.java | 2 +- .../java/org/apache/iotdb/db/service/IoTDB.java | 12 + .../org/apache/iotdb/db/service/RPCService.java | 8 +- .../apache/iotdb/db/service/RPCServiceMetrics.java | 2 +- .../db/service/metrics/DataNodeMetricsHelper.java | 14 +- .../iotdb/db/service/metrics/FileMetrics.java | 16 +- .../db/service/metrics/IoTDBInternalReporter.java | 172 ++++++++++++ .../iotdb/db/service/metrics/ProcessMetrics.java | 18 +- .../iotdb/db/service/metrics/SystemMetrics.java | 16 +- .../metrics/recorder/CacheMetricsRecorder.java | 2 +- .../recorder/CompactionMetricsRecorder.java | 4 +- .../InternalServiceThriftHandlerMetrics.java | 2 +- .../handler/RPCServiceThriftHandlerMetrics.java | 2 +- .../impl/DataNodeInternalRPCServiceImpl.java | 20 +- .../iotdb/db/tools/vis/TsFileExtractVisdata.java | 170 ------------ .../main/java/org/apache/iotdb/db/tools/vis/vis.m | 290 --------------------- .../apache/iotdb/db/metric/MetricServiceTest.java | 11 +- .../apache/iotdb/db/utils/EnvironmentUtils.java | 2 - 93 files changed, 1208 insertions(+), 1296 deletions(-)