Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-14 17:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert the session renaming

Browse Source
This commit is contained in:
Alexey Rybalchenko 2020-02-20 12:24:39 +01:00 committed by Dennis Klein
parent 334d81a1ab
commit 21835cc104
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
examples/dds/fairmq-start-ex-dds.sh.in
View File

@ -25,29 +25,29 @@ plugin=${1:-localhost}
exec 5>&1 exec 5>&1
output=$(dds-session start | tee >(cat - >&5)) output=$(dds-session start | tee >(cat - >&5))
export FAIRMQ_DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4) export DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4)
echo "SESSION ID: ${FAIRMQ_DDS_SESSION_ID}" echo "SESSION ID: ${DDS_SESSION_ID}"
trap "cleanup ${FAIRMQ_DDS_SESSION_ID}" EXIT trap "cleanup ${DDS_SESSION_ID}" EXIT
requiredNofSlots=12 requiredNofSlots=12
if [[ "$plugin" == "ssh" ]]; then 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 else
dds-submit -r ${plugin} --slots ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} dds-submit -r ${plugin} --slots ${requiredNofSlots}
fi fi
echo "...waiting for ${requiredNofSlots} idle slots..." 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 export FAIRMQ_DDS_TOPO_FILE=@DATA_DIR@/ex-dds-topology.xml
echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}" echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}"
echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${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-info --active-topology
dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE} -s ${FAIRMQ_DDS_SESSION_ID} dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE}
dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} dds-info --active-topology
echo "...waiting for ${requiredNofSlots} executing slots..." 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 "------------------------"
echo "...waiting for Topology to finish..." 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 d
fairmq-dds-command-ui -c q fairmq-dds-command-ui -c q
echo "...waiting for ${requiredNofSlots} idle slots..." echo "...waiting for ${requiredNofSlots} idle slots..."
dds-info --idle-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} dds-info --idle-count --wait ${requiredNofSlots}
echo "------------------------" echo "------------------------"
dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} dds-info --active-topology
dds-topology --stop -s ${FAIRMQ_DDS_SESSION_ID} dds-topology --stop
dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} dds-info --active-topology
dds-agent-cmd getlog -a -s ${FAIRMQ_DDS_SESSION_ID} dds-agent-cmd getlog -a
logDir="${wrkDir}/logs" logDir="${wrkDir}/logs"
for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
echo "AGENT LOG FILES IN: ${logDir}" echo "AGENT LOG FILES IN: ${logDir}"

28
examples/qc/fairmq-start-ex-qc.sh.in
View File

@ -22,25 +22,25 @@ export PATH=@BIN_DIR@:$PATH
exec 5>&1 exec 5>&1
output=$(dds-session start | tee >(cat - >&5)) output=$(dds-session start | tee >(cat - >&5))
export FAIRMQ_DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4) export DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4)
echo "SESSION ID: ${FAIRMQ_DDS_SESSION_ID}" echo "SESSION ID: ${DDS_SESSION_ID}"
trap "cleanup ${FAIRMQ_DDS_SESSION_ID}" EXIT trap "cleanup ${DDS_SESSION_ID}" EXIT
requiredNofSlots=4 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..." 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 export FAIRMQ_DDS_TOPO_FILE=@DATA_DIR@/ex-qc-topology.xml
echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}" echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}"
echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${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-info --active-topology
dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE} -s ${FAIRMQ_DDS_SESSION_ID} dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE}
dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} dds-info --active-topology
echo "...waiting for ${requiredNofSlots} executing slots..." 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 "------------------------"
echo "...waiting for Topology to finish..." 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 d
fairmq-dds-command-ui -c q fairmq-dds-command-ui -c q
echo "...waiting for ${requiredNofSlots} idle slots..." echo "...waiting for ${requiredNofSlots} idle slots..."
dds-info --idle-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID} dds-info --idle-count --wait ${requiredNofSlots}
echo "------------------------" echo "------------------------"
dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} dds-info --active-topology
dds-topology --stop -s ${FAIRMQ_DDS_SESSION_ID} dds-topology --stop
dds-info --active-topology -s ${FAIRMQ_DDS_SESSION_ID} dds-info --active-topology
dds-agent-cmd getlog -a -s ${FAIRMQ_DDS_SESSION_ID} dds-agent-cmd getlog -a
logDir="${wrkDir}/logs" logDir="${wrkDir}/logs"
for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
echo "AGENT LOG FILES IN: ${logDir}" echo "AGENT LOG FILES IN: ${logDir}"

6
fairmq/plugins/DDS/runDDSCommandUI.cxx
View File

@ -148,11 +148,11 @@ try {
bpo::options_description options("Common options"); bpo::options_description options("Common options");
auto envSessionId = getenv("FAIRMQ_DDS_SESSION_ID"); auto envSessionId = getenv("DDS_SESSION_ID");
if (envSessionId) { if (envSessionId) {
options.add_options()("session,s", bpo::value<string>(&sessionID)->default_value(envSessionId), "DDS Session ID (overrides any value in env var $FAIRMQ_DDS_SESSION_ID)"); options.add_options()("session,s", bpo::value<string>(&sessionID)->default_value(envSessionId), "DDS Session ID (overrides any value in env var $DDS_SESSION_ID)");
} else { } else {
options.add_options()("session,s", bpo::value<string>(&sessionID)->required(), "DDS Session ID (overrides any value in env var $FAIRMQ_DDS_SESSION_ID)"); options.add_options()("session,s", bpo::value<string>(&sessionID)->required(), "DDS Session ID (overrides any value in env var $DDS_SESSION_ID)");
} }
auto envTopoFile = getenv("FAIRMQ_DDS_TOPO_FILE"); auto envTopoFile = getenv("FAIRMQ_DDS_TOPO_FILE");