summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/mgmt/glusterd/src')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c3
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.c9
2 files changed, 8 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index e98b5a948de..165fdd882b1 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -2250,6 +2250,9 @@ volgen_graph_build_clients (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
"%s", brick->brick_id);
if (!xl)
goto out;
+ ret = xlator_set_option (xl, "ping-timeout", "42");
+ if (ret)
+ goto out;
ret = xlator_set_option (xl, "remote-host", brick->hostname);
if (ret)
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index d89c1ef7bcf..a5927e66a96 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -40,6 +40,7 @@
#include "glusterd-locks.h"
#include "common-utils.h"
#include "run.h"
+#include "rpc-clnt-ping.h"
#include "syncop.h"
@@ -1623,10 +1624,10 @@ struct volume_options options[] = {
.description = "directory where the bricks for the snapshots will be created"
},
{ .key = {"ping-timeout"},
- .type = GF_OPTION_TYPE_INT,
- .min = 1,
- .max = 100,
- .default_value = "30",
+ .type = GF_OPTION_TYPE_TIME,
+ .min = 0,
+ .max = 300,
+ .default_value = TOSTRING(RPC_DEFAULT_PING_TIMEOUT),
},
{ .key = {NULL} },
};