summaryrefslogtreecommitdiffstats
path: root/glusterfsd
diff options
context:
space:
mode:
authorKaushal M <kaushal@redhat.com>2012-02-17 12:32:18 +0530
committerVijay Bellur <vijay@gluster.com>2012-02-21 02:48:57 -0800
commite311a30f845255b44f3abc56215f584a3c245136 (patch)
treedba503a01a4029277d88c76c92941c6f08ece25f /glusterfsd
parent0ef7e763c85c045ef7937d0ca02d8c5f0333e6e8 (diff)
cli, glusterfsd: Fixes for "volume top {read,write}-perf"
Changed variables to use unsigned types, to support larger comninations of block_size * block_count Also increases cli time out for "volume top" ops to 600, to allow more time for glusterd to return the results to cli. Change-Id: I4b953799c78a5a184311f6f8c4a7a99dc9e87a07 BUG: 783980 Signed-off-by: Kaushal M <kaushal@redhat.com> Reviewed-on: http://review.gluster.com/2761 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Amar Tumballi <amarts@redhat.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'glusterfsd')
-rw-r--r--glusterfsd/src/glusterfsd-mgmt.c28
-rw-r--r--glusterfsd/src/glusterfsd.h4
2 files changed, 16 insertions, 16 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index de6e2d6..e41653f 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -359,9 +359,9 @@ glusterfs_handle_translator_info_get (rpcsvc_request_t *req)
gd1_mgmt_brick_op_req xlator_req = {0,};
dict_t *dict = NULL;
xlator_t *this = NULL;
- gf1_cli_top_op top_op = 0;
- int32_t blk_size = 0;
- int32_t blk_count = 0;
+ gf1_cli_top_op top_op = 0;
+ uint32_t blk_size = 0;
+ uint32_t blk_count = 0;
gfd_vol_top_priv_t *priv = NULL;
pthread_t tid = -1;
@@ -398,10 +398,10 @@ glusterfs_handle_translator_info_get (rpcsvc_request_t *req)
ret = dict_get_int32 (dict, "top-op", (int32_t *)&top_op);
if ((!ret) && (GF_CLI_TOP_READ_PERF == top_op ||
GF_CLI_TOP_WRITE_PERF == top_op)) {
- ret = dict_get_int32 (dict, "blk-size", &blk_size);
+ ret = dict_get_uint32 (dict, "blk-size", &blk_size);
if (ret)
goto cont;
- ret = dict_get_int32 (dict, "blk-cnt", &blk_count);
+ ret = dict_get_uint32 (dict, "blk-cnt", &blk_count);
if (ret)
goto cont;
priv->blk_size = blk_size;
@@ -441,11 +441,11 @@ glusterfs_volume_top_write_perf (void *args)
int32_t input_fd = -1;
char export_path[PATH_MAX];
char *buf = NULL;
- int32_t blk_size = 0;
- int32_t blk_count = 0;
+ uint32_t blk_size = 0;
+ uint32_t blk_count = 0;
int32_t iter = 0;
int32_t ret = -1;
- int64_t total_blks = 0;
+ uint64_t total_blks = 0;
struct timeval begin, end = {0,};
double throughput = 0;
double time = 0;
@@ -495,7 +495,7 @@ glusterfs_volume_top_write_perf (void *args)
total_blks += ret;
}
ret = 0;
- if (total_blks != (blk_size * blk_count)) {
+ if (total_blks != ((uint64_t)blk_size * blk_count)) {
gf_log ("glusterd", GF_LOG_WARNING, "Error in write");
ret = -1;
goto out;
@@ -533,11 +533,11 @@ glusterfs_volume_top_read_perf (void *args)
int32_t output_fd = -1;
char export_path[PATH_MAX];
char *buf = NULL;
- int32_t blk_size = 0;
- int32_t blk_count = 0;
+ uint32_t blk_size = 0;
+ uint32_t blk_count = 0;
int32_t iter = 0;
int32_t ret = -1;
- int64_t total_blks = 0;
+ uint64_t total_blks = 0;
struct timeval begin, end = {0,};
double throughput = 0;
double time = 0;
@@ -619,9 +619,9 @@ glusterfs_volume_top_read_perf (void *args)
total_blks += ret;
}
ret = 0;
- if ((blk_size * blk_count) != total_blks) {
+ if (total_blks != ((uint64_t)blk_size * blk_count)) {
ret = -1;
- gf_log ("glusterd", GF_LOG_WARNING, "Error in write");
+ gf_log ("glusterd", GF_LOG_WARNING, "Error in read");
goto out;
}
diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h
index 0e68f7f..3c38fbe 100644
--- a/glusterfsd/src/glusterfsd.h
+++ b/glusterfsd/src/glusterfsd.h
@@ -85,8 +85,8 @@ enum argp_option_keys {
struct _gfd_vol_top_priv_t {
rpcsvc_request_t *req;
gd1_mgmt_brick_op_req xlator_req;
- int32_t blk_count;
- int32_t blk_size;
+ uint32_t blk_count;
+ uint32_t blk_size;
double throughput;
double time;
int32_t ret;