Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
maestro-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
maestro
maestro-core
Commits
7d6dede8
Commit
7d6dede8
authored
Nov 24, 2021
by
Ali Omar Abdelazim Mohammed
Committed by
Ali Mohammed
Dec 17, 2021
Browse files
Options
Downloads
Patches
Plain Diff
fix rdma dist cdo transport - remove not needed clients in dist test
parent
9d00df2a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/check_pm_dist_cdo.sh.in
+4
-4
4 additions, 4 deletions
tests/check_pm_dist_cdo.sh.in
transport/rdma.c
+4
-3
4 additions, 3 deletions
transport/rdma.c
with
8 additions
and
7 deletions
tests/check_pm_dist_cdo.sh.in
+
4
−
4
View file @
7d6dede8
...
...
@@ -96,15 +96,15 @@ export MSTRO_POOL_MANAGER_INFO
(
env
MSTRO_TRANSPORT_DEFAULT
=
OFI
MSTRO_LOG_LEVEL
=
3
MSTRO_COMPONENT_NAME
=
"consumer"
MSTRO_LOG_COLOR_ERRORS
=
1
MSTRO_LOG_COLOR
=
"GREEN"
${
CLIENT_CMD
}
_2
-n
)
||
exit
99 &
#start client 3
(
env
MSTRO_TRANSPORT_DEFAULT
=
GFS
MSTRO_LOG_LEVEL
=
3
MSTRO_COMPONENT_NAME
=
"producer2"
MSTRO_LOG_COLOR_ERRORS
=
1
MSTRO_LOG_COLOR
=
"GREEN"
${
CLIENT_CMD
}
_3
-n
)
||
exit
99 &
#
(env MSTRO_TRANSPORT_DEFAULT=GFS MSTRO_LOG_LEVEL=3 MSTRO_COMPONENT_NAME="producer2" MSTRO_LOG_COLOR_ERRORS=1 MSTRO_LOG_COLOR="GREEN" ${CLIENT_CMD}_3 -n) || exit 99 &
# start client 4
(
env
MSTRO_TRANSPORT_DEFAULT
=
GFS
MSTRO_LOG_LEVEL
=
3
MSTRO_COMPONENT_NAME
=
"consumer"
MSTRO_LOG_COLOR_ERRORS
=
1
MSTRO_LOG_COLOR
=
"GREEN"
${
CLIENT_CMD
}
_4
-n
)
||
exit
99 &
#
(env MSTRO_TRANSPORT_DEFAULT=GFS MSTRO_LOG_LEVEL=3 MSTRO_COMPONENT_NAME="consumer" MSTRO_LOG_COLOR_ERRORS=1 MSTRO_LOG_COLOR="GREEN" ${CLIENT_CMD}_4 -n) || exit 99 &
wait
%1
||
exit
99
wait
%2
||
exit
99
wait
%3
||
exit
99
wait
%4
||
exit
99
#
wait %3 || exit 99
#
wait %4 || exit 99
# trap normal script termination: close pipe to pool manager
terminate
${
PM_PID
}
0
This diff is collapsed.
Click to expand it.
transport/rdma.c
+
4
−
3
View file @
7d6dede8
...
...
@@ -222,7 +222,8 @@ FRESH_REGISTRATION:
ERR
(
"Couldn't get CDO data and size for RDMA transport (status: %s)
\n
"
,
mstro_status_description
(
status
));
goto
BAILOUT_UNLOCK
;
}
regentry
->
addr
=
dl
.
data
;
regentry
->
addr
=
dl
.
data
+
ticket
->
src_offset
;
DEBUG
(
"Moving cdo ptr by %zu as src offset
\n\n\n\n\n
"
,
ticket
->
src_offset
);
regentry
->
len
=
dl
.
len
;
if
(
mstro_memlock
(
dl
.
data
,
dl
.
len
)
!=
MSTRO_OK
)
{
...
...
@@ -234,7 +235,7 @@ FRESH_REGISTRATION:
/* register this address for OFI */
struct
fid_mr
*
mr
;
/*Calculate the src ptr taking into account source offsets for dist_cdos -- silence compiler warnings */
void
*
src_ptr
=
(
void
*
)
((
char
*
)
dl
.
data
+
ticket
->
src_offset
);
void
*
src_ptr
=
regentry
->
addr
;
//
(void *) ((char *) dl.data);
uint64_t
requested_key
=
e
->
ep
->
fi
->
domain_attr
->
mr_mode
&
FI_MR_PROV_KEY
?
0
:
mstro_memory_new_key
();
int
err
=
fi_mr_reg
(
e
->
ep
->
domain
,
src_ptr
,
dl
.
len
,
FI_REMOTE_READ
,
0
,
requested_key
,
0
,
&
mr
,
NULL
);
...
...
@@ -429,7 +430,7 @@ mstro_transport_rdma_dst_execute(mstro_cdo cdo_dst, Mstro__Pool__TransferTicket*
*/
uint64_t
requested_key
=
app_entry
->
ep
->
fi
->
domain_attr
->
mr_mode
&
FI_MR_PROV_KEY
?
0
:
mstro_memory_new_key
();
int
err
=
fi_mr_reg
(
app_entry
->
ep
->
domain
,
cdo_dst
->
raw_ptr
,
len
,
int
err
=
fi_mr_reg
(
app_entry
->
ep
->
domain
,
cdo_dst
->
raw_ptr
+
ticket
->
dst_offset
,
len
,
FI_READ
,
0
,
requested_key
,
0
,
&
mr
,
NULL
);
if
(
err
)
{
ERR
(
"Couldn't register memory region for RDMA transport (err: %d, %s)
\n
"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment