From 760742763686d561f03768345d672935d72e49b0 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Thu, 16 Feb 2017 23:01:48 +0530 Subject: cli: deprecate volserver option volserver can be considered as "localhost", as we anyway tieing-up glusterd, gluster-blockd and cli processes. Signed-off-by: Prasanna Kumar Kalever --- rpc/block.h | 2 -- rpc/block_svc_routines.c | 13 ++++++------- rpc/block_xdr.c | 6 ------ rpc/glfs-operations.c | 8 ++++---- rpc/glfs-operations.h | 2 +- rpc/rpcl/block.x | 2 -- 6 files changed, 11 insertions(+), 22 deletions(-) (limited to 'rpc') diff --git a/rpc/block.h b/rpc/block.h index e219b94..4cc510e 100644 --- a/rpc/block.h +++ b/rpc/block.h @@ -15,7 +15,6 @@ extern "C" { struct blockCreate { char volume[255]; - char volfileserver[255]; char gbid[127]; u_quad_t size; char block_name[255]; @@ -24,7 +23,6 @@ typedef struct blockCreate blockCreate; struct blockCreateCli { char volume[255]; - char volfileserver[255]; u_quad_t size; u_int mpath; char block_name[255]; diff --git a/rpc/block_svc_routines.c b/rpc/block_svc_routines.c index 38ed690..dbbecac 100644 --- a/rpc/block_svc_routines.c +++ b/rpc/block_svc_routines.c @@ -584,7 +584,7 @@ block_create_cli_1_svc(blockCreateCli *blk, struct svc_req *rqstp) goto optfail; } - glfs = glusterBlockVolumeInit(blk->volume, blk->volfileserver); + glfs = glusterBlockVolumeInit(blk->volume); if (!glfs) { LOG("mgmt", GB_LOG_ERROR, "%s", "glusterBlockVolumeInit failed"); goto optfail; @@ -622,7 +622,7 @@ block_create_cli_1_svc(blockCreateCli *blk, struct svc_req *rqstp) GB_METAUPDATE_OR_GOTO(lock, glfs, blk->block_name, blk->volume, ret, exist, "ENTRYCREATE: FAIL\n"); LOG("mgmt", GB_LOG_ERROR, "%s volume: %s host: %s", - FAILED_CREATING_FILE, blk->volume, blk->volfileserver); + FAILED_CREATING_FILE, blk->volume, blk->block_hosts); goto out; } @@ -630,7 +630,6 @@ block_create_cli_1_svc(blockCreateCli *blk, struct svc_req *rqstp) ret, exist, "ENTRYCREATE: SUCCESS\n"); strcpy(cobj.volume, blk->volume); - strcpy(cobj.volfileserver, blk->volfileserver); strcpy(cobj.block_name, blk->block_name); cobj.size = blk->size; strcpy(cobj.gbid, gbid); @@ -696,7 +695,7 @@ block_create_1_svc(blockCreate *blk, struct svc_req *rqstp) if (asprintf(&backstore, "%s %s %s %zu %s@%s%s/%s %s", GB_TGCLI_GLFS, GB_CREATE, blk->block_name, blk->size, blk->volume, - blk->volfileserver, GB_STOREDIR, blk->gbid, blk->gbid) == -1) { + hostname, GB_STOREDIR, blk->gbid, blk->gbid) == -1) { reply->exit = -1; goto out; } @@ -784,7 +783,7 @@ block_delete_cli_1_svc(blockDeleteCli *blk, struct svc_req *rqstp) return NULL; } - glfs = glusterBlockVolumeInit(blk->volume, "localhost"); + glfs = glusterBlockVolumeInit(blk->volume); if (!glfs) { LOG("mgmt", GB_LOG_ERROR, "%s", "glusterBlockVolumeInit failed"); goto out; @@ -894,7 +893,7 @@ block_list_cli_1_svc(blockListCli *blk, struct svc_req *rqstp) int ret = -1; - glfs = glusterBlockVolumeInit(blk->volume, "localhost"); + glfs = glusterBlockVolumeInit(blk->volume); if (!glfs) { LOG("mgmt", GB_LOG_ERROR, "%s", "glusterBlockVolumeInit failed"); goto out; @@ -974,7 +973,7 @@ block_info_cli_1_svc(blockInfoCli *blk, struct svc_req *rqstp) size_t i; - glfs = glusterBlockVolumeInit(blk->volume, "localhost"); + glfs = glusterBlockVolumeInit(blk->volume); if (!glfs) { LOG("mgmt", GB_LOG_ERROR, "%s", "glusterBlockVolumeInit failed"); goto out; diff --git a/rpc/block_xdr.c b/rpc/block_xdr.c index eb5d887..f9d3f63 100644 --- a/rpc/block_xdr.c +++ b/rpc/block_xdr.c @@ -11,9 +11,6 @@ xdr_blockCreate (XDR *xdrs, blockCreate *objp) if (!xdr_vector (xdrs, (char *)objp->volume, 255, sizeof (char), (xdrproc_t) xdr_char)) return FALSE; - if (!xdr_vector (xdrs, (char *)objp->volfileserver, 255, - sizeof (char), (xdrproc_t) xdr_char)) - return FALSE; if (!xdr_vector (xdrs, (char *)objp->gbid, 127, sizeof (char), (xdrproc_t) xdr_char)) return FALSE; @@ -31,9 +28,6 @@ xdr_blockCreateCli (XDR *xdrs, blockCreateCli *objp) if (!xdr_vector (xdrs, (char *)objp->volume, 255, sizeof (char), (xdrproc_t) xdr_char)) return FALSE; - if (!xdr_vector (xdrs, (char *)objp->volfileserver, 255, - sizeof (char), (xdrproc_t) xdr_char)) - return FALSE; if (!xdr_u_quad_t (xdrs, &objp->size)) return FALSE; if (!xdr_u_int (xdrs, &objp->mpath)) diff --git a/rpc/glfs-operations.c b/rpc/glfs-operations.c index 885ff5f..26d89e3 100644 --- a/rpc/glfs-operations.c +++ b/rpc/glfs-operations.c @@ -15,7 +15,7 @@ struct glfs * -glusterBlockVolumeInit(char *volume, char *volfileserver) +glusterBlockVolumeInit(char *volume) { struct glfs *glfs; int ret; @@ -24,14 +24,14 @@ glusterBlockVolumeInit(char *volume, char *volfileserver) glfs = glfs_new(volume); if (!glfs) { LOG("gfapi", GB_LOG_ERROR, "glfs_new(%s) from %s failed[%s]", volume, - volfileserver, strerror(errno)); + "localhost", strerror(errno)); return NULL; } - ret = glfs_set_volfile_server(glfs, "tcp", volfileserver, 24007); + ret = glfs_set_volfile_server(glfs, "tcp", "localhost", 24007); if (ret) { LOG("gfapi", GB_LOG_ERROR, "glfs_set_volfile_server(%s) of %s " - "failed[%s]", volfileserver, volume, strerror(errno)); + "failed[%s]", "localhost", volume, strerror(errno)); goto out; } diff --git a/rpc/glfs-operations.h b/rpc/glfs-operations.h index 1f6614e..3e7f72a 100644 --- a/rpc/glfs-operations.h +++ b/rpc/glfs-operations.h @@ -41,7 +41,7 @@ typedef struct MetaInfo { struct glfs * -glusterBlockVolumeInit(char *volume, char *volfileserver); +glusterBlockVolumeInit(char *volume); int glusterBlockCreateEntry(struct glfs *glfs, blockCreateCli *blk, char *gbid); diff --git a/rpc/rpcl/block.x b/rpc/rpcl/block.x index 0bc988c..06e83f3 100644 --- a/rpc/rpcl/block.x +++ b/rpc/rpcl/block.x @@ -1,6 +1,5 @@ struct blockCreate { char volume[255]; - char volfileserver[255]; char gbid[127]; /* uuid */ u_quad_t size; char block_name[255]; @@ -8,7 +7,6 @@ struct blockCreate { struct blockCreateCli { char volume[255]; - char volfileserver[255]; u_quad_t size; u_int mpath; /* HA request count */ char block_name[255]; -- cgit