[incubator-inlong] branch master updated (317ee86 -> 9b44953)

[go...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gosonzhang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git.


    from 317ee86  [INLONG-2346][Feature][InLong-Sort] Support avro and canal formats for sort sink (#2387)
     add 9b44953  [INLONG-2517][TubeMQ] Adjust the statistical logic of the Master service status (#2527)

No new revisions were added by this update.

Summary of changes:
 .../tubemq/server/broker/BrokerServiceServer.java  |  10 +-
 .../inlong/tubemq/server/broker/TubeBroker.java    |   6 +-
 .../server/broker/msgstore/disk/FileSegment.java   |  10 +-
 .../server/broker/msgstore/disk/MsgFileStore.java  |   8 +-
 .../server/broker/msgstore/mem/MsgMemStore.java    |   4 +-
 .../server/broker/offset/DefaultOffsetManager.java |   4 +-
 .../server/broker/stats/BrokerJMXHolder.java       |   4 +-
 ...eStatsHolder.java => BrokerSrvStatsHolder.java} |   8 +-
 .../server/broker/stats/BrokerStatsType.java       |   4 +-
 .../server/broker/web/BrokerAdminServlet.java      |   8 +-
 .../common/offsetstorage/ZkOffsetStorage.java      |  10 +-
 .../inlong/tubemq/server/master/TMaster.java       |   9 +-
 .../server/master/balance/DefaultLoadBalancer.java |   4 +-
 .../server/master/metrics/MasterMetricMXBean.java  |  36 --
 .../server/master/metrics/MasterMetrics.java       | 235 ----------
 .../server/master/metrics/MasterMetricsHolder.java | 161 -------
 .../nodemanage/nodebroker/BrokerAbnHolder.java     |  18 +-
 .../nodemanage/nodebroker/DefBrokerRunManager.java |   8 +-
 .../nodeconsumer/ConsumerEventManager.java         |  14 +-
 .../nodeconsumer/ConsumerInfoHolder.java           |  12 +-
 .../nodeproducer/ProducerInfoHolder.java           |   6 +-
 .../stats/MasterJMXHolder.java}                    |  44 +-
 .../server/master/stats/MasterSrvStatsHolder.java  | 458 +++++++++++++++++++
 .../stats/MasterStatsType.java}                    |  13 +-
 ...lderTest.java => BrokerSrvStatsHolderTest.java} |  54 +--
 .../tubemq/server/master/MasterMetricsTest.java    | 489 ---------------------
 .../master/stats/MasterSrvStatsHolderTest.java     | 126 ++++++
 27 files changed, 713 insertions(+), 1050 deletions(-)
 rename inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/stats/{ServiceStatsHolder.java => BrokerSrvStatsHolder.java} (95%)
 delete mode 100644 inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metrics/MasterMetricMXBean.java
 delete mode 100644 inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metrics/MasterMetrics.java
 delete mode 100644 inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metrics/MasterMetricsHolder.java
 copy inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/{broker/stats/BrokerJMXHolder.java => master/stats/MasterJMXHolder.java} (74%)
 create mode 100644 inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/stats/MasterSrvStatsHolder.java
 copy inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/{broker/stats/BrokerStatsType.java => master/stats/MasterStatsType.java} (76%)
 rename inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/broker/stats/{ServiceStatsHolderTest.java => BrokerSrvStatsHolderTest.java} (75%)
 delete mode 100644 inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/MasterMetricsTest.java
 create mode 100644 inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/stats/MasterSrvStatsHolderTest.java