[incubator-pulsar] branch master updated: Key the download directory by the instance id (#1691)

[mmerli]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c99306  Key the download directory by the instance id (#1691)
3c99306 is described below

commit 3c99306f2e3e95e9070ea47911fbd6855d860261
Author: Sanjeev Kulkarni <sanjee...@gmail.com>
AuthorDate: Mon Apr 30 16:07:09 2018 -0700

    Key the download directory by the instance id (#1691)
---
 .../java/org/apache/pulsar/functions/worker/FunctionActioner.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
 
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
index d7bbc96..e6821f6 100644
--- 
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
+++ 
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
@@ -108,7 +108,7 @@ public class FunctionActioner implements AutoCloseable {
                 functionMetaData.getFunctionDetails().getName(), 
instance.getInstanceId());
         File pkgDir = new File(
                 workerConfig.getDownloadDirectory(),
-                getDownloadPackagePath(functionMetaData));
+                getDownloadPackagePath(functionMetaData, 
instance.getInstanceId()));
         pkgDir.mkdirs();
 
         int instanceId = 
functionRuntimeInfo.getFunctionInstance().getInstanceId();
@@ -184,7 +184,7 @@ public class FunctionActioner implements AutoCloseable {
         // clean up function package
         File pkgDir = new File(
                 workerConfig.getDownloadDirectory(),
-                getDownloadPackagePath(functionMetaData));
+                getDownloadPackagePath(functionMetaData, 
instance.getInstanceId()));
 
         if (pkgDir.exists()) {
             try {
@@ -196,12 +196,13 @@ public class FunctionActioner implements AutoCloseable {
         }
     }
 
-    private String getDownloadPackagePath(FunctionMetaData functionMetaData) {
+    private String getDownloadPackagePath(FunctionMetaData functionMetaData, 
int instanceId) {
         return StringUtils.join(
                 new String[]{
                         functionMetaData.getFunctionDetails().getTenant(),
                         functionMetaData.getFunctionDetails().getNamespace(),
                         functionMetaData.getFunctionDetails().getName(),
+                        Integer.toString(instanceId),
                 },
                 File.separatorChar);
     }

-- 
To stop receiving notification emails like this one, please contact
mme...@apache.org.