You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by he...@apache.org on 2023/11/06 02:29:46 UTC
(pulsar) 03/04: Revert "Resolved comments"
This is an automated email from the ASF dual-hosted git repository.
heesung pushed a commit to branch revert-21408-pip-307
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit e1d2398d0f09328e90b35eab3d2ef065c7b1db00
Author: Heesung Sohn <10...@users.noreply.github.com>
AuthorDate: Sun Nov 5 18:29:37 2023 -0800
Revert "Resolved comments"
This reverts commit 6018b2bf8c0b6c04680518f873579aa601753086.
---
.../extensions/ExtensibleLoadManagerImpl.java | 2 +-
.../channel/ServiceUnitStateChannelImpl.java | 19 +++++++++++--------
.../extensions/ExtensibleLoadManagerImplTest.java | 9 +++------
.../java/org/apache/pulsar/client/impl/ClientCnx.java | 9 +++------
.../apache/pulsar/client/impl/ConnectionHandler.java | 4 ++--
5 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java
index 14c81a6a492..8e166f00bc9 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java
@@ -324,7 +324,7 @@ public class ExtensibleLoadManagerImpl implements ExtensibleLoadManager {
}
);
} catch (Throwable e) {
- log.error("Failed to lookup destination broker for topic:{}", topic, e);
+ log.error("Failed to DestinationBrokerLookupData for topic:{}", topic, e);
return CompletableFuture.completedFuture(Optional.empty());
}
}
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 1fe7b83d77d..e5fa504e1db 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
@@ -554,7 +554,10 @@ public class ServiceUnitStateChannelImpl implements ServiceUnitStateChannel {
return Optional.of(data.dstBroker());
}
case Releasing -> {
- return Optional.ofNullable(data.dstBroker());
+ if (data.dstBroker() != null) {
+ return Optional.of(data.dstBroker());
+ }
+ return Optional.empty();
}
case Splitting -> {
return Optional.of(data.sourceBroker());
@@ -767,20 +770,20 @@ public class ServiceUnitStateChannelImpl implements ServiceUnitStateChannel {
if (getOwnerRequest != null) {
getOwnerRequest.complete(data.dstBroker());
}
-
+ CompletableFuture<Integer> ownFuture = null;
if (isTargetBroker(data.dstBroker())) {
pulsar.getNamespaceService()
.onNamespaceBundleOwned(LoadManagerShared.getNamespaceBundle(pulsar, serviceUnit));
lastOwnEventHandledAt = System.currentTimeMillis();
- stateChangeListeners.notify(serviceUnit, data, null);
- log(null, serviceUnit, data, null);
+ ownFuture = CompletableFuture.completedFuture(null);
} else if ((data.force() || isTransferCommand(data)) && isTargetBroker(data.sourceBroker())) {
- stateChangeListeners.notifyOnCompletion(
- closeServiceUnit(serviceUnit, false), serviceUnit, data)
- .whenComplete((__, e) -> log(e, serviceUnit, data, null));
+ ownFuture = closeServiceUnit(serviceUnit, false);
} else {
- stateChangeListeners.notify(serviceUnit, data, null);
+ ownFuture = CompletableFuture.completedFuture(null);
}
+
+ stateChangeListeners.notifyOnCompletion(ownFuture, serviceUnit, data)
+ .whenComplete((__, e) -> log(e, serviceUnit, data, null));
}
private void handleAssignEvent(String serviceUnit, ServiceUnitStateData data) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImplTest.java
index b8873ebb6bb..2c2d6653627 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImplTest.java
@@ -147,8 +147,6 @@ public class ExtensibleLoadManagerImplTest extends MockedPulsarServiceBaseTest {
private final String defaultTestNamespace = "public/test";
- private LookupService lookupService;
-
@BeforeClass
@Override
public void setup() throws Exception {
@@ -197,7 +195,6 @@ public class ExtensibleLoadManagerImplTest extends MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace(defaultTestNamespace);
admin.namespaces().setNamespaceReplicationClusters(defaultTestNamespace,
Sets.newHashSet(this.conf.getClusterName()));
- lookupService = (LookupService) FieldUtils.readDeclaredField(pulsarClient, "lookup", true);
}
}
@@ -211,10 +208,9 @@ public class ExtensibleLoadManagerImplTest extends MockedPulsarServiceBaseTest {
}
@BeforeMethod(alwaysRun = true)
- protected void initializeState() throws PulsarAdminException, IllegalAccessException {
+ protected void initializeState() throws PulsarAdminException {
admin.namespaces().unload(defaultTestNamespace);
reset(primaryLoadManager, secondaryLoadManager);
- FieldUtils.writeDeclaredField(pulsarClient, "lookup", lookupService, true);
}
@Test
@@ -510,7 +506,8 @@ public class ExtensibleLoadManagerImplTest extends MockedPulsarServiceBaseTest {
private LookupService spyLookupService(AtomicInteger lookupCount, TopicName topicName)
throws IllegalAccessException {
- var lookup = spy(lookupService);
+ var lookup = spy((LookupService)
+ FieldUtils.readDeclaredField(pulsarClient, "lookup", true));
FieldUtils.writeDeclaredField(pulsarClient, "lookup", lookup, true);
doAnswer(invocationOnMock -> {
lookupCount.incrementAndGet();
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
index 794ef318bba..abdbe2f872c 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
@@ -812,14 +812,11 @@ public class ClientCnx extends PulsarHandler {
: closeProducer.getAssignedBrokerServiceUrl());
log.info("[{}] Broker notification of Closed producer: {}. Redirecting to {}.",
remoteAddress, closeProducer.getProducerId(), uri);
- producer.getConnectionHandler().connectionClosed(
- this, Optional.of(0L), Optional.of(uri));
+ producer.getConnectionHandler().connectionClosed(this, 0L, Optional.of(uri));
} catch (URISyntaxException e) {
log.error("[{}] Invalid redirect url {}/{} for {}", remoteAddress,
- closeProducer.hasAssignedBrokerServiceUrl()
- ? closeProducer.getAssignedBrokerServiceUrl() : "",
- closeProducer.hasAssignedBrokerServiceUrlTls()
- ? closeProducer.getAssignedBrokerServiceUrlTls() : "",
+ closeProducer.getAssignedBrokerServiceUrl(),
+ closeProducer.getAssignedBrokerServiceUrlTls(),
closeProducer.getRequestId());
producer.connectionClosed(this);
}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
index 7361c27155c..90210803242 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
@@ -170,7 +170,7 @@ public class ConnectionHandler {
connectionClosed(cnx, null, Optional.empty());
}
- public void connectionClosed(ClientCnx cnx, Optional<Long> initialConnectionDelayMs, Optional<URI> hostUrl) {
+ public void connectionClosed(ClientCnx cnx, Long initialConnectionDelayMs, Optional<URI> hostUrl) {
lastConnectionClosedTimestamp = System.currentTimeMillis();
duringConnect.set(false);
state.client.getCnxPool().releaseConnection(cnx);
@@ -180,7 +180,7 @@ public class ConnectionHandler {
state.topic, state.getHandlerName(), state.getState());
return;
}
- long delayMs = initialConnectionDelayMs.orElse(backoff.next());
+ long delayMs = initialConnectionDelayMs != null ? initialConnectionDelayMs.longValue() : backoff.next();
state.setState(State.Connecting);
log.info("[{}] [{}] Closed connection {} -- Will try again in {} s",
state.topic, state.getHandlerName(), cnx.channel(),