Update "sample" tenant on standalone to stop using old property/clust…

…er/namespace naming convention. (#10486) Co-authored-by: Chris Bartholomew <c_bartholomew@yahoo.com>
apache · May 10, 2021 · 4d2d66d · 4d2d66d
1 parent d39e5e4
commit 4d2d66d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
@@ -368,9 +368,9 @@ private void createNameSpace(String cluster, String publicTenant, String default
 
     private void createSampleNameSpace(ClusterData clusterData, String cluster) {
         // Create a sample namespace
-        final String property = "sample";
+        final String tenant = "sample";
         final String globalCluster = "global";
-        final String namespace = property + "/" + cluster + "/ns1";
+        final String namespace = tenant + "/ns1";
         try {
             if (!admin.clusters().getClusters().contains(cluster)) {
                 admin.clusters().createCluster(cluster, clusterData);
@@ -385,12 +385,12 @@ private void createSampleNameSpace(ClusterData clusterData, String cluster) {
                 admin.clusters().createCluster(globalCluster, new ClusterData(null, null));
             }
 
-            if (!admin.tenants().getTenants().contains(property)) {
-                admin.tenants().createTenant(property,
+            if (!admin.tenants().getTenants().contains(tenant)) {
+                admin.tenants().createTenant(tenant,
                         new TenantInfo(Sets.newHashSet(config.getSuperUserRoles()), Sets.newHashSet(cluster)));
             }
 
-            if (!admin.namespaces().getNamespaces(property).contains(namespace)) {
+            if (!admin.namespaces().getNamespaces(tenant).contains(namespace)) {
                 admin.namespaces().createNamespace(namespace);
             }
         } catch (PulsarAdminException e) {