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

Add session id to DDS commands in dds/qc examples

Browse Source
This commit is contained in:
Alexey Rybalchenko
2020-02-19 15:54:27 +01:00
committed by Dennis Klein
parent e221242f9a
commit fcd1022997
5 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/dds/CMakeLists.txt
View File

@@ -42,6 +42,7 @@ if(DDS_FOUND)
add_test(NAME Example.DDS.localhost COMMAND ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh localhost)
set_tests_properties(Example.DDS.localhost PROPERTIES
TIMEOUT 15
RUN_SERIAL true
PASS_REGULAR_EXPRESSION "Example successful"
)
endif()

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

@@ -32,22 +32,22 @@ trap "cleanup ${FAIRMQ_DDS_SESSION_ID}" EXIT
requiredNofSlots=12
if [[ "$plugin" == "ssh" ]]; then
dds-submit -r ${plugin} -c @DATA_DIR@/ex-dds-hosts.cfg
dds-submit -r ${plugin} -c @DATA_DIR@/ex-dds-hosts.cfg -s ${FAIRMQ_DDS_SESSION_ID}
else
dds-submit -r ${plugin} --slots ${requiredNofSlots}
dds-submit -r ${plugin} --slots ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID}
fi
echo "...waiting for ${requiredNofSlots} idle slots..."
dds-info --idle-count --wait ${requiredNofSlots}
dds-info --idle-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID}
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
dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE}
dds-info --active-topology
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}
echo "...waiting for ${requiredNofSlots} executing slots..."
dds-info --executing-count --wait ${requiredNofSlots}
dds-info --executing-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID}
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}
dds-info --idle-count --wait ${requiredNofSlots} -s ${FAIRMQ_DDS_SESSION_ID}
echo "------------------------"
dds-info --active-topology
dds-topology --stop
dds-info --active-topology
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-agent-cmd getlog -a
dds-agent-cmd getlog -a -s ${FAIRMQ_DDS_SESSION_ID}
logDir="${wrkDir}/logs"
for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
echo "AGENT LOG FILES IN: ${logDir}"