From 474fe18e26e3874a848b0f43f4a96b93471fe2fe Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 15 Oct 2004 22:08:40 +0000
Subject: [PATCH] Remove NodeBase support, no longer used.
---
doc/html/quickstart_admin.html | 5 ++---
doc/man/man5/slurm.conf.5 | 10 ----------
slurm/slurm.h.in | 1 -
src/api/config_info.c | 2 --
src/common/read_config.c | 14 ++------------
src/common/read_config.h | 1 -
src/common/slurm_protocol_pack.c | 2 --
src/slurmctld/node_mgr.c | 2 --
src/slurmctld/proc_req.c | 1 -
9 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/doc/html/quickstart_admin.html b/doc/html/quickstart_admin.html
index 810a6c531a0..0f61bfde169 100644
--- a/doc/html/quickstart_admin.html
+++ b/doc/html/quickstart_admin.html
@@ -9,7 +9,7 @@
<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management,
Linux clusters, high-performance computing, Livermore Computing">
<meta name="LLNLRandR" content="UCRL-WEB-204324">
-<meta name="LLNLRandRdate" content="13 October 2004">
+<meta name="LLNLRandRdate" content="15 October 2004">
<meta name="distribution" content="global">
<meta name="description" content="Simple Linux Utility for Resource Management">
<meta name="copyright"
@@ -391,7 +391,6 @@ ControlMachine = adevi
Epilog = (null)
FastSchedule = 1
FirstJobId = 1
-NodeHashBase = 10
HeartbeatInterval = 60
InactiveLimit = 0
JobCompLoc = /var/tmp/jette/slurm.job.log
@@ -450,7 +449,7 @@ in the NEWS file.
<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
<p class="footer">UCRL-WEB-207187<br>
-Last modified 13 October 2004</p></td>
+Last modified 15 October 2004</p></td>
</tr>
</table>
</td>
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 83e215df9d2..659689f1251 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -99,14 +99,6 @@ for each subsequent job. This may be used to provide a meta-scheduler
with a job id space which is disjoint from the interactive jobs.
The default value is 1.
.TP
-\fBHashBase\fR
-If the node names include a sequence number, this value defines the
-base to be used in building a hash table based upon node name. Value of 8
-and 10 are recognized for octal and decimal sequence numbers respectively.
-The value of zero is also recognized for node names lacking a sequence number.
-The use of node names containing a numeric suffix will provide faster
-operation for larger clusters. The default value is 10.
-.TP
\fBHeartbeatInterval\fR
The interval, in seconds, at which the SLURM controller tests the
status of other daemons. The default value is 30 seconds.
@@ -597,8 +589,6 @@ FastSchedule=1
.br
FirstJobId=65536
.br
-HashBase=10
-.br
HeartbeatInterval=60
.br
InactiveLimit=120
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index 3fbc5b24cf3..9333e15b00a 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -482,7 +482,6 @@ typedef struct slurm_ctl_conf {
uint32_t first_job_id; /* first slurm generated job_id to assign */
uint16_t fast_schedule; /* 1 to *not* check configurations by node
* (only check configuration file, faster) */
- uint16_t hash_base; /* base used for hashing node table */
uint16_t heartbeat_interval; /* interval between heartbeats, seconds */
uint16_t inactive_limit;/* seconds of inactivity before a
* inactive resource allocation is released */
diff --git a/src/api/config_info.c b/src/api/config_info.c
index 5071d01b5c8..72fe910845f 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -83,8 +83,6 @@ void slurm_print_ctl_conf ( FILE* out,
slurm_ctl_conf_ptr->fast_schedule);
fprintf(out, "FirstJobId = %u\n",
slurm_ctl_conf_ptr->first_job_id);
- fprintf(out, "NodeHashBase = %u\n",
- slurm_ctl_conf_ptr->hash_base);
fprintf(out, "HeartbeatInterval = %u\n",
slurm_ctl_conf_ptr->heartbeat_interval);
fprintf(out, "InactiveLimit = %u\n",
diff --git a/src/common/read_config.c b/src/common/read_config.c
index 09b7899b4a7..9b6153ec1c5 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -140,7 +140,6 @@ init_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr)
xfree (ctl_conf_ptr->epilog);
ctl_conf_ptr->fast_schedule = (uint16_t) NO_VAL;
ctl_conf_ptr->first_job_id = (uint32_t) NO_VAL;
- ctl_conf_ptr->hash_base = (uint16_t) NO_VAL;
ctl_conf_ptr->heartbeat_interval = (uint16_t) NO_VAL;
ctl_conf_ptr->inactive_limit = (uint16_t) NO_VAL;
xfree (ctl_conf_ptr->job_comp_loc);
@@ -195,7 +194,7 @@ int
parse_config_spec (char *in_line, slurm_ctl_conf_t *ctl_conf_ptr)
{
int error_code;
- int fast_schedule = -1, hash_base = -1, heartbeat_interval = -1;
+ int fast_schedule = -1, hash_base, heartbeat_interval = -1;
int inactive_limit = -1, kill_wait = -1;
int ret2service = -1, slurmctld_timeout = -1, slurmd_timeout = -1;
int sched_port = -1;
@@ -229,7 +228,7 @@ parse_config_spec (char *in_line, slurm_ctl_conf_t *ctl_conf_ptr)
"Epilog=", 's', &epilog,
"FastSchedule=", 'd', &fast_schedule,
"FirstJobId=", 'l', &first_job_id,
- "HashBase=", 'd', &hash_base,
+ "HashBase=", 'd', &hash_base, /* defunct */
"HeartbeatInterval=", 'd', &heartbeat_interval,
"InactiveLimit=", 'd', &inactive_limit,
"JobCompLoc=", 's', &job_comp_loc,
@@ -336,12 +335,6 @@ parse_config_spec (char *in_line, slurm_ctl_conf_t *ctl_conf_ptr)
ctl_conf_ptr->first_job_id = first_job_id;
}
- if ( hash_base != -1) {
- if ( ctl_conf_ptr->hash_base != (uint16_t) NO_VAL)
- error (MULTIPLE_VALUE_MSG, "HashBase");
- ctl_conf_ptr->hash_base = hash_base;
- }
-
if ( heartbeat_interval != -1) {
if ( ctl_conf_ptr->heartbeat_interval != (uint16_t) NO_VAL)
error (MULTIPLE_VALUE_MSG, "HeartbeatInterval");
@@ -862,9 +855,6 @@ validate_config (slurm_ctl_conf_t *ctl_conf_ptr)
if (ctl_conf_ptr->first_job_id == (uint32_t) NO_VAL)
ctl_conf_ptr->first_job_id = DEFAULT_FIRST_JOB_ID;
- if (ctl_conf_ptr->hash_base == (uint16_t) NO_VAL)
- ctl_conf_ptr->hash_base = DEFAULT_HASH_BASE;
-
if (ctl_conf_ptr->heartbeat_interval == (uint16_t) NO_VAL)
ctl_conf_ptr->heartbeat_interval = DEFAULT_HEARTBEAT_INTERVAL;
diff --git a/src/common/read_config.h b/src/common/read_config.h
index 59d3ed11207..4666d88d0fe 100644
--- a/src/common/read_config.h
+++ b/src/common/read_config.h
@@ -34,7 +34,6 @@
#define DEFAULT_CHECKPOINT_TYPE "checkpoint/none"
#define DEFAULT_FAST_SCHEDULE 1
#define DEFAULT_FIRST_JOB_ID 1
-#define DEFAULT_HASH_BASE 10
#define DEFAULT_HEARTBEAT_INTERVAL 60
/* NOTE: DEFAULT_INACTIVE_LIMIT must be 0 for Blue Gene/L systems */
#define DEFAULT_INACTIVE_LIMIT 0
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 58d0e684836..61903c0a62b 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -1707,7 +1707,6 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer)
packstr(build_ptr->epilog, buffer);
pack16(build_ptr->fast_schedule, buffer);
pack32(build_ptr->first_job_id, buffer);
- pack16(build_ptr->hash_base, buffer);
pack16(build_ptr->heartbeat_interval, buffer);
pack16(build_ptr->inactive_limit, buffer);
packstr(build_ptr->job_comp_loc, buffer);
@@ -1770,7 +1769,6 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
safe_unpackstr_xmalloc(&build_ptr->epilog, &uint16_tmp, buffer);
safe_unpack16(&build_ptr->fast_schedule, buffer);
safe_unpack32(&build_ptr->first_job_id, buffer);
- safe_unpack16(&build_ptr->hash_base, buffer);
safe_unpack16(&build_ptr->heartbeat_interval, buffer);
safe_unpack16(&build_ptr->inactive_limit, buffer);
safe_unpackstr_xmalloc(&build_ptr->job_comp_loc, &uint16_tmp, buffer);
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index f9fb573bddb..695a792e508 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -473,8 +473,6 @@ find_node_record (char *name)
* _hash_index - return a hash table index for the given node name
* IN name = the node's name
* RET the hash table index
- * global: slurmctld_conf.hash_base - numbering base for sequence numbers,
- * if not set (while updating), reverts to sequential search
*/
static int _hash_index (char *name)
{
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 1db0432c672..01c11856883 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -251,7 +251,6 @@ void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
conf_ptr->epilog = xstrdup(slurmctld_conf.epilog);
conf_ptr->fast_schedule = slurmctld_conf.fast_schedule;
conf_ptr->first_job_id = slurmctld_conf.first_job_id;
- conf_ptr->hash_base = slurmctld_conf.hash_base;
conf_ptr->heartbeat_interval = slurmctld_conf.heartbeat_interval;
conf_ptr->inactive_limit = slurmctld_conf.inactive_limit;
conf_ptr->job_comp_loc = xstrdup(slurmctld_conf.job_comp_loc);
--
GitLab