Skip to content

Ensure the epilog gets executed in PMIx server #4698

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

Merged
merged 1 commit into from
Jan 11, 2018
Merged

Ensure the epilog gets executed in PMIx server #4698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions opal/mca/pmix/pmix3x/pmix/src/include/pmix_globals.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2017 Research Organization for Information Science
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
* and Technology (RIST). All rights reserved.
Expand Down Expand Up @@ -53,7 +53,6 @@
#include "src/util/error.h"
#include "src/util/os_path.h"

static void cleanup(pmix_epilog_t *epi);
static void dirpath_destroy(char *path, pmix_cleanup_dir_t *cd,
pmix_epilog_t *epi);
static bool dirpath_is_empty(const char *path);
Expand Down Expand Up @@ -121,7 +120,7 @@ static void nsdes(pmix_nspace_t *p)
}
PMIX_LIST_DESTRUCT(&p->ranks);
/* perform any epilog */
cleanup(&p->epilog);
pmix_execute_epilog(&p->epilog);
/* cleanup the epilog */
PMIX_LIST_DESTRUCT(&p->epilog.cleanup_dirs);
PMIX_LIST_DESTRUCT(&p->epilog.cleanup_files);
Expand Down Expand Up @@ -208,7 +207,7 @@ static void pdes(pmix_peer_t *p)
PMIX_RELEASE(p->recv_msg);
}
/* perform any epilog */
cleanup(&p->epilog);
pmix_execute_epilog(&p->epilog);
/* cleanup the epilog */
PMIX_LIST_DESTRUCT(&p->epilog.cleanup_dirs);
PMIX_LIST_DESTRUCT(&p->epilog.cleanup_files);
Expand Down Expand Up @@ -318,15 +317,15 @@ PMIX_EXPORT PMIX_CLASS_INSTANCE(pmix_query_caddy_t,
pmix_object_t,
qcon, qdes);

static void cleanup(pmix_epilog_t *epi)
void pmix_execute_epilog(pmix_epilog_t *epi)
{
pmix_cleanup_file_t *cf;
pmix_cleanup_dir_t *cd;
pmix_cleanup_file_t *cf, *cfnext;
pmix_cleanup_dir_t *cd, *cdnext;
struct stat statbuf;
int rc;

/* start with any specified files */
PMIX_LIST_FOREACH(cf, &epi->cleanup_files, pmix_cleanup_file_t) {
PMIX_LIST_FOREACH_SAFE(cf, cfnext, &epi->cleanup_files, pmix_cleanup_file_t) {
/* check the effective uid/gid of the file and ensure it
* matches that of the peer - we do this to provide at least
* some minimum level of protection */
Expand All @@ -350,10 +349,12 @@ static void cleanup(pmix_epilog_t *epi)
pmix_output_verbose(10, pmix_globals.debug_output,
"File %s failed to unlink: %s", cf->path, strerror(rc));
}
pmix_list_remove_item(&epi->cleanup_files, &cf->super);
PMIX_RELEASE(cf);
}

/* now cleanup the directories */
PMIX_LIST_FOREACH(cd, &epi->cleanup_dirs, pmix_cleanup_dir_t) {
PMIX_LIST_FOREACH_SAFE(cd, cdnext, &epi->cleanup_dirs, pmix_cleanup_dir_t) {
/* check the effective uid/gid of the file and ensure it
* matches that of the peer - we do this to provide at least
* some minimum level of protection */
Expand All @@ -378,6 +379,8 @@ static void cleanup(pmix_epilog_t *epi)
pmix_output_verbose(10, pmix_globals.debug_output,
"Directory %s lacks permissions", cd->path);
}
pmix_list_remove_item(&epi->cleanup_dirs, &cd->super);
PMIX_RELEASE(cd);
}
}

Expand Down
4 changes: 3 additions & 1 deletion opal/mca/pmix/pmix3x/pmix/src/include/pmix_globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -408,6 +408,8 @@ typedef struct {
pmix_gds_base_module_t *mygds;
} pmix_globals_t;

/* provide access to a function to cleanup epilogs */
PMIX_EXPORT void pmix_execute_epilog(pmix_epilog_t *ep);

PMIX_EXPORT extern pmix_globals_t pmix_globals;
PMIX_EXPORT extern pmix_lock_t pmix_global_lock;
Expand Down
16 changes: 14 additions & 2 deletions opal/mca/pmix/pmix3x/pmix/src/server/pmix_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014-2015 Artem Y. Polyakov <[email protected]>.
Expand Down Expand Up @@ -346,6 +346,7 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)
{
int i;
pmix_peer_t *peer;
pmix_nspace_t *ns;

PMIX_ACQUIRE_THREAD(&pmix_global_lock);
if (pmix_globals.init_cntr <= 0) {
Expand All @@ -359,7 +360,6 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)
return PMIX_SUCCESS;
}
pmix_globals.init_cntr = 0;
PMIX_RELEASE_THREAD(&pmix_global_lock);

pmix_output_verbose(2, pmix_server_globals.base_output,
"pmix:server finalize called");
Expand All @@ -376,6 +376,10 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)

for (i=0; i < pmix_server_globals.clients.size; i++) {
if (NULL != (peer = (pmix_peer_t*)pmix_pointer_array_get_item(&pmix_server_globals.clients, i))) {
/* ensure that we do the specified cleanup - if this is an
* abnormal termination, then the peer object may not be
* at zero refcount */
pmix_execute_epilog(&peer->epilog);
PMIX_RELEASE(peer);
}
}
Expand All @@ -385,6 +389,12 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)
PMIX_LIST_DESTRUCT(&pmix_server_globals.local_reqs);
PMIX_LIST_DESTRUCT(&pmix_server_globals.gdata);
PMIX_LIST_DESTRUCT(&pmix_server_globals.events);
PMIX_LIST_FOREACH(ns, &pmix_server_globals.nspaces, pmix_nspace_t) {
/* ensure that we do the specified cleanup - if this is an
* abnormal termination, then the nspace object may not be
* at zero refcount */
pmix_execute_epilog(&ns->epilog);
}
PMIX_LIST_DESTRUCT(&pmix_server_globals.nspaces);

if (NULL != security_mode) {
Expand All @@ -406,6 +416,8 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)

pmix_output_verbose(2, pmix_server_globals.base_output,
"pmix:server finalize complete");
PMIX_RELEASE_THREAD(&pmix_global_lock);
PMIX_DESTRUCT_LOCK(&pmix_global_lock);

return PMIX_SUCCESS;
}
Expand Down