diff --git a/src/common/slurm_protocol_common.h b/src/common/slurm_protocol_common.h
index c4e28c5eb63d9e4c276b6bdaadc440b82b9f1fd3..187fd388c2308e1b00d3f38a3eb034c2a0cf1462 100644
--- a/src/common/slurm_protocol_common.h
+++ b/src/common/slurm_protocol_common.h
@@ -81,10 +81,6 @@
#define SLURM_PROTOCOL_NO_FLAGS 0
#define SLURM_GLOBAL_AUTH_KEY 0x0001
-#if MONGO_IMPLEMENTATION
-# include "src/common/slurm_protocol_mongo_common.h"
-#else
-# include "src/common/slurm_protocol_socket_common.h"
-#endif
+#include "src/common/slurm_protocol_socket_common.h"
#endif
diff --git a/src/common/slurm_protocol_mongo_common.h b/src/common/slurm_protocol_mongo_common.h
deleted file mode 100644
index 699014312bc4238c0bc1e40e605141807325a633..0000000000000000000000000000000000000000
--- a/src/common/slurm_protocol_mongo_common.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*****************************************************************************\
- * slurm_protocol_mongo_common.h - alternative communications protocol to
- * TCP sockets. As of 11/18/2002 it is unclear that this communications
- * protocol will be fully developed.
- ****************************************************************************
- * Copyright (C) 2002 The Regents of the University of California.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Kevin Tew <tew1@llnl.gov>
- * CODE-OCEC-09-009. All rights reserved.
- *
- * This file is part of SLURM, a resource management program.
- * For details, see <http://www.schedmd.com/slurmdocs/>.
- * Please also read the included file: DISCLAIMER.
- *
- * SLURM is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * In addition, as a special exception, the copyright holders give permission
- * to link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two. You must obey the GNU
- * General Public License in all respects for all of the code used other than
- * OpenSSL. If you modify file(s) with this exception, you may extend this
- * exception to your version of the file(s), but you are not obligated to do
- * so. If you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files in
- * the program, then also delete it here.
- *
- * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with SLURM; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-\*****************************************************************************/
-
-#ifndef _SLURM_PROTOCOL_MONGO_COMMON_H
-#define _SLURM_PROTOCOL_MONGO_COMMON_H
-
-#if HAVE_CONFIG_H
-# include "config.h"
-# if HAVE_INTTYPES_H
-# include <inttypes.h>
-# else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
-# endif /* HAVE_INTTYPES_H */
-#else /* !HAVE_CONFIG_H */
-# include <inttypes.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <netinet/in.h>
-
-#define AF_SLURM AF_INET
-#define SLURM_INADDR_ANY 0x00000000
-
-/* LINUX SPECIFIC */
-/* this is the slurm equivalent of the operating system file descriptor,
- * which in linux is just an int */
-typedef uint32_t slurm_fd_t ;
-
-/* this is the slurm equivalent of the BSD sockets sockaddr */
-typedef struct mongo_addr_t slurm_addr_t ;
-/* this is the slurm equivalent of the BSD sockets fd_set */
-typedef fd_set slurm_fd_set ;
-/*struct kevin {
- int16_t family ;
- uint16_t port ;
- uint32_t address ;
- char pad[16 - sizeof ( int16_t ) -
- sizeof (uint16_t) - sizeof (uint32_t) ] ;
-} ;
-*/
-
-/* SLURM datatypes */
-/* this is a custom data type to describe the slurm msg type type
- * that is placed in the slurm protocol header
- * while just an short now, it may change in the future */
-/* Now defined in ../../src/common/slurm_protocol_defs.h
- * typedef uint16_t slurm_msg_type_t ;
- */
-
-#endif
diff --git a/src/slurmctld/backup.c b/src/slurmctld/backup.c
index f1f75b44125c36c3d4c24fdc11862fc96e5966de..2456e764f5a290d56b31b2d2135ad84b5f876116 100644
--- a/src/slurmctld/backup.c
+++ b/src/slurmctld/backup.c
@@ -372,9 +372,6 @@ static void *_background_rpc_mgr(void *no_data)
slurm_free_msg(msg);
- /* close should only be called when the socket
- * implementation is being used the following call will
- * be a no-op in a message/mongo implementation */
slurm_close_accepted_conn(newsockfd); /* close new socket */
}
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 0ba48c948615ab1a824ab645ced2ebb4f2001c3c..dd57c9b27aed8b23e2e9775a2d5402fb86ce850c 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -999,17 +999,14 @@ static void *_service_connection(void *arg)
* slurm_receive_msg sets msg connection fd to accepted fd. This allows
* possibility for slurmctld_req() to close accepted connection.
*/
- if(slurm_receive_msg(conn->newsockfd, msg, 0) != 0) {
+ if (slurm_receive_msg(conn->newsockfd, msg, 0) != 0) {
error("slurm_receive_msg: %m");
- /* close should only be called when the socket implementation
- * is being used the following call will be a no-op in a
- * message/mongo implementation */
/* close the new socket */
slurm_close_accepted_conn(conn->newsockfd);
goto cleanup;
}
- if(errno != SLURM_SUCCESS) {
+ if (errno != SLURM_SUCCESS) {
if (errno == SLURM_PROTOCOL_VERSION_ERROR) {
slurm_send_rc_msg(msg, SLURM_PROTOCOL_VERSION_ERROR);
} else