[airavata] branch develop updated: Removing realtime monitoring from condor jobs

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8a95dc0738 Removing realtime monitoring from condor jobs
8a95dc0738 is described below

commit 8a95dc0738c947adb166e85e3fa93cf689b41003
Author: DImuthuUpe <dimuthu.upeks...@gmail.com>
AuthorDate: Fri Mar 17 12:32:43 2023 -0400

    Removing realtime monitoring from condor jobs
---
 .../airavata/helix/impl/task/submission/JobSubmissionTask.java       | 5 ++++-
 .../configuration/server/src/main/resources/HTCONDOR_Groovy.template | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
 
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
index 70d6299aec..5b815b87fe 100644
--- 
a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
+++ 
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
@@ -32,6 +32,7 @@ import 
org.apache.airavata.helix.impl.task.submission.config.JobFactory;
 import 
org.apache.airavata.helix.impl.task.submission.config.JobManagerConfiguration;
 import org.apache.airavata.helix.impl.task.submission.config.RawCommandInfo;
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
+import 
org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
 import org.apache.airavata.model.job.JobModel;
 import org.apache.airavata.model.status.JobStatus;
 import org.apache.commons.io.FileUtils;
@@ -59,7 +60,9 @@ public abstract class JobSubmissionTask extends AiravataTask {
         JobManagerConfiguration jobManagerConfiguration = 
JobFactory.getJobManagerConfiguration(JobFactory.getResourceJobManager(
                 getRegistryServiceClient(), 
getTaskContext().getJobSubmissionProtocol(), 
getTaskContext().getPreferredJobSubmissionInterface()));
 
-        addMonitoringCommands(groovyMapData);
+        if 
(getTaskContext().getResourceJobManager().getResourceJobManagerType() != 
ResourceJobManagerType.HTCONDOR) {
+            addMonitoringCommands(groovyMapData);
+        }
 
         String scriptAsString = 
groovyMapData.loadFromFile(jobManagerConfiguration.getJobDescriptionTemplateName());
         logger.info("Generated job submission script : " + scriptAsString);
diff --git 
a/modules/configuration/server/src/main/resources/HTCONDOR_Groovy.template 
b/modules/configuration/server/src/main/resources/HTCONDOR_Groovy.template
index 9e4cb974a9..c0f6501949 100644
--- a/modules/configuration/server/src/main/resources/HTCONDOR_Groovy.template
+++ b/modules/configuration/server/src/main/resources/HTCONDOR_Groovy.template
@@ -23,7 +23,7 @@
    if (inputFiles != null && inputFiles.size() > 0) out.print 
'transfer_input_files = '
    if (inputFiles != null && inputFiles.size() > 0) for(file in inputFiles) 
out.print file + ', '
    def preJobInputs = checkCommand(preJobCommands, 'transfer_input_files =')
-   if (preJobInputs) out.print ',' + preJobInputs.substring(22)
+   if (preJobInputs) out.print preJobInputs.substring(22)
 
    if (inputFiles != null && inputFiles.size() > 0) out.print '\n'
    if (moduleCommands != null) for(mc in moduleCommands)  out.print mc +'\n'