From 5e1bd676801a2222df5cfd1dc4d526f1404ebf34 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Thu, 16 Apr 2020 11:02:01 +0200
Subject: [PATCH] removed unuseful parameter

---
 .../input_projecttoresult_parameters.json     |  6 ----
 .../projecttoresult/oozie_app/workflow.xml    | 36 +------------------
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/input_projecttoresult_parameters.json b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/input_projecttoresult_parameters.json
index 9d5354c641..af52c4e5b4 100644
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/input_projecttoresult_parameters.json
+++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/input_projecttoresult_parameters.json
@@ -1,10 +1,4 @@
 [
-  {
-    "paramName":"s",
-    "paramLongName":"sourcePath",
-    "paramDescription": "the path of the sequencial file to read",
-    "paramRequired": true
-  },
   {
     "paramName":"h",
     "paramLongName":"hive_metastore_uris",
diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/oozie_app/workflow.xml b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/oozie_app/workflow.xml
index 1d15391ab6..d8df18c58a 100644
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/oozie_app/workflow.xml
@@ -31,7 +31,6 @@
     </parameters>
 
     <start to="reset-outputpath"/>
-<!--<start to="prepare_project_results_association"/>-->
     <kill name="Kill">
         <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
     </kill>
@@ -98,7 +97,7 @@
                     --conf spark.dynamicAllocation.enabled=true
                     --conf spark.dynamicAllocation.maxExecutors=${spark2MaxExecutors}
                 </spark-opts>
-                <arg>--sourcePath</arg><arg>${sourcePath}/relation</arg>
+<!--                <arg>&#45;&#45;sourcePath</arg><arg>${sourcePath}/relation</arg>-->
                 <arg>--writeUpdate</arg><arg>${writeUpdate}</arg>
                 <arg>--saveGraph</arg><arg>${saveGraph}</arg>
                 <arg>--hive_metastore_uris</arg><arg>${hive_metastore_uris}</arg>
@@ -110,38 +109,5 @@
             <error to="Kill"/>
         </action>
 
-    <action name="ProjectPropagation">
-        <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>ProjectToResultPropagation</name>
-            <class>eu.dnetlib.dhp.projecttoresult.SparkResultToProjectThroughSemRelJob2</class>
-            <jar>dhp-propagation-${projectVersion}.jar</jar>
-            <spark-opts>
-                --num-executors=${sparkExecutorNumber}
-                --executor-memory=${sparkExecutorMemory}
-                --executor-cores=${sparkExecutorCores}
-                --driver-memory=${sparkDriverMemory}
-                --conf spark.extraListeners=${spark2ExtraListeners}
-                --conf spark.sql.queryExecutionListeners=${spark2SqlQueryExecutionListeners}
-                --conf spark.yarn.historyServer.address=${spark2YarnHistoryServerAddress}
-                --conf spark.eventLog.dir=${nameNode}${spark2EventLogDir}
-                --conf spark.dynamicAllocation.enabled=true
-                --conf spark.dynamicAllocation.maxExecutors=${spark2MaxExecutors}
-            </spark-opts>
-            <arg>--sourcePath</arg><arg>${sourcePath}</arg>
-            <arg>--allowedsemrels</arg><arg>${allowedsemrels}</arg>
-            <arg>--hive_metastore_uris</arg><arg>${hive_metastore_uris}</arg>
-            <arg>--writeUpdate</arg><arg>${writeUpdate}</arg>
-            <arg>--saveGraph</arg><arg>${saveGraph}</arg>
-            <arg>--potentialUpdatePath</arg><arg>${workingDir}/projecttoresult_propagation/preparedInfo/potentialUpdates</arg>
-            <arg>--alreadyLinkedPath</arg><arg>${workingDir}/projecttoresult_propagation/preparedInfo/alreadyLinked</arg>
-        </spark>
-        <ok to="End"/>
-        <error to="Kill"/>
-    </action>
-
     <end name="End"/>
 </workflow-app>
\ No newline at end of file