merlimat closed pull request #1595: When new cluster is setup, public/default
namespace should be extended there
URL: https://github.com/apache/incubator-pulsar/pull/1595
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/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java
b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java
index 31bbdb7d2..37aff4b10 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java
@@ -25,6 +25,7 @@
import com.google.common.collect.Lists;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
import org.apache.bookkeeper.client.BookKeeperAdmin;
@@ -150,13 +151,21 @@ public static void main(String[] args) throws Exception {
// Ignore
}
- // Create public tenant
- TenantInfo publicTenant = new TenantInfo();
+ // Create public tenant, whitelisted to use the this same cluster,
along with other clusters
+ String publicTenantPath = POLICIES_ROOT + "/" +
TopicName.PUBLIC_TENANT;
+ TenantInfo publicTenant;
+ if (globalZk.exists(publicTenantPath, false) == null) {
+ publicTenant = new TenantInfo(Collections.emptySet(),
Collections.singleton(arguments.cluster));
+ } else {
+ byte[] content = globalZk.getData(publicTenantPath, false, null);
+ publicTenant =
ObjectMapperFactory.getThreadLocal().readValue(content, TenantInfo.class);
+ publicTenant.getAllowedClusters().add(arguments.cluster);
+ }
byte[] publicPropertyDataJson =
ObjectMapperFactory.getThreadLocal().writeValueAsBytes(publicTenant);
try {
ZkUtils.createFullPathOptimistic(
globalZk,
- POLICIES_ROOT + "/" + TopicName.PUBLIC_TENANT,
+ publicTenantPath,
publicPropertyDataJson,
ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
@@ -165,13 +174,22 @@ public static void main(String[] args) throws Exception {
}
// Create default namespace
- Policies policies = new Policies();
- policies.bundles = getBundles(4);
+ String defaultNamespacePath = POLICIES_ROOT + "/" +
TopicName.PUBLIC_TENANT + "/" + TopicName.DEFAULT_NAMESPACE;
+ Policies policies;
+ if (globalZk.exists(defaultNamespacePath, false) == null) {
+ policies = new Policies();
+ policies.bundles = getBundles(16);
+ } else {
+ byte[] content = globalZk.getData(defaultNamespacePath, false,
null);
+ policies = ObjectMapperFactory.getThreadLocal().readValue(content,
Policies.class);
+ policies.replication_clusters.add(arguments.cluster);
+ }
+
byte[] defaultNamespaceDataJson =
ObjectMapperFactory.getThreadLocal().writeValueAsBytes(policies);
try {
ZkUtils.createFullPathOptimistic(
globalZk,
- POLICIES_ROOT + "/" + TopicName.PUBLIC_TENANT + "/" +
TopicName.DEFAULT_NAMESPACE,
+ defaultNamespacePath,
defaultNamespaceDataJson,
ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
