You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/10/11 02:37:32 UTC
[pulsar] branch master updated: [fix][broker] Fix incorrect bundle split count metric (#17970)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 882fcfba87a [fix][broker] Fix incorrect bundle split count metric (#17970)
882fcfba87a is described below
commit 882fcfba87a14e1027b3660fd00bd177f6bb4120
Author: 萧易客 <km...@live.com>
AuthorDate: Tue Oct 11 10:37:23 2022 +0800
[fix][broker] Fix incorrect bundle split count metric (#17970)
---
.../pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java | 10 ++++++----
site2/docs/reference-metrics.md | 2 +-
.../version-2.10.0-deprecated/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.6.0/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.6.1/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.6.2/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.6.3/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.6.4/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.7.0/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.7.1/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.7.2/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.7.3/reference-metrics.md | 2 +-
.../website/versioned_docs/version-2.7.4/reference-metrics.md | 2 +-
.../version-2.8.0-deprecated/reference-metrics.md | 2 +-
.../version-2.8.1-deprecated/reference-metrics.md | 2 +-
.../version-2.8.2-deprecated/reference-metrics.md | 2 +-
.../version-2.8.3-deprecated/reference-metrics.md | 2 +-
.../version-2.9.0-deprecated/reference-metrics.md | 2 +-
.../version-2.9.1-deprecated/reference-metrics.md | 2 +-
.../version-2.9.2-deprecated/reference-metrics.md | 2 +-
20 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
index 7247f8c5e29..faa6fe48bbc 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
@@ -750,6 +750,7 @@ public class ModularLoadManagerImpl implements ModularLoadManager {
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,13 +772,14 @@ public class ModularLoadManagerImpl implements ModularLoadManager {
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);
}
}
@@ -785,10 +787,10 @@ public class ModularLoadManagerImpl implements ModularLoadManager {
/**
* 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
index 226f1aa22ea..959e58a4d02 100644
--- 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
index c0c67c3bfd2..44b03a5069c 100644
--- 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
index 8921123c136..e3403b8ad81 100644
--- 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
index 8921123c136..e3403b8ad81 100644
--- 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
index 8921123c136..e3403b8ad81 100644
--- 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
index 8921123c136..e3403b8ad81 100644
--- 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
index 0e47ef05e6f..daece9fef90 100644
--- 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
index 03457f0d0ec..1fadede9362 100644
--- 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
index 5172653659e..804aba18640 100644
--- 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
index 5172653659e..804aba18640 100644
--- 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
index a146ce1907b..9335fa1bdab 100644
--- 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
index a146ce1907b..9335fa1bdab 100644
--- 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
index 24a67d4b81d..df5f7594335 100644
--- 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
index 9ec2cec93be..2d7944e0c83 100644
--- 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
index 4c0f307b7e6..61c734f96a2 100644
--- 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
index 4c0f307b7e6..61c734f96a2 100644
--- 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
index 96c378c3c5d..e4e12d89ac5 100644
--- 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
index 96c378c3c5d..e4e12d89ac5 100644
--- 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
index 96c378c3c5d..e4e12d89ac5 100644
--- 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