This is an automated email from the ASF dual-hosted git repository. vinoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push: new 9c24151 [HUDI-1175] Commenting out testsuite tests from Integration tests until we investigate the CI flakiness (#1945) 9c24151 is described below commit 9c24151929659f80f88607f068662fdc5855fc91 Author: Sivabalan Narayanan <sivab...@uber.com> AuthorDate: Tue Aug 11 00:00:57 2020 -0400 [HUDI-1175] Commenting out testsuite tests from Integration tests until we investigate the CI flakiness (#1945) --- .../{compaction.commands => compaction-bootstrap.commands} | 4 ---- docker/demo/compaction.commands | 4 ---- .../src/test/java/org/apache/hudi/integ/ITTestBase.java | 12 +++++------- .../test/java/org/apache/hudi/integ/ITTestHoodieDemo.java | 2 ++ pom.xml | 1 - 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/docker/demo/compaction.commands b/docker/demo/compaction-bootstrap.commands similarity index 80% copy from docker/demo/compaction.commands copy to docker/demo/compaction-bootstrap.commands index 6abdad7..6c246be 100644 --- a/docker/demo/compaction.commands +++ b/docker/demo/compaction-bootstrap.commands @@ -15,10 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -connect --path /user/hive/warehouse/stock_ticks_mor -compactions show all -compaction schedule --hoodieConfigs hoodie.compact.inline.max.delta.commits=1 -compaction run --parallelism 2 --sparkMemory 1G --schemaFilePath /var/demo/config/schema.avsc --retry 1 connect --path /user/hive/warehouse/stock_ticks_mor_bs compactions show all compaction schedule --hoodieConfigs hoodie.compact.inline.max.delta.commits=1 diff --git a/docker/demo/compaction.commands b/docker/demo/compaction.commands index 6abdad7..a8baaff 100644 --- a/docker/demo/compaction.commands +++ b/docker/demo/compaction.commands @@ -19,7 +19,3 @@ connect --path /user/hive/warehouse/stock_ticks_mor compactions show all compaction schedule --hoodieConfigs hoodie.compact.inline.max.delta.commits=1 compaction run --parallelism 2 --sparkMemory 1G --schemaFilePath /var/demo/config/schema.avsc --retry 1 -connect --path /user/hive/warehouse/stock_ticks_mor_bs -compactions show all -compaction schedule --hoodieConfigs hoodie.compact.inline.max.delta.commits=1 -compaction run --parallelism 2 --sparkMemory 1G --schemaFilePath /var/demo/config/schema.avsc --retry 1 diff --git a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java index 0423103..d0b32ee 100644 --- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java +++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java @@ -115,11 +115,9 @@ public abstract class ITTestBase { } static String getPrestoConsoleCommand(String commandFile) { - StringBuilder builder = new StringBuilder().append("presto --server " + PRESTO_COORDINATOR_URL) + return new StringBuilder().append("presto --server " + PRESTO_COORDINATOR_URL) .append(" --catalog hive --schema default") - .append(" -f " + commandFile); - System.out.println("Presto comamnd " + builder.toString()); - return builder.toString(); + .append(" -f " + commandFile).toString(); } @BeforeEach @@ -166,14 +164,14 @@ public abstract class ITTestBase { boolean completed = dockerClient.execStartCmd(createCmdResponse.getId()).withDetach(false).withTty(false).exec(callback) - .awaitCompletion(900, SECONDS); + .awaitCompletion(540, SECONDS); if (!completed) { callback.getStderr().flush(); callback.getStdout().flush(); LOG.error("\n\n ###### Timed Out Command : " + Arrays.asList(command)); LOG.error("\n\n ###### Stderr of timed-out command #######\n" + callback.getStderr().toString()); - LOG.error("\n\n ###### stdout of timed-out command #######\n" + callback.getStderr().toString()); - throw new TimeoutException("Command " + command + " has been running for more than 15 minutes. " + LOG.error("\n\n ###### stdout of timed-out command #######\n" + callback.getStdout().toString()); + throw new TimeoutException("Command " + command + " has been running for more than 9 minutes. " + "Killing and failing !!"); } int exitCode = dockerClient.inspectExecCmd(createCmdResponse.getId()).exec().getExitCode(); diff --git a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java index d2a0841..eb608df 100644 --- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java +++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java @@ -65,6 +65,7 @@ public class ITTestHoodieDemo extends ITTestBase { private static final String MIN_COMMIT_TIME_MOR_SCRIPT = HOODIE_WS_ROOT + "/docker/demo/get_min_commit_time_mor.sh"; private static final String HUDI_CLI_TOOL = HOODIE_WS_ROOT + "/hudi-cli/hudi-cli.sh"; private static final String COMPACTION_COMMANDS = HOODIE_WS_ROOT + "/docker/demo/compaction.commands"; + private static final String COMPACTION_BOOTSTRAP_COMMANDS = HOODIE_WS_ROOT + "/docker/demo/compaction-bootstrap.commands"; private static final String SPARKSQL_BS_PREP_COMMANDS = HOODIE_WS_ROOT + "/docker/demo/sparksql-bootstrap-prep-source.commands"; private static final String SPARKSQL_BATCH1_COMMANDS = HOODIE_WS_ROOT + "/docker/demo/sparksql-batch1.commands"; private static final String SPARKSQL_BATCH2_COMMANDS = HOODIE_WS_ROOT + "/docker/demo/sparksql-batch2.commands"; @@ -407,5 +408,6 @@ public class ITTestHoodieDemo extends ITTestBase { private void scheduleAndRunCompaction() throws Exception { executeCommandStringInDocker(ADHOC_1_CONTAINER, HUDI_CLI_TOOL + " --cmdfile " + COMPACTION_COMMANDS, true); + executeCommandStringInDocker(ADHOC_1_CONTAINER, HUDI_CLI_TOOL + " --cmdfile " + COMPACTION_BOOTSTRAP_COMMANDS, true); } } diff --git a/pom.xml b/pom.xml index 1d25e68..cce96d2 100644 --- a/pom.xml +++ b/pom.xml @@ -1121,7 +1121,6 @@ <configuration combine.self="override"> <skip>${skipITs}</skip> <includes> - <include>**/testsuite/**/Test*.java</include> <include>**/IT*.java</include> </includes> </configuration>