Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated DRAT to work with OODT 1.9 and fixed python version issue when executing rat aggregator and mime partitioner. #200

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated DRAT to work with OODT 1.9 and fixed python version issue when executing rat aggregator and mime partitioner. #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fa246b
Updated DRAT to work with OODT 1.9 and fixed python version issue whe…
IMS94 Feb 4, 2020
128ac99
Merge branch 'master' of https://github.com/IMS94/drat into apache-dr…
chrismattmann Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pge/src/main/resources/config/PgeConfig_MimePartitioner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<cmd>echo "Creating working dirs"</cmd>
<cmd>mkdir [JobInputDir] ; mkdir [JobOutputDir]; mkdir [JobLogDir]</cmd>
<cmd>echo "Running MIME partitioner"</cmd>
<cmd>[MimePartitionerPyScript] -u [SolrUrl] -c [NumFilesPerJob] -w [PCS_WorkflowManagerUrl] -t [RatTaskId] > [JobLogDir]/mime-partitioner-[DateMilis].log</cmd>
<cmd>[PythonExecutable] [MimePartitionerPyScript] -u [SolrUrl] -c [NumFilesPerJob] -w [PCS_WorkflowManagerUrl] -t [RatTaskId] > [JobLogDir]/mime-partitioner-[DateMilis].log</cmd>
</exe>

<!-- Files to ingest -->
Expand Down
2 changes: 1 addition & 1 deletion pge/src/main/resources/config/PgeConfig_RatAggregator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<cmd>echo "Creating working dirs"</cmd>
<cmd>mkdir [JobInputDir] ; mkdir [JobOutputDir]; mkdir [JobLogDir]</cmd>
<cmd>echo "Running RAT aggregator"</cmd>
<cmd>[RatAggregatorScript] `python -c "print(' '.join('[InputFiles]'.split(',')))"` > [JobOutputDir]/rat_aggregate_stats_[DateMilis].csv</cmd>
<cmd>[PythonExecutable] [RatAggregatorScript] `python -c "print(' '.join('[InputFiles]'.split(',')))"` > [JobOutputDir]/rat_aggregate_stats_[DateMilis].csv</cmd>
</exe>

<!-- Files to ingest -->
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<oodt.version>1.9</oodt.version>
<oodt.version>1.10-SNAPSHOT</oodt.version>
<junit.version>4.12</junit.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion resmgr/src/main/resources/bin/resmgr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if [ "$1" = "start" ]; then
-Djava.util.logging.config.file="$RESMGR_HOME"/etc/logging.properties \
-Dorg.apache.oodt.cas.resource.properties="$RESMGR_HOME"/etc/resource.properties \
-Djava.io.tmpdir="$OODT_TMPDIR" \
org.apache.oodt.cas.resource.system.XmlRpcResourceManager \
org.apache.oodt.cas.resource.system.ResourceManagerMain \
--portNum "$RESMGR_PORT" 2>&1 &

if [ ! -z "$RESMGR_PID" ]; then
Expand Down
2 changes: 1 addition & 1 deletion workflow/src/main/resources/bin/wmgr-client
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ cd "$WORKFLOW_HOME"/bin
-Djava.util.logging.config.file="$WORKFLOW_HOME"/etc/logging.properties \
-Dorg.apache.oodt.cas.cli.action.spring.config=file:"$WORKFLOW_HOME"/policy/cmd-line-actions.xml \
-Dorg.apache.oodt.cas.cli.option.spring.config=file:"$WORKFLOW_HOME"/policy/cmd-line-options.xml \
org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient "$@"
org.apache.oodt.cas.workflow.system.WorkflowManagerClientStarter "$@"
2 changes: 2 additions & 0 deletions workflow/src/main/resources/policy/tasks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<property name="SolrUrl" value="http://localhost:8080/solr/drat"/>
<property name="RatTaskId" value="urn:drat:RatCodeAudit"/>
<property name="NumFilesPerJob" value="100"/>
<property name="PythonExecutable" value="python3"/>
<property name="MimePartitionerPyScript" value="[DRAT_HOME]/pge/bin/mime_partitioner/mime_rat_partitioner.py"/>
<requiredMetFields/>
</configuration>
Expand All @@ -70,6 +71,7 @@
<property name="PCS_FileManagerUrl" value="[FILEMGR_URL]" envReplace="true"/>
<property name="PCS_MetFileExtension" value="met"/>
<property name="PCS_ClientTransferServiceFactory" value="org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory"/>
<property name="PythonExecutable" value="python3"/>
<property name="RatAggregatorScript" value="[DRAT_HOME]/pge/bin/rat_aggregator/rat_aggregator.py"/>
<requiredMetFields/>
</configuration>
Expand Down