diff options
| author | Amar Tumballi <amar@gluster.com> | 2010-10-04 13:51:29 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-04 12:52:42 -0700 |
| commit | 2136876274690bc7377b97ca0ed812a6befafee2 (patch) | |
| tree | a947b90718b854324c7c66f3bd1571037d119b84 /xlators/mgmt/glusterd/src/glusterd.c | |
| parent | 0d31e7e4239d4765198ea6f46b98ba680038f7ad (diff) | |
glusterd: more sanity checks during restart
* check for validity of pid file before doing pmap search, as in
few cases, pmap_signin() may take more time.
* remove stale code from 'init()'
* update pmap->last_alloc during restore itself to handle glusterd
restarts more agnostics to port collisions
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 7ec5cafbb..12a2486c3 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -228,8 +228,6 @@ init (xlator_t *this) glusterd_conf_t *conf = NULL; data_t *dir_data = NULL; struct stat buf = {0,}; - char *port_str = NULL; - int port_num = 0; char voldir [PATH_MAX] = {0,}; char dirname [PATH_MAX]; char cmd_log_filename [PATH_MAX] = {0,}; @@ -347,13 +345,6 @@ init (xlator_t *this) goto out; } - glusterd1_mop_prog.options = this->options; - port_str = getenv ("GLUSTERD_LOCAL_PORT"); - if (port_str) { - port_num = atoi (port_str); - glusterd1_mop_prog.progport = port_num; - } - /* * only one (atmost a pair - rdma and socket) listener for * glusterd1_mop_prog, gluster_pmap_prog and gluster_handshake_prog. @@ -377,7 +368,6 @@ init (xlator_t *this) goto out; } - gluster_handshake_prog.options = this->options; ret = glusterd_program_register (this, rpc, &gluster_handshake_prog); if (ret) { rpcsvc_program_unregister (rpc, &glusterd1_mop_prog); |