Revert "Changing default function subscription to be function name, n…

…ot FQFN" This reverts commit 186e63b.
datastax · Jun 23, 2021 · 653aeca · 653aeca
1 parent 105a1d3
commit 653aeca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java b/...-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java
@@ -117,9 +117,7 @@ public Function.FunctionDetails.ComponentType calculateSubjectType(Function.Func
     }
 
     public static String getDefaultSubscriptionName(String tenant, String namespace, String name) {
-        // Hacking this to just return the function name. Using a FQFN breaks the REST endpoints
-        // that deal with subscriptions
-        return name;
+        return FunctionCommon.getFullyQualifiedName(tenant, namespace, name);
     }
 
     public static String getDefaultSubscriptionName(Function.FunctionDetails functionDetails) {

diff --git a/pulsar-functions/instance/src/main/python/python_instance.py b/pulsar-functions/instance/src/main/python/python_instance.py
@@ -136,8 +136,9 @@ def run(self):
     if self.instance_config.function_details.source.subscriptionType == Function_pb2.SubscriptionType.Value("FAILOVER"):
       mode = pulsar._pulsar.ConsumerType.Failover
 
-    # Default subscription to function name
-    subscription_name = str(self.instance_config.function_details.name)
+    subscription_name = str(self.instance_config.function_details.tenant) + "/" + \
+                        str(self.instance_config.function_details.namespace) + "/" + \
+                        str(self.instance_config.function_details.name)
 
     properties = util.get_properties(util.getFullyQualifiedFunctionName(
                         self.instance_config.function_details.tenant,