miriam.baglioni
/
dnet-hadoop
forked from D-Net/dnet-hadoop
2
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Merge pull request 'Closes #7: subdirs inside graph table dirs' (#8) from przemyslaw.jacewicz/dnet-hadoop:przemyslawjacewicz_7_distcp_configuration_fix into master 

Run the code from this PR in isolation and it worked fine. Thanks!
This commit is contained in:
Claudio Atzori 2020-04-16 14:38:46 +02:00
parent c439d0c6bb da019495d7
commit 09f356b047
8 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dhp-workflows/dhp-actionmanager/src/main/resources/eu/dnetlib/dhp/actionmanager/wf/dataset/oozie_app/workflow.xml
View File

@ -118,6 +118,9 @@
<action name="SkipPromoteDatasetActionPayloadForDatasetTable"> <action name="SkipPromoteDatasetActionPayloadForDatasetTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${workingDir}/dataset"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${inputGraphRootPath}/dataset</arg> <arg>${inputGraphRootPath}/dataset</arg>
<arg>${workingDir}/dataset</arg> <arg>${workingDir}/dataset</arg>
@ -166,6 +169,9 @@
<action name="SkipPromoteResultActionPayloadForDatasetTable"> <action name="SkipPromoteResultActionPayloadForDatasetTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${outputGraphRootPath}/dataset"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${workingDir}/dataset</arg> <arg>${workingDir}/dataset</arg>
<arg>${outputGraphRootPath}/dataset</arg> <arg>${outputGraphRootPath}/dataset</arg>

3
dhp-workflows/dhp-actionmanager/src/main/resources/eu/dnetlib/dhp/actionmanager/wf/datasource/oozie_app/workflow.xml
View File

@ -113,6 +113,9 @@
<action name="SkipPromoteDatasourceActionPayloadForDatasourceTable"> <action name="SkipPromoteDatasourceActionPayloadForDatasourceTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${outputGraphRootPath}/datasource"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${inputGraphRootPath}/datasource</arg> <arg>${inputGraphRootPath}/datasource</arg>
<arg>${outputGraphRootPath}/datasource</arg> <arg>${outputGraphRootPath}/datasource</arg>

3
dhp-workflows/dhp-actionmanager/src/main/resources/eu/dnetlib/dhp/actionmanager/wf/organization/oozie_app/workflow.xml
View File

@ -113,6 +113,9 @@
<action name="SkipPromoteOrganizationActionPayloadForOrganizationTable"> <action name="SkipPromoteOrganizationActionPayloadForOrganizationTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${outputGraphRootPath}/organization"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${inputGraphRootPath}/organization</arg> <arg>${inputGraphRootPath}/organization</arg>
<arg>${outputGraphRootPath}/organization</arg> <arg>${outputGraphRootPath}/organization</arg>

6
dhp-workflows/dhp-actionmanager/src/main/resources/eu/dnetlib/dhp/actionmanager/wf/otherresearchproduct/oozie_app/workflow.xml
View File

@ -117,6 +117,9 @@
<action name="SkipPromoteOtherResearchProductActionPayloadForOtherResearchProductTable"> <action name="SkipPromoteOtherResearchProductActionPayloadForOtherResearchProductTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${workingDir}/otherresearchproduct"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${inputGraphRootPath}/otherresearchproduct</arg> <arg>${inputGraphRootPath}/otherresearchproduct</arg>
<arg>${workingDir}/otherresearchproduct</arg> <arg>${workingDir}/otherresearchproduct</arg>
@ -165,6 +168,9 @@
<action name="SkipPromoteResultActionPayloadForOtherResearchProductTable"> <action name="SkipPromoteResultActionPayloadForOtherResearchProductTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${outputGraphRootPath}/otherresearchproduct"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${workingDir}/otherresearchproduct</arg> <arg>${workingDir}/otherresearchproduct</arg>
<arg>${outputGraphRootPath}/otherresearchproduct</arg> <arg>${outputGraphRootPath}/otherresearchproduct</arg>

3
dhp-workflows/dhp-actionmanager/src/main/resources/eu/dnetlib/dhp/actionmanager/wf/project/oozie_app/workflow.xml
View File

@ -113,6 +113,9 @@
<action name="SkipPromoteProjectActionPayloadForProjectTable"> <action name="SkipPromoteProjectActionPayloadForProjectTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${outputGraphRootPath}/project"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${inputGraphRootPath}/project</arg> <arg>${inputGraphRootPath}/project</arg>
<arg>${outputGraphRootPath}/project</arg> <arg>${outputGraphRootPath}/project</arg>

6
dhp-workflows/dhp-actionmanager/src/main/resources/eu/dnetlib/dhp/actionmanager/wf/publication/oozie_app/workflow.xml
View File

@ -118,6 +118,9 @@
<action name="SkipPromotePublicationActionPayloadForPublicationTable"> <action name="SkipPromotePublicationActionPayloadForPublicationTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${workingDir}/publication"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${inputGraphRootPath}/publication</arg> <arg>${inputGraphRootPath}/publication</arg>
<arg>${workingDir}/publication</arg> <arg>${workingDir}/publication</arg>
@ -166,6 +169,9 @@
<action name="SkipPromoteResultActionPayloadForPublicationTable"> <action name="SkipPromoteResultActionPayloadForPublicationTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${outputGraphRootPath}/publication"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${workingDir}/publication</arg> <arg>${workingDir}/publication</arg>
<arg>${outputGraphRootPath}/publication</arg> <arg>${outputGraphRootPath}/publication</arg>

3
dhp-workflows/dhp-actionmanager/src/main/resources/eu/dnetlib/dhp/actionmanager/wf/relation/oozie_app/workflow.xml
View File

@ -114,6 +114,9 @@
<action name="SkipPromoteRelationActionPayloadForRelationTable"> <action name="SkipPromoteRelationActionPayloadForRelationTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${outputGraphRootPath}/relation"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${inputGraphRootPath}/relation</arg> <arg>${inputGraphRootPath}/relation</arg>
<arg>${outputGraphRootPath}/relation</arg> <arg>${outputGraphRootPath}/relation</arg>

6
dhp-workflows/dhp-actionmanager/src/main/resources/eu/dnetlib/dhp/actionmanager/wf/software/oozie_app/workflow.xml
View File

@ -117,6 +117,9 @@
<action name="SkipPromoteSoftwareActionPayloadForSoftwareTable"> <action name="SkipPromoteSoftwareActionPayloadForSoftwareTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${workingDir}/software"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${inputGraphRootPath}/software</arg> <arg>${inputGraphRootPath}/software</arg>
<arg>${workingDir}/software</arg> <arg>${workingDir}/software</arg>
@ -165,6 +168,9 @@
<action name="SkipPromoteResultActionPayloadForSoftwareTable"> <action name="SkipPromoteResultActionPayloadForSoftwareTable">
<distcp xmlns="uri:oozie:distcp-action:0.2"> <distcp xmlns="uri:oozie:distcp-action:0.2">
<prepare>
<delete path="${outputGraphRootPath}/software"/>
</prepare>
<arg>-pb</arg> <arg>-pb</arg>
<arg>${workingDir}/software</arg> <arg>${workingDir}/software</arg>
<arg>${outputGraphRootPath}/software</arg> <arg>${outputGraphRootPath}/software</arg>