From c7d1aee76d5713d1f337ab1c831c0ed74e4676e1 Mon Sep 17 00:00:00 2001
From: Yaniv Kaul <ykaul@redhat.com>
Date: Thu, 27 Dec 2018 18:56:16 +0200
Subject: Multiple files: reduce work while under lock.

Mostly, unlock before logging.
In some cases, moved different code that was not needed
to be under lock (for example, taking time, or malloc'ing)
to be executed before taking the lock.

Note: logging might be slightly less accurate in order, since it may
not be done now under the lock, so order of logs is racy. I think
it's a reasonable compromise.

Compile-tested only!
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>

Change-Id: I2438710016afc9f4f62a176ef1a0d3ed793b4f89
---
 glusterfsd/src/glusterfsd-mgmt.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'glusterfsd')

diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index 6dec11b2bc2..a78acb602a0 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -2008,10 +2008,11 @@ volfile:
             if (!strcmp(volfile_id, volfile_obj->vol_id)) {
                 if (!memcmp(sha256_hash, volfile_obj->volfile_checksum,
                             sizeof(volfile_obj->volfile_checksum))) {
+                    UNLOCK(&ctx->volfile_lock);
                     gf_log(frame->this->name, GF_LOG_INFO,
                            "No change in volfile,"
                            "continuing");
-                    goto out;
+                    goto post_unlock;
                 }
                 volfile_tmp = volfile_obj;
                 break;
@@ -2021,10 +2022,11 @@ volfile:
         /* coverity[secure_temp] mkstemp uses 0600 as the mode */
         tmp_fd = mkstemp(template);
         if (-1 == tmp_fd) {
+            UNLOCK(&ctx->volfile_lock);
             gf_msg(frame->this->name, GF_LOG_ERROR, 0, glusterfsd_msg_39,
                    "Unable to create temporary file: %s", template);
             ret = -1;
-            goto out;
+            goto post_unlock;
         }
 
         /* Calling unlink so that when the file is closed or program
@@ -2065,11 +2067,11 @@ volfile:
                    "No need to re-load volfile, reconfigure done");
             if (!volfile_tmp) {
                 ret = -1;
+                UNLOCK(&ctx->volfile_lock);
                 gf_log("mgmt", GF_LOG_ERROR,
-                       "Graph "
-                       "reconfigure succeeded with out having "
+                       "Graph reconfigure succeeded with out having "
                        "checksum.");
-                goto out;
+                goto post_unlock;
             }
             memcpy(volfile_tmp->volfile_checksum, sha256_hash,
                    sizeof(volfile_tmp->volfile_checksum));
@@ -2077,8 +2079,9 @@ volfile:
         }
 
         if (ret < 0) {
+            UNLOCK(&ctx->volfile_lock);
             gf_log("glusterfsd-mgmt", GF_LOG_DEBUG, "Reconfigure failed !!");
-            goto out;
+            goto post_unlock;
         }
 
         ret = glusterfs_process_volfp(ctx, tmpfp);
@@ -2118,7 +2121,7 @@ out:
 
     if (locked)
         UNLOCK(&ctx->volfile_lock);
-
+post_unlock:
     GF_FREE(frame->local);
     frame->local = NULL;
     STACK_DESTROY(frame->root);
-- 
cgit