diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-03-02 17:04:49 -0500 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-03-06 13:43:53 +0000 |
| commit | 503c6dfe6c05896501a1bf84686cf015afb1e774 (patch) | |
| tree | 29a4c89788619a21d61c1e220eb7f864d81e5859 /xlators/protocol | |
| parent | b3e29b4659fff8af599d7c297091d49cb3e41479 (diff) | |
build: address linkage issues
We have the following undefined symbol error from protocol/server.so:
glusterfs_mgmt_pmap_signout
glusterfs_autoscale_threads
See https://review.gluster.org/19225 (bz#1532238)
and https://review.gluster.org/19657 (bz#1550895)
IMO this is a cleaner solution. I.e. moving the above two functions
to libgfrpc (.../rpc/rpc-lib/...)
I would also, for (foolish) consistency sake, like to see
glusterfs_mgmt_pmap_signin() moved from glusterfsd to libgfrpc as
well.
This works on f28/rawhide, with its new, more restrictive run-time
link semantics. The smoke and regression tests on earlier fedora and
centos will confirm that it works on those platforms too.
master: 1550895
master: https://review.gluster.org/19664
Change-Id: I9cfbd1cc15e7ebd9fc31b56ac791287fa2c584de
BUG: 1551640
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators/protocol')
| -rw-r--r-- | xlators/protocol/server/src/server.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 7bd276cdece..db96363123b 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -23,6 +23,7 @@ #include "event.h" #include "events.h" #include "server-messages.h" +#include "rpc-clnt.h" #include "glusterfsd.h" rpcsvc_cbk_program_t server_cbk_prog = { @@ -1497,11 +1498,9 @@ server_notify (xlator_t *this, int32_t event, void *data, ...) UNLOCK (&ctx->volfile_lock); if (victim_found) (*trav_p) = (*trav_p)->next; - glusterfs_mgmt_pmap_signout (ctx, - victim->name); - glusterfs_autoscale_threads (THIS->ctx, -1); + rpc_clnt_mgmt_pmap_signout (ctx, victim->name); + rpcsvc_autoscale_threads (ctx, conf->rpc, -1); default_notify (victim, GF_EVENT_CLEANUP, data); - } break; |