glusterd: call runner_end even if runner_start fails

Change-Id: I5eca01a131307ba3be2aed4922eea73025ff284c
BUG: 1081013
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/7360
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index fdfdcc28168..8c5cd7a43c6 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -5110,6 +5110,17 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
                         "size for %s : %s package missing", fs_name,
                         ((strcmp (fs_name, "xfs")) ?
                          "e2fsprogs" : "xfsprogs"));
+                /*
+                 * Runner_start might return an error after the child has
+                 * been forked, e.g. if the program isn't there.  In that
+                 * case, we still need to call runner_end to reap the
+                 * child and free resources.  Fortunately, that seems to
+                 * be harmless for other kinds of failures.
+                 */
+                if (runner_end(&runner)) {
+                        gf_log (THIS->name, GF_LOG_ERROR,
+                                "double failure calling runner_end");
+                }
                 goto out;
         }