[GitHub] srkukarni closed pull request #2727: Fix download path in Kubernetes

[GitBox <gi...@apache.org>]

srkukarni closed pull request #2727: Fix download path in Kubernetes
URL: https://github.com/apache/pulsar/pull/2727
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/KubernetesRuntime.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/KubernetesRuntime.java
index a2cd71c44b..43f5a5d386 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/KubernetesRuntime.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/KubernetesRuntime.java
@@ -115,9 +115,9 @@
         this.pulsarDockerImageName = pulsarDockerImageName;
         this.pulsarRootDir = pulsarRootDir;
         this.userCodePkgUrl = userCodePkgUrl;
-        this.originalCodeFileName = originalCodeFileName;
+        this.originalCodeFileName = pulsarRootDir + "/" + originalCodeFileName;
         this.pulsarAdminUrl = pulsarAdminUrl;
-        this.processArgs = RuntimeUtils.composeArgs(instanceConfig, instanceFile, logDirectory, originalCodeFileName, pulsarServiceUrl, stateStorageServiceUrl,
+        this.processArgs = RuntimeUtils.composeArgs(instanceConfig, instanceFile, logDirectory, this.originalCodeFileName, pulsarServiceUrl, stateStorageServiceUrl,
                 authConfig, "$" + ENV_SHARD_ID, GRPC_PORT, -1l, "conf/log4j2.yaml");
         running = false;
         doChecks(instanceConfig.getFunctionDetails());
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/KubernetesRuntimeTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/KubernetesRuntimeTest.java
index 417516ff14..f4aeafc6a1 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/KubernetesRuntimeTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/KubernetesRuntimeTest.java
@@ -54,6 +54,7 @@
 
     private final KubernetesRuntimeFactory factory;
     private final String userJarFile;
+    private final String pulsarRootDir;
     private final String javaInstanceJarFile;
     private final String pythonInstanceFile;
     private final String pulsarServiceUrl;
@@ -62,14 +63,15 @@
     private final String logDirectory;
 
     public KubernetesRuntimeTest() throws Exception {
-        this.userJarFile = "/Users/user/UserJar.jar";
+        this.userJarFile = "UserJar.jar";
+        this.pulsarRootDir = "/pulsar";
         this.javaInstanceJarFile = "/pulsar/instances/java-instance.jar";
         this.pythonInstanceFile = "/pulsar/instances/python-instance/python_instance_main.py";
         this.pulsarServiceUrl = "pulsar://localhost:6670";
         this.pulsarAdminUrl = "http://localhost:8080";
         this.stateStorageServiceUrl = "bk://localhost:4181";
         this.logDirectory = "logs/functions";
-        this.factory = spy(new KubernetesRuntimeFactory(null, null, null, null,
+        this.factory = spy(new KubernetesRuntimeFactory(null, null, null, pulsarRootDir,
             false, null, pulsarServiceUrl, pulsarAdminUrl, stateStorageServiceUrl, null));
         doNothing().when(this.factory).setupClient();
     }
@@ -126,7 +128,7 @@ public void testJavaConstructor() throws Exception {
                 + "-Dpulsar.function.log.dir=" + logDirectory + "/" + FunctionDetailsUtils.getFullyQualifiedName(config.getFunctionDetails())
                 + " -Dpulsar.function.log.file=" + config.getFunctionDetails().getName() + "-$SHARD_ID"
                 + " org.apache.pulsar.functions.runtime.JavaInstanceMain"
-                + " --jar " + userJarFile + " --instance_id "
+                + " --jar " + pulsarRootDir + "/" + userJarFile + " --instance_id "
                 + "$SHARD_ID" + " --function_id " + config.getFunctionId()
                 + " --function_version " + config.getFunctionVersion()
                 + " --function_details '" + JsonFormat.printer().omittingInsignificantWhitespace().print(config.getFunctionDetails())
@@ -145,7 +147,7 @@ public void testPythonConstructor() throws Exception {
         List<String> args = container.getProcessArgs();
         assertEquals(args.size(), 24);
         String expectedArgs = "python " + pythonInstanceFile
-                + " --py " + userJarFile + " --logging_directory "
+                + " --py " + pulsarRootDir + "/" + userJarFile + " --logging_directory "
                 + logDirectory + " --logging_file " + config.getFunctionDetails().getName() + " --instance_id "
                 + "$SHARD_ID" + " --function_id " + config.getFunctionId()
                 + " --function_version " + config.getFunctionVersion()


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services