This is an automated email from the ASF dual-hosted git repository.
bogong pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new e197eaa8b98 [fix][broker] Fix incorrect bundle split count metric
(#17970)
e197eaa8b98 is described below
commit e197eaa8b98992d3404c8a438dd2083aad6b5b5b
Author: 萧易客 <[email protected]>
AuthorDate: Tue Oct 11 10:37:23 2022 +0800
[fix][broker] Fix incorrect bundle split count metric (#17970)
(cherry picked from commit 882fcfba87a14e1027b3660fd00bd177f6bb4120)
---
.../pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java | 10 ++++++----
site2/docs/reference-metrics.md | 4 ++++
.../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 +-
11 files changed, 19 insertions(+), 13 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 6191078569c..d821e339944 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
@@ -691,6 +691,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);
@@ -712,13 +713,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);
}
}
@@ -726,10 +728,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 = Lists.newArrayList();
Map<String, String> dimensions = new HashMap<>();
diff --git a/site2/docs/reference-metrics.md b/site2/docs/reference-metrics.md
index 3467931e86b..720d077d1e9 100644
--- a/site2/docs/reference-metrics.md
+++ b/site2/docs/reference-metrics.md
@@ -328,6 +328,10 @@ All the bundleUnloading metrics are labelled with the
following labels:
- cluster: cluster=${pulsar_cluster}. ${pulsar_cluster} is the cluster name
that you have configured in the `broker.conf` file.
- metric: metric="bundlesSplit".
+| Name | Type | Description
|
+|-------------------------------|---------|------------------------------------------------------------|
+| pulsar_lb_bundles_split_total | Counter | The total count of bundle split in
this leader broker |
+
| Name | Type | Description |
| --- | --- | --- |
| pulsar_lb_bundles_split_count | Counter | bundle split count in this bundle
splitting check interval |
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 d3f60bd415f..71a26f5fba9 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
@@ -280,7 +280,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 ebd6e4616b5..d0ba807652c 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
@@ -280,7 +280,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 e1f58788b35..8bb6d1fdb30 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
@@ -280,7 +280,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 f0feb88e390..076c08ef24a 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
@@ -280,7 +280,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 9804a138ccf..24ffea239d3 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
@@ -280,7 +280,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 cd9731e7804..74684fd73d5 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
@@ -276,7 +276,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 0aa3ca92e08..fee94027264 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
@@ -278,7 +278,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 0b2dada20c2..d2c90a841a3 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
@@ -278,7 +278,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 60c26903f98..408acb161ed 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
@@ -298,7 +298,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
