You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by yo...@apache.org on 2021/12/23 14:03:52 UTC
[pulsar] 07/14: fix(functions): missing runtime set in GoInstanceConfig (#13031)
This is an automated email from the ASF dual-hosted git repository.
yong pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4dd61e61eaf16cc93126f83dce8a7029d4bec682
Author: Eric Shen <er...@outlook.com>
AuthorDate: Tue Nov 30 23:29:30 2021 -0600
fix(functions): missing runtime set in GoInstanceConfig (#13031)
* fix(functions): missing runtime set in GoInstanceConfig
Signed-off-by: Eric Shen <er...@outlook.com>
* fix ci ut
Signed-off-by: Eric Shen <er...@outlook.com>
* fix test ci
Signed-off-by: Eric Shen <er...@outlook.com>
* rollback some change in function-go
Signed-off-by: Eric Shen <er...@outlook.com>
(cherry picked from commit aa992e843581b65c854a0f97353f68ab0170b576)
---
.../main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java | 3 +++
.../java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java | 3 ++-
.../pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
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 107d5cf..4ebb7d9 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
@@ -173,6 +173,9 @@ public class RuntimeUtils {
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());
}
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 f8bbbc4..bc00776 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 class RuntimeUtilsTest {
.setName("go-func")
.setLogTopic("go-func-log")
.setProcessingGuarantees(Function.ProcessingGuarantees.ATLEAST_ONCE)
+ .setRuntime(Function.FunctionDetails.Runtime.GO)
.setSecretsMap(secretsMap.toJSONString())
.setParallelism(1)
.setSource(sources)
@@ -137,7 +138,7 @@ public class RuntimeUtilsTest {
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 8e24222..032936d 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
@@ -870,7 +870,7 @@ public class KubernetesRuntimeTest {
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);