This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new c0e7cdfdf80 [fix][broker] Fix incorrect bundle split count metric
(#17970)
c0e7cdfdf80 is described below
commit c0e7cdfdf80cc4ff9fb144f5f000dffcb25439f9
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 | 6 +++---
.../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 +-
12 files changed, 19 insertions(+), 17 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 261548baa0d..8b8e7674a73 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
@@ -711,6 +711,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);
@@ -732,13 +733,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);
}
}
@@ -746,10 +748,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 ce64ce0e633..7ddbdababaf 100644
--- a/site2/docs/reference-metrics.md
+++ b/site2/docs/reference-metrics.md
@@ -342,9 +342,9 @@ 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_count | Counter | bundle split count in this bundle
splitting check interval |
+| Name | Type | Description |
+| --- | --- |-------------------------------------------------------|
+| 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 fad48f41c35..f268bd54b07 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
@@ -281,7 +281,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 deb6d0efefa..1c23f6f0309 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
@@ -281,7 +281,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 766e3caa431..955ae87c527 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
@@ -281,7 +281,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 2ea614e87e3..adc2ca2c63e 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
@@ -281,7 +281,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 933f11f91a6..8065095cd6a 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
@@ -281,7 +281,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 f0d12e5d9c5..4ccc3acf4a9 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
@@ -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.1/reference-metrics.md
b/site2/website/versioned_docs/version-2.7.1/reference-metrics.md
index b2fb2e49c6f..52f0b4f1aca 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
@@ -279,7 +279,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 79b05e61be3..22df5114ef5 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
@@ -279,7 +279,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 8a48185a654..dfc4743accf 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
@@ -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.7.4/reference-metrics.md
b/site2/website/versioned_docs/version-2.7.4/reference-metrics.md
index 3e54f3d51fc..b35e14687a4 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
@@ -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
