Skip to content

Commit af85e48

Browse files
author
Ralph Castain
committed
Silence Coverity warning, silence pmix_error_log of success
Signed-off-by: Ralph Castain <[email protected]>
1 parent b8d3999 commit af85e48

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2886,15 +2886,19 @@ static pmix_status_t dstore_store_modex(struct pmix_nspace_t *nspace,
28862886
PMIX_DESTRUCT(&pbkt);
28872887
return rc;
28882888
}
2889+
/* don't store blobs to the sm dstore from local clients */
2890+
if (_my_client(proc.nspace, proc.rank)) {
2891+
bo->bytes = pbkt.base_ptr;
2892+
bo->size = pbkt.bytes_used; // restore the incoming data
2893+
pbkt.base_ptr = NULL;
2894+
PMIX_DESTRUCT(&pbkt);
2895+
return PMIX_SUCCESS;
2896+
}
28892897
/* unpack the remaining values until we hit the end of the buffer */
28902898
cnt = 1;
28912899
kv = PMIX_NEW(pmix_kval_t);
28922900
PMIX_BFROPS_UNPACK(rc, peer, &pbkt, kv, &cnt, PMIX_KVAL);
28932901
while (PMIX_SUCCESS == rc) {
2894-
/* don't store blobs to the sm dstore from local clients */
2895-
if (_my_client(proc.nspace, proc.rank)) {
2896-
break;
2897-
}
28982902
/* store this in the hash table */
28992903
PMIX_GDS_STORE_KV(rc, pmix_globals.mypeer, &proc, PMIX_REMOTE, kv);
29002904
if (PMIX_SUCCESS != rc) {

orte/orted/pmix/pmix_server_pub.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ static int init_server(void)
106106
/* parse the URI to get the server's name */
107107
if (ORTE_SUCCESS != (rc = orte_rml_base_parse_uris(server, &orte_pmix_server_globals.server, NULL))) {
108108
ORTE_ERROR_LOG(rc);
109+
free(server);
109110
return rc;
110111
}
111112
/* setup our route to the server */
@@ -116,12 +117,10 @@ static int init_server(void)
116117
if (OPAL_SUCCESS != (rc = opal_pmix.store_local(&orte_pmix_server_globals.server, &val))) {
117118
ORTE_ERROR_LOG(rc);
118119
val.key = NULL;
119-
val.data.string = NULL;
120120
OBJ_DESTRUCT(&val);
121121
return rc;
122122
}
123123
val.key = NULL;
124-
val.data.string = NULL;
125124
OBJ_DESTRUCT(&val);
126125

127126
/* check if we are to wait for the server to start - resolves

0 commit comments

Comments
 (0)