core: Log level changes do not effect on running client process

Problem: commit c34e4161f3cb6539ec83a9020f3d27eb4759a975 set log-level
         per xlator during reconfigure only for a brick process not for
         the client process.

Solution: 1) Change per xlator log-level only if brick_mux is enabled.To make sure
             about brick multiplex introudce a flag brick_mux at ctx->cmd_args.

Note: There are two other changes done with this patch
      1) Ignore client-log-level option to attach a brick with
         already running brick if brick_mux is enabled
      2) Add a log to print pid of the running process to make easier
         debugging

Change-Id: I39e85de778e150d0685cd9a79425ce8b4783f9c9
Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
Fixes: bz#1696046

3 files changed, 29 insertions, 18 deletions

diff --git a/glusterfsd/src/glusterfsd-messages.h b/glusterfsd/src/glusterfsd-messages.h
index 94312a5b1bb..209279d051b 100644
--- a/glusterfsd/src/glusterfsd-messages.h
+++ b/glusterfsd/src/glusterfsd-messages.h
@@ -23,19 +23,17 @@
  * glfs-message-id.h.
  */
 
-GLFS_MSGID(GLUSTERFSD, glusterfsd_msg_1, glusterfsd_msg_2, glusterfsd_msg_3,
-           glusterfsd_msg_4, glusterfsd_msg_5, glusterfsd_msg_6,
-           glusterfsd_msg_7, glusterfsd_msg_8, glusterfsd_msg_9,
-           glusterfsd_msg_10, glusterfsd_msg_11, glusterfsd_msg_12,
-           glusterfsd_msg_13, glusterfsd_msg_14, glusterfsd_msg_15,
-           glusterfsd_msg_16, glusterfsd_msg_17, glusterfsd_msg_18,
-           glusterfsd_msg_19, glusterfsd_msg_20, glusterfsd_msg_21,
-           glusterfsd_msg_22, glusterfsd_msg_23, glusterfsd_msg_24,
-           glusterfsd_msg_25, glusterfsd_msg_26, glusterfsd_msg_27,
-           glusterfsd_msg_28, glusterfsd_msg_29, glusterfsd_msg_30,
-           glusterfsd_msg_31, glusterfsd_msg_32, glusterfsd_msg_33,
-           glusterfsd_msg_34, glusterfsd_msg_35, glusterfsd_msg_36,
-           glusterfsd_msg_37, glusterfsd_msg_38, glusterfsd_msg_39,
-           glusterfsd_msg_40, glusterfsd_msg_41, glusterfsd_msg_42);
+GLFS_MSGID(
+    GLUSTERFSD, glusterfsd_msg_1, glusterfsd_msg_2, glusterfsd_msg_3,
+    glusterfsd_msg_4, glusterfsd_msg_5, glusterfsd_msg_6, glusterfsd_msg_7,
+    glusterfsd_msg_8, glusterfsd_msg_9, glusterfsd_msg_10, glusterfsd_msg_11,
+    glusterfsd_msg_12, glusterfsd_msg_13, glusterfsd_msg_14, glusterfsd_msg_15,
+    glusterfsd_msg_16, glusterfsd_msg_17, glusterfsd_msg_18, glusterfsd_msg_19,
+    glusterfsd_msg_20, glusterfsd_msg_21, glusterfsd_msg_22, glusterfsd_msg_23,
+    glusterfsd_msg_24, glusterfsd_msg_25, glusterfsd_msg_26, glusterfsd_msg_27,
+    glusterfsd_msg_28, glusterfsd_msg_29, glusterfsd_msg_30, glusterfsd_msg_31,
+    glusterfsd_msg_32, glusterfsd_msg_33, glusterfsd_msg_34, glusterfsd_msg_35,
+    glusterfsd_msg_36, glusterfsd_msg_37, glusterfsd_msg_38, glusterfsd_msg_39,
+    glusterfsd_msg_40, glusterfsd_msg_41, glusterfsd_msg_42, glusterfsd_msg_43);
 
 #endif /* !_GLUSTERFSD_MESSAGES_H_ */
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index c4fb5dfc7e2..2482edd85ed 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -205,7 +205,6 @@ static struct argp_option gf_options[] = {
      "Enables thin mount and connects via gfproxyd daemon"},
     {"global-threading", ARGP_GLOBAL_THREADING_KEY, "BOOL", OPTION_ARG_OPTIONAL,
      "Use the global thread pool instead of io-threads"},
-
     {0, 0, 0, 0, "Fuse options:"},
     {"direct-io-mode", ARGP_DIRECT_IO_MODE_KEY, "BOOL|auto",
      OPTION_ARG_OPTIONAL, "Specify direct I/O strategy [default: \"auto\"]"},
@@ -277,6 +276,7 @@ static struct argp_option gf_options[] = {
      "attribute, dentry and page-cache. "
      "Disable this only if same files/directories are not accessed across "
      "two different mounts concurrently [default: \"on\"]"},
+    {"brick-mux", ARGP_BRICK_MUX_KEY, 0, 0, "Enable brick mux. "},
     {0, 0, 0, 0, "Miscellaneous Options:"},
     {
         0,
@@ -721,7 +721,6 @@ create_fuse_mount(glusterfs_ctx_t *ctx)
     xlator_t *master = NULL;
 
     cmd_args = &ctx->cmd_args;
-
     if (!cmd_args->mount_point) {
         gf_msg_trace("glusterfsd", 0,
                      "mount point not found, not a client process");
@@ -1109,6 +1108,10 @@ parse_opts(int key, char *arg, struct argp_state *state)
             cmd_args->thin_client = _gf_true;
             break;
 
+        case ARGP_BRICK_MUX_KEY:
+            cmd_args->brick_mux = _gf_true;
+            break;
+
         case ARGP_PID_FILE_KEY:
             cmd_args->pid_file = gf_strdup(arg);
             break;
@@ -1226,7 +1229,6 @@ parse_opts(int key, char *arg, struct argp_state *state)
         case ARGP_KEY_ARG:
             if (state->arg_num >= 1)
                 argp_usage(state);
-
             cmd_args->mount_point = gf_strdup(arg);
             break;
 
@@ -2588,6 +2590,8 @@ postfork:
         if (ret)
             goto out;
     }
+    gf_log("glusterfs", GF_LOG_INFO, "Pid of current running process is %d",
+           getpid());
     ret = gf_log_inject_timer_event(ctx);
 
     glusterfs_signals_setup(ctx);
@@ -2835,6 +2839,14 @@ main(int argc, char *argv[])
     if (ret)
         goto out;
 
+    /* set brick_mux mode only for server process */
+    if ((ctx->process_mode != GF_SERVER_PROCESS) && cmd->brick_mux) {
+        gf_msg("glusterfs", GF_LOG_CRITICAL, 0, glusterfsd_msg_43,
+               "command line argument --brick-mux is valid only for brick "
+               "process");
+        goto out;
+    }
+
     /* log the version of glusterfs running here along with the actual
        command line options. */
     {
diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h
index c91daa0fb54..dc7d995e778 100644
--- a/glusterfsd/src/glusterfsd.h
+++ b/glusterfsd/src/glusterfsd.h
@@ -111,7 +111,8 @@ enum argp_option_keys {
     ARGP_FUSE_FLUSH_HANDLE_INTERRUPT_KEY = 189,
     ARGP_FUSE_LRU_LIMIT_KEY = 190,
     ARGP_FUSE_AUTO_INVAL_KEY = 191,
-    ARGP_GLOBAL_THREADING_KEY = 192
+    ARGP_GLOBAL_THREADING_KEY = 192,
+    ARGP_BRICK_MUX_KEY = 193
 };
 
 struct _gfd_vol_top_priv {