This commit is contained in:
Jeff Zhang 2021-04-14 12:04:44 +08:00
parent 32c6f76c02
commit 6a0d9fd1c6
11 changed files with 76 additions and 3 deletions

View file

@ -0,0 +1,31 @@
#
# 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.
#
name: Tune Runner VM performance
description: tunes the GitHub Runner VM operation system
runs:
using: composite
steps:
- run: |
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
# Ensure that reverse lookups for current hostname are handled properly
# Add the current IP address, long hostname and short hostname record to /etc/hosts file
echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
fi
shell: bash

View file

@ -17,6 +17,9 @@ env:
-Dmaven.wagon.http.retryHandler.count=3
ZEPPELIN_HELIUM_REGISTRY: helium
SPARK_PRINT_LAUNCH_COMMAND: "true"
SPARK_LOCAL_IP: 127.0.0.1
ZEPPELIN_LOCAL_IP: 127.0.0.1
# Use the bash login, because we are using miniconda
defaults:
run:
@ -32,6 +35,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -71,6 +76,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -101,6 +108,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -139,6 +148,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -170,6 +181,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -207,6 +220,8 @@ jobs:
run: sudo systemctl start mysql.service
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -242,6 +257,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -276,6 +293,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -310,6 +329,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -342,6 +363,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:

View file

@ -17,6 +17,8 @@ env:
-Dmaven.wagon.http.retryHandler.count=3
ZEPPELIN_HELIUM_REGISTRY: helium
SPARK_PRINT_LAUNCH_COMMAND: "true"
SPARK_LOCAL_IP: 127.0.0.1
ZEPPELIN_LOCAL_IP: 127.0.0.1
INTERPRETERS: '!beam,!hbase,!pig,!jdbc,!file,!flink,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!livy,!groovy,!sap,!java,!geode,!neo4j,!hazelcastjet,!submarine,!sparql,!mongodb'
jobs:
@ -25,6 +27,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -47,6 +51,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
@ -71,6 +77,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- name: Set up JDK 8
uses: actions/setup-java@v1
with:

View file

@ -98,6 +98,8 @@ public abstract class SqlInterpreterTest {
p.setProperty("zeppelin.flink.hive.version", "2.3.4");
p.setProperty("zeppelin.pyflink.useIPython", "false");
p.setProperty("local.number-taskmanager", "4");
p.setProperty("zeppelin.python.gatewayserver_address", "127.0.0.1");
File hiveConfDir = Files.createTempDir();
hiveShell.getHiveConf().writeXml(new FileWriter(new File(hiveConfDir, "hive-site.xml")));
p.setProperty("HIVE_CONF_DIR", hiveConfDir.getAbsolutePath());

View file

@ -52,6 +52,7 @@ public class PythonInterpreterMatplotlibTest implements InterpreterOutputListene
p.setProperty("zeppelin.python", "python");
p.setProperty("zeppelin.python.maxResult", "100");
p.setProperty("zeppelin.python.useIPython", "false");
p.setProperty("zeppelin.python.gatewayserver_address", "127.0.0.1");
intpGroup = new InterpreterGroup();

View file

@ -66,6 +66,7 @@ public class PythonInterpreterPandasSqlTest implements InterpreterOutputListener
p.setProperty("zeppelin.python", "python");
p.setProperty("zeppelin.python.maxResult", "100");
p.setProperty("zeppelin.python.useIPython", "false");
p.setProperty("zeppelin.python.gatewayserver_address", "127.0.0.1");
intpGroup = new InterpreterGroup();

View file

@ -101,7 +101,7 @@ public class ShinyInterpreterTest {
Thread.sleep(5 * 1000);
// extract shiny url
List<InterpreterResultMessage> resultMessages = context2.out.toInterpreterResultMessage();
assertEquals(1, resultMessages.size());
assertEquals(resultMessages.toString(), 1, resultMessages.size());
assertEquals(InterpreterResult.Type.HTML, resultMessages.get(0).getType());
String resultMessageData = resultMessages.get(0).getData();
assertTrue(resultMessageData, resultMessageData.contains("<iframe"));
@ -205,7 +205,7 @@ public class ShinyInterpreterTest {
// wait for the shiny app start
Thread.sleep(5 * 1000);
List<InterpreterResultMessage> resultMessages = context2.out.toInterpreterResultMessage();
assertEquals(1, resultMessages.size());
assertEquals(resultMessages.toString(), 1, resultMessages.size());
assertEquals(InterpreterResult.Type.HTML, resultMessages.get(0).getType());
String resultMessageData = resultMessages.get(0).getData();
assertTrue(resultMessageData, resultMessageData.contains("<iframe"));

View file

@ -102,7 +102,7 @@ public class SparkShinyInterpreterTest extends ShinyInterpreterTest {
Thread.sleep(5 * 1000);
// extract shiny url
List<InterpreterResultMessage> resultMessages = context2.out.toInterpreterResultMessage();
assertEquals(1, resultMessages.size());
assertEquals(resultMessages + "", 1, resultMessages.size());
assertEquals(InterpreterResult.Type.HTML, resultMessages.get(0).getType());
String resultMessageData = resultMessages.get(0).getData();
assertTrue(resultMessageData, resultMessageData.contains("<iframe"));

View file

@ -90,6 +90,9 @@ public class JdbcIntegrationTest {
assertEquals("c1\tc2\n1\t2\n", interpreterResult.message().get(0).getData());
// read table_1 from python interpreter
InterpreterSetting pythonInterpreterSetting = interpreterSettingManager.getInterpreterSettingByName("python");
pythonInterpreterSetting.setProperty("zeppelin.python.gatewayserver_address", "127.0.0.1");
Interpreter pythonInterpreter = interpreterFactory.getInterpreter("python", new ExecutionContext("user1", "note1", "test"));
assertNotNull("PythonInterpreter is null", pythonInterpreter);

View file

@ -98,6 +98,8 @@ public abstract class SparkIntegrationTest {
InterpreterSetting sparkInterpreterSetting = interpreterSettingManager.getInterpreterSettingByName("spark");
sparkInterpreterSetting.setProperty("spark.jars.packages", "com.maxmind.geoip2:geoip2:2.5.0");
sparkInterpreterSetting.setProperty("SPARK_PRINT_LAUNCH_COMMAND", "true");
sparkInterpreterSetting.setProperty("zeppelin.python.gatewayserver_address", "127.0.0.1");
MavenXpp3Reader reader = new MavenXpp3Reader();
Model model = reader.read(new FileReader("pom.xml"));
sparkInterpreterSetting.setProperty("spark.jars", new File("target/zeppelin-interpreter-integration-" + model.getVersion() + ".jar").getAbsolutePath());

View file

@ -392,6 +392,7 @@ public class ZSessionIntegrationTest extends AbstractTestRestApi {
@Test
public void testZSession_Python() throws Exception {
Map<String, String> intpProperties = new HashMap<>();
intpProperties.put("zeppelin.python.gatewayserver_address", "127.0.0.1");
ZSession session = ZSession.builder()
.setClientConfig(clientConfig)
@ -434,6 +435,7 @@ public class ZSessionIntegrationTest extends AbstractTestRestApi {
@Test
public void testZSessionCleanup() throws Exception {
Map<String, String> intpProperties = new HashMap<>();
intpProperties.put("zeppelin.python.gatewayserver_address", "127.0.0.1");
ZSession session = ZSession.builder()
.setClientConfig(clientConfig)