Bug 1328502
| Summary: | Move FOP enumerations and other network protocol bits to XDR generated headers | ||
|---|---|---|---|
| Product: | [Community] GlusterFS | Reporter: | Niels de Vos <ndevos> |
| Component: | rpc | Assignee: | Niels de Vos <ndevos> |
| Status: | CLOSED CURRENTRELEASE | QA Contact: | |
| Severity: | unspecified | Docs Contact: | |
| Priority: | unspecified | ||
| Version: | mainline | CC: | bugs |
| Target Milestone: | --- | Keywords: | FutureFeature |
| Target Release: | --- | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
| Whiteboard: | |||
| Fixed In Version: | glusterfs-3.8rc2 | Doc Type: | Enhancement |
| Doc Text: | Story Points: | --- | |
| Clone Of: | Environment: | ||
| Last Closed: | 2016-06-16 14:04:01 UTC | Type: | Bug |
| Regression: | --- | Mount Type: | --- |
| Documentation: | --- | CRM: | |
| Verified Versions: | Category: | --- | |
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |
| Cloudforms Team: | --- | Target Upstream Version: | |
| Embargoed: | |||
| Bug Depends On: | |||
| Bug Blocks: | 1303829 | ||
|
Description
Niels de Vos
2016-04-19 14:18:33 UTC
REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#1) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#2) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14035 (snapshot: svc_stat collides with define from /usr/include/rpc/svc.h) posted (#1) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#3) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#4) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14035 (snapshot: svc_stat collides with define from /usr/include/rpc/svc.h) posted (#2) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#5) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#6) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#7) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#8) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#9) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#10) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#11) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#12) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14035 (snapshot: svc_stat collides with define from /usr/include/rpc/svc.h) posted (#3) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#13) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14035 (snapshot: svc_stat collides with define from /usr/include/rpc/svc.h) posted (#4) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#14) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#15) for review on master by Niels de Vos (ndevos) COMMIT: http://review.gluster.org/14035 committed in master by Niels de Vos (ndevos) ------ commit 60cf56b1289bbf574a38a7f99f8cacb692f65474 Author: Niels de Vos <ndevos> Date: Mon Apr 18 19:34:26 2016 +0200 snapshot: svc_stat collides with define from /usr/include/rpc/svc.h Compiling fails with this error: snapview-client.c:559:24: error: macro "svc_stat" passed 4 arguments, but takes just 1 dict_t *xdata) ^ snapview-client.c:560:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token { ^ snapview-client.c:2412:26: error: ‘svc_stat’ undeclared here (not in a function) .stat = svc_stat, ^ svc_* is the common prefix for (SUN)RPC functions provided by system headers. svc_stat() seems to be an existing function name. This happens because change-id I98fc8cf7e4b631082c7b203b5a0a77111bec1fb9 causes <rpc/rpc.h> included through "glusterfs.h". Prepending gf_ for all svc_* functions works around the symbol collision. Change-Id: Idc86b719c48675a5154c54d844c1899d14d46e2a BUG: 1328502 Signed-off-by: Niels de Vos <ndevos> Reviewed-on: http://review.gluster.org/14035 Smoke: Gluster Build System <jenkins.com> Reviewed-by: Rajesh Joseph <rjoseph> Reviewed-by: Kaleb KEITHLEY <kkeithle> CentOS-regression: Gluster Build System <jenkins.com> NetBSD-regression: NetBSD Build System <jenkins.org> REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#16) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#17) for review on master by Niels de Vos (ndevos) REVIEW: http://review.gluster.org/14032 (rpc: split FOPs enum from glusterfs.h) posted (#18) for review on master by Niels de Vos (ndevos) COMMIT: http://review.gluster.org/14032 committed in master by Jeff Darcy (jdarcy) ------ commit 2f945b86d30eca3a32f5e8e42fbe692ddf4b55be Author: Niels de Vos <ndevos> Date: Mon Apr 18 21:47:18 2016 +0200 rpc: split FOPs enum from glusterfs.h Moving the enumeration of FOPs and some of the other parts that are defining the network protocol to the rpc/xdr/ section. These structures need some care when modifications are made, moving them out of the common glusterfs.h header helps with that. The protocol definition structures are generated in a new glusterfs-fops header. This file is present in rpc/xdr/src/ and libglusterfs/src/, it is a little ugly, but prevents the need to update all Makefile.am files with the additional -I option for finding the new header file. The generation of the .c and .h files from the .x descriptions needed small modifications to accommodate these changes. The build/xdrgen script was improved slightly for this. The .c and .h files are incorrectly in the $(top_srcdir), instead of $(top_builddir). This is an existing issue, and bug 1330604 has been filed to get that addressed. Change-Id: I98fc8cf7e4b631082c7b203b5a0a77111bec1fb9 BUG: 1328502 Signed-off-by: Niels de Vos <ndevos> Reviewed-on: http://review.gluster.org/14032 Smoke: Gluster Build System <jenkins.com> CentOS-regression: Gluster Build System <jenkins.com> NetBSD-regression: NetBSD Build System <jenkins.org> Reviewed-by: Jeff Darcy <jdarcy> This bug is getting closed because a release has been made available that should address the reported issue. In case the problem is still not fixed with glusterfs-3.8.0, please open a new bug report. glusterfs-3.8.0 has been announced on the Gluster mailinglists [1], packages for several distributions should become available in the near future. Keep an eye on the Gluster Users mailinglist [2] and the update infrastructure for your distribution. [1] http://blog.gluster.org/2016/06/glusterfs-3-8-released/ [2] http://thread.gmane.org/gmane.comp.file-systems.gluster.user |