ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpc: remove [Rpc] configuration file section

Browse Source 
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 <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/398239
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Daniel Verkamp 2018-02-02 10:39:35 -07:00 committed by Jim Harris
parent 227e7bdcf2
commit ff12a9b540
4 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,5 +1,13 @@
# Changelog # 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 ## v18.01: Blobstore Thin Provisioning
### Build System ### Build System

1
include/spdk_internal/event.h
View File

@ -78,7 +78,6 @@ void spdk_subsystem_config(FILE *fp);
void spdk_rpc_initialize(const char *listen_addr); void spdk_rpc_initialize(const char *listen_addr);
void spdk_rpc_finish(void); void spdk_rpc_finish(void);
void spdk_rpc_config_text(FILE *fp);
/** /**
* \brief Register a new subsystem * \brief Register a new subsystem

1
lib/event/app.c
View File

@ -140,7 +140,6 @@ spdk_app_get_running_config(char **config_str, char *name)
setvbuf(fp, vbuf, _IOFBF, BUFSIZ); setvbuf(fp, vbuf, _IOFBF, BUFSIZ);
spdk_app_config_dump_global_section(fp); spdk_app_config_dump_global_section(fp);
spdk_rpc_config_text(fp);
spdk_subsystem_config(fp); spdk_subsystem_config(fp);
length = ftell(fp); length = ftell(fp);

35
lib/event/rpc.c
View File

@ -45,19 +45,6 @@
static struct spdk_poller *g_rpc_poller = NULL; 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 static void
spdk_rpc_subsystem_poll(void *arg) spdk_rpc_subsystem_poll(void *arg)
{ {
@ -69,10 +56,6 @@ spdk_rpc_initialize(const char *listen_addr)
{ {
int rc; int rc;
if (listen_addr == NULL) {
listen_addr = rpc_get_listen_addr();
}
if (listen_addr == NULL) { if (listen_addr == NULL) {
return; return;
} }
@ -94,21 +77,3 @@ spdk_rpc_finish(void)
spdk_rpc_close(); spdk_rpc_close();
spdk_poller_unregister(&g_rpc_poller); 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);
}