fixes to run PTF container

eflows4hpc · Aug 4, 2023 · 7e8167f · 7e8167f
1 parent 65130fc
commit 7e8167f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...ss/runtime/adaptors/execution/src/main/java/es/bsc/compss/invokers/binary/MPIInvoker.java b/...ss/runtime/adaptors/execution/src/main/java/es/bsc/compss/invokers/binary/MPIInvoker.java
@@ -291,9 +291,9 @@ private Object runInvocation() throws InvokeExecutionException {
             this.context.getThreadErrStream(), null, this.mpiDef.isFailByEV());
     }
 
-    private static boolean isOnContainer() {
+    private boolean isOnContainer() {
         String masterContImage = System.getenv(COMPSsConstants.MASTER_CONTAINER_IMAGE);
-        return masterContImage != null && !masterContImage.isEmpty();
+        return masterContImage != null && !masterContImage.isEmpty() && this.numWorkers > 1;
     }
 
     @Override

diff --git a/compss/runtime/scripts/user/launch_compss b/compss/runtime/scripts/user/launch_compss
@@ -1316,7 +1316,11 @@ get_args() {
           container_compss_path=${OPTARG//container_compss_path=/}
           ;;
         container_opts=*)
-          container_opts=${OPTARG//container_opts=/}
+          if [ -z "${container_opts}" ]; then
+                container_opts=${OPTARG//container_opts=/}
+          else
+                container_opts="${container_opts} ${OPTARG//container_opts=/}"
+          fi
           ;;
         elasticity=*)
           elasticity=${OPTARG//elasticity=/}