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
e52bf30b
Commit
e52bf30b
authored
19 years ago
by
Moe Jette
Browse files
Options
Downloads
Patches
Plain Diff
Change sfree references in user messages from "partition" to "bglblock"
in order to avoid confusion with slurm partitions.
parent
bdc24b62
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/select/bluegene/opts.c
+3
-2
3 additions, 2 deletions
src/plugins/select/bluegene/opts.c
src/plugins/select/bluegene/sfree.c
+8
-7
8 additions, 7 deletions
src/plugins/select/bluegene/sfree.c
with
11 additions
and
9 deletions
src/plugins/select/bluegene/opts.c
+
3
−
2
View file @
e52bf30b
/****************************************************************************\
/****************************************************************************\
* opts.c - sfree command line option processing functions
* opts.c - sfree command line option processing functions
* $Id$
*****************************************************************************
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
...
@@ -118,8 +119,8 @@ static void _help(void)
...
@@ -118,8 +119,8 @@ static void _help(void)
{
{
printf
(
"\
printf
(
"\
Usage: sfree [OPTIONS]
\n
\
Usage: sfree [OPTIONS]
\n
\
-p, --partition free specific
partition
named
\n
\
-p, --partition free specific
bglblock
named
\n
\
-a, --all free all
partition
s
\n
\
-a, --all free all
bglblock
s
\n
\
-V, --version output version information and exit
\n
\
-V, --version output version information and exit
\n
\
\n
Help options:
\n
\
\n
Help options:
\n
\
--help show this help message
\n
\
--help show this help message
\n
\
...
...
This diff is collapsed.
Click to expand it.
src/plugins/select/bluegene/sfree.c
+
8
−
7
View file @
e52bf30b
/*****************************************************************************\
/*****************************************************************************\
* sfree.c - free specified partition or all partitions.
* sfree.c - free specified partition or all partitions.
* $Id$
*****************************************************************************
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
...
@@ -60,7 +61,7 @@ static void *_mult_free_part(void *args)
...
@@ -60,7 +61,7 @@ static void *_mult_free_part(void *args)
{
{
char
*
bgl_part_id
=
(
char
*
)
args
;
char
*
bgl_part_id
=
(
char
*
)
args
;
debug
(
"destroying the
partition
%s."
,
bgl_part_id
);
debug
(
"destroying the
bglblock
%s."
,
bgl_part_id
);
_free_partition
(
bgl_part_id
);
_free_partition
(
bgl_part_id
);
slurm_mutex_lock
(
&
freed_cnt_mutex
);
slurm_mutex_lock
(
&
freed_cnt_mutex
);
...
@@ -106,7 +107,7 @@ int main(int argc, char *argv[])
...
@@ -106,7 +107,7 @@ int main(int argc, char *argv[])
parse_command_line
(
argc
,
argv
);
parse_command_line
(
argc
,
argv
);
if
(
!
all_parts
)
{
if
(
!
all_parts
)
{
if
(
!
bgl_part_id
)
{
if
(
!
bgl_part_id
)
{
error
(
"you need to specify a
partition
"
);
error
(
"you need to specify a
bglblock
"
);
exit
(
0
);
exit
(
0
);
}
}
_free_partition
(
bgl_part_id
);
_free_partition
(
bgl_part_id
);
...
@@ -190,7 +191,7 @@ int main(int argc, char *argv[])
...
@@ -190,7 +191,7 @@ int main(int argc, char *argv[])
}
}
}
}
while
(
num_part_to_free
!=
num_part_freed
)
{
while
(
num_part_to_free
!=
num_part_freed
)
{
info
(
"waiting for all
partition
s to free..."
);
info
(
"waiting for all
bglblock
s to free..."
);
sleep
(
1
);
sleep
(
1
);
}
}
...
@@ -202,7 +203,7 @@ static int _free_partition(char *bgl_part_id)
...
@@ -202,7 +203,7 @@ static int _free_partition(char *bgl_part_id)
int
state
=-
1
;
int
state
=-
1
;
int
rc
;
int
rc
;
info
(
"freeing
partition
%s"
,
bgl_part_id
);
info
(
"freeing
bglblock
%s"
,
bgl_part_id
);
_term_jobs_on_part
(
bgl_part_id
);
_term_jobs_on_part
(
bgl_part_id
);
while
(
1
)
{
while
(
1
)
{
if
((
state
=
_update_bgl_record_state
(
bgl_part_id
))
if
((
state
=
_update_bgl_record_state
(
bgl_part_id
))
...
@@ -228,7 +229,7 @@ static int _free_partition(char *bgl_part_id)
...
@@ -228,7 +229,7 @@ static int _free_partition(char *bgl_part_id)
break
;
break
;
sleep
(
3
);
sleep
(
3
);
}
}
info
(
"
partition
%s is freed"
,
bgl_part_id
);
info
(
"
bglblock
%s is freed"
,
bgl_part_id
);
return
SLURM_SUCCESS
;
return
SLURM_SUCCESS
;
}
}
...
@@ -292,7 +293,7 @@ static int _update_bgl_record_state(char *bgl_part_id)
...
@@ -292,7 +293,7 @@ static int _update_bgl_record_state(char *bgl_part_id)
if
(
state
==
-
1
)
if
(
state
==
-
1
)
goto
clean_up
;
goto
clean_up
;
else
if
(
j
>=
num_parts
)
{
else
if
(
j
>=
num_parts
)
{
error
(
"This
partition
, %s, doesn't exist in MMCS"
,
error
(
"This
bglblock
, %s, doesn't exist in MMCS"
,
bgl_part_id
);
bgl_part_id
);
state
=
-
1
;
state
=
-
1
;
goto
clean_up
;
goto
clean_up
;
...
@@ -383,7 +384,7 @@ static void _term_jobs_on_part(char *bgl_part_id)
...
@@ -383,7 +384,7 @@ static void _term_jobs_on_part(char *bgl_part_id)
}
}
if
(
job_found
==
0
)
if
(
job_found
==
0
)
info
(
"No jobs on
partition
%s"
,
bgl_part_id
);
info
(
"No jobs on
bglblock
%s"
,
bgl_part_id
);
not_removed:
not_removed:
if
((
rc
=
rm_free_job_list
(
job_list
))
!=
STATUS_OK
)
if
((
rc
=
rm_free_job_list
(
job_list
))
!=
STATUS_OK
)
...
...
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