From 60f25b780de1c456762003cbb8b0011c9c82f93d Mon Sep 17 00:00:00 2001 From: Serafeim Chatzopoulos Date: Fri, 23 Jun 2023 12:51:50 +0300 Subject: [PATCH] Minor fixes in workflow.xml and job.properties --- .../oa/graph/impact_indicators/job.properties | 2 +- .../impact_indicators/oozie_app/workflow.xml | 95 ++++++++++--------- 2 files changed, 49 insertions(+), 48 deletions(-) diff --git a/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/job.properties b/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/job.properties index a2f3d5828..860a14713 100644 --- a/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/job.properties +++ b/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/job.properties @@ -102,4 +102,4 @@ actionSetOutputPath=${workingDir}/bip_actionsets/ # The directory to store project impact indicators projectImpactIndicatorsOutput=${workingDir}/project_indicators -resume=create-openaire-ranking-graph +resume=entry-point-decision diff --git a/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml b/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml index 9bd582984..1d49322b6 100644 --- a/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml +++ b/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml @@ -33,7 +33,7 @@ - + @@ -44,12 +44,12 @@ - --> - - - yarn-cluster + --> + + + yarn-cluster cluster - + Openaire Ranking Graph Creation @@ -141,8 +141,8 @@ - - yarn-cluster + + yarn-cluster cluster @@ -244,8 +244,8 @@ - - yarn-cluster + + yarn-cluster cluster @@ -289,8 +289,8 @@ - - yarn-cluster + + yarn-cluster cluster @@ -335,8 +335,8 @@ - - + + @@ -349,7 +349,7 @@ get_ranking_files.sh - /${workingDir} + ${workingDir} ${wfAppPath}/get_ranking_files.sh#get_ranking_files.sh @@ -481,8 +481,8 @@ - - yarn-cluster + + yarn-cluster cluster @@ -503,7 +503,7 @@ - ${openaireDataInput} + ${openaireDataInput}/ ${synonymFolder} @@ -523,8 +523,8 @@ - - yarn-cluster + + yarn-cluster cluster @@ -561,47 +561,48 @@ + - - + + - - - + + + - - - yarn - cluster - Produces the atomic action with the bip finder scores for publications - eu.dnetlib.dhp.actionmanager.bipfinder.SparkAtomicActionScoreJob - dhp-aggregation-${projectVersion}.jar - - --executor-memory=${sparkNormalExecutorMemory} - --executor-cores=${sparkExecutorCores} - --driver-memory=${sparkNormalDriverMemory} - --conf spark.extraListeners=${spark2ExtraListeners} - --conf spark.sql.queryExecutionListeners=${spark2SqlQueryExecutionListeners} - --conf spark.yarn.historyServer.address=${spark2YarnHistoryServerAddress} - --conf spark.eventLog.dir=${nameNode}${spark2EventLogDir} - --conf spark.sql.warehouse.dir=${sparkSqlWarehouseDir} - - --inputPath${bipScorePath} - --outputPath${actionSetOutputPath}/results/ + + + yarn + cluster + Produces the atomic action with the bip finder scores for publications + eu.dnetlib.dhp.actionmanager.bipfinder.SparkAtomicActionScoreJob + dhp-aggregation-${projectVersion}.jar + + --executor-memory=${sparkNormalExecutorMemory} + --executor-cores=${sparkExecutorCores} + --driver-memory=${sparkNormalDriverMemory} + --conf spark.extraListeners=${spark2ExtraListeners} + --conf spark.sql.queryExecutionListeners=${spark2SqlQueryExecutionListeners} + --conf spark.yarn.historyServer.address=${spark2YarnHistoryServerAddress} + --conf spark.eventLog.dir=${nameNode}${spark2EventLogDir} + --conf spark.sql.warehouse.dir=${sparkSqlWarehouseDir} + + --inputPath${bipScorePath} + --outputPath${actionSetOutputPath}/results/ --targetEntityresult - - - + + +