From commits-return-10339-archive-asf-public=cust-asf.ponee.io@pulsar.incubator.apache.org Tue Jul 3 09:24:13 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 950BC180632 for ; Tue, 3 Jul 2018 09:24:12 +0200 (CEST) Received: (qmail 77885 invoked by uid 500); 3 Jul 2018 07:24:11 -0000 Mailing-List: contact commits-help@pulsar.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pulsar.incubator.apache.org Delivered-To: mailing list commits@pulsar.incubator.apache.org Received: (qmail 77874 invoked by uid 99); 3 Jul 2018 07:24:11 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jul 2018 07:24:11 +0000 From: GitBox To: commits@pulsar.apache.org Subject: [GitHub] sijie closed pull request #2072: Integration test coverage on python functions Message-ID: <153060265102.4491.12968816828487233895.gitbox@gitbox.apache.org> Date: Tue, 03 Jul 2018 07:24:11 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit sijie closed pull request #2072: Integration test coverage on python functions URL: https://github.com/apache/incubator-pulsar/pull/2072 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/distribution/server/src/assemble/bin.xml b/distribution/server/src/assemble/bin.xml index ff7c1a3a00..61178bfe4f 100644 --- a/distribution/server/src/assemble/bin.xml +++ b/distribution/server/src/assemble/bin.xml @@ -47,6 +47,10 @@ ${basedir}/../../pulsar-functions/runtime/target/python-instance instances/python-instance + + ${basedir}/../../pulsar-functions/python-examples + examples/python-examples + diff --git a/pom.xml b/pom.xml index 1c7f899742..862a29d020 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,7 @@ flexible messaging model and an intuitive client API. 0.5.0 + 1.6.0 diff --git a/pulsar-client-cpp/docker/build-wheels.sh b/pulsar-client-cpp/docker/build-wheels.sh index 2146869449..ebbb441cac 100755 --- a/pulsar-client-cpp/docker/build-wheels.sh +++ b/pulsar-client-cpp/docker/build-wheels.sh @@ -35,6 +35,34 @@ PYTHON_VERSIONS=( '3.6 cp36-cp36m' ) +function contains() { + local n=$# + local value=${!n} + for ((i=1;i < $#;i++)) { + if [ "${!i}" == "${value}" ]; then + echo "y" + return 0 + fi + } + echo "n" + return 1 +} + + +if [ $# -ge 1 ]; then + build_version=$@ + if [ $(contains "${PYTHON_VERSIONS[@]}" "${build_version}") == "y" ]; then + PYTHON_VERSIONS=( + "${build_version}" + ) + else + echo "Unknown build version : ${build_version}" + echo "Supported python build versions are :" + echo ${PYTHON_VERSIONS[@]} + exit 1 + fi +fi + for line in "${PYTHON_VERSIONS[@]}"; do read -r -a PY <<< "$line" PYTHON_VERSION=${PY[0]} diff --git a/tests/docker-images/latest-version-image/Dockerfile b/tests/docker-images/latest-version-image/Dockerfile index e638ba0851..bcc2b539d9 100644 --- a/tests/docker-images/latest-version-image/Dockerfile +++ b/tests/docker-images/latest-version-image/Dockerfile @@ -19,7 +19,7 @@ FROM apachepulsar/pulsar:latest -RUN apt-get update && apt-get install -y supervisor +RUN apt-get update && apt-get install -y supervisor python-pip RUN mkdir -p /var/log/pulsar && mkdir -p /var/run/supervisor/ && mkdir -p /pulsar/ssl @@ -31,5 +31,9 @@ COPY ssl/ca.cert.pem ssl/broker.key-pk8.pem ssl/broker.cert.pem \ ssl/admin.key-pk8.pem ssl/admin.cert.pem /pulsar/ssl/ COPY scripts/init-cluster.sh scripts/run-global-zk.sh scripts/run-local-zk.sh \ - scripts/run-bookie.sh scripts/run-broker.sh scripts/run-functions-worker.sh scripts/run-proxy.sh /pulsar/bin/ + scripts/run-bookie.sh scripts/run-broker.sh scripts/run-functions-worker.sh scripts/run-proxy.sh \ + scripts/install-pulsar-client.sh /pulsar/bin/ + +ADD target/python-client/ /pulsar/pulsar-client +RUN /pulsar/bin/install-pulsar-client.sh diff --git a/tests/docker-images/latest-version-image/pom.xml b/tests/docker-images/latest-version-image/pom.xml index 232312f13d..5094f89e41 100644 --- a/tests/docker-images/latest-version-image/pom.xml +++ b/tests/docker-images/latest-version-image/pom.xml @@ -48,7 +48,51 @@ + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + build-pulsar-clients + compile + + exec + + + ${skipBuildPythonClient} + ${project.basedir}/target + ${project.basedir}/../../../pulsar-client-cpp/docker/build-wheels.sh + + + 2.7 cp27-cp27mu + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + compile + + run + + + ${skipBuildPythonClient} + + copy python wheel file + + + + + + + com.spotify dockerfile-maven-plugin @@ -56,12 +100,14 @@ default + package build add-latest-tag + package tag diff --git a/tests/docker-images/latest-version-image/scripts/install-pulsar-client.sh b/tests/docker-images/latest-version-image/scripts/install-pulsar-client.sh new file mode 100755 index 0000000000..2e048c1c20 --- /dev/null +++ b/tests/docker-images/latest-version-image/scripts/install-pulsar-client.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +set -x + +WHEEL_FILE=`ls /pulsar/pulsar-client` +pip install /pulsar/pulsar-client/${WHEEL_FILE} diff --git a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java index dc2e290e5a..b8ffc7cf09 100644 --- a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java +++ b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java @@ -31,9 +31,24 @@ @Slf4j public abstract class PulsarFunctionsTestBase extends PulsarClusterTestBase { - public static final String EXCLAMATION_FUNC_CLASS = + public static final String EXCLAMATION_JAVA_CLASS = "org.apache.pulsar.functions.api.examples.ExclamationFunction"; + public static final String EXCLAMATION_PYTHON_CLASS = + "exclamation.Exclamation"; + + public static final String EXCLAMATION_PYTHON_FILE = "exclamation.py"; + + protected static String getExclamationClass(Runtime runtime) { + if (Runtime.JAVA == runtime) { + return EXCLAMATION_JAVA_CLASS; + } else if (Runtime.PYTHON == runtime) { + return EXCLAMATION_PYTHON_CLASS; + } else { + throw new IllegalArgumentException("Unsupported runtime : " + runtime); + } + } + @BeforeClass public static void setupCluster() throws Exception { PulsarClusterTestBase.setupCluster(); @@ -47,7 +62,8 @@ public static void setupCluster() throws Exception { @DataProvider(name = "FunctionRuntimes") public static Object[][] functionRuntimes() { return new Object[][] { - new Object[] { Runtime.JAVA } + new Object[] { Runtime.JAVA }, + new Object[] { Runtime.PYTHON } }; } diff --git a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsProcessRuntimeTest.java b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsProcessRuntimeTest.java index 7c4033f07c..83edac8523 100644 --- a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsProcessRuntimeTest.java +++ b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsProcessRuntimeTest.java @@ -22,4 +22,7 @@ * Run runtime tests in process mode. */ public class PulsarFunctionsProcessRuntimeTest extends PulsarFunctionsRuntimeTest { + public PulsarFunctionsProcessRuntimeTest() { + super(ContainerFactory.PROCESS); + } } diff --git a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsRuntimeTest.java b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsRuntimeTest.java index e816f70c80..41be67f114 100644 --- a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsRuntimeTest.java +++ b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsRuntimeTest.java @@ -40,12 +40,28 @@ */ public abstract class PulsarFunctionsRuntimeTest extends PulsarFunctionsTestBase { + protected enum ContainerFactory { + PROCESS, + THREAD + } + + private final ContainerFactory containerFactory; + + public PulsarFunctionsRuntimeTest(ContainerFactory containerFactory) { + this.containerFactory = containerFactory; + } + // // Test CRUD functions on different runtimes. // @Test(dataProvider = "FunctionRuntimes") public void testExclamationFunction(Runtime runtime) throws Exception { + if (ContainerFactory.THREAD == containerFactory && Runtime.PYTHON == runtime) { + // python can only run on process mode + return; + } + String inputTopicName = "test-exclamation-" + runtime + "-input-" + randomName(8); String outputTopicName = "test-exclamation-" + runtime + "-output-" + randomName(8); String functionName = "test-exclamation-fn-" + randomName(8); @@ -53,7 +69,7 @@ public void testExclamationFunction(Runtime runtime) throws Exception { // submit the exclamation function submitExclamationFunction( - inputTopicName, outputTopicName, functionName); + runtime, inputTopicName, outputTopicName, functionName); // get function info getFunctionInfoSuccess(functionName); @@ -71,13 +87,23 @@ public void testExclamationFunction(Runtime runtime) throws Exception { getFunctionInfoNotFound(functionName); } - private static void submitExclamationFunction(String inputTopicName, + private static void submitExclamationFunction(Runtime runtime, + String inputTopicName, String outputTopicName, String functionName) throws Exception { - CommandGenerator generator = CommandGenerator.createDefaultGenerator(inputTopicName, EXCLAMATION_FUNC_CLASS); + CommandGenerator generator; + generator = CommandGenerator.createDefaultGenerator(inputTopicName, getExclamationClass(runtime)); generator.setSinkTopic(outputTopicName); generator.setFunctionName(functionName); - String command = generator.generateCreateFunctionCommand(); + String command; + if (Runtime.JAVA == runtime) { + command = generator.generateCreateFunctionCommand(); + } else if (Runtime.PYTHON == runtime) { + generator.setRuntime(runtime); + command = generator.generateCreateFunctionCommand(EXCLAMATION_PYTHON_FILE); + } else { + throw new IllegalArgumentException("Unsupported runtime : " + runtime); + } String[] commands = { "sh", "-c", command }; diff --git a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsThreadRuntimeTest.java b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsThreadRuntimeTest.java index 61ddba3704..7ca9931b0c 100644 --- a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsThreadRuntimeTest.java +++ b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/runtime/PulsarFunctionsThreadRuntimeTest.java @@ -29,6 +29,10 @@ @Slf4j public class PulsarFunctionsThreadRuntimeTest extends PulsarFunctionsRuntimeTest { + public PulsarFunctionsThreadRuntimeTest() { + super(ContainerFactory.THREAD); + } + @BeforeClass public static void setupCluster() throws Exception { PulsarClusterTestBase.setupCluster(); diff --git a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java index 12225fec10..71466160fe 100644 --- a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java +++ b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java @@ -54,7 +54,7 @@ private Map userConfig = new HashMap<>(); private static final String JAVAJAR = "/pulsar/examples/api-examples.jar"; - private static final String PYTHONBASE = "/pulsar/examples/python"; + private static final String PYTHONBASE = "/pulsar/examples/python-examples/"; public static CommandGenerator createDefaultGenerator(String sourceTopic, String functionClassName) { CommandGenerator generator = new CommandGenerator(); ---------------------------------------------------------------- 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