From b8cbad26f2d0aeb23749619b9aa961c068f9f96b Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Thu, 16 Oct 2014 14:56:38 -0700
Subject: [PATCH] Remove functions needed to translate the now defunct
SLURMDBD_*_VERSION to be the SLURM_*_PROTOCOL_VERSION.
---
src/common/slurm_jobacct_gather.c | 26 --------------------------
src/common/slurm_protocol_util.c | 21 +++++----------------
src/common/slurmdbd_defs.c | 17 -----------------
src/common/slurmdbd_defs.h | 8 --------
src/slurmdbd/slurmdbd.c | 3 +--
5 files changed, 6 insertions(+), 69 deletions(-)
diff --git a/src/common/slurm_jobacct_gather.c b/src/common/slurm_jobacct_gather.c
index 6d6afeb533e..0f4fde5eca4 100644
--- a/src/common/slurm_jobacct_gather.c
+++ b/src/common/slurm_jobacct_gather.c
@@ -850,19 +850,6 @@ extern void jobacctinfo_pack(jobacctinfo_t *jobacct,
no_pack = (!plugin_polling && (protocol_type != PROTOCOL_TYPE_DBD));
- /* The function can take calls from both DBD and from regular
- * SLURM functions. We choose to standardize on using the
- * SLURM_PROTOCOL_VERSION here so if PROTOCOL_TYPE_DBD comes
- * in we need to translate the DBD rpc_version to use the
- * SLURM protocol_version.
- *
- * If this function ever changes make sure the
- * slurmdbd_translate_rpc function has been updated with the
- * new protocol version.
- */
- if (protocol_type == PROTOCOL_TYPE_DBD)
- rpc_version = slurmdbd_translate_rpc(rpc_version);
-
if (rpc_version >= SLURM_14_03_PROTOCOL_VERSION) {
if (no_pack) {
pack8((uint8_t) 0, buffer);
@@ -924,19 +911,6 @@ extern int jobacctinfo_unpack(jobacctinfo_t **jobacct,
jobacct_gather_init();
- /* The function can take calls from both DBD and from regular
- * SLURM functions. We choose to standardize on using the
- * SLURM_PROTOCOL_VERSION here so if PROTOCOL_TYPE_DBD comes
- * in we need to translate the DBD rpc_version to use the
- * SLURM protocol_version.
- *
- * If this function ever changes make sure the
- * slurmdbd_translate_rpc function has been updated with the
- * new protocol version.
- */
- if (protocol_type == PROTOCOL_TYPE_DBD)
- rpc_version = slurmdbd_translate_rpc(rpc_version);
-
if (rpc_version >= SLURM_14_03_PROTOCOL_VERSION) {
safe_unpack8(&uint8_tmp, buffer);
if (uint8_tmp == (uint8_t) 0)
diff --git a/src/common/slurm_protocol_util.c b/src/common/slurm_protocol_util.c
index 923c75a94e3..d61dbe9bac8 100644
--- a/src/common/slurm_protocol_util.c
+++ b/src/common/slurm_protocol_util.c
@@ -50,14 +50,6 @@
#include "src/common/xmalloc.h"
#include "src/slurmdbd/read_config.h"
-uint16_t _get_slurm_version(uint32_t rpc_version)
-{
- if (rpc_version >= SLURM_PROTOCOL_VERSION)
- return SLURM_PROTOCOL_VERSION;
- else
- return SLURM_2_6_PROTOCOL_VERSION;
-}
-
/*
* check_header_version checks to see that the specified header was sent
* from a node running the same version of the protocol as the current node
@@ -68,10 +60,8 @@ int check_header_version(header_t * header)
{
uint16_t check_version = SLURM_PROTOCOL_VERSION;
- if (working_cluster_rec) {
- check_version = _get_slurm_version(
- working_cluster_rec->rpc_version);
- }
+ if (working_cluster_rec)
+ check_version = working_cluster_rec->rpc_version;
if (slurmdbd_conf) {
if ((header->version != SLURM_PROTOCOL_VERSION) &&
@@ -128,14 +118,13 @@ void init_header(header_t *header, slurm_msg_t *msg, uint16_t flags)
if (msg->protocol_version != (uint16_t)NO_VAL)
header->version = msg->protocol_version;
else if (working_cluster_rec)
- msg->protocol_version = header->version = _get_slurm_version(
- working_cluster_rec->rpc_version);
+ msg->protocol_version = header->version =
+ working_cluster_rec->rpc_version;
else if ((msg->msg_type == ACCOUNTING_UPDATE_MSG) ||
(msg->msg_type == ACCOUNTING_FIRST_REG)) {
uint32_t rpc_version =
((accounting_update_msg_t *)msg->data)->rpc_version;
- msg->protocol_version = header->version =
- _get_slurm_version(rpc_version);
+ msg->protocol_version = header->version = rpc_version;
} else
msg->protocol_version = header->version =
SLURM_PROTOCOL_VERSION;
diff --git a/src/common/slurmdbd_defs.c b/src/common/slurmdbd_defs.c
index 086c1674d2a..89c31b3e3e8 100644
--- a/src/common/slurmdbd_defs.c
+++ b/src/common/slurmdbd_defs.c
@@ -139,23 +139,6 @@ static int _tot_wait (struct timeval *start_time);
* Socket open/close/read/write functions
****************************************************************************/
-/* Some functions are called by the DBD as well as regular slurm
- * procedures. In this case we need to make a way to translate the
- * DBD rpc to that of SLURM.
- * rpc_version IN - DBD rpc version
- * Returns corrisponding SLURM rpc version
- */
-extern uint16_t slurmdbd_translate_rpc(uint16_t rpc_version)
-{
- if (rpc_version >= SLURM_14_03_PROTOCOL_VERSION)
- return SLURM_14_03_PROTOCOL_VERSION;
- else if (rpc_version >= SLURMDBD_2_6_VERSION)
- return SLURM_2_6_PROTOCOL_VERSION;
-
- return 0;
-}
-
-
/* Open a socket connection to SlurmDbd
* auth_info IN - alternate authentication key
* callbacks IN - make agent to process RPCs and contains callback pointers
diff --git a/src/common/slurmdbd_defs.h b/src/common/slurmdbd_defs.h
index 3532d9e3fb7..407733ecb8a 100644
--- a/src/common/slurmdbd_defs.h
+++ b/src/common/slurmdbd_defs.h
@@ -414,14 +414,6 @@ extern pthread_cond_t assoc_cache_cond; /* assoc cache condition */
* Slurm DBD message processing functions
\*****************************************************************************/
-/* Some functions are called by the DBD as well as regular slurm
- * procedures. In this case we need to make a way to translate the
- * DBD rpc to that of SLURM.
- * rpc_version IN - DBD rpc version
- * Returns corrisponding SLURM rpc version
- */
-extern uint16_t slurmdbd_translate_rpc(uint16_t rpc_version);
-
/* Open a socket connection to SlurmDbd
* auth_info IN - alternate authentication key
* make_agent IN - make agent to process RPCs if set
diff --git a/src/slurmdbd/slurmdbd.c b/src/slurmdbd/slurmdbd.c
index 2a2e5e60b28..4676afeb1a8 100644
--- a/src/slurmdbd/slurmdbd.c
+++ b/src/slurmdbd/slurmdbd.c
@@ -689,8 +689,7 @@ static int _send_slurmctld_register_req(slurmdb_cluster_rec_t *cluster_rec)
slurm_msg_t_init(&out_msg);
out_msg.msg_type = ACCOUNTING_REGISTER_CTLD;
out_msg.flags = SLURM_GLOBAL_AUTH_KEY;
- out_msg.protocol_version
- = slurmdbd_translate_rpc(cluster_rec->rpc_version);
+ out_msg.protocol_version = cluster_rec->rpc_version;
slurm_send_node_msg(fd, &out_msg);
/* We probably need to add matching recv_msg function
* for an arbitray fd or should these be fire
--
GitLab