Skip to content

fix for proxy name #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chiarazampolli wants to merge 3 commits into
base: PR
Choose a base branch
from
Open

fix for proxy name #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8512dc
Fix misleading output
davidrohr May 11, 2022
df8002e
Use IPC for local calib connections
davidrohr May 11, 2022
13f481d
fix for proxy name
chiarazampolli May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions DATA/common/setenv_calib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ echo CALIBDATASPEC_BARREL = $CALIBDATASPEC_BARREL 1>&2
echo CALIBDATASPEC_CALO = $CALIBDATASPEC_CALO 1>&2

# proxies properties
PORT_BARREL=30453
PORT_CALO=30454
get_proxy_connection()
{
if (( $# < 2 )); then
Expand All @@ -117,28 +115,25 @@ get_proxy_connection()
echo "second parameter is the type of connection (input/output)"
exit 1
fi

# setting the port
if [[ $1 == "barrel" ]]; then
local PORT=$PORT_BARREL
elif [[ $1 == "calo" ]]; then
local PORT=$PORT_CALO
else
echo "parameter 1 should be either 'barrel' or 'calo'"
exit 3
fi

# setting the type of connection
if [[ $2 == "input" ]]; then
local CONNECTION="method=bind,type=pull"
local NAMECONNECTION="--proxy-name"
elif [[ $2 == "output" ]]; then
local CONNECTION="method=connect,type=push"
local NAMECONNECTION="--proxy-channel-name"
else
echo "parameter 2 should be either 'input' or 'output'"
exit 2
fi

local PROXY_CONN="--proxy-channel-name aggregator-proxy-$1 --channel-config \"name=aggregator-proxy-$1,$CONNECTION,rateLogging=1,transport=zeromq,address=tcp://localhost:$PORT\""

if workflow_has_parameter CALIB_LOCAL_AGGREGATOR; then
CONNECTION+=",transport=shmem,address=ipc://${UDS_PREFIX}aggregator-shm-$1"
else
CONNECTION+=",transport=zeromq"
fi
local PROXY_CONN="$NAMECONNECTION aggregator-proxy-$1 --channel-config \"name=aggregator-proxy-$1,$CONNECTION,rateLogging=1\""

echo PROXY_CONN = $PROXY_CONN 1>&2
echo $PROXY_CONN
Expand Down
2 changes: 1 addition & 1 deletion DATA/tools/epn/gen_topo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ else
# Note that this does not load the module, but just needs an O2DPG path to find, which then does the bulk of the topology generation.
# gen_topo_o2dpg.sh is kept compatible between O2DPG versions, thus it doesn't really depend on which O2DPG version we use at this point.
if [[ -z $O2DPG_ROOT ]]; then
O2DPG_ROOT=`bash -c "module load O2DPG > /dev/null; echo \\\$O2DPG_ROOT;"`
O2DPG_ROOT=`bash -c "module load O2DPG &> /dev/null; echo \\\$O2DPG_ROOT;"`
fi
fi
# Now we know which gen_topo_o2dpg.sh we can use, and all EPN related env variables are set, so we can run the topology generation.
Expand Down