diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-03-05 02:35:00 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-03-05 03:29:32 +0000 |
| commit | d23e33a93ccf46435e4176943da1797b7c142288 (patch) | |
| tree | 1167b5c1006ec893013ddc4d761ba2c357d2f162 /xlators/mgmt/glusterd/src | |
| parent | 2775959b47c15e597a7974bbafa79e0882452952 (diff) | |
nsr: update to latest versions of etcd and etcd-api
Also fixed some general bit-rot around how daemons are started when
using real etcd.
Change-Id: Ib5d9c8d49982c4562b6a28b7a7c1dd1e5d9d3077
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-etcd.c | 11 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-etcd.c b/xlators/mgmt/glusterd/src/glusterd-etcd.c index 3382e20ae..656ea3b9b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-etcd.c +++ b/xlators/mgmt/glusterd/src/glusterd-etcd.c @@ -18,7 +18,7 @@ #include "glusterd-etcd.h" #define GLUSTERD_ETCD_DIR "/var/lib/glusterd/etcd" -#define GLUSTERD_ETCD_CMD "/root/etcd/etcd" +#define GLUSTERD_ETCD_CMD "/root/etcd/bin/etcd" pid_t start_etcd (char *this_host, char *other_host) @@ -40,13 +40,14 @@ start_etcd (char *this_host, char *other_host) runinit (&runner); runner_add_args (&runner, GLUSTERD_ETCD_CMD, - "-n", this_host, "-d", GLUSTERD_ETCD_DIR, - "-c", NULL); + "-name", this_host, + "-data-dir", GLUSTERD_ETCD_DIR, + "-bind-addr", NULL); runner_argprintf( &runner, "%s:4001", me); - runner_add_arg (&runner, "-s"); + runner_add_arg (&runner, "-peer-addr"); runner_argprintf (&runner, "%s:7001", me); if (other_host) { - runner_add_arg (&runner, "-C"); + runner_add_arg (&runner, "-peers"); runner_argprintf (&runner, "%s:7001", other_host); gf_log (__func__, GF_LOG_INFO, "starting etcd via %s", other_host); } else { diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 86bdc754a..545b66818 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1467,11 +1467,7 @@ add_nsr_stuff (volgen_graph_t *graph, char *volname, char c_d[NSR_MAX_PATH_SIZE]; char *username = NULL, *password = NULL; gf_boolean_t enable_recon = _gf_false; -#ifdef HAVE_ETCD - uint32_t nsr_port = 27000; -#else static uint32_t nsr_port = 27000; -#endif if (glusterd_volinfo_get_boolean(volinfo,"cluster.nsr.recon") > 0) { |