From 836262354cde9237173a8508dc85811b16f38199 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 29 Dec 2015 10:28:54 -0800
Subject: [PATCH] burst_buffer/cray work
Rename avail_space to total_space and correct value displayed by scontrol show burst
---
slurm/slurm.h.in | 2 +-
src/api/burst_buffer_info.c | 3 +--
src/common/slurm_protocol_pack.c | 4 ++--
src/plugins/burst_buffer/common/burst_buffer_common.c | 8 ++++----
src/plugins/burst_buffer/cray/burst_buffer_cray.c | 9 +++++----
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index 204975160c3..7133c60b146 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -4715,7 +4715,7 @@ void slurm_init_trigger_msg PARAMS((trigger_info_t *trigger_info_msg));
/* Information about alternate pools or other burst buffer resources */
typedef struct {
- uint64_t avail_space; /* Total size of available resources, unused
+ uint64_t total_space; /* Total size of available resources, unused
* by burst_buffer_resv_t */
uint64_t granularity; /* Granularity of resource allocation size */
char *name; /* Resource (pool) name */
diff --git a/src/api/burst_buffer_info.c b/src/api/burst_buffer_info.c
index a6cbd522256..c0c6d2a19ba 100644
--- a/src/api/burst_buffer_info.c
+++ b/src/api/burst_buffer_info.c
@@ -279,8 +279,7 @@ extern void slurm_print_burst_buffer_record(FILE *out,
_get_size_str(g_sz_buf, sizeof(g_sz_buf),
burst_buffer_ptr->pool_ptr[i].granularity);
_get_size_str(t_sz_buf, sizeof(t_sz_buf),
- (burst_buffer_ptr->pool_ptr[i].avail_space +
- burst_buffer_ptr->pool_ptr[i].used_space));
+ burst_buffer_ptr->pool_ptr[i].total_space);
_get_size_str(u_sz_buf, sizeof(u_sz_buf),
burst_buffer_ptr->pool_ptr[i].used_space);
snprintf(tmp_line, sizeof(tmp_line),
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 5a5bd9c2cf8..7a52437674f 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -10461,7 +10461,7 @@ static int _unpack_burst_buffer_info_msg(
&bb_info_ptr->pool_ptr[j].name,
&uint32_tmp, buffer);
safe_unpack64(
- &bb_info_ptr->pool_ptr[j].avail_space,
+ &bb_info_ptr->pool_ptr[j].total_space,
buffer);
safe_unpack64(
&bb_info_ptr->pool_ptr[j].granularity,
@@ -10555,7 +10555,7 @@ static int _unpack_burst_buffer_info_msg(
&bb_info_ptr->pool_ptr[j].name,
&uint32_tmp, buffer);
safe_unpack64(
- &bb_info_ptr->pool_ptr[j].avail_space,
+ &bb_info_ptr->pool_ptr[j].total_space,
buffer);
safe_unpack64(
&bb_info_ptr->pool_ptr[j].used_space,
diff --git a/src/plugins/burst_buffer/common/burst_buffer_common.c b/src/plugins/burst_buffer/common/burst_buffer_common.c
index b0871cbe9b1..fddd7a6a131 100644
--- a/src/plugins/burst_buffer/common/burst_buffer_common.c
+++ b/src/plugins/burst_buffer/common/burst_buffer_common.c
@@ -222,7 +222,7 @@ extern void bb_clear_config(bb_config_t *config_ptr, bool fini)
config_ptr->pool_cnt = 0;
} else {
for (i = 0; i < config_ptr->pool_cnt; i++)
- config_ptr->pool_ptr[i].avail_space = 0;
+ config_ptr->pool_ptr[i].total_space = 0;
}
config_ptr->other_timeout = 0;
config_ptr->stage_in_timeout = 0;
@@ -554,7 +554,7 @@ extern void bb_load_config(bb_state_t *state_ptr, char *plugin_type)
for (i = 0; i < state_ptr->bb_config.pool_cnt; i++) {
info("%s: AltPoolName[%d]:%s:%"PRIu64"", __func__, i,
state_ptr->bb_config.pool_ptr[i].name,
- state_ptr->bb_config.pool_ptr[i].avail_space);
+ state_ptr->bb_config.pool_ptr[i].total_space);
}
info("%s: OtherTimeout:%u", __func__,
state_ptr->bb_config.other_timeout);
@@ -660,7 +660,7 @@ extern void bb_pack_state(bb_state_t *state_ptr, Buf buffer,
pack32(config_ptr->pool_cnt, buffer);
for (i = 0; i < config_ptr->pool_cnt; i++) {
packstr(config_ptr->pool_ptr[i].name, buffer);
- pack64(config_ptr->pool_ptr[i].avail_space, buffer);
+ pack64(config_ptr->pool_ptr[i].total_space, buffer);
pack64(config_ptr->pool_ptr[i].granularity, buffer);
pack64(config_ptr->pool_ptr[i].used_space, buffer);
}
@@ -686,7 +686,7 @@ extern void bb_pack_state(bb_state_t *state_ptr, Buf buffer,
pack32(config_ptr->pool_cnt, buffer);
for (i = 0; i < config_ptr->pool_cnt; i++) {
packstr(config_ptr->pool_ptr[i].name, buffer);
- pack64(config_ptr->pool_ptr[i].avail_space, buffer);
+ pack64(config_ptr->pool_ptr[i].total_space, buffer);
pack64(config_ptr->pool_ptr[i].used_space, buffer);
}
packstr(config_ptr->start_stage_in, buffer);
diff --git a/src/plugins/burst_buffer/cray/burst_buffer_cray.c b/src/plugins/burst_buffer/cray/burst_buffer_cray.c
index ca34668bd17..c383d5ee889 100644
--- a/src/plugins/burst_buffer/cray/burst_buffer_cray.c
+++ b/src/plugins/burst_buffer/cray/burst_buffer_cray.c
@@ -1146,7 +1146,8 @@ static void _load_state(bool init_config)
bb_state.bb_config.pool_cnt++;
}
- pool_ptr->avail_space = pools[i].quantity * pools[i].granularity;
+ pool_ptr->total_space = pools[i].quantity *
+ pools[i].granularity;
pool_ptr->granularity = pools[i].granularity;
if (bb_state.bb_config.flags & BB_FLAG_EMULATE_CRAY)
continue;
@@ -1936,12 +1937,12 @@ static int _test_size_limit(struct job_record *job_ptr, bb_job_t *bb_job)
total_space = xmalloc(sizeof(int64_t) * ds_len);
for (i = 0, pool_ptr = bb_state.bb_config.pool_ptr;
i < bb_state.bb_config.pool_cnt; i++, pool_ptr++) {
- if (pool_ptr->avail_space >= pool_ptr->used_space)
- avail_space[i] = pool_ptr->avail_space -
+ if (pool_ptr->total_space >= pool_ptr->used_space)
+ avail_space[i] = pool_ptr->total_space -
pool_ptr->used_space;
granularity[i] = pool_ptr->granularity;
pool_name[i] = pool_ptr->name;
- total_space[i] = pool_ptr->avail_space;
+ total_space[i] = pool_ptr->total_space;
}
if (bb_state.total_space - bb_state.used_space)
avail_space[i] = bb_state.total_space - bb_state.used_space;
--
GitLab