Skip to content

Multiple patches for fixes to pulsar #2

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.

Sign up for GitHub

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

Merged
addisonj merged 5 commits into from
Oct 21, 2019
Merged

Multiple patches for fixes to pulsar #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16088fa
[proxy] Fix proxy to be able to re-send request body
Oct 11, 2019
2d4bbf0
create release 2.4.1-inst2
Oct 11, 2019
51a4484
[functions] BACKPORT Allow functions to pass runtime specific options
Oct 5, 2019
9a1e359
[functions] Distributed the CA for KubernetesSecretsTokenAuthProvider
Oct 16, 2019
64c6d22
create release 2.4.1-inst3
Oct 15, 2019
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
2 changes: 1 addition & 1 deletion buildtools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<groupId>org.apache.pulsar</groupId>
<artifactId>buildtools</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
<packaging>jar</packaging>
<name>Pulsar Build Tools</name>

Expand Down
2 changes: 1 addition & 1 deletion dashboard/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>../docker</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion distribution/io/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion distribution/offloaders/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion distribution/server/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docker/grafana/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.pulsar</groupId>
Expand Down
2 changes: 1 addition & 1 deletion docker/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>docker-images</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion docker/pulsar-all/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pulsar-all-docker-image</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion docker/pulsar-standalone/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.pulsar</groupId>
Expand Down
2 changes: 1 addition & 1 deletion docker/pulsar/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.pulsar</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/flink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.pulsar.examples</groupId>
<artifactId>pulsar-examples</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>

<groupId>org.apache.pulsar.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>

<groupId>org.apache.pulsar.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<artifactId>pulsar-examples</artifactId>
<groupId>org.apache.pulsar.examples</groupId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>

<groupId>org.apache.pulsar.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jclouds-shaded/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion managed-ledger-shaded/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion managed-ledger/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>

<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>

<name>Pulsar</name>
<description>Pulsar is a distributed pub-sub messaging platform with a very
Expand Down
2 changes: 1 addition & 1 deletion protobuf-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<artifactId>protobuf-shaded</artifactId>
<name>Apache Pulsar :: Protobuf shaded</name>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-auth-athenz/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>

<artifactId>pulsar-broker-auth-athenz</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-auth-sasl/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>

<artifactId>pulsar-broker-auth-sasl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-common/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
</parent>

<artifactId>pulsar-broker-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-shaded/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-1x-base/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-1x-base/pulsar-client-1x/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-1x-base</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-1x-base/pulsar-client-2x-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-1x-base</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-admin-shaded/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-admin/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-all/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-api/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-auth-athenz/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-auth-sasl/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-shaded/pom.xml
View file
Open in desktop
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.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-tools-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>2.4.1-inst1</version>
<version>2.4.1-inst3</version>
<relativePath>..</relativePath>
</parent>

Expand Down
8 changes: 7 additions & 1 deletion pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,9 @@ abstract class FunctionDetailsCommand extends BaseCommand {
protected Long timeoutMs;
@Parameter(names = "--max-message-retries", description = "How many times should we try to process a message before giving up")
protected Integer maxMessageRetries;
@Parameter(names = "--dead-letter-topic", description = "The topic where all messages which could not be processed successfully are sent")
@Parameter(names = "--custom-runtime-options", description = "A string that encodes options to customize the runtime, see docs for configured runtime for details")
protected String customRuntimeOptions;
@Parameter(names = "--dead-letter-topic", description = "The topic where messages that are not processed successfully are sent to")
protected String deadLetterTopic;
protected FunctionConfig functionConfig;
protected String userCodeFile;
Expand Down Expand Up @@ -437,6 +439,10 @@ void processArguments() throws Exception {
functionConfig.setTimeoutMs(timeoutMs);
}

if (customRuntimeOptions != null) {
functionConfig.setCustomRuntimeOptions(customRuntimeOptions);
}

// window configs
WindowConfig windowConfig = functionConfig.getWindowConfig();
if (null != windowLengthCount) {
Expand Down
Loading