brick-mux : fix error handling

Fix error handling from ReadFromPidFile call. Also added a check to bypass detach if the brick pid is -1. Signed-off-by: Atin Mukherjee <[email protected]>
gluster · Jan 10, 2019 · cedf0cb · cedf0cb
1 parent 91e5c87
commit cedf0cb
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/glusterd2/brickmux/demultiplex.go b/glusterd2/brickmux/demultiplex.go
@@ -32,11 +32,17 @@ func Demultiplex(b brick.Brickinfo) error {
 	if err != nil {
 		return err
 	}
-	if pidOnFile, err = daemon.ReadPidFromFile(brickDaemon.PidFile()); err == nil {
+	if pidOnFile, err = daemon.ReadPidFromFile(brickDaemon.PidFile()); err != nil {
 		log.WithFields(log.Fields{"brick": b.String(),
 			"pidfile": brickDaemon.PidFile()}).Error("Failed to read the pidfile")
 		return err
 
+	}
+	if pidOnFile == -1 {
+		log.WithFields(log.Fields{"brick": b.String(),
+			"pidfile": brickDaemon.PidFile()}).Error("Pid is -1")
+		return err
+
 	}
 	brickDaemon.Socketfilepath, err = glusterdGetSockFromBrickPid(pidOnFile)
 	if err != nil {