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 2022/08/16 10:28:28 UTC
[pulsar] branch master updated: [cleanup][functions] Remove unused code (#16472)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new fe2eb6ac463 [cleanup][functions] Remove unused code (#16472)
fe2eb6ac463 is described below
commit fe2eb6ac46390ced5fe76e25f1547926a71a8e41
Author: Christophe Bornet <cb...@hotmail.com>
AuthorDate: Tue Aug 16 12:28:19 2022 +0200
[cleanup][functions] Remove unused code (#16472)
packageUrl is not set anymore in FunctionDetails so code that depend on it can be removed.
In the case of KubernetesRuntime we currently download the function itself and not the package.
This change doesn't modify this behaviour.
---
.../runtime/kubernetes/KubernetesRuntime.java | 41 +---------------------
.../runtime/kubernetes/KubernetesRuntimeTest.java | 37 -------------------
2 files changed, 1 insertion(+), 77 deletions(-)
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
index 02af86c7334..50dc975075f 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
@@ -88,7 +88,6 @@ import org.apache.pulsar.functions.runtime.RuntimeUtils;
import org.apache.pulsar.functions.secretsproviderconfigurator.SecretsProviderConfigurator;
import org.apache.pulsar.functions.utils.Actions;
import org.apache.pulsar.functions.utils.FunctionCommon;
-import org.apache.pulsar.packages.management.core.common.PackageType;
/**
* Kubernetes based runtime for running functions.
@@ -855,13 +854,8 @@ public class KubernetesRuntime implements Runtime {
}
private List<String> getDownloadCommand(Function.FunctionDetails functionDetails, String userCodeFilePath) {
- if (Arrays.stream(PackageType.values()).anyMatch(type ->
- functionDetails.getPackageUrl().startsWith(type.toString()))) {
- return getPackageDownloadCommand(functionDetails.getPackageUrl(), userCodeFilePath);
- } else {
- return getDownloadCommand(functionDetails.getTenant(), functionDetails.getNamespace(),
+ return getDownloadCommand(functionDetails.getTenant(), functionDetails.getNamespace(),
functionDetails.getName(), userCodeFilePath);
- }
}
private List<String> getDownloadCommand(String tenant, String namespace, String name, String userCodeFilePath) {
@@ -908,39 +902,6 @@ public class KubernetesRuntime implements Runtime {
userCodeFilePath);
}
- private List<String> getPackageDownloadCommand(String packageName, String userCodeFilePath) {
- // add auth plugin and parameters if necessary
- if (authenticationEnabled && authConfig != null) {
- if (isNotBlank(authConfig.getClientAuthenticationPlugin())
- && isNotBlank(authConfig.getClientAuthenticationParameters())
- && instanceConfig.getFunctionAuthenticationSpec() != null) {
- return Arrays.asList(
- pulsarRootDir + configAdminCLI,
- "--auth-plugin",
- authConfig.getClientAuthenticationPlugin(),
- "--auth-params",
- authConfig.getClientAuthenticationParameters(),
- "--admin-url",
- pulsarAdminUrl,
- "packages",
- "download",
- packageName,
- "--path",
- userCodeFilePath);
- }
- }
-
- return Arrays.asList(
- pulsarRootDir + configAdminCLI,
- "--admin-url",
- pulsarAdminUrl,
- "packages",
- "download",
- packageName,
- "--path",
- userCodeFilePath);
- }
-
private static String setShardIdEnvironmentVariableCommand() {
return String.format("%s=${POD_NAME##*-} && echo shardId=${%s}", ENV_SHARD_ID, ENV_SHARD_ID);
}
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 18fbe2e5160..df5c369303c 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
@@ -806,24 +806,6 @@ public class KubernetesRuntimeTest {
assertEquals(spec.getSpec().getTemplate().getSpec().getServiceAccountName(), "my-service-account");
}
- @Test
- public void testCustomKubernetesDownloadCommands() throws Exception {
- InstanceConfig config = createJavaInstanceConfig(FunctionDetails.Runtime.JAVA, false);
- config.setFunctionDetails(createFunctionDetails(FunctionDetails.Runtime.JAVA, false, (fb) -> {
- return fb.setPackageUrl("function://public/default/test@v1");
- }));
-
- factory = createKubernetesRuntimeFactory(null, 10, 1.0, 1.0);
-
- verifyJavaInstance(config, pulsarRootDir + "/instances/deps", false);
- KubernetesRuntime container = factory.createContainer(config, userJarFile, userJarFile, 30l);
- V1StatefulSet spec = container.createStatefulSet();
- String expectedDownloadCommand = "pulsar-admin --admin-url http://localhost:8080 packages download "
- + "function://public/default/test@v1 --path " + pulsarRootDir + "/" + userJarFile;
- String containerCommand = spec.getSpec().getTemplate().getSpec().getContainers().get(0).getCommand().get(2);
- assertTrue(containerCommand.contains(expectedDownloadCommand));
- }
-
InstanceConfig createGolangInstanceConfig() {
InstanceConfig config = new InstanceConfig();
@@ -1133,25 +1115,6 @@ public class KubernetesRuntimeTest {
verifyJavaInstance(config, pulsarRootDir + "/instances/deps", false, factory.getDownloadDirectory());
}
- @Test
- public void testCustomKubernetesDownloadCommandsWithDownloadDirectoryDefined() throws Exception {
- String downloadDirectory = "download/pulsar_functions";
- InstanceConfig config = createJavaInstanceConfig(FunctionDetails.Runtime.JAVA, false);
- config.setFunctionDetails(createFunctionDetails(FunctionDetails.Runtime.JAVA, false, (fb) -> {
- return fb.setPackageUrl("function://public/default/test@v1");
- }));
-
- factory = createKubernetesRuntimeFactory(null, 10, 1.0, 1.0, Optional.empty(), downloadDirectory);
-
- verifyJavaInstance(config, pulsarRootDir + "/instances/deps", false, factory.getDownloadDirectory());
- KubernetesRuntime container = factory.createContainer(config, userJarFile, userJarFile, 30l);
- V1StatefulSet spec = container.createStatefulSet();
- String expectedDownloadCommand = "pulsar-admin --admin-url http://localhost:8080 packages download "
- + "function://public/default/test@v1 --path " + factory.getDownloadDirectory() + "/" + userJarFile;
- String containerCommand = spec.getSpec().getTemplate().getSpec().getContainers().get(0).getCommand().get(2);
- assertTrue(containerCommand.contains(expectedDownloadCommand));
- }
-
@Test
public void shouldUseConfiguredMetricsPort() throws Exception {
assertMetricsPortConfigured(Collections.singletonMap("metricsPort", 12345), 12345);