This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 867bf22e0d Issue #6714 (#6717)
867bf22e0d is described below
commit 867bf22e0d7e60613d91cfa4a8c1c19f143388da
Author: Matt Casters <[email protected]>
AuthorDate: Fri Mar 6 08:27:40 2026 +0100
Issue #6714 (#6717)
* issue #6295
# Conflicts:
# docs/hop-user-manual/modules/ROOT/pages/hop-tools/hop-doc.adoc
* spotless fix
* added extra exception handeling in the piplineEngine and WorkflowEngine
* Issue #6714 (fix plus integration test for hop-run)
* Issue #6714 (spotless)
---------
Co-authored-by: solarflare <[email protected]>
Co-authored-by: Hans Van Akelyen <[email protected]>
---
.../engines/local/LocalPipelineEngine.java | 106 +++++++------
.../engines/local/LocalWorkflowEngine.java | 116 +++++++-------
.../0014-transactional-stalling-freezed.hpl | 90 +++++++++++
.../database/0014-transactional-stalling.hpl | 120 ++++++++++++++
.../database/0014-transactional-stalling.hwf | 175 +++++++++++++++++++++
.../database/main-0014-transactional.hwf | 129 ++++++++-------
.../database/metadata/rdbms/not-working.json | 27 ++++
7 files changed, 600 insertions(+), 163 deletions(-)
diff --git
a/engine/src/main/java/org/apache/hop/pipeline/engines/local/LocalPipelineEngine.java
b/engine/src/main/java/org/apache/hop/pipeline/engines/local/LocalPipelineEngine.java
index 35d9170d65..7e66fb616c 100644
---
a/engine/src/main/java/org/apache/hop/pipeline/engines/local/LocalPipelineEngine.java
+++
b/engine/src/main/java/org/apache/hop/pipeline/engines/local/LocalPipelineEngine.java
@@ -155,66 +155,70 @@ public class LocalPipelineEngine extends Pipeline
implements IPipelineEngine<Pip
//
addExecutionFinishedListener(
pipeline -> {
- String group = (String)
pipeline.getExtensionDataMap().get(Const.CONNECTION_GROUP);
- List<Database> databases =
DatabaseConnectionMap.getInstance().getDatabases(group);
- Result result = pipeline.getResult();
- for (Database database : databases) {
- // All fine? Commit!
- //
- try {
- if (result.isResult() && !result.isStopped() &&
result.getNrErrors() == 0) {
+ try {
+ String group = (String)
pipeline.getExtensionDataMap().get(Const.CONNECTION_GROUP);
+ List<Database> databases =
DatabaseConnectionMap.getInstance().getDatabases(group);
+ Result result = pipeline.getResult();
+ for (Database database : databases) {
+ // All fine? Commit!
+ //
+ try {
+ if (result.isResult() && !result.isStopped() &&
result.getNrErrors() == 0) {
+ try {
+ database.commit(true);
+ pipeline
+ .getLogChannel()
+ .logBasic(
+ "All transactions of database connection '"
+ + database.getDatabaseMeta().getName()
+ + "' were committed at the end of the
pipeline!");
+ } catch (HopDatabaseException e) {
+ throw new HopException(
+ "Error committing database connection "
+ + database.getDatabaseMeta().getName(),
+ e);
+ }
+ } else {
+ try {
+ database.rollback(true);
+ pipeline
+ .getLogChannel()
+ .logBasic(
+ "All transactions of database connection '"
+ + database.getDatabaseMeta().getName()
+ + "' were rolled back at the end of the
pipeline!");
+ } catch (HopDatabaseException e) {
+ throw new HopException(
+ "Error rolling back database connection "
+ + database.getDatabaseMeta().getName(),
+ e);
+ }
+ }
+ } finally {
+ // Always close connection!
try {
- database.commit(true);
+ database.closeConnectionOnly();
pipeline
.getLogChannel()
- .logBasic(
- "All transactions of database connection '"
+ .logDebug(
+ "Database connection '"
+ database.getDatabaseMeta().getName()
- + "' were committed at the end of the
pipeline!");
- } catch (HopDatabaseException e) {
- throw new HopException(
- "Error committing database connection "
- + database.getDatabaseMeta().getName(),
- e);
- }
- } else {
- try {
- database.rollback(true);
+ + "' closed successfully!");
+ } catch (HopDatabaseException hde) {
pipeline
.getLogChannel()
- .logBasic(
- "All transactions of database connection '"
- + database.getDatabaseMeta().getName()
- + "' were rolled back at the end of the
pipeline!");
- } catch (HopDatabaseException e) {
- throw new HopException(
- "Error rolling back database connection "
- + database.getDatabaseMeta().getName(),
- e);
+ .logError(
+ "Error disconnecting from database -
closeConnectionOnly failed:"
+ + Const.CR
+ + hde.getMessage());
+
pipeline.getLogChannel().logError(Const.getStackTracker(hde));
}
}
- } finally {
- // Always close connection!
- try {
- database.closeConnectionOnly();
- pipeline
- .getLogChannel()
- .logDebug(
- "Database connection '"
- + database.getDatabaseMeta().getName()
- + "' closed successfully!");
- } catch (HopDatabaseException hde) {
- pipeline
- .getLogChannel()
- .logError(
- "Error disconnecting from database -
closeConnectionOnly failed:"
- + Const.CR
- + hde.getMessage());
-
pipeline.getLogChannel().logError(Const.getStackTracker(hde));
- }
+ // Definitely remove the connection reference the connections
map
+ DatabaseConnectionMap.getInstance().removeConnection(group,
null, database);
}
- // Definitely remove the connection reference the connections map
- DatabaseConnectionMap.getInstance().removeConnection(group,
null, database);
+ } catch (Exception e) {
+ log.logError("Error finishing database handling of the
transactional pipeline" + e);
}
});
}
diff --git
a/engine/src/main/java/org/apache/hop/workflow/engines/local/LocalWorkflowEngine.java
b/engine/src/main/java/org/apache/hop/workflow/engines/local/LocalWorkflowEngine.java
index 0fddf83ef6..ed382c1fc4 100644
---
a/engine/src/main/java/org/apache/hop/workflow/engines/local/LocalWorkflowEngine.java
+++
b/engine/src/main/java/org/apache/hop/workflow/engines/local/LocalWorkflowEngine.java
@@ -129,74 +129,78 @@ public class LocalWorkflowEngine extends Workflow
implements IWorkflowEngine<Wor
//
addExecutionFinishedListener(
workflow -> {
- String group = (String)
workflow.getExtensionDataMap().get(Const.CONNECTION_GROUP);
- List<Database> databases =
DatabaseConnectionMap.getInstance().getDatabases(group);
- Result result = workflow.getResult();
+ try {
+ String group = (String)
workflow.getExtensionDataMap().get(Const.CONNECTION_GROUP);
+ List<Database> databases =
DatabaseConnectionMap.getInstance().getDatabases(group);
+ Result result = workflow.getResult();
- for (Database database : databases) {
- // All fine? Commit!
- //
- try {
- if (result.isResult() && !result.isStopped() &&
result.getNrErrors() == 0) {
- try {
- database.commit(true);
- workflow
- .getLogChannel()
- .logBasic(
- "All transactions of database connection '"
- + database.getDatabaseMeta().getName()
- + "' were committed at the end of the
workflow!");
- } catch (HopDatabaseException e) {
- workflow
- .getLogChannel()
- .logError(
- "Error committing database connection "
- + database.getDatabaseMeta().getName(),
- e);
- result.setNrErrors(result.getNrErrors() + 1);
+ for (Database database : databases) {
+ // All fine? Commit!
+ //
+ try {
+ if (result.isResult() && !result.isStopped() &&
result.getNrErrors() == 0) {
+ try {
+ database.commit(true);
+ workflow
+ .getLogChannel()
+ .logBasic(
+ "All transactions of database connection '"
+ + database.getDatabaseMeta().getName()
+ + "' were committed at the end of the
workflow!");
+ } catch (HopDatabaseException e) {
+ workflow
+ .getLogChannel()
+ .logError(
+ "Error committing database connection "
+ + database.getDatabaseMeta().getName(),
+ e);
+ result.setNrErrors(result.getNrErrors() + 1);
+ }
+ } else {
+ // Error? Rollback!
+ try {
+ database.rollback(true);
+ workflow
+ .getLogChannel()
+ .logBasic(
+ "All transactions of database connection '"
+ + database.getDatabaseMeta().getName()
+ + "' were rolled back at the end of the
workflow!");
+ } catch (HopDatabaseException e) {
+ workflow
+ .getLogChannel()
+ .logError(
+ "Error rolling back database connection "
+ + database.getDatabaseMeta().getName(),
+ e);
+ result.setNrErrors(result.getNrErrors() + 1);
+ }
}
- } else {
- // Error? Rollback!
+ } finally {
+ // Always close connection!
try {
- database.rollback(true);
+ database.closeConnectionOnly();
workflow
.getLogChannel()
- .logBasic(
- "All transactions of database connection '"
+ .logDebug(
+ "Database connection '"
+ database.getDatabaseMeta().getName()
- + "' were rolled back at the end of the
workflow!");
- } catch (HopDatabaseException e) {
+ + "' closed successfully!");
+ } catch (HopDatabaseException hde) {
workflow
.getLogChannel()
.logError(
- "Error rolling back database connection "
- + database.getDatabaseMeta().getName(),
- e);
- result.setNrErrors(result.getNrErrors() + 1);
+ "Error disconnecting from database -
closeConnectionOnly failed:"
+ + Const.CR
+ + hde.getMessage());
+
workflow.getLogChannel().logError(Const.getStackTracker(hde));
}
+ // Definitely remove the connection reference the
connections map
+ DatabaseConnectionMap.getInstance().removeConnection(group,
null, database);
}
- } finally {
- // Always close connection!
- try {
- database.closeConnectionOnly();
- workflow
- .getLogChannel()
- .logDebug(
- "Database connection '"
- + database.getDatabaseMeta().getName()
- + "' closed successfully!");
- } catch (HopDatabaseException hde) {
- workflow
- .getLogChannel()
- .logError(
- "Error disconnecting from database -
closeConnectionOnly failed:"
- + Const.CR
- + hde.getMessage());
-
workflow.getLogChannel().logError(Const.getStackTracker(hde));
- }
- // Definitely remove the connection reference the connections
map
- DatabaseConnectionMap.getInstance().removeConnection(group,
null, database);
}
+ } catch (Exception e) {
+ log.logError("Error finishing database handling of the
transactional workflow" + e);
}
});
}
diff --git a/integration-tests/database/0014-transactional-stalling-freezed.hpl
b/integration-tests/database/0014-transactional-stalling-freezed.hpl
new file mode 100644
index 0000000000..638b932618
--- /dev/null
+++ b/integration-tests/database/0014-transactional-stalling-freezed.hpl
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+
+-->
+<pipeline>
+ <info>
+ <name>0014-transactional-stalling-freezed</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description/>
+ <extended_description/>
+ <pipeline_version/>
+ <pipeline_type>Normal</pipeline_type>
+ <parameters>
+ </parameters>
+ <capture_transform_performance>N</capture_transform_performance>
+
<transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+
<transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+ <created_user>-</created_user>
+ <created_date>2026/03/05 14:39:47.188</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2026/03/05 14:39:47.188</modified_date>
+ </info>
+ <notepads>
+ </notepads>
+ <order>
+ <hop>
+ <from>Attempt to read from non-working db</from>
+ <to>Nothing</to>
+ <enabled>Y</enabled>
+ </hop>
+ </order>
+ <transform>
+ <name>Attempt to read from non-working db</name>
+ <type>TableInput</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <connection>not-working</connection>
+ <execute_each_row>N</execute_each_row>
+ <limit>0</limit>
+ <sql>SELECT * FROM tr_data
+</sql>
+ <variables_active>N</variables_active>
+ <attributes/>
+ <GUI>
+ <xloc>160</xloc>
+ <yloc>96</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Nothing</name>
+ <type>Dummy</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <attributes/>
+ <GUI>
+ <xloc>352</xloc>
+ <yloc>96</yloc>
+ </GUI>
+ </transform>
+ <transform_error_handling>
+ </transform_error_handling>
+ <attributes/>
+</pipeline>
diff --git a/integration-tests/database/0014-transactional-stalling.hpl
b/integration-tests/database/0014-transactional-stalling.hpl
new file mode 100644
index 0000000000..acf6f0ecec
--- /dev/null
+++ b/integration-tests/database/0014-transactional-stalling.hpl
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+
+-->
+<pipeline>
+ <info>
+ <name>0014-transactional-stalling</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description/>
+ <extended_description/>
+ <pipeline_version/>
+ <pipeline_type>Normal</pipeline_type>
+ <parameters>
+ </parameters>
+ <capture_transform_performance>N</capture_transform_performance>
+
<transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+
<transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+ <created_user>-</created_user>
+ <created_date>2026/03/05 14:38:42.687</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2026/03/05 14:38:42.687</modified_date>
+ </info>
+ <notepads>
+ </notepads>
+ <order>
+ <hop>
+ <from>1 row</from>
+ <to>0014-transactional-stalling-freezed.hpl</to>
+ <enabled>Y</enabled>
+ </hop>
+ </order>
+ <transform>
+ <name>0014-transactional-stalling-freezed.hpl</name>
+ <type>PipelineExecutor</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <run_configuration>transactional</run_configuration>
+
<filename>${PROJECT_HOME}/0014-transactional-stalling-freezed.hpl</filename>
+ <filenameInField>N</filenameInField>
+ <filenameField/>
+ <group_size>1</group_size>
+ <group_field/>
+ <group_time/>
+ <parameters>
+ <inherit_all_vars>N</inherit_all_vars>
+ </parameters>
+ <execution_result_target_transform/>
+ <execution_time_field>ExecutionTime</execution_time_field>
+ <execution_result_field>ExecutionResult</execution_result_field>
+ <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+ <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+
<execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+
<execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+
<execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+
<execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+
<execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+
<execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+
<execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+
<execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+ <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+
<execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+ <result_rows_target_transform/>
+ <result_files_target_transform/>
+ <result_files_file_name_field>FileName</result_files_file_name_field>
+ <executors_output_transform/>
+ <attributes/>
+ <GUI>
+ <xloc>320</xloc>
+ <yloc>112</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>1 row</name>
+ <type>RowGenerator</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <fields>
+</fields>
+ <interval_in_ms>5000</interval_in_ms>
+ <last_time_field>FiveSecondsAgo</last_time_field>
+ <limit>1</limit>
+ <never_ending>N</never_ending>
+ <row_time_field>now</row_time_field>
+ <attributes/>
+ <GUI>
+ <xloc>144</xloc>
+ <yloc>112</yloc>
+ </GUI>
+ </transform>
+ <transform_error_handling>
+ </transform_error_handling>
+ <attributes/>
+</pipeline>
diff --git a/integration-tests/database/0014-transactional-stalling.hwf
b/integration-tests/database/0014-transactional-stalling.hwf
new file mode 100644
index 0000000000..e0d16c8507
--- /dev/null
+++ b/integration-tests/database/0014-transactional-stalling.hwf
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+
+-->
+<workflow>
+ <name>0014-transactional-stalling</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description/>
+ <extended_description/>
+ <workflow_version/>
+ <created_user>-</created_user>
+ <created_date>2026/03/05 14:43:28.915</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2026/03/05 14:43:28.915</modified_date>
+ <parameters>
+ </parameters>
+ <actions>
+ <action>
+ <name>Start</name>
+ <description/>
+ <type>SPECIAL</type>
+ <attributes/>
+ <DayOfMonth>1</DayOfMonth>
+ <hour>12</hour>
+ <intervalMinutes>60</intervalMinutes>
+ <intervalSeconds>0</intervalSeconds>
+ <minutes>0</minutes>
+ <repeat>N</repeat>
+ <schedulerType>0</schedulerType>
+ <weekDay>1</weekDay>
+ <parallel>N</parallel>
+ <xloc>112</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Shell</name>
+ <description/>
+ <type>SHELL</type>
+ <attributes/>
+ <filename/>
+ <work_directory/>
+ <arg_from_previous>N</arg_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <set_append_logfile>N</set_append_logfile>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <insertScript>Y</insertScript>
+ <script>timeout 15 sh hop-run.sh -j 'default' -r 'transactional' -f
0014-transactional-stalling.hpl -l Basic</script>
+ <loglevel>Basic</loglevel>
+ <parallel>N</parallel>
+ <xloc>288</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>exit_status < 100</name>
+ <description/>
+ <type>EVAL</type>
+ <attributes/>
+ <script>
+// A timeout in the shell script gives an exit status 124 or higher.
+//
+
+action.logBasic("!!!!!!!! exit_status = "+exit_status);
+
+exit_status < 100</script>
+ <parallel>N</parallel>
+ <xloc>432</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Success</name>
+ <description/>
+ <type>SUCCESS</type>
+ <attributes/>
+ <parallel>N</parallel>
+ <xloc>592</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>hop-run stalled</name>
+ <description/>
+ <type>ABORT</type>
+ <attributes/>
+ <always_log_rows>N</always_log_rows>
+ <message>Failure: hop-run stalled</message>
+ <parallel>N</parallel>
+ <xloc>592</xloc>
+ <yloc>176</yloc>
+ <attributes_hac/>
+ </action>
+ </actions>
+ <hops>
+ <hop>
+ <from>Start</from>
+ <to>Shell</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>Shell</from>
+ <to>exit_status < 100</to>
+ <enabled>Y</enabled>
+ <evaluation>N</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>exit_status < 100</from>
+ <to>Success</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>exit_status < 100</from>
+ <to>hop-run stalled</to>
+ <enabled>Y</enabled>
+ <evaluation>N</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ </hops>
+ <notepads>
+ <notepad>
+ <backgroundcolorblue>210</backgroundcolorblue>
+ <backgroundcolorgreen>136</backgroundcolorgreen>
+ <backgroundcolorred>15</backgroundcolorred>
+ <bordercolorblue>250</bordercolorblue>
+ <bordercolorgreen>231</bordercolorgreen>
+ <bordercolorred>200</bordercolorred>
+ <fontbold>N</fontbold>
+ <fontcolorblue>250</fontcolorblue>
+ <fontcolorgreen>231</fontcolorgreen>
+ <fontcolorred>200</fontcolorred>
+ <fontitalic>N</fontitalic>
+ <fontname>Noto Sans</fontname>
+ <fontsize>10</fontsize>
+ <height>118</height>
+ <xloc>80</xloc>
+ <yloc>176</yloc>
+ <note>The pipeline called
+
+ 0014-transactional-stalling
+
+is stalling (never ending) when executed using hop-run.
+(it will finish properly in the GUI)
+
+So in this test we're executing the hop-run.sh script inside the test
container.
+We're using the timeout bash command to make sure the pipeline doesn't
stall.</note>
+ <width>309</width>
+ </notepad>
+ </notepads>
+ <attributes/>
+</workflow>
diff --git a/integration-tests/database/main-0014-transactional.hwf
b/integration-tests/database/main-0014-transactional.hwf
index d8d8e60076..a66c6ca422 100644
--- a/integration-tests/database/main-0014-transactional.hwf
+++ b/integration-tests/database/main-0014-transactional.hwf
@@ -35,14 +35,14 @@ limitations under the License.
<description/>
<type>SPECIAL</type>
<attributes/>
- <repeat>N</repeat>
- <schedulerType>0</schedulerType>
- <intervalSeconds>0</intervalSeconds>
- <intervalMinutes>60</intervalMinutes>
+ <DayOfMonth>1</DayOfMonth>
<hour>12</hour>
+ <intervalMinutes>60</intervalMinutes>
+ <intervalSeconds>0</intervalSeconds>
<minutes>0</minutes>
+ <repeat>N</repeat>
+ <schedulerType>0</schedulerType>
<weekDay>1</weekDay>
- <DayOfMonth>1</DayOfMonth>
<parallel>N</parallel>
<xloc>80</xloc>
<yloc>80</yloc>
@@ -53,25 +53,20 @@ limitations under the License.
<description/>
<type>WORKFLOW</type>
<attributes/>
- <run_configuration>local</run_configuration>
- <filename>${PROJECT_HOME}/0014-1-setup-before.hwf</filename>
- <params_from_previous>N</params_from_previous>
- <exec_per_row>N</exec_per_row>
- <set_logfile>N</set_logfile>
- <logfile/>
- <logext/>
<add_date>N</add_date>
<add_time>N</add_time>
- <loglevel>Nothing</loglevel>
- <wait_until_finished>Y</wait_until_finished>
- <follow_abort_remote>N</follow_abort_remote>
<create_parent_folder>N</create_parent_folder>
- <pass_export>N</pass_export>
- <run_configuration>local</run_configuration>
+ <exec_per_row>N</exec_per_row>
+ <filename>${PROJECT_HOME}/0014-1-setup-before.hwf</filename>
+ <loglevel>Nothing</loglevel>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
+ <params_from_previous>N</params_from_previous>
+ <run_configuration>local</run_configuration>
<set_append_logfile>N</set_append_logfile>
+ <set_logfile>N</set_logfile>
+ <wait_until_finished>Y</wait_until_finished>
<parallel>N</parallel>
<xloc>240</xloc>
<yloc>80</yloc>
@@ -82,25 +77,20 @@ limitations under the License.
<description/>
<type>WORKFLOW</type>
<attributes/>
- <run_configuration>transactional</run_configuration>
- <filename>${PROJECT_HOME}/0014-2-fail-transactional.hwf</filename>
- <params_from_previous>N</params_from_previous>
- <exec_per_row>N</exec_per_row>
- <set_logfile>N</set_logfile>
- <logfile/>
- <logext/>
<add_date>N</add_date>
<add_time>N</add_time>
- <loglevel>Nothing</loglevel>
- <wait_until_finished>Y</wait_until_finished>
- <follow_abort_remote>N</follow_abort_remote>
<create_parent_folder>N</create_parent_folder>
- <pass_export>N</pass_export>
- <run_configuration>transactional</run_configuration>
+ <exec_per_row>N</exec_per_row>
+ <filename>${PROJECT_HOME}/0014-2-fail-transactional.hwf</filename>
+ <loglevel>Nothing</loglevel>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
+ <params_from_previous>N</params_from_previous>
+ <run_configuration>transactional</run_configuration>
<set_append_logfile>N</set_append_logfile>
+ <set_logfile>N</set_logfile>
+ <wait_until_finished>Y</wait_until_finished>
<parallel>N</parallel>
<xloc>400</xloc>
<yloc>80</yloc>
@@ -111,27 +101,47 @@ limitations under the License.
<description/>
<type>PIPELINE</type>
<attributes/>
- <filename>${PROJECT_HOME}/0014-3-validate.hpl</filename>
- <params_from_previous>N</params_from_previous>
- <exec_per_row>N</exec_per_row>
- <clear_rows>N</clear_rows>
- <clear_files>N</clear_files>
- <set_logfile>N</set_logfile>
- <logfile/>
- <logext/>
<add_date>N</add_date>
<add_time>N</add_time>
+ <clear_files>N</clear_files>
+ <clear_rows>N</clear_rows>
+ <create_parent_folder>N</create_parent_folder>
+ <exec_per_row>N</exec_per_row>
+ <filename>${PROJECT_HOME}/0014-3-validate.hpl</filename>
<loglevel>Basic</loglevel>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <params_from_previous>N</params_from_previous>
+ <run_configuration>local</run_configuration>
<set_append_logfile>N</set_append_logfile>
+ <set_logfile>N</set_logfile>
<wait_until_finished>Y</wait_until_finished>
- <follow_abort_remote>N</follow_abort_remote>
+ <parallel>N</parallel>
+ <xloc>528</xloc>
+ <yloc>80</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>0014-transactional-stalling</name>
+ <description/>
+ <type>WORKFLOW</type>
+ <attributes/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
<create_parent_folder>N</create_parent_folder>
- <run_configuration>local</run_configuration>
+ <exec_per_row>N</exec_per_row>
+ <filename>${PROJECT_HOME}/0014-transactional-stalling.hwf</filename>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
+ <params_from_previous>N</params_from_previous>
+ <run_configuration>local</run_configuration>
+ <set_append_logfile>N</set_append_logfile>
+ <set_logfile>N</set_logfile>
+ <wait_until_finished>Y</wait_until_finished>
<parallel>N</parallel>
- <xloc>560</xloc>
+ <xloc>672</xloc>
<yloc>80</yloc>
<attributes_hac/>
</action>
@@ -158,30 +168,37 @@ limitations under the License.
<evaluation>N</evaluation>
<unconditional>Y</unconditional>
</hop>
+ <hop>
+ <from>0014-3-validate</from>
+ <to>0014-transactional-stalling</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
</hops>
<notepads>
<notepad>
+ <backgroundcolorblue>251</backgroundcolorblue>
+ <backgroundcolorgreen>232</backgroundcolorgreen>
+ <backgroundcolorred>201</backgroundcolorred>
+ <bordercolorblue>90</bordercolorblue>
+ <bordercolorgreen>58</bordercolorgreen>
+ <bordercolorred>14</bordercolorred>
+ <fontbold>N</fontbold>
+ <fontcolorblue>90</fontcolorblue>
+ <fontcolorgreen>58</fontcolorgreen>
+ <fontcolorred>14</fontcolorred>
+ <fontitalic>N</fontitalic>
+ <fontname>Noto Sans</fontname>
+ <fontsize>11</fontsize>
+ <height>58</height>
+ <xloc>80</xloc>
+ <yloc>160</yloc>
<note>First we set up the database table "tr_data" with 100 records
specific data.
Afte that we test a workflow which deletes the data, then writes 50 random
data rows into tr_data.
At the end we abort the second workflow which should force a rollback.
When all is said and done we expect the 100 records to remain in place
unchanged.</note>
- <xloc>80</xloc>
- <yloc>160</yloc>
<width>507</width>
- <heigth>74</heigth>
- <fontname>Noto Sans</fontname>
- <fontsize>11</fontsize>
- <fontbold>N</fontbold>
- <fontitalic>N</fontitalic>
- <fontcolorred>14</fontcolorred>
- <fontcolorgreen>58</fontcolorgreen>
- <fontcolorblue>90</fontcolorblue>
- <backgroundcolorred>201</backgroundcolorred>
- <backgroundcolorgreen>232</backgroundcolorgreen>
- <backgroundcolorblue>251</backgroundcolorblue>
- <bordercolorred>14</bordercolorred>
- <bordercolorgreen>58</bordercolorgreen>
- <bordercolorblue>90</bordercolorblue>
</notepad>
</notepads>
<attributes/>
diff --git a/integration-tests/database/metadata/rdbms/not-working.json
b/integration-tests/database/metadata/rdbms/not-working.json
new file mode 100644
index 0000000000..1e2dc97e90
--- /dev/null
+++ b/integration-tests/database/metadata/rdbms/not-working.json
@@ -0,0 +1,27 @@
+{
+ "virtualPath": "",
+ "rdbms": {
+ "POSTGRESQL": {
+ "databaseName": "none",
+ "pluginId": "POSTGRESQL",
+ "accessType": 0,
+ "hostname": "localhost",
+ "password": "Encrypted 2be98afa605d39a8da51ee367d180a4c9",
+ "pluginName": "PostgreSQL",
+ "port": "5432",
+ "attributes": {
+ "SUPPORTS_TIMESTAMP_DATA_TYPE": "Y",
+ "QUOTE_ALL_FIELDS": "N",
+ "SUPPORTS_BOOLEAN_DATA_TYPE": "Y",
+ "FORCE_IDENTIFIERS_TO_LOWERCASE": "N",
+ "PRESERVE_RESERVED_WORD_CASE": "Y",
+ "SQL_CONNECT": "",
+ "FORCE_IDENTIFIERS_TO_UPPERCASE": "N",
+ "PREFERRED_SCHEMA_NAME": ""
+ },
+ "manualUrl": "",
+ "username": "no-user"
+ }
+ },
+ "name": "not-working"
+}
\ No newline at end of file
