You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/05/07 23:07:33 UTC
[GitHub] merlimat closed pull request #1742: Move functions to use V2 style
namespaces for internal data keeping
merlimat closed pull request #1742: Move functions to use V2 style namespaces for internal data keeping
URL: https://github.com/apache/incubator-pulsar/pull/1742
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/conf/functions_worker.yml b/conf/functions_worker.yml
index ff9d2311b0..663c4f7338 100644
--- a/conf/functions_worker.yml
+++ b/conf/functions_worker.yml
@@ -23,7 +23,8 @@ workerPort: 6750
functionMetadataTopicName: metadata
functionMetadataSnapshotsTopicPath: snapshots
clusterCoordinationTopicName: coordinate
-pulsarFunctionsNamespace: sample/standalone/functions
+pulsarFunctionsNamespace: public/functions
+pulsarFunctionsCluster: standalone
pulsarServiceUrl: pulsar://localhost:6650
pulsarWebServiceUrl: http://localhost:8080
numFunctionPackageReplicas: 1
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
index 38d8e849a9..7b975f3bb9 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
@@ -30,9 +30,7 @@
import java.io.IOException;
import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
@@ -81,6 +79,7 @@
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.Policies;
+import org.apache.pulsar.common.policies.data.RetentionPolicies;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.ObjectMapperFactory;
@@ -852,7 +851,7 @@ private void startWorkerService() throws InterruptedException, IOException, Keep
.getWorkerConfig().getPulsarFunctionsNamespace();
String[] a = functionWorkerService.get().getWorkerConfig().getPulsarFunctionsNamespace().split("/");
String property = a[0];
- String cluster = a[1];
+ String cluster = functionWorkerService.get().getWorkerConfig().getPulsarFunctionsCluster();
/*
multiple brokers may be trying to create the property, cluster, and namespace
@@ -904,6 +903,8 @@ private void startWorkerService() throws InterruptedException, IOException, Keep
// create namespace for function worker service
try {
Policies policies = new Policies();
+ policies.retention_policies = new RetentionPolicies(-1, -1);
+ policies.replication_clusters = Collections.singleton(functionWorkerService.get().getWorkerConfig().getPulsarFunctionsCluster());
int defaultNumberOfBundles = this.getConfiguration().getDefaultNumberOfNamespaceBundles();
policies.bundles = getBundles(defaultNumberOfBundles);
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
index 469cdf033a..4f700ab451 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
@@ -31,6 +31,7 @@
import javax.ws.rs.core.Response;
import java.io.IOException;
import java.net.URI;
+import java.util.HashSet;
@Slf4j
public class Worker extends AbstractService {
@@ -104,6 +105,8 @@ private static URI initialize(WorkerConfig workerConfig)
try {
Policies policies = new Policies();
policies.retention_policies = new RetentionPolicies(-1, -1);
+ policies.replication_clusters = new HashSet<>();
+ policies.replication_clusters.add(workerConfig.getPulsarFunctionsCluster());
admin.namespaces().createNamespace(workerConfig.getPulsarFunctionsNamespace(),
policies);
} catch (PulsarAdminException e1) {
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
index 06f4e53dd3..161d210573 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
@@ -51,6 +51,7 @@
private String clusterCoordinationTopicName;
private String functionMetadataSnapshotsTopicPath;
private String pulsarFunctionsNamespace;
+ private String pulsarFunctionsCluster;
private int numFunctionPackageReplicas;
private String downloadDirectory;
private long snapshotFreqMs;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services