diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-03-02 17:04:49 -0500 |
|---|---|---|
| committer | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-03-05 09:25:17 -0500 |
| commit | 2bb17551a597b382d77bb5ebc2671b45565cd542 (patch) | |
| tree | 2743fc73f99ec97f40591d850792c54ed97428f9 /xlators/protocol | |
| parent | 2347debbaf229707b1d957d67cefbe999cbd52d4 (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)
(why are there two different bzs for the same bug?)
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.
Change-Id: I9cfbd1cc15e7ebd9fc31b56ac791287fa2c584de
BUG: 1550895
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators/protocol')
| -rw-r--r-- | xlators/protocol/server/src/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 758264a638b..cc68df7f51b 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 = { @@ -1503,10 +1504,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); + rpc_clnt_mgmt_pmap_signout (ctx, victim->name); /* we need the protocol/server xlator here as 'this' */ - glusterfs_autoscale_threads (ctx, -1, this); + rpcsvc_autoscale_threads (ctx, conf->rpc, -1); } break; |