On 07/19/2016 10:57 AM, Prasanna Kumar Kalever wrote: Grammar suggestions, can be squashed in by the maintainer (in addition to what Markus pointed out):
> gluster volfile server fetch happens through unix and/or tcp, it doesn't
> support volfile fetch over rdma, the rdma code may actually mislead,
s/rdma, the/rdma. The/
> to make sure things do not break, for now we fallback to tcp when requested
s/to make/so to make/
> for rdma with a warning.
s/rdma with/rdma, with/
>
> If you are wondering how this worked all these days, its the gluster libgfapi
> code which handles anything other than unix transport as socket/tcp, sad but
> true.
>
> Also gluster doesn't support ipv6 addresses, removing the ipv6 related
> comments/docs section
>
> Signed-off-by: Prasanna Kumar Kalever <prasanna.kale...@redhat.com>
> ---
> block/gluster.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/block/gluster.c b/block/gluster.c
> index 40ee852..8a54ad4 100644
> --- a/block/gluster.c
> +++ b/block/gluster.c
> @@ -12,6 +12,7 @@
> #include "block/block_int.h"
> #include "qapi/error.h"
> #include "qemu/uri.h"
> +#include "qemu/error-report.h"
>
> #define GLUSTER_OPT_FILENAME "filename"
> #define GLUSTER_OPT_DEBUG "debug"
> @@ -134,12 +135,10 @@ static int parse_volume_options(GlusterConf *gconf,
> char *path)
> *
> * 'transport' specifies the transport type used to connect to gluster
> * management daemon (glusterd). Valid transport types are
> - * tcp, unix and rdma. If a transport type isn't specified, then tcp
> - * type is assumed.
> + * tcp, unix. If a transport type isn't specified, then tcp type is assumed.
s/tcp, unix/tcp or unix/
> *
> * 'host' specifies the host where the volume file specification for
> - * the given volume resides. This can be either hostname, ipv4 address
> - * or ipv6 address. ipv6 address needs to be within square brackets [ ].
> + * the given volume resides. This can be either hostname, ipv4 address.
s/either hostname, ipv4 address/either a hostname or an ipv4 address/
> @@ -1048,6 +1046,12 @@ static BlockDriver bdrv_gluster_unix = {
> .create_opts = &qemu_gluster_create_opts,
> };
>
> +/* rdma is deprecated (actually never supported for volfile fetch)
> + * lets maintain for the protocol compatibility, to make sure things
s/fetch) lets maintain for/fetch). Let's maintain it for/
> + * won't break immediately for now gluster+rdma will fall back to gluster+tcp
s/immediately for now gluster+rdma/immediately. For now, gluster+rdma/
> + * protocol with Warning
s/Warning/a warning/
> + * TODO: remove gluster+rdma interface support
> + */
> static BlockDriver bdrv_gluster_rdma = {
> .format_name = "gluster",
> .protocol_name = "gluster+rdma",
>
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
