From d30e71016550f20ac838fc284e1a330d0e3a0b58 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Mon, 27 Apr 2020 10:52:30 +0200
Subject: [PATCH] fixed duplicates action name in the workflow

---
 .../oozie_app/workflow.xml                    | 41 +++----------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/oozie_app/workflow.xml b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/oozie_app/workflow.xml
index 13c3a2fee5..245c4f5560 100644
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/oozie_app/workflow.xml
@@ -149,7 +149,7 @@
             <arg>--datasourceOrganizationPath</arg><arg>${workingDir}/resulttoorganization_propagation/preparedInfo/datasourceOrganization</arg>
             <arg>--alreadyLinkedPath</arg><arg>${workingDir}/resulttoorganization_propagation/preparedInfo/alreadyLinked</arg>
         </spark>
-        <ok to="wait"/>
+        <ok to="wait2"/>
         <error to="Kill"/>
     </action>
 
@@ -180,7 +180,7 @@
             <arg>--datasourceOrganizationPath</arg><arg>${workingDir}/resulttoorganization_propagation/preparedInfo/datasourceOrganization</arg>
             <arg>--alreadyLinkedPath</arg><arg>${workingDir}/resulttoorganization_propagation/preparedInfo/alreadyLinked</arg>
         </spark>
-        <ok to="wait"/>
+        <ok to="wait2"/>
         <error to="Kill"/>
     </action>
 
@@ -211,7 +211,7 @@
             <arg>--datasourceOrganizationPath</arg><arg>${workingDir}/resulttoorganization_propagation/preparedInfo/datasourceOrganization</arg>
             <arg>--alreadyLinkedPath</arg><arg>${workingDir}/resulttoorganization_propagation/preparedInfo/alreadyLinked</arg>
         </spark>
-        <ok to="wait"/>
+        <ok to="wait2"/>
         <error to="Kill"/>
     </action>
 
@@ -242,42 +242,11 @@
             <arg>--datasourceOrganizationPath</arg><arg>${workingDir}/resulttoorganization_propagation/preparedInfo/datasourceOrganization</arg>
             <arg>--alreadyLinkedPath</arg><arg>${workingDir}/resulttoorganization_propagation/preparedInfo/alreadyLinked</arg>
         </spark>
-        <ok to="wait"/>
+        <ok to="wait2"/>
         <error to="Kill"/>
     </action>
 
-    <join name="wait" to="End"/>
+    <join name="wait2" to="End"/>
     <end name="End"/>
 
-<!--    <action name="AffiliationPropagation">-->
-<!--    <spark xmlns="uri:oozie:spark-action:0.2">-->
-<!--        <job-tracker>${jobTracker}</job-tracker>-->
-<!--        <name-node>${nameNode}</name-node>-->
-<!--        <master>yarn-cluster</master>-->
-<!--        <mode>cluster</mode>-->
-<!--        <name>AffiliationPropagation</name>-->
-<!--        <class>eu.dnetlib.dhp.resulttoorganizationfrominstrepo.SparkResultToOrganizationFromIstRepoJob</class>-->
-<!--        <jar>dhp-propagation-${projectVersion}.jar</jar>-->
-<!--        <spark-opts>-->
-<!--            &#45;&#45;num-executors=${sparkExecutorNumber}-->
-<!--            &#45;&#45;executor-memory=${sparkExecutorMemory}-->
-<!--            &#45;&#45;executor-cores=${sparkExecutorCores}-->
-<!--            &#45;&#45;driver-memory=${sparkDriverMemory}-->
-<!--            &#45;&#45;conf spark.extraListeners=${spark2ExtraListeners}-->
-<!--            &#45;&#45;conf spark.sql.queryExecutionListeners=${spark2SqlQueryExecutionListeners}-->
-<!--            &#45;&#45;conf spark.yarn.historyServer.address=${spark2YarnHistoryServerAddress}-->
-<!--            &#45;&#45;conf spark.eventLog.dir=${nameNode}${spark2EventLogDir}-->
-<!--            &#45;&#45;conf spark.dynamicAllocation.enabled=true-->
-<!--            &#45;&#45;conf spark.dynamicAllocation.maxExecutors=${spark2MaxExecutors}-->
-<!--        </spark-opts>-->
-<!--        <arg>-mt</arg> <arg>yarn-cluster</arg>-->
-<!--        <arg>&#45;&#45;sourcePath</arg><arg>${sourcePath}</arg>-->
-<!--        <arg>&#45;&#45;hive_metastore_uris</arg><arg>${hive_metastore_uris}</arg>-->
-<!--        <arg>&#45;&#45;writeUpdate</arg><arg>${writeUpdate}</arg>-->
-<!--        <arg>&#45;&#45;saveGraph</arg><arg>${saveGraph}</arg>-->
-<!--    </spark>-->
-<!--    <ok to="End"/>-->
-<!--    <error to="Kill"/>-->
-<!--</action>-->
-
 </workflow-app>
\ No newline at end of file