diff options
Diffstat (limited to 'xlators/cluster/nsr-server/src/leader.c')
| -rw-r--r-- | xlators/cluster/nsr-server/src/leader.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xlators/cluster/nsr-server/src/leader.c b/xlators/cluster/nsr-server/src/leader.c index 944c85cdc..02a2609c8 100644 --- a/xlators/cluster/nsr-server/src/leader.c +++ b/xlators/cluster/nsr-server/src/leader.c @@ -30,7 +30,6 @@ #include "../../nsr-recon/src/recon_driver.h" #include "../../nsr-recon/src/recon_xlator.h" -#define NSR_KEY "xyzzy" #define NSR_TTL 5 static void @@ -39,20 +38,19 @@ nsr_set_leader (xlator_t *this, etcd_session etcd) long term = 0; etcd_result res; nsr_private_t *priv = this->private; - char *term_key = priv->term_uuid; char n_t[sizeof(long)+1]; char *text = NULL; gf_log (this->name, GF_LOG_INFO, "Just became leader"); - text = etcd_get(etcd, priv->term_uuid); + text = etcd_get(etcd, priv->term_key); if(text == NULL) { term = 0; } else { term = strtol(text, NULL, 10); } sprintf(n_t,"%ld",term+1); - res = etcd_set(etcd, term_key,n_t,text,0); + res = etcd_set(etcd, priv->term_key,n_t,text,0); if(res != ETCD_OK) { gf_log (this->name, GF_LOG_ERROR, "failed to set term"); return; @@ -84,7 +82,7 @@ nsr_leader_thread (void *arg) char *index_out = NULL; gf_log (this->name, GF_LOG_INFO, - "calling glfs_open_str on servers %s", priv->etcd_servers); + "calling etcd_open_str on servers %s", priv->etcd_servers); priv->etcd = etcd_open_str(priv->etcd_servers); if (!(priv->etcd)) { @@ -98,7 +96,7 @@ nsr_leader_thread (void *arg) for (;;) { /* Not leader yet. Try to become leader. */ for (;;) { - res = etcd_lock (priv->etcd, NSR_KEY, NSR_TTL, + res = etcd_lock (priv->etcd, priv->leader_key, NSR_TTL, index_in, &index_out); if (res == ETCD_OK) { break; @@ -113,7 +111,7 @@ nsr_leader_thread (void *arg) index_in = index_out; index_out = NULL; for (;;) { - res = etcd_lock (priv->etcd, NSR_KEY, NSR_TTL, + res = etcd_lock (priv->etcd, priv->leader_key, NSR_TTL, index_in, &index_out); if (index_out && (index_in != index_out)) { if (index_in) { |