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/04 06:17:31 UTC
(pulsar) branch branch-3.3 updated (67b982e3439 -> dfa94419ca3)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from 67b982e3439 Bump org.apache.zookeeper:zookeeper from 3.9.3 to 3.9.4 (#24779)
new 5812fe4e21b [fix][broker] Flaky-test: ExtensibleLoadManagerImplTest.testDisableBroker (#24770)
new 05975453c09 [fix][build] Fix maven deploy with maven-source-plugin 3.3.1 (#24811)
new dfa94419ca3 [fix][build] Remove invalid profile in settings.xml that caused gpg signing to fail (#24812)
The 3 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 | 27 +++++++++++++++++++++-
pulsar-client-all/pom.xml | 11 +++++++++
src/settings.xml | 15 +-----------
3 files changed, 38 insertions(+), 15 deletions(-)
(pulsar) 01/03: [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.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 5812fe4e21b0ca2f7d3c59f237bb58c4f41d01a8
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 | 27 +++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
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 cdd016ec245..7294fbce854 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
@@ -498,7 +498,32 @@ public class ServiceUnitStateChannelImpl implements ServiceUnitStateChannel {
String serviceUnit,
ServiceUnitState state,
Optional<String> owner) {
-
+ // When the channel is disabled/closed, do not perform liveness verification, return according to the status:
+ if (channelState == Disabled || 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());
+ }
+ }
// If this broker's registry does not exist(possibly suffering from connecting to the metadata store),
// we return the owner without its activeness check.
// This broker tries to serve lookups on a best efforts basis when metadata store connection is unstable.
(pulsar) 02/03: [fix][build] Fix maven deploy with maven-source-plugin 3.3.1 (#24811)
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.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 05975453c09532320a9d6c5ee60d325adf4cef12
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Thu Oct 2 17:47:30 2025 +0300
[fix][build] Fix maven deploy with maven-source-plugin 3.3.1 (#24811)
(cherry picked from commit f5547dc13f091dc8aeb2a3867f483664c3f858b6)
---
pulsar-client-all/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
index 3d6040854e3..d4ec5f45799 100644
--- a/pulsar-client-all/pom.xml
+++ b/pulsar-client-all/pom.xml
@@ -468,6 +468,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- this is required when maven-shade-plugin sets createSourcesJar to true -->
+ <id>attach-sources</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
(pulsar) 03/03: [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.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit dfa94419ca33fe0bb56723f90bee3ec29db1d1d7
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>