From 21835cc104cb3e42f5b44634eff3cd451a2511ca Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Thu, 20 Feb 2020 12:24:39 +0100 Subject: [PATCH] Revert the session renaming --- examples/dds/fairmq-start-ex-dds.sh.in | 30 +++++++++++++------------- examples/qc/fairmq-start-ex-qc.sh.in | 28 ++++++++++++------------ fairmq/plugins/DDS/runDDSCommandUI.cxx | 6 +++--- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/examples/dds/fairmq-start-ex-dds.sh.in b/examples/dds/fairmq-start-ex-dds.sh.in index ea79e024..99a4f72f 100755 --- a/examples/dds/fairmq-start-ex-dds.sh.in +++ b/examples/dds/fairmq-start-ex-dds.sh.in @@ -25,29 +25,29 @@ plugin=${1:-localhost} exec 5>&1 output=$(dds-session start | tee >(cat - >&5)) -export FAIRMQ_DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4) -echo "SESSION ID: ${FAIRMQ_DDS_SESSION_ID}" +export DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4) +echo "SESSION ID: ${DDS_SESSION_ID}" -trap "cleanup ${FAIRMQ_DDS_SESSION_ID}" EXIT +trap "cleanup ${DDS_SESSION_ID}" EXIT requiredNofSlots=12 if [[ "$plugin" == "ssh" ]]; then - dds-submit -r ${plugin} -c @DATA_DIR@/ex-dds-hosts.cfg -s ${FAIRMQ_DDS_SESSION_ID} + dds-submit -r ${plugin} -c @DATA_DIR@/ex-dds-hosts.cfg else - dds-submit -r ${plugin} --slots ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} + dds-submit -r ${plugin} --slots ${requiredNofSlots} fi echo "...waiting for ${requiredNofSlots} idle slots..." -dds-info --idle-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --idle-count --wait ${requiredNofSlots} export FAIRMQ_DDS_TOPO_FILE=@DATA_DIR@/ex-dds-topology.xml echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}" echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${FAIRMQ_DDS_TOPO_FILE})" -dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} -dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE} -s ${FAIRMQ_DDS_SESSION_ID} -dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --active-topology +dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE} +dds-info --active-topology echo "...waiting for ${requiredNofSlots} executing slots..." -dds-info --executing-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --executing-count --wait ${requiredNofSlots} echo "------------------------" echo "...waiting for Topology to finish..." @@ -67,14 +67,14 @@ fairmq-dds-command-ui -c t fairmq-dds-command-ui -c d fairmq-dds-command-ui -c q echo "...waiting for ${requiredNofSlots} idle slots..." -dds-info --idle-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --idle-count --wait ${requiredNofSlots} echo "------------------------" -dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} -dds-topology --stop -s ${FAIRMQ_DDS_SESSION_ID} -dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --active-topology +dds-topology --stop +dds-info --active-topology -dds-agent-cmd getlog -a -s ${FAIRMQ_DDS_SESSION_ID} +dds-agent-cmd getlog -a logDir="${wrkDir}/logs" for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done echo "AGENT LOG FILES IN: ${logDir}" diff --git a/examples/qc/fairmq-start-ex-qc.sh.in b/examples/qc/fairmq-start-ex-qc.sh.in index 7383e375..92e0c1aa 100755 --- a/examples/qc/fairmq-start-ex-qc.sh.in +++ b/examples/qc/fairmq-start-ex-qc.sh.in @@ -22,25 +22,25 @@ export PATH=@BIN_DIR@:$PATH exec 5>&1 output=$(dds-session start | tee >(cat - >&5)) -export FAIRMQ_DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4) -echo "SESSION ID: ${FAIRMQ_DDS_SESSION_ID}" +export DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4) +echo "SESSION ID: ${DDS_SESSION_ID}" -trap "cleanup ${FAIRMQ_DDS_SESSION_ID}" EXIT +trap "cleanup ${DDS_SESSION_ID}" EXIT requiredNofSlots=4 -dds-submit -r localhost --slots ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} +dds-submit -r localhost --slots ${requiredNofSlots} echo "...waiting for ${requiredNofSlots} idle slots..." -dds-info --idle-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --idle-count --wait ${requiredNofSlots} export FAIRMQ_DDS_TOPO_FILE=@DATA_DIR@/ex-qc-topology.xml echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}" echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${FAIRMQ_DDS_TOPO_FILE})" -dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} -dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE} -s ${FAIRMQ_DDS_SESSION_ID} -dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --active-topology +dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE} +dds-info --active-topology echo "...waiting for ${requiredNofSlots} executing slots..." -dds-info --executing-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --executing-count --wait ${requiredNofSlots} echo "------------------------" echo "...waiting for Topology to finish..." @@ -60,14 +60,14 @@ fairmq-dds-command-ui -c t fairmq-dds-command-ui -c d fairmq-dds-command-ui -c q echo "...waiting for ${requiredNofSlots} idle slots..." -dds-info --idle-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --idle-count --wait ${requiredNofSlots} echo "------------------------" -dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} -dds-topology --stop -s ${FAIRMQ_DDS_SESSION_ID} -dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} +dds-info --active-topology +dds-topology --stop +dds-info --active-topology -dds-agent-cmd getlog -a -s ${FAIRMQ_DDS_SESSION_ID} +dds-agent-cmd getlog -a logDir="${wrkDir}/logs" for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done echo "AGENT LOG FILES IN: ${logDir}" diff --git a/fairmq/plugins/DDS/runDDSCommandUI.cxx b/fairmq/plugins/DDS/runDDSCommandUI.cxx index 5cd5f4a3..19c13b0a 100644 --- a/fairmq/plugins/DDS/runDDSCommandUI.cxx +++ b/fairmq/plugins/DDS/runDDSCommandUI.cxx @@ -148,11 +148,11 @@ try { bpo::options_description options("Common options"); - auto envSessionId = getenv("FAIRMQ_DDS_SESSION_ID"); + auto envSessionId = getenv("DDS_SESSION_ID"); if (envSessionId) { - options.add_options()("session,s", bpo::value(&sessionID)->default_value(envSessionId), "DDS Session ID (overrides any value in env var $FAIRMQ_DDS_SESSION_ID)"); + options.add_options()("session,s", bpo::value(&sessionID)->default_value(envSessionId), "DDS Session ID (overrides any value in env var $DDS_SESSION_ID)"); } else { - options.add_options()("session,s", bpo::value(&sessionID)->required(), "DDS Session ID (overrides any value in env var $FAIRMQ_DDS_SESSION_ID)"); + options.add_options()("session,s", bpo::value(&sessionID)->required(), "DDS Session ID (overrides any value in env var $DDS_SESSION_ID)"); } auto envTopoFile = getenv("FAIRMQ_DDS_TOPO_FILE");