[incubator-pulsar] branch master updated: Have the ability to specify instance id offset in localrun (#1938)

[sanjeevrk]

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

sanjeevrk 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 51a7c02  Have the ability to specify instance id offset in localrun 
(#1938)
51a7c02 is described below

commit 51a7c02d5317d9c40db11e17f469e77e21372996
Author: Sanjeev Kulkarni <sanjee...@gmail.com>
AuthorDate: Fri Jun 8 16:08:53 2018 -0700

    Have the ability to specify instance id offset in localrun (#1938)
    
    * Have the ability to specify instance id offset in localrun
    
    * Fixed compilation issue
    
    * Init instanceOffSet with 0
---
 .../main/java/org/apache/pulsar/admin/cli/CmdFunctions.java    | 10 +++++++---
 .../src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java    |  2 +-
 .../src/main/java/org/apache/pulsar/admin/cli/CmdSources.java  |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index 4b17ff5..1031cba 100644
--- 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++ 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -663,9 +663,13 @@ public class CmdFunctions extends CmdBase {
         @Parameter(names = "--tls_trust_cert_path", description = "tls trust 
cert file path")
         protected String tlsTrustCertFilePath;
 
+        @Parameter(names = "--instanceIdOffset", description = "Start the 
instanceIds from this offset")
+        protected Integer instanceIdOffset = 0;
+
         @Override
         void runCmd() throws Exception {
-            CmdFunctions.startLocalRun(convertProto2(functionConfig), 
functionConfig.getParallelism(), brokerServiceUrl,
+            CmdFunctions.startLocalRun(convertProto2(functionConfig), 
functionConfig.getParallelism(),
+                    instanceIdOffset, brokerServiceUrl,
                     
AuthenticationConfig.builder().clientAuthenticationPlugin(clientAuthPlugin)
                             
.clientAuthenticationParameters(clientAuthParams).useTls(useTls)
                             
.tlsAllowInsecureConnection(tlsAllowInsecureConnection)
@@ -936,7 +940,7 @@ public class CmdFunctions extends CmdBase {
     }
 
     protected static void 
startLocalRun(org.apache.pulsar.functions.proto.Function.FunctionDetails 
functionDetails,
-            int parallelism, String brokerServiceUrl, AuthenticationConfig 
authConfig,
+            int parallelism, int instanceIdOffset, String brokerServiceUrl, 
AuthenticationConfig authConfig,
             String userCodeFile, PulsarAdmin admin)
             throws Exception {
 
@@ -956,7 +960,7 @@ public class CmdFunctions extends CmdBase {
                 // TODO: correctly implement function version and id
                 
instanceConfig.setFunctionVersion(UUID.randomUUID().toString());
                 instanceConfig.setFunctionId(UUID.randomUUID().toString());
-                instanceConfig.setInstanceId(Integer.toString(i));
+                instanceConfig.setInstanceId(Integer.toString(i + 
instanceIdOffset));
                 instanceConfig.setMaxBufferedTuples(1024);
                 instanceConfig.setPort(Utils.findAvailablePort());
                 RuntimeSpawner runtimeSpawner = new RuntimeSpawner(
diff --git 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
index 59b9201..fa8ace4 100644
--- 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
+++ 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
@@ -122,7 +122,7 @@ public class CmdSinks extends CmdBase {
         @Override
         void runCmd() throws Exception {
             CmdFunctions.startLocalRun(createSinkConfigProto2(sinkConfig), 
sinkConfig.getParallelism(),
-                    brokerServiceUrl,
+                    0, brokerServiceUrl,
                     
AuthenticationConfig.builder().clientAuthenticationPlugin(clientAuthPlugin)
                             
.clientAuthenticationParameters(clientAuthParams).useTls(useTls)
                             
.tlsAllowInsecureConnection(tlsAllowInsecureConnection)
diff --git 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
index a3bec4a..c724b72 100644
--- 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
+++ 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
@@ -118,7 +118,7 @@ public class CmdSources extends CmdBase {
         @Override
         void runCmd() throws Exception {
             CmdFunctions.startLocalRun(createSourceConfigProto2(sourceConfig), 
sourceConfig.getParallelism(),
-                    brokerServiceUrl,
+                    0, brokerServiceUrl,
                     
AuthenticationConfig.builder().clientAuthenticationPlugin(clientAuthPlugin)
                             
.clientAuthenticationParameters(clientAuthParams).useTls(useTls)
                             
.tlsAllowInsecureConnection(tlsAllowInsecureConnection)

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