Skip to content

Remove extra character at end of error messages #1905

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
rhc54 merged 1 commit into from
Jan 10, 2024
Merged

Remove extra character at end of error messages #1905

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
6 changes: 4 additions & 2 deletions src/mca/odls/base/odls_base_default_fns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2017 Mellanox Technologies Ltd. All rights reserved.
* Copyright (c) 2017-2020 IBM Corporation. All rights reserved.
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -1958,7 +1958,9 @@ int prte_odls_base_default_kill_local_procs(pmix_pointer_array_t *procs,
cd->child->pid = 0;

/* mark the child as "killed" */
cd->child->state = PRTE_PROC_STATE_KILLED_BY_CMD; /* we ordered it to die */
if (cd->child->state < PRTE_PROC_STATE_TERMINATED) {
cd->child->state = PRTE_PROC_STATE_KILLED_BY_CMD; /* we ordered it to die */
}

/* ensure the child's session directory is cleaned up */
prte_session_dir_finalize(&cd->child->name);
Expand Down
4 changes: 2 additions & 2 deletions src/mca/state/dvm/state_dvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2020 IBM Corporation. All rights reserved.
* Copyright (c) 2020 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -625,7 +625,7 @@ static void check_complete(int fd, short args, void *cbdata)
pmix_byte_object_t bo;
PMIX_BYTE_OBJECT_CONSTRUCT(&bo);
bo.bytes = (char *) msg;
bo.size = strlen(msg) + 1;
bo.size = strlen(msg);
PRTE_PMIX_CONSTRUCT_LOCK(&lock);
rc = PMIx_server_IOF_deliver(&prte_process_info.myproc,
PMIX_FWD_STDDIAG_CHANNEL,
Expand Down
5 changes: 3 additions & 2 deletions src/runtime/prte_quit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
* Copyright (c) 2021 Amazon.com, Inc. or its affiliates. All Rights
* reserved.
* $COPYRIGHT$
Expand Down Expand Up @@ -228,7 +228,8 @@ static char *print_aborted_job(prte_job_t *job,
}
}
return output;
} else if (PRTE_PROC_STATE_ABORTED == proc->state) {
} else if (PRTE_PROC_STATE_ABORTED == proc->state ||
PRTE_PROC_STATE_CALLED_ABORT == proc->state) {
output = pmix_show_help_string("help-prun.txt", "prun:proc-ordered-abort", true,
prte_tool_basename, (unsigned long) proc->name.rank,
(unsigned long) proc->pid, node->name, prte_tool_basename);
Expand Down