From ff12a9b54071384387bd9e17ce8ce26295d5d664 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 2 Feb 2018 10:39:35 -0700 Subject: [PATCH] rpc: remove [Rpc] configuration file section This section was deprecated in the previous release, and its removal was planned for v18.04. Users may configure the RPC listen address via the command-line '-r' parameter. Change-Id: Ic714417b87d422492b8742852c16983eb61793c2 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/398239 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Reviewed-by: Changpeng Liu --- CHANGELOG.md | 8 ++++++++ include/spdk_internal/event.h | 1 - lib/event/app.c | 1 - lib/event/rpc.c | 35 ----------------------------------- 4 files changed, 8 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0265756e3..f61aff0d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## v18.04: (Upcoming Release) + +### RPC + +The Rpc configuration file section, which was deprecated in v18.01, has been removed. +Users should switch to the `-r` command-line parameter instead. + + ## v18.01: Blobstore Thin Provisioning ### Build System diff --git a/include/spdk_internal/event.h b/include/spdk_internal/event.h index 685c8b5a7..840385285 100644 --- a/include/spdk_internal/event.h +++ b/include/spdk_internal/event.h @@ -78,7 +78,6 @@ void spdk_subsystem_config(FILE *fp); void spdk_rpc_initialize(const char *listen_addr); void spdk_rpc_finish(void); -void spdk_rpc_config_text(FILE *fp); /** * \brief Register a new subsystem diff --git a/lib/event/app.c b/lib/event/app.c index da765492e..bc3e26c04 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -140,7 +140,6 @@ spdk_app_get_running_config(char **config_str, char *name) setvbuf(fp, vbuf, _IOFBF, BUFSIZ); spdk_app_config_dump_global_section(fp); - spdk_rpc_config_text(fp); spdk_subsystem_config(fp); length = ftell(fp); diff --git a/lib/event/rpc.c b/lib/event/rpc.c index 89e5d62c9..9f7d7ab57 100644 --- a/lib/event/rpc.c +++ b/lib/event/rpc.c @@ -45,19 +45,6 @@ static struct spdk_poller *g_rpc_poller = NULL; -static const char * -rpc_get_listen_addr(void) -{ - struct spdk_conf_section *sp; - - sp = spdk_conf_find_section(NULL, "Rpc"); - if (sp == NULL) { - return NULL; - } - - return spdk_conf_section_get_val(sp, "Listen"); -} - static void spdk_rpc_subsystem_poll(void *arg) { @@ -69,10 +56,6 @@ spdk_rpc_initialize(const char *listen_addr) { int rc; - if (listen_addr == NULL) { - listen_addr = rpc_get_listen_addr(); - } - if (listen_addr == NULL) { return; } @@ -94,21 +77,3 @@ spdk_rpc_finish(void) spdk_rpc_close(); spdk_poller_unregister(&g_rpc_poller); } - -void -spdk_rpc_config_text(FILE *fp) -{ - const char *listen_addr; - - listen_addr = rpc_get_listen_addr(); - if (listen_addr == NULL) { - return; - } - - fprintf(fp, - "\n" - "[Rpc]\n" - " # Listen address for the RPC service.\n" - " # May be an IP address or an absolute path to a Unix socket.\n" - " Listen %s\n", listen_addr); -}