Commit de23e72b authored by Stefano Garzarella's avatar Stefano Garzarella Committed by Kevin Wolf
Browse files

block/gluster: limit the transfer size to 512 MiB 

Several versions of GlusterFS (3.12? -> 6.0.1) fail when the
transfer size is greater or equal to 1024 MiB, so we are
limiting the transfer size to 512 MiB to avoid this rare issue.

Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1691320


Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Reviewed-by: default avatarNiels de Vos <ndevos@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent a3d6ae22

block/gluster.c

+16 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include <glusterfs/api/glfs.h>

#include "block/block_int.h"

#include "block/qdict.h"
@@ -41,6 +42,12 @@ 
#define GLUSTER_DEBUG_MAX           9

#define GLUSTER_OPT_LOGFILE         "logfile"

#define GLUSTER_LOGFILE_DEFAULT     "-" /* handled in libgfapi as /dev/stderr */

/*

 * Several versions of GlusterFS (3.12? -> 6.0.1) fail when the transfer size

 * is greater or equal to 1024 MiB, so we are limiting the transfer size to 512

 * MiB to avoid this rare issue.

 */

#define GLUSTER_MAX_TRANSFER        (512 * MiB)



#define GERR_INDEX_HINT "hint: check in 'server' array index '%d'\n"
@@ -887,6 +894,11 @@ out: 
    return ret;

}



static void qemu_gluster_refresh_limits(BlockDriverState *bs, Error **errp)

{

    bs->bl.max_transfer = GLUSTER_MAX_TRANSFER;

}



static int qemu_gluster_reopen_prepare(BDRVReopenState *state,

                                       BlockReopenQueue *queue, Error **errp)

{
@@ -1544,6 +1556,7 @@ static BlockDriver bdrv_gluster = { 
    .bdrv_co_pwrite_zeroes        = qemu_gluster_co_pwrite_zeroes,

#endif

    .bdrv_co_block_status         = qemu_gluster_co_block_status,

    .bdrv_refresh_limits          = qemu_gluster_refresh_limits,

    .create_opts                  = &qemu_gluster_create_opts,

    .strong_runtime_opts          = gluster_strong_open_opts,

};
@@ -1574,6 +1587,7 @@ static BlockDriver bdrv_gluster_tcp = { 
    .bdrv_co_pwrite_zeroes        = qemu_gluster_co_pwrite_zeroes,

#endif

    .bdrv_co_block_status         = qemu_gluster_co_block_status,

    .bdrv_refresh_limits          = qemu_gluster_refresh_limits,

    .create_opts                  = &qemu_gluster_create_opts,

    .strong_runtime_opts          = gluster_strong_open_opts,

};
@@ -1604,6 +1618,7 @@ static BlockDriver bdrv_gluster_unix = { 
    .bdrv_co_pwrite_zeroes        = qemu_gluster_co_pwrite_zeroes,

#endif

    .bdrv_co_block_status         = qemu_gluster_co_block_status,

    .bdrv_refresh_limits          = qemu_gluster_refresh_limits,

    .create_opts                  = &qemu_gluster_create_opts,

    .strong_runtime_opts          = gluster_strong_open_opts,

};
@@ -1640,6 +1655,7 @@ static BlockDriver bdrv_gluster_rdma = { 
    .bdrv_co_pwrite_zeroes        = qemu_gluster_co_pwrite_zeroes,

#endif

    .bdrv_co_block_status         = qemu_gluster_co_block_status,

    .bdrv_refresh_limits          = qemu_gluster_refresh_limits,

    .create_opts                  = &qemu_gluster_create_opts,

    .strong_runtime_opts          = gluster_strong_open_opts,

};