diff options
| author | Venkatesh Somyajulu <vsomyaju@redhat.com> | 2013-07-22 19:00:53 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-07-23 02:52:42 -0700 |
| commit | 50cfc2d8e814ec649283bbd058eebd779d213d4d (patch) | |
| tree | 637c305e26db4c2747e64ab105271c94e3c666ba | |
| parent | eef0737ca6ae8056d906c7bff0a9280cc748270e (diff) | |
cli: Increased timeout for gluster volume heal commnads
Problem:
If number of files are very large, then gluster volume heal
volumename info commnads take large time. So timeout of 2
minutes seems to be insufficient.
Fix:
Increased timeout to 10 minutes
Change-Id: I5f847163e01c4afbb587b726833ad80183f1a928
BUG: 986945
Signed-off-by: Venkatesh Somyajulu <vsomyaju@redhat.com>
Reviewed-on: http://review.gluster.org/5372
Reviewed-by: Kaushal M <kaushal@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | cli/src/cli-cmd.c | 7 | ||||
| -rw-r--r-- | cli/src/cli.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c index 7a697603e15..aa7600350c1 100644 --- a/cli/src/cli-cmd.c +++ b/cli/src/cli-cmd.c @@ -365,8 +365,11 @@ cli_cmd_submit (void *req, call_frame_t *frame, int ret = -1; unsigned timeout = 0; - timeout = (GLUSTER_CLI_PROFILE_VOLUME == procnum) ? - CLI_TOP_CMD_TIMEOUT : CLI_DEFAULT_CMD_TIMEOUT; + if ((GLUSTER_CLI_PROFILE_VOLUME == procnum) || + (GLUSTER_CLI_HEAL_VOLUME == procnum)) + timeout = CLI_TEN_MINUTES_TIMEOUT; + else + timeout = CLI_DEFAULT_CMD_TIMEOUT; cli_cmd_lock (); cmd_sent = 0; diff --git a/cli/src/cli.h b/cli/src/cli.h index e0699b4293f..da3d9c73cfd 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -30,7 +30,7 @@ #define CLI_GLUSTERD_PORT 24007 #define CLI_DEFAULT_CONN_TIMEOUT 120 #define CLI_DEFAULT_CMD_TIMEOUT 120 -#define CLI_TOP_CMD_TIMEOUT 600 //Longer timeout for volume top +#define CLI_TEN_MINUTES_TIMEOUT 600 //Longer timeout for volume top #define DEFAULT_CLI_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" #define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" #define DEFAULT_VAR_RUN_DIRECTORY DATADIR "/run/gluster" |