REVIEW: minor comments

openucx · Sep 7, 2023 · b976769 · b976769
1 parent 486b7e8
commit b976769
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/components/tl/sharp/tl_sharp_context.c b/src/components/tl/sharp/tl_sharp_context.c
@@ -442,7 +442,7 @@ ucc_status_t ucc_tl_sharp_context_create_epilog(ucc_base_context_t *context)
     status = ucc_topo_init(set, core_ctx->topo, &topo);
     if (UCC_OK != status) {
         tl_error(sharp_ctx->super.super.lib, "failed to init topo");
-        goto err_topo_init;
+        return status;
     }
 
     status = ucc_tl_sharp_context_init(sharp_ctx, &sharp_ctx->sharp_context,
@@ -456,7 +456,6 @@ ucc_status_t ucc_tl_sharp_context_create_epilog(ucc_base_context_t *context)
         status = ucc_tl_sharp_rcache_create(sharp_ctx->sharp_context, &sharp_ctx->rcache);
         if (status != UCC_OK) {
             tl_error(sharp_ctx->super.super.lib, "failed to create rcache");
-            status = UCC_ERR_NO_RESOURCE;
             goto err_sharp_ctx_init;
         }
     }
@@ -477,8 +476,6 @@ ucc_status_t ucc_tl_sharp_context_create_epilog(ucc_base_context_t *context)
     }
 err_sharp_ctx_init:
     sharp_coll_finalize(sharp_ctx->sharp_context);
-err_topo_init:
-    ucc_mpool_cleanup(&sharp_ctx->req_mp, 1);
     return status;
 }
 

diff --git a/src/core/ucc_context.c b/src/core/ucc_context.c
@@ -810,6 +810,7 @@ ucc_status_t ucc_context_create_proc_info(ucc_lib_h                   lib,
                 } else {
                     ucc_debug("ctx create epilog for %s failed: %s",
                               tl_lib->iface->super.name, ucc_status_string(status));
+                    tl_lib->iface->context.destroy(&tl_ctx->super);
                     for (j = 0; j < ctx->n_cl_ctx; j++) {
                         remove_tl_ctx_from_array(ctx->cl_ctx[j]->tl_ctxs,
                                                  &ctx->cl_ctx[j]->n_tl_ctxs,
@@ -825,7 +826,7 @@ ucc_status_t ucc_context_create_proc_info(ucc_lib_h                   lib,
     }
     if (0 == created_ctx_counter) {
         ucc_error("no TL context created");
-        status = UCC_ERR_NO_MESSAGE;
+        status = UCC_ERR_NO_RESOURCE;
         goto error_ctx_create_epilog;
     }