Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
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
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
01a29b4d
Commit
01a29b4d
authored
18 years ago
by
Christopher J. Morrone
Browse files
Options
Downloads
Patches
Plain Diff
Handle another spot where the backup controller calls switch/federation code.
parent
40d8a1c8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/plugins/switch/federation/federation.c
+15
-6
15 additions, 6 deletions
src/plugins/switch/federation/federation.c
with
15 additions
and
6 deletions
src/plugins/switch/federation/federation.c
+
15
−
6
View file @
01a29b4d
...
@@ -160,7 +160,7 @@ typedef struct {
...
@@ -160,7 +160,7 @@ typedef struct {
fed_libstate_t
*
fed_state
=
NULL
;
fed_libstate_t
*
fed_state
=
NULL
;
pthread_mutex_t
global_lock
=
PTHREAD_MUTEX_INITIALIZER
;
pthread_mutex_t
global_lock
=
PTHREAD_MUTEX_INITIALIZER
;
/* slurmd/slurm
d_
step global variables */
/* slurmd/slurmstep
d
global variables */
hostlist_t
adapter_list
;
hostlist_t
adapter_list
;
static
fed_cache_entry_t
lid_cache
[
FED_MAXADAPTERS
];
static
fed_cache_entry_t
lid_cache
[
FED_MAXADAPTERS
];
...
@@ -325,7 +325,7 @@ char *fed_sprint_jobinfo(fed_jobinfo_t *j, char *buf,
...
@@ -325,7 +325,7 @@ char *fed_sprint_jobinfo(fed_jobinfo_t *j, char *buf,
* _init_cache() simply initializes the cache to sane values and
* _init_cache() simply initializes the cache to sane values and
* needs to be called before any other cache functions are called.
* needs to be called before any other cache functions are called.
*
*
* Used by: slurmd/slurm
d_
step
* Used by: slurmd/slurmstep
d
*/
*/
static
void
static
void
_init_adapter_cache
(
void
)
_init_adapter_cache
(
void
)
...
@@ -341,7 +341,7 @@ _init_adapter_cache(void)
...
@@ -341,7 +341,7 @@ _init_adapter_cache(void)
/* Use ntbl_adapter_resources to cache information about local adapters.
/* Use ntbl_adapter_resources to cache information about local adapters.
*
*
* Used by: slurm
d_
step
* Used by: slurmstep
d
*/
*/
static
int
static
int
_fill_in_adapter_cache
(
void
)
_fill_in_adapter_cache
(
void
)
...
@@ -1763,9 +1763,18 @@ fed_job_step_complete(fed_jobinfo_t *jp, hostlist_t hl)
...
@@ -1763,9 +1763,18 @@ fed_job_step_complete(fed_jobinfo_t *jp, hostlist_t hl)
hi
=
hostlist_iterator_create
(
uniq_hl
);
hi
=
hostlist_iterator_create
(
uniq_hl
);
_lock
();
_lock
();
while
((
nodename
=
hostlist_next
(
hi
))
!=
NULL
)
{
if
(
fed_state
!=
NULL
)
{
_free_windows_by_job_key
(
jp
->
job_key
,
nodename
);
while
((
nodename
=
hostlist_next
(
hi
))
!=
NULL
)
{
free
(
nodename
);
_free_windows_by_job_key
(
jp
->
job_key
,
nodename
);
free
(
nodename
);
}
}
else
{
/* fed_state == NULL */
/* If there is no state at all, the job is already cleaned
* up. :) This should really only happen when the backup
* controller is calling job_fini() just before it takes over
* the role of active controller.
*/
debug
(
"fed_job_step_complete called when fed_state == NULL"
);
}
}
_unlock
();
_unlock
();
...
...
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
register
or
sign in
to comment