diff options
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 20 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 12 |
2 files changed, 0 insertions, 32 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index c8ffdf18b3e..108edc10cf2 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -1508,26 +1508,6 @@ glusterfs_pidfile_setup (glusterfs_ctx_t *ctx) goto out; } - ret = lockf (fileno (pidfp), F_TLOCK, 0); - if (ret) { - gf_log ("glusterfsd", GF_LOG_ERROR, - "pidfile %s lock error (%s)", - cmd_args->pid_file, strerror (errno)); - goto out; - } - - gf_log ("glusterfsd", GF_LOG_TRACE, - "pidfile %s lock acquired", - cmd_args->pid_file); - - ret = lockf (fileno (pidfp), F_ULOCK, 0); - if (ret) { - gf_log ("glusterfsd", GF_LOG_ERROR, - "pidfile %s unlock error (%s)", - cmd_args->pid_file, strerror (errno)); - goto out; - } - ctx->pidfp = pidfp; ret = 0; diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 7c58e51addb..9fb2ab31e04 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -1307,16 +1307,6 @@ out: return ret; } -/* Caller should ensure that brick process is not running*/ -static void -_reap_brick_process (char *pidfile, char *brickpath) -{ - unlink (pidfile); - /* Brick process is not running and pmap may have an entry for it.*/ - pmap_registry_remove (THIS, 0, brickpath, - GF_PMAP_PORT_BRICKSERVER, NULL); -} - static int _mk_rundir_p (glusterd_volinfo_t *volinfo) { @@ -1371,8 +1361,6 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, if (gf_is_service_running (pidfile, NULL)) goto connect; - _reap_brick_process (pidfile, brickinfo->path); - port = brickinfo->port; if (!port) port = pmap_registry_alloc (THIS); |