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 2024/04/05 16:09:48 UTC
(pulsar) branch branch-3.2 updated (b4d4b3613bf -> 71fffaf4c92)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from b4d4b3613bf [improve][test] Move most flaky tests to flaky group (#22433)
new 4978c3610d4 [fix][broker][admin] Fix cannot update properties on NonDurable subscription. (#22411)
new 71fffaf4c92 [fix][build] Fix building java-test-image without setting IMAGE_JDK_MAJOR_VERSION (#22095)
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:
docker/pulsar/pom.xml | 6 ----
.../bookkeeper/mledger/impl/ManagedCursorImpl.java | 10 ++++--
pom.xml | 42 ++++++++++++++++++++++
.../pulsar/broker/admin/PersistentTopicsTest.java | 38 ++++++++++++++++++++
tests/docker-images/java-test-image/pom.xml | 6 ++--
5 files changed, 90 insertions(+), 12 deletions(-)
(pulsar) 02/02: [fix][build] Fix building java-test-image without setting IMAGE_JDK_MAJOR_VERSION (#22095)
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.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 71fffaf4c921d436c3bfc290e6dbbf2cf22bdd08
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Thu Feb 22 14:42:26 2024 +0200
[fix][build] Fix building java-test-image without setting IMAGE_JDK_MAJOR_VERSION (#22095)
(cherry picked from commit 48c85ab1707004dc27022c494dbc557f7c3e888c)
---
docker/pulsar/pom.xml | 6 -----
pom.xml | 42 +++++++++++++++++++++++++++++
tests/docker-images/java-test-image/pom.xml | 6 ++---
3 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
index 5468c4d511d..f2bf8d9e343 100644
--- a/docker/pulsar/pom.xml
+++ b/docker/pulsar/pom.xml
@@ -47,12 +47,6 @@
</dependency>
</dependencies>
- <properties>
- <UBUNTU_MIRROR>http://archive.ubuntu.com/ubuntu/</UBUNTU_MIRROR>
- <UBUNTU_SECURITY_MIRROR>http://security.ubuntu.com/ubuntu/</UBUNTU_SECURITY_MIRROR>
- <IMAGE_JDK_MAJOR_VERSION>17</IMAGE_JDK_MAJOR_VERSION>
- </properties>
-
<profiles>
<profile>
<id>git-commit-id-no-git</id>
diff --git a/pom.xml b/pom.xml
index a1d23cb3a45..7a831b51bd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,10 @@ flexible messaging model and an intuitive client API.</description>
<pulsar.client.python.version>3.4.0</pulsar.client.python.version>
+ <UBUNTU_MIRROR>http://archive.ubuntu.com/ubuntu/</UBUNTU_MIRROR>
+ <UBUNTU_SECURITY_MIRROR>http://security.ubuntu.com/ubuntu/</UBUNTU_SECURITY_MIRROR>
+ <IMAGE_JDK_MAJOR_VERSION>17</IMAGE_JDK_MAJOR_VERSION>
+
<!--config keys to configure test selection -->
<include>**/Test*.java,**/*Test.java,**/*Tests.java,**/*TestCase.java</include>
<exclude/>
@@ -2542,6 +2546,44 @@ flexible messaging model and an intuitive client API.</description>
<checkstyle.skip>true</checkstyle.skip>
</properties>
</profile>
+
+ <profile>
+ <id>ubuntu-mirror-set</id>
+ <activation>
+ <property>
+ <name>env.UBUNTU_MIRROR</name>
+ </property>
+ </activation>
+ <properties>
+ <!-- Override the default value with the environment variable -->
+ <UBUNTU_MIRROR>${env.UBUNTU_MIRROR}</UBUNTU_MIRROR>
+ </properties>
+ </profile>
+ <profile>
+ <id>ubuntu-security-mirror-set</id>
+ <activation>
+ <property>
+ <name>env.UBUNTU_SECURITY_MIRROR</name>
+ </property>
+ </activation>
+ <properties>
+ <!-- Override the default value with the environment variable -->
+ <UBUNTU_SECURITY_MIRROR>${env.UBUNTU_SECURITY_MIRROR}</UBUNTU_SECURITY_MIRROR>
+ </properties>
+ </profile>
+ <profile>
+ <id>jdk-major-version-set</id>
+ <activation>
+ <property>
+ <name>env.IMAGE_JDK_MAJOR_VERSION</name>
+ </property>
+ </activation>
+ <properties>
+ <!-- Override the default value with the environment variable -->
+ <IMAGE_JDK_MAJOR_VERSION>${env.IMAGE_JDK_MAJOR_VERSION}</IMAGE_JDK_MAJOR_VERSION>
+ </properties>
+ </profile>
+
</profiles>
<repositories>
diff --git a/tests/docker-images/java-test-image/pom.xml b/tests/docker-images/java-test-image/pom.xml
index 18af9cc74da..e8ce6a1686c 100644
--- a/tests/docker-images/java-test-image/pom.xml
+++ b/tests/docker-images/java-test-image/pom.xml
@@ -35,9 +35,9 @@
<id>docker</id>
<properties>
<docker.buildArg.PULSAR_TARBALL>target/pulsar-server-distribution-bin.tar.gz</docker.buildArg.PULSAR_TARBALL>
- <docker.buildArg.UBUNTU_MIRROR>${env.UBUNTU_MIRROR}</docker.buildArg.UBUNTU_MIRROR>
- <docker.buildArg.UBUNTU_SECURITY_MIRROR>${env.UBUNTU_SECURITY_MIRROR}</docker.buildArg.UBUNTU_SECURITY_MIRROR>
- <docker.buildArg.JDK_MAJOR_VERSION>${env.IMAGE_JDK_MAJOR_VERSION}</docker.buildArg.JDK_MAJOR_VERSION>
+ <docker.buildArg.UBUNTU_MIRROR>${UBUNTU_MIRROR}</docker.buildArg.UBUNTU_MIRROR>
+ <docker.buildArg.UBUNTU_SECURITY_MIRROR>${UBUNTU_SECURITY_MIRROR}</docker.buildArg.UBUNTU_SECURITY_MIRROR>
+ <docker.buildArg.JDK_MAJOR_VERSION>${IMAGE_JDK_MAJOR_VERSION}</docker.buildArg.JDK_MAJOR_VERSION>
</properties>
<activation>
<property>
(pulsar) 01/02: [fix][broker][admin] Fix cannot update properties on NonDurable subscription. (#22411)
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.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4978c3610d44010e24370fac8d0145951c052f1f
Author: 道君 <da...@apache.org>
AuthorDate: Fri Apr 5 15:42:40 2024 +0800
[fix][broker][admin] Fix cannot update properties on NonDurable subscription. (#22411)
(cherry picked from commit 902728ef6590233b87c14d2528590ad7e6fdcc12)
# Conflicts:
# pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
---
.../bookkeeper/mledger/impl/ManagedCursorImpl.java | 10 ++++--
.../pulsar/broker/admin/PersistentTopicsTest.java | 38 ++++++++++++++++++++++
2 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
index 0da71e89018..dbdde7cf707 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
@@ -350,15 +350,19 @@ public class ManagedCursorImpl implements ManagedCursor {
final Function<Map<String, String>, Map<String, String>> updateFunction) {
CompletableFuture<Void> updateCursorPropertiesResult = new CompletableFuture<>();
- final Stat lastCursorLedgerStat = ManagedCursorImpl.this.cursorLedgerStat;
-
Map<String, String> newProperties = updateFunction.apply(ManagedCursorImpl.this.cursorProperties);
+ if (!isDurable()) {
+ this.cursorProperties = Collections.unmodifiableMap(newProperties);
+ updateCursorPropertiesResult.complete(null);
+ return updateCursorPropertiesResult;
+ }
+
ManagedCursorInfo copy = ManagedCursorInfo
.newBuilder(ManagedCursorImpl.this.managedCursorInfo)
.clearCursorProperties()
.addAllCursorProperties(buildStringPropertiesMap(newProperties))
.build();
-
+ final Stat lastCursorLedgerStat = ManagedCursorImpl.this.cursorLedgerStat;
ledger.getStore().asyncUpdateCursorInfo(ledger.getName(),
name, copy, lastCursorLedgerStat, new MetaStoreCallback<>() {
@Override
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
index 9a292175caa..6641a5805c0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertSame;
import static org.testng.Assert.assertThrows;
import static org.testng.Assert.assertTrue;
@@ -54,6 +55,8 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
+import org.apache.bookkeeper.mledger.ManagedCursor;
+import org.apache.commons.collections4.MapUtils;
import org.apache.pulsar.broker.BrokerTestUtil;
import org.apache.pulsar.broker.admin.v2.ExtPersistentTopics;
import org.apache.pulsar.broker.admin.v2.NonPersistentTopics;
@@ -66,6 +69,8 @@ import org.apache.pulsar.broker.resources.PulsarResources;
import org.apache.pulsar.broker.resources.TopicResources;
import org.apache.pulsar.broker.service.BrokerService;
import org.apache.pulsar.broker.service.Topic;
+import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
+import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.broker.web.PulsarWebResource;
import org.apache.pulsar.broker.web.RestException;
import org.apache.pulsar.client.admin.LongRunningProcessStatus;
@@ -77,6 +82,7 @@ import org.apache.pulsar.client.api.CompressionType;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.Reader;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.interceptor.ProducerInterceptor;
import org.apache.pulsar.client.impl.BatchMessageIdImpl;
@@ -1786,4 +1792,36 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
String topicName = "persistent://" + testTenant + "/" + testNamespaceLocal + "/testCreateMissingPartitions";
assertThrows(PulsarAdminException.NotFoundException.class, () -> admin.topics().createMissedPartitions(topicName));
}
+
+ @Test
+ public void testUpdatePropertiesOnNonDurableSub() throws Exception {
+ String topic = "persistent://" + testTenant + "/" + testNamespaceLocal + "/testUpdatePropertiesOnNonDurableSub";
+ String subscription = "sub";
+ admin.topics().createNonPartitionedTopic(topic);
+
+ @Cleanup
+ Reader<String> __ = pulsarClient.newReader(Schema.STRING)
+ .startMessageId(MessageId.earliest)
+ .subscriptionName(subscription)
+ .topic(topic)
+ .create();
+
+ PersistentTopic persistentTopic =
+ (PersistentTopic) pulsar.getBrokerService().getTopic(topic, false).get().get();
+ PersistentSubscription subscription1 = persistentTopic.getSubscriptions().get(subscription);
+ assertNotNull(subscription1);
+ ManagedCursor cursor = subscription1.getCursor();
+
+ Map<String, String> properties = admin.topics().getSubscriptionProperties(topic, subscription);
+ assertEquals(properties.size(), 0);
+ assertTrue(MapUtils.isEmpty(cursor.getCursorProperties()));
+
+ admin.topics().updateSubscriptionProperties(topic, subscription, Map.of("foo", "bar"));
+ properties = admin.topics().getSubscriptionProperties(topic, subscription);
+ assertEquals(properties.size(), 1);
+ assertEquals(properties.get("foo"), "bar");
+
+ assertEquals(cursor.getCursorProperties().size(), 1);
+ assertEquals(cursor.getCursorProperties().get("foo"), "bar");
+ }
}