You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2025/10/08 07:11:23 UTC
(pulsar) branch branch-3.0 updated (e371e6663e7 -> ff19542aefe)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from e371e6663e7 Bump org.apache.zookeeper:zookeeper from 3.9.3 to 3.9.4 (#24779)
new ff70e661ffe [fix][broker] Flaky-test: ExtensibleLoadManagerImplTest.testDisableBroker (#24770)
new ff19542aefe [fix][build] Remove invalid profile in settings.xml that caused gpg signing to fail (#24812)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../channel/ServiceUnitStateChannelImpl.java | 26 ++++++++++++++++++++++
src/settings.xml | 15 +------------
2 files changed, 27 insertions(+), 14 deletions(-)
(pulsar) 01/02: [fix][broker] Flaky-test: ExtensibleLoadManagerImplTest.testDisableBroker (#24770)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit ff70e661ffe5c867e4f5830afcdbf06e6280e114
Author: sinan liu <li...@gmail.com>
AuthorDate: Sun Sep 28 23:12:08 2025 +0800
[fix][broker] Flaky-test: ExtensibleLoadManagerImplTest.testDisableBroker (#24770)
(cherry picked from commit e44e084faf66738a22d61892a86d9fc9943bc484)
---
.../channel/ServiceUnitStateChannelImpl.java | 26 ++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
index 7e864ddac2c..782e4a38bad 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
@@ -491,6 +491,32 @@ public class ServiceUnitStateChannelImpl implements ServiceUnitStateChannel {
String serviceUnit,
ServiceUnitState state,
Optional<String> owner) {
+ // When the channel is closed, do not perform liveness verification, return according to the status:
+ if (channelState == Closed) {
+ switch (state) {
+ // Owned/Splitting: Directly return owner (for isOwner judgment as true)
+ case Owned:
+ case Splitting:
+ return CompletableFuture.completedFuture(owner);
+ case Assigning:
+ case Releasing:
+ if (owner.isPresent()) {
+ if (isTargetBroker(owner.get())) {
+ // This machine is the target taker,
+ // return an unfinished future with "waiting for ownership"
+ return dedupeGetOwnerRequest(serviceUnit).thenApply(Optional::ofNullable);
+ } else {
+ // The target is another broker, return directly so that the upper layer can redirect
+ return CompletableFuture.completedFuture(owner);
+ }
+ } else {
+ return CompletableFuture.completedFuture(Optional.empty());
+ }
+ // Other status: return empty
+ default:
+ return CompletableFuture.completedFuture(Optional.empty());
+ }
+ }
return dedupeGetOwnerRequest(serviceUnit)
.thenCompose(newOwner -> {
if (newOwner == null) {
(pulsar) 02/02: [fix][build] Remove invalid profile in settings.xml that caused gpg signing to fail (#24812)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit ff19542aefea708a53d3139097c3cc95d21d9b92
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Oct 3 22:57:00 2025 -0700
[fix][build] Remove invalid profile in settings.xml that caused gpg signing to fail (#24812)
(cherry picked from commit 008e4ebbaf5808c0f859dddabd8382991f32d3aa)
---
src/settings.xml | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/src/settings.xml b/src/settings.xml
index 80ec2f40620..b27c9356340 100644
--- a/src/settings.xml
+++ b/src/settings.xml
@@ -26,7 +26,7 @@
<username>${env.APACHE_USER}</username>
<password>${env.APACHE_PASSWORD}</password>
</server>
-
+
<!-- To stage a release of some part of Maven -->
<server>
<id>apache.releases.https</id>
@@ -34,17 +34,4 @@
<password>${env.APACHE_PASSWORD}</password>
</server>
</servers>
-
- <profiles>
- <profile>
- <id>apache</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <gpg.executable>${env.GPG_EXECUTABLE}</gpg.executable>
- <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
- </properties>
- </profile>
- </profiles>
</settings>