make intermediate memory usage info visible to pilot

lsst · Aug 22, 2022 · 241baa8 · 241baa8
1 parent 49185ad
commit 241baa8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/config/bps_panda.yaml b/config/bps_panda.yaml
@@ -42,6 +42,8 @@ runnerCommand: >
   logFile=${logDir}/${REALTIME_LOGFILES};
   touch ${logFile};
   chmod ugo+w ${logFile} ${logDir}; ln -s ${logFile} ./;
+  file=${logDir}/memory_monitor_output.txt; touch ${file}; chmod ugo+w ${file}; ln -s ${file} ./;
+  file=${logDir}/memory_monitor_summary.json; touch ${file}; chmod ugo+w ${file}; ln -s ${file} ./;
   docker run
   --rm
   -v ${logDir}:${logDir}
@@ -57,15 +59,16 @@ runnerCommand: >
   ls -al;
   setup lsst_distrib;
   pwd;
-  prmon
-  -i 5
-  -f ${logDir}/prmon.txt
-  -j ${logDir}/prmon.json
-  --
-  python3 \${CTRL_BPS_PANDA_DIR}/python/lsst/ctrl/bps/panda/edgenode/cmd_line_decoder.py _cmd_line_;" >&2;
+  python3 \${CTRL_BPS_PANDA_DIR}/python/lsst/ctrl/bps/panda/edgenode/cmd_line_decoder.py _cmd_line_ & pJob=\$!;
+  prmon -i 5
+  -f ${logDir}/memory_monitor_output.txt
+  -j ${logDir}/memory_monitor_summary.json
+  -p \$pJob & mJob=\$!;
+  wait \$pJob;
+  ret=\$?;
+  wait \$mJob;
+  exit \$ret;" >&2;
   retStat=$?;
-  ln -fs ${logDir}/prmon.txt ./memory_monitor_output.txt;
-  ln -fs ${logDir}/prmon.json ./memory_monitor_summary.json;
   exit $retStat
 
 wmsServiceClass: lsst.ctrl.bps.panda.PanDAService
diff --git a/config/bps_usdf.yaml b/config/bps_usdf.yaml
@@ -16,12 +16,15 @@ runnerCommand: >
   source /cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib/{LSST_VERSION}/loadLSST.bash;
   pwd; ls -al;
   setup lsst_distrib;
-  prmon -i 5 -f ${PWD}/prmon.txt -j ${PWD}/prmon.json --
-  python3 ${CTRL_BPS_PANDA_DIR}/python/lsst/ctrl/bps/panda/edgenode/cmd_line_decoder.py _cmd_line_;
+  python3 ${CTRL_BPS_PANDA_DIR}/python/lsst/ctrl/bps/panda/edgenode/cmd_line_decoder.py _cmd_line_ & pJob=$!;
+  prmon -i 5
+  -f memory_monitor_output.txt
+  -j memory_monitor_summary.json
+  -p $pJob & mJob=$!;
+  wait $pJob;
   retStat=$?;
+  wait $mJob;
   rm -fr EXEC_REPO-*;
-  ln -fs ${PWD}/prmon.txt ./memory_monitor_output.txt;
-  ln -fs ${PWD}/prmon.json ./memory_monitor_summary.json;
   exit $retStat
 
 payload:

diff --git a/python/lsst/ctrl/bps/panda/conf_example/setupUSDF.sh b/python/lsst/ctrl/bps/panda/conf_example/setupUSDF.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # setup Rubin env
-export LSST_VERSION=w_2022_30
+export LSST_VERSION=w_2022_32
 source /cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib/${LSST_VERSION}/loadLSST.bash 
 setup lsst_distrib
 

diff --git a/python/lsst/ctrl/bps/panda/conf_example/test_idf.yaml b/python/lsst/ctrl/bps/panda/conf_example/test_idf.yaml
@@ -9,4 +9,4 @@ payload:
   payloadName: testIDF
   inCollection: "2.2i/defaults/test-med-1"
   dataQuery: "instrument='LSSTCam-imSim' and skymap='DC2' and exposure in (214433) and detector=10"
-  sw_image: "lsstsqre/centos:7-stack-lsst_distrib-w_2022_30"
+  sw_image: "lsstsqre/centos:7-stack-lsst_distrib-w_2022_32"
diff --git a/python/lsst/ctrl/bps/panda/conf_example/test_usdf.yaml b/python/lsst/ctrl/bps/panda/conf_example/test_usdf.yaml
@@ -2,7 +2,7 @@
 # Need to setup USDF before submitting the yaml
 # source setupUSDF.sh
 
-LSST_VERSION: w_2022_30
+LSST_VERSION: w_2022_32
 
 includeConfigs:
 - ${CTRL_BPS_PANDA_DIR}/config/bps_usdf.yaml