Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trigger branch-2.10 CI #174

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/tune-runner-vm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ runs:
# tune filesystem mount options, https://www.kernel.org/doc/Documentation/filesystems/ext4.txt
# commit=999999, effectively disables automatic syncing to disk (default is every 5 seconds)
# nobarrier/barrier=0, loosen data consistency on system crash (no negative impact to empheral CI nodes)
sudo mount -o remount,nodiscard,commit=999999,barrier=0 /
sudo mount -o remount,nodiscard,commit=999999,barrier=0 /mnt
sudo mount -o remount,nodiscard,commit=999999,barrier=0 / || true
sudo mount -o remount,nodiscard,commit=999999,barrier=0 /mnt || true
# disable discard/trim at device level since remount with nodiscard doesn't seem to be effective
# https://www.spinics.net/lists/linux-ide/msg52562.html
for i in /sys/block/sd*/queue/discard_max_bytes; do
Expand Down
2 changes: 1 addition & 1 deletion bouncy-castle/bc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>bouncy-castle-parent</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bouncy-castle/bcfips-include-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>bouncy-castle-parent</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bouncy-castle/bcfips/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>bouncy-castle-parent</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bouncy-castle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion buildtools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<groupId>org.apache.pulsar</groupId>
<artifactId>buildtools</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Pulsar Build Tools</name>

Expand Down
8 changes: 8 additions & 0 deletions conf/functions_worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,15 @@ saslJaasServerRoleTokenSignerSecretPath:
########################

connectorsDirectory: ./connectors
# Whether to enable referencing connectors directory files by file url in connector (sink/source) creation
enableReferencingConnectorDirectoryFiles: true
# Regex patterns for enabling creation of connectors by referencing packages in matching http/https urls
additionalEnabledConnectorUrlPatterns: []
functionsDirectory: ./functions
# Whether to enable referencing functions directory files by file url in functions creation
enableReferencingFunctionsDirectoryFiles: true
# Regex patterns for enabling creation of functions by referencing packages in matching http/https urls
additionalEnabledFunctionsUrlPatterns: []

# Enables extended validation for connector config with fine-grain annotation based validation
# during submission. Classloading with either enableClassloadingOfExternalFiles or
Expand Down
2 changes: 1 addition & 1 deletion distribution/io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>distribution</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion distribution/offloaders/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>distribution</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion distribution/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>distribution</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
46 changes: 23 additions & 23 deletions distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ The Apache Software License, Version 2.0
* Caffeine -- com.github.ben-manes.caffeine-caffeine-2.9.1.jar
* Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar
* Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-2.0.1.jar
* Bitbucket -- org.bitbucket.b_c-jose4j-0.9.3.jar
* Bitbucket -- org.bitbucket.b_c-jose4j-0.9.4.jar
* Gson
- com.google.code.gson-gson-2.8.9.jar
- io.gsonfire-gson-fire-1.8.5.jar
Expand Down Expand Up @@ -429,25 +429,25 @@ The Apache Software License, Version 2.0
- org.asynchttpclient-async-http-client-2.12.1.jar
- org.asynchttpclient-async-http-client-netty-utils-2.12.1.jar
* Jetty
- org.eclipse.jetty-jetty-client-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-continuation-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-proxy-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-server-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-servlets-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar
- org.eclipse.jetty.websocket-javax-websocket-client-impl-9.4.53.v20231009.jar
- org.eclipse.jetty.websocket-websocket-api-9.4.53.v20231009.jar
- org.eclipse.jetty.websocket-websocket-client-9.4.53.v20231009.jar
- org.eclipse.jetty.websocket-websocket-common-9.4.53.v20231009.jar
- org.eclipse.jetty.websocket-websocket-server-9.4.53.v20231009.jar
- org.eclipse.jetty.websocket-websocket-servlet-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-alpn-server-9.4.53.v20231009.jar
- org.eclipse.jetty-jetty-client-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-continuation-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-http-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-io-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-proxy-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-security-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-server-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-servlet-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-servlets-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-util-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-util-ajax-9.4.54.v20240208.jar
- org.eclipse.jetty.websocket-javax-websocket-client-impl-9.4.54.v20240208.jar
- org.eclipse.jetty.websocket-websocket-api-9.4.54.v20240208.jar
- org.eclipse.jetty.websocket-websocket-client-9.4.54.v20240208.jar
- org.eclipse.jetty.websocket-websocket-common-9.4.54.v20240208.jar
- org.eclipse.jetty.websocket-websocket-server-9.4.54.v20240208.jar
- org.eclipse.jetty.websocket-websocket-servlet-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.54.v20240208.jar
- org.eclipse.jetty-jetty-alpn-server-9.4.54.v20240208.jar
* SnakeYaml -- org.yaml-snakeyaml-2.0.jar
* RocksDB - org.rocksdb-rocksdbjni-6.29.4.1.jar
* Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.5.1.jar
Expand Down Expand Up @@ -525,9 +525,9 @@ The Apache Software License, Version 2.0
- io.vertx-vertx-web-3.9.8.jar
- io.vertx-vertx-web-common-3.9.8.jar
* Apache ZooKeeper
- org.apache.zookeeper-zookeeper-3.9.1.jar
- org.apache.zookeeper-zookeeper-jute-3.9.1.jar
- org.apache.zookeeper-zookeeper-prometheus-metrics-3.9.1.jar
- org.apache.zookeeper-zookeeper-3.9.2.jar
- org.apache.zookeeper-zookeeper-jute-3.9.2.jar
- org.apache.zookeeper-zookeeper-prometheus-metrics-3.9.2.jar
* Snappy Java
- org.xerial.snappy-snappy-java-1.1.10.5.jar
* Google HTTP Client
Expand Down
2 changes: 1 addition & 1 deletion docker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
</parent>
<artifactId>docker-images</artifactId>
<name>Apache Pulsar :: Docker Images</name>
Expand Down
2 changes: 1 addition & 1 deletion docker/pulsar-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>docker-images</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pulsar-all-docker-image</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion docker/pulsar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>docker-images</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pulsar-docker-image</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jclouds-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion kafka-connect-avro-converter-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>pulsar</artifactId>
<groupId>org.apache.pulsar</groupId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion managed-ledger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
13 changes: 10 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>

<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>

<name>Pulsar</name>
<description>Pulsar is a distributed pub-sub messaging platform with a very
Expand Down Expand Up @@ -105,13 +105,13 @@ flexible messaging model and an intuitive client API.</description>
<commons-compress.version>1.26.0</commons-compress.version>

<bookkeeper.version>4.14.8</bookkeeper.version>
<zookeeper.version>3.9.1</zookeeper.version>
<zookeeper.version>3.9.2</zookeeper.version>
<commons-cli.version>1.5.0</commons-cli.version>
<snappy.version>1.1.10.5</snappy.version> <!-- ZooKeeper server -->
<dropwizardmetrics.version>3.2.5</dropwizardmetrics.version> <!-- ZooKeeper server -->
<curator.version>5.1.0</curator.version>
<netty.version>4.1.100.Final</netty.version>
<jetty.version>9.4.53.v20231009</jetty.version>
<jetty.version>9.4.54.v20240208</jetty.version>
<conscrypt.version>2.5.2</conscrypt.version>
<jersey.version>2.34</jersey.version>
<athenz.version>1.10.50</athenz.version>
Expand Down Expand Up @@ -200,6 +200,7 @@ flexible messaging model and an intuitive client API.</description>
<jakarta.validation.version>2.0.2</jakarta.validation.version>
<jna.version>4.2.0</jna.version>
<kubernetesclient.version>18.0.0</kubernetesclient.version>
<jose4j.version>0.9.4</jose4j.version>
<okhttp3.version>4.9.3</okhttp3.version>
<!-- use okio version that matches the okhttp3 version -->
<okio.version>2.8.0</okio.version>
Expand Down Expand Up @@ -588,6 +589,12 @@ flexible messaging model and an intuitive client API.</description>
<version>${rocksdb.version}</version>
</dependency>

<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
<version>${jose4j.version}</version>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-auth-athenz/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
</parent>

<artifactId>pulsar-broker-auth-athenz</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-auth-sasl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
</parent>

<artifactId>pulsar-broker-auth-sasl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
</parent>

<artifactId>pulsar-broker-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.10.6-SNAPSHOT</version>
<version>2.10.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@
import org.apache.pulsar.common.policies.data.NamespaceOperation;
import org.apache.pulsar.common.policies.data.PersistencePolicies;
import org.apache.pulsar.common.policies.data.Policies;
import org.apache.pulsar.common.policies.data.PolicyName;
import org.apache.pulsar.common.policies.data.PolicyOperation;
import org.apache.pulsar.common.policies.data.RetentionPolicies;
import org.apache.pulsar.common.policies.data.SchemaCompatibilityStrategy;
import org.apache.pulsar.common.policies.data.SubscribeRate;
Expand Down Expand Up @@ -704,10 +702,7 @@ protected static void resumeAsyncResponseExceptionally(AsyncResponse asyncRespon
}

protected CompletableFuture<SchemaCompatibilityStrategy> getSchemaCompatibilityStrategyAsync() {
return validateTopicPolicyOperationAsync(topicName,
PolicyName.SCHEMA_COMPATIBILITY_STRATEGY,
PolicyOperation.READ)
.thenCompose((__) -> getSchemaCompatibilityStrategyAsyncWithoutAuth()).whenComplete((__, ex) -> {
return getSchemaCompatibilityStrategyAsyncWithoutAuth().whenComplete((__, ex) -> {
if (ex != null) {
log.error("[{}] Failed to get schema compatibility strategy of topic {} {}",
clientAppId(), topicName, ex);
Expand Down Expand Up @@ -798,6 +793,17 @@ protected static boolean isRedirectException(Throwable ex) {
== Status.TEMPORARY_REDIRECT.getStatusCode();
}

protected static boolean isNotFoundException(Throwable ex) {
Throwable realCause = FutureUtil.unwrapCompletionException(ex);
return realCause instanceof WebApplicationException
&& ((WebApplicationException) realCause).getResponse().getStatus()
== Status.NOT_FOUND.getStatusCode();
}

protected static boolean isNot307And404Exception(Throwable ex) {
return !isRedirectException(ex) && !isNotFoundException(ex);
}

protected static String getTopicNotFoundErrorMessage(String topic) {
return String.format("Topic %s not found", topic);
}
Expand Down
Loading
Loading