You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by eo...@apache.org on 2021/05/13 07:46:07 UTC
[pulsar] 13/46: Changing default function subscription to be
function name, not FQFN
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch 2.7.2_ds_tmp
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 186e63b27bf2662f52a32a8769b95ce0a125acd7
Author: Chris Bartholomew <c_...@yahoo.com>
AuthorDate: Tue Nov 26 19:18:54 2019 -0500
Changing default function subscription to be function name, not FQFN
(cherry picked from commit 4bb90560ad7c22f136c50252041c3906ae2e28d4)
---
.../java/org/apache/pulsar/functions/instance/InstanceUtils.java | 4 +++-
pulsar-functions/instance/src/main/python/python_instance.py | 5 ++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java
index 024599c..b0cb5e6 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java
@@ -117,7 +117,9 @@ public class InstanceUtils {
}
public static String getDefaultSubscriptionName(String tenant, String namespace, String name) {
- return FunctionCommon.getFullyQualifiedName(tenant, namespace, name);
+ // Hacking this to just return the function name. Using a FQFN breaks the REST endpoints
+ // that deal with subscriptions
+ return 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
index fecde7a..1fd67a7 100644
--- a/pulsar-functions/instance/src/main/python/python_instance.py
+++ b/pulsar-functions/instance/src/main/python/python_instance.py
@@ -136,9 +136,8 @@ class PythonInstance(object):
if self.instance_config.function_details.source.subscriptionType == Function_pb2.SubscriptionType.Value("FAILOVER"):
mode = pulsar._pulsar.ConsumerType.Failover
- subscription_name = str(self.instance_config.function_details.tenant) + "/" + \
- str(self.instance_config.function_details.namespace) + "/" + \
- str(self.instance_config.function_details.name)
+ # Default subscription to function name
+ subscription_name = str(self.instance_config.function_details.name)
properties = util.get_properties(util.getFullyQualifiedFunctionName(
self.instance_config.function_details.tenant,