[fix][broker] Fix incorrect bundle split count metric (#17970)

apache · Oct 11, 2022 · 882fcfb · 882fcfb
1 parent c9651ec
commit 882fcfb
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 23 deletions.
diff --git a/...roker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java b/...roker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
@@ -750,6 +750,7 @@ public void checkNamespaceBundleSplit() {
         synchronized (bundleSplitStrategy) {
             final Set<String> bundlesToBeSplit = bundleSplitStrategy.findBundlesToSplit(loadData, pulsar);
             NamespaceBundleFactory namespaceBundleFactory = pulsar.getNamespaceService().getNamespaceBundleFactory();
+            int splitCount = 0;
             for (String bundleName : bundlesToBeSplit) {
                 try {
                     final String namespaceName = LoadManagerShared.getNamespaceNameFromBundleName(bundleName);
@@ -771,24 +772,25 @@ public void checkNamespaceBundleSplit() {
                     pulsar.getAdminClient().namespaces().splitNamespaceBundle(namespaceName, bundleRange,
                         unloadSplitBundles, null);
 
+                    splitCount++;
                     log.info("Successfully split namespace bundle {}", bundleName);
                 } catch (Exception e) {
                     log.error("Failed to split namespace bundle {}", bundleName, e);
                 }
             }
 
-            updateBundleSplitMetrics(bundlesToBeSplit);
+            updateBundleSplitMetrics(splitCount);
         }
 
     }
 
     /**
      * As leader broker, update bundle split metrics.
      *
-     * @param bundlesToBeSplit
+     * @param bundlesSplit the number of bundles splits
      */
-    private void updateBundleSplitMetrics(Set<String> bundlesToBeSplit) {
-        bundleSplitCount += bundlesToBeSplit.size();
+    private void updateBundleSplitMetrics(int bundlesSplit) {
+        bundleSplitCount += bundlesSplit;
 
         List<Metrics> metrics = new ArrayList<>();
         Map<String, String> dimensions = new HashMap<>();

diff --git a/site2/docs/reference-metrics.md b/site2/docs/reference-metrics.md
@@ -401,7 +401,7 @@ All the bundleUnloading metrics are labeled with the following labels:
 
 | Name                          | Type    | Description                                                |
 |-------------------------------|---------|------------------------------------------------------------|
-| pulsar_lb_bundles_split_total | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_total | Counter | The total count of bundle split in this leader broker |
 
 #### Bundle metrics
 All the bundle metrics are labeled with the following labels:

diff --git a/site2/website/versioned_docs/version-2.10.0-deprecated/reference-metrics.md b/site2/website/versioned_docs/version-2.10.0-deprecated/reference-metrics.md
@@ -343,7 +343,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 #### Bundle metrics
 All the bundle metrics are labelled with the following labels:

diff --git a/site2/website/versioned_docs/version-2.6.0/reference-metrics.md b/site2/website/versioned_docs/version-2.6.0/reference-metrics.md
@@ -277,7 +277,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.6.1/reference-metrics.md b/site2/website/versioned_docs/version-2.6.1/reference-metrics.md
@@ -277,7 +277,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.6.2/reference-metrics.md b/site2/website/versioned_docs/version-2.6.2/reference-metrics.md
@@ -277,7 +277,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.6.3/reference-metrics.md b/site2/website/versioned_docs/version-2.6.3/reference-metrics.md
@@ -277,7 +277,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.6.4/reference-metrics.md b/site2/website/versioned_docs/version-2.6.4/reference-metrics.md
@@ -277,7 +277,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.7.0/reference-metrics.md b/site2/website/versioned_docs/version-2.7.0/reference-metrics.md
@@ -275,7 +275,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.7.1/reference-metrics.md b/site2/website/versioned_docs/version-2.7.1/reference-metrics.md
@@ -277,7 +277,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.7.2/reference-metrics.md b/site2/website/versioned_docs/version-2.7.2/reference-metrics.md
@@ -277,7 +277,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.7.3/reference-metrics.md b/site2/website/versioned_docs/version-2.7.3/reference-metrics.md
@@ -297,7 +297,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.7.4/reference-metrics.md b/site2/website/versioned_docs/version-2.7.4/reference-metrics.md
@@ -297,7 +297,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.8.0-deprecated/reference-metrics.md b/site2/website/versioned_docs/version-2.8.0-deprecated/reference-metrics.md
@@ -296,7 +296,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.8.1-deprecated/reference-metrics.md b/site2/website/versioned_docs/version-2.8.1-deprecated/reference-metrics.md
@@ -299,7 +299,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.8.2-deprecated/reference-metrics.md b/site2/website/versioned_docs/version-2.8.2-deprecated/reference-metrics.md
@@ -308,7 +308,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.8.3-deprecated/reference-metrics.md b/site2/website/versioned_docs/version-2.8.3-deprecated/reference-metrics.md
@@ -308,7 +308,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.9.0-deprecated/reference-metrics.md b/site2/website/versioned_docs/version-2.9.0-deprecated/reference-metrics.md
@@ -329,7 +329,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.9.1-deprecated/reference-metrics.md b/site2/website/versioned_docs/version-2.9.1-deprecated/reference-metrics.md
@@ -329,7 +329,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics
 

diff --git a/site2/website/versioned_docs/version-2.9.2-deprecated/reference-metrics.md b/site2/website/versioned_docs/version-2.9.2-deprecated/reference-metrics.md
@@ -329,7 +329,7 @@ All the bundleUnloading metrics are labelled with the following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle splitting check interval |
+| pulsar_lb_bundles_split_count | Counter | The total count of bundle split in this leader broker |
 
 ### Subscription metrics