You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ya...@apache.org on 2021/03/23 17:05:16 UTC
[phoenix] branch 4.x updated: PHOENIX-6417 Fix PHERF ITs that are
failing in the local builds
This is an automated email from the ASF dual-hosted git repository.
yanxinyi pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 1cde9ee PHOENIX-6417 Fix PHERF ITs that are failing in the local builds
1cde9ee is described below
commit 1cde9ee6eca0fb39848a2e75f4e7d4de93f9277a
Author: jpisaac <ja...@gmail.com>
AuthorDate: Tue Mar 23 10:04:32 2021 -0700
PHOENIX-6417 Fix PHERF ITs that are failing in the local builds
---
phoenix-pherf/pom.xml | 9 +++++
.../java/org/apache/phoenix/pherf/PherfMainIT.java | 3 +-
phoenix-pherf/src/it/resources/pherf.properties | 42 ++++++++++++++++++++++
.../src/test/resources/scenario/test_scenario.xml | 6 ++--
4 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index f7f45da..32f3e67 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -64,6 +64,11 @@
<version>3.3.2</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.3</version>
@@ -143,6 +148,9 @@
<directory>src/test/resources</directory>
</testResource>
<testResource>
+ <directory>src/it/resources</directory>
+ </testResource>
+ <testResource>
<directory>${project.basedir}/config</directory>
</testResource>
</testResources>
@@ -221,6 +229,7 @@
<include>joda-time:joda-time</include>
<include>org.apache.commons:commons-csv</include>
<include>commons-lang:commons-lang</include>
+ <include>commons-io:commons-io</include>
</includes>
</artifactSet>
<filters>
diff --git a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
index c1a7b66..57aaae1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
@@ -54,8 +54,7 @@ public class PherfMainIT extends ResultBaseTestIT {
public void testPherfMain() throws Exception {
String[] args = { "-q", "-l",
"--schemaFile", ".*create_prod_test_unsalted.sql",
- "--scenarioFile", ".*prod_test_unsalted_scenario.xml",
- "-m", "--monitorFrequency", "10" };
+ "--scenarioFile", ".*prod_test_unsalted_scenario.xml"};
Pherf pherf = new Pherf(args);
pherf.run();
diff --git a/phoenix-pherf/src/it/resources/pherf.properties b/phoenix-pherf/src/it/resources/pherf.properties
new file mode 100644
index 0000000..b5a5e62
--- /dev/null
+++ b/phoenix-pherf/src/it/resources/pherf.properties
@@ -0,0 +1,42 @@
+# 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.
+
+# General purpose thread pool size for Pherf. It's used for things like monitor threads.This should remain small
+# to limit the amount of background tasks sucking up resources away from tests.
+pherf.default.threadpool=10
+
+# Interval in Ms that the JMX monitors will take a snapshot and dump to log
+pherf.default.monitorFrequency=30000
+
+# Default value to display log line after every 'N' row load
+pherf.default.log_per_nrows=1000000
+
+# Default number of writers to use when loading data
+# 0 - Set the number of writers to use all available cores
+# 1-N - ANy integer value for the number of threads to use
+pherf.default.dataloader.threadpool=0
+
+# When upserting, this is the max # of rows that will be inserted in a single commit
+pherf.default.dataloader.batchsize=1000
+
+# Directory where results from a scenario run will be written
+pherf.default.results.dir=/tmp/RESULTS
+
+# Google chart summary html file
+pherf.default.summary.file=/tmp/RESULTS/summary.html
+
+# Threshold for comparator to fail. ex. 0.5 equates to 50%
+pherf.default.comparison.threshold=0.45
diff --git a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
index 076f236..8b4762e 100644
--- a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
+++ b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
@@ -306,12 +306,12 @@
<scenario tableName="PHERF.TEST_TABLE" rowCount="99" name="testPreAndPostDdls">
<preScenarioDdls>
- <ddl statement="CREATE INDEX IDX_DIVISION ON ? (DIVISION)" tableName="PHERF.PHERF_PROD_TEST_UNSALTED"/>
+ <ddl statement="CREATE INDEX IDX_DIVISION ON ? (DIVISION)" tableName="PHERF.TEST_TABLE"/>
</preScenarioDdls>
<postScenarioDdls>
- <ddl statement="CREATE INDEX IDX_OLDVAL_STRING ON ? (OLDVAL_STRING)" tableName="PHERF.PHERF_PROD_TEST_UNSALTED"/>
- <ddl statement="CREATE INDEX IDX_CONNECTION_ID ON ? (CONNECTION_ID)" tableName="PHERF.PHERF_PROD_TEST_UNSALTED"/>
+ <ddl statement="CREATE INDEX IDX_OLDVAL_STRING ON ? (OLDVAL_STRING)" tableName="PHERF.TEST_TABLE"/>
+ <ddl statement="CREATE INDEX IDX_CONNECTION_ID ON ? (CONNECTION_ID)" tableName="PHERF.TEST_TABLE"/>
</postScenarioDdls>
<querySet concurrency="1" executionType="SERIAL" executionDurationInMs="5000"