From d9849e1f0cb8e631411a0fbf2f4bd707ba8960df Mon Sep 17 00:00:00 2001 From: Eric Shen Date: Tue, 30 Nov 2021 02:05:05 +0800 Subject: [PATCH 1/4] fix(functions): missing runtime set in GoInstanceConfig Signed-off-by: Eric Shen --- .../java/org/apache/pulsar/functions/runtime/RuntimeUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java index 1f2ff711e792c..9e4dea8b110f0 100644 --- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java +++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java @@ -172,6 +172,9 @@ public static List getGoInstanceCmd(InstanceConfig instanceConfig, if (instanceConfig.getFunctionDetails().getProcessingGuarantees() != null) { goInstanceConfig.setProcessingGuarantees(instanceConfig.getFunctionDetails().getProcessingGuaranteesValue()); } + if (instanceConfig.getFunctionDetails().getRuntime() != null) { + goInstanceConfig.setRuntime(instanceConfig.getFunctionDetails().getRuntimeValue()); + } if (instanceConfig.getFunctionDetails().getSecretsMap() != null) { goInstanceConfig.setSecretsMap(instanceConfig.getFunctionDetails().getSecretsMap()); } From fd6221a8d4e8d3a9ca2577526d7dc0e16822bf8b Mon Sep 17 00:00:00 2001 From: Eric Shen Date: Tue, 30 Nov 2021 17:41:02 +0800 Subject: [PATCH 2/4] fix ci ut Signed-off-by: Eric Shen --- pulsar-function-go/conf/conf.yaml | 2 +- .../org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java | 2 +- .../functions/runtime/kubernetes/KubernetesRuntimeTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pulsar-function-go/conf/conf.yaml b/pulsar-function-go/conf/conf.yaml index 59ac9bbd51308..af3082f4e8c10 100644 --- a/pulsar-function-go/conf/conf.yaml +++ b/pulsar-function-go/conf/conf.yaml @@ -32,7 +32,7 @@ name: "go-function" logTopic: "log-topic" processingGuarantees: 0 secretsMap: "" -runtime: 0 +runtime: 3 autoAck: true parallelism: 0 userConfig: '{"word-of-the-day": "hapax legomenon"}' diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java index f8bbbc4a883af..01538b5b0e5fc 100644 --- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java +++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java @@ -137,7 +137,7 @@ public void getGoInstanceCmd(boolean k8sRuntime) throws IOException { Assert.assertEquals(goInstanceConfig.get("autoAck"), true); Assert.assertEquals(goInstanceConfig.get("regexPatternSubscription"), false); Assert.assertEquals(goInstanceConfig.get("pulsarServiceURL"), "pulsar://localhost:6650"); - Assert.assertEquals(goInstanceConfig.get("runtime"), 0); + Assert.assertEquals(goInstanceConfig.get("runtime"), 3); Assert.assertEquals(goInstanceConfig.get("cpu"), 2.0); Assert.assertEquals(goInstanceConfig.get("funcID"), "func-7734"); Assert.assertEquals(goInstanceConfig.get("funcVersion"), "1.0.0"); diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java index 7f6c36acc6104..b295cf8a72a80 100644 --- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java +++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java @@ -876,7 +876,7 @@ private void verifyGolangInstance(InstanceConfig config) throws Exception { assertEquals(goInstanceConfig.get("autoAck"), false); assertEquals(goInstanceConfig.get("regexPatternSubscription"), false); assertEquals(goInstanceConfig.get("pulsarServiceURL"), pulsarServiceUrl); - assertEquals(goInstanceConfig.get("runtime"), 0); + assertEquals(goInstanceConfig.get("runtime"), 3); assertEquals(goInstanceConfig.get("cpu"), 1.0); assertEquals(goInstanceConfig.get("funcVersion"), "1.0"); assertEquals(goInstanceConfig.get("disk"), 10000); From b745e6291af9925e5a8339e348a73d37e65b6687 Mon Sep 17 00:00:00 2001 From: Eric Shen Date: Tue, 30 Nov 2021 19:51:54 +0800 Subject: [PATCH 3/4] fix test ci Signed-off-by: Eric Shen --- .../org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java index 01538b5b0e5fc..bc00776c78ebd 100644 --- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java +++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java @@ -99,6 +99,7 @@ public void getGoInstanceCmd(boolean k8sRuntime) throws IOException { .setName("go-func") .setLogTopic("go-func-log") .setProcessingGuarantees(Function.ProcessingGuarantees.ATLEAST_ONCE) + .setRuntime(Function.FunctionDetails.Runtime.GO) .setSecretsMap(secretsMap.toJSONString()) .setParallelism(1) .setSource(sources) From b2661fe22f6063af15738a3449388d38431d68be Mon Sep 17 00:00:00 2001 From: Eric Shen Date: Tue, 30 Nov 2021 19:55:41 +0800 Subject: [PATCH 4/4] rollback some change in function-go Signed-off-by: Eric Shen --- pulsar-function-go/conf/conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-function-go/conf/conf.yaml b/pulsar-function-go/conf/conf.yaml index af3082f4e8c10..59ac9bbd51308 100644 --- a/pulsar-function-go/conf/conf.yaml +++ b/pulsar-function-go/conf/conf.yaml @@ -32,7 +32,7 @@ name: "go-function" logTopic: "log-topic" processingGuarantees: 0 secretsMap: "" -runtime: 3 +runtime: 0 autoAck: true parallelism: 0 userConfig: '{"word-of-the-day": "hapax legomenon"}'