cli,mgmt/glusterd: fsm log implementation

Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 1966 (Unnecessarily verbose logs at the default log level)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1966

2 files changed, 159 insertions, 5 deletions

diff --git a/cli/src/cli-cmd-system.c b/cli/src/cli-cmd-system.c
index 08fc44a37c2..8d55144749d 100644
--- a/cli/src/cli-cmd-system.c
+++ b/cli/src/cli-cmd-system.c
@@ -129,6 +129,39 @@ out:
         return ret;
 }
 
+void
+cli_cmd_fsm_log_usage ()
+{
+	cli_out ("Usage: fsm log [<peer-name>]");
+}
+
+int
+cli_cmd_fsm_log (struct cli_state *state, struct cli_cmd_word *in_word,
+                 const char **words, int wordcount)
+{
+        int                             ret = -1;
+        rpc_clnt_procedure_t            *proc = NULL;
+        call_frame_t                    *frame = NULL;
+        char                            *name = "";
+
+        if ((wordcount != 3) && (wordcount != 2)) {
+                cli_cmd_fsm_log_usage ();
+                goto out;
+        }
+
+        if (wordcount == 3)
+                name = (char*)words[2];
+        proc = &cli_rpc_prog->proctable[GF1_CLI_FSM_LOG];
+        if (proc && proc->fn) {
+                frame = create_frame (THIS, THIS->ctx->pool);
+                if (!frame)
+                        goto out;
+                ret = proc->fn (frame, THIS, (void*)name);
+        }
+out:
+        return ret;
+}
+
 struct cli_cmd cli_system_cmds[] = {
         { GETSPEC_SYNTAX,
           cli_cmd_getspec_cbk,
@@ -142,6 +175,10 @@ struct cli_cmd cli_system_cmds[] = {
            cli_cmd_system_help_cbk,
            "display help for system commands"},
 
+        { "fsm log [<peer-name>]",
+           cli_cmd_fsm_log,
+           "display fsm transitions"},
+
         { NULL, NULL, NULL }
 };
 
diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c
index b8985f71264..7e885a010f6 100644
--- a/cli/src/cli3_1-cops.c
+++ b/cli/src/cli3_1-cops.c
@@ -330,15 +330,15 @@ out:
         return ret;
 }
 
-void 
+void
 cli_out_options ( char *substr, char *optstr, char *valstr)
 {
         char                    *ptr1 = NULL;
         char                    *ptr2 = NULL;
-        
+
         ptr1 = substr;
         ptr2 = optstr;
-        
+
         while (ptr1)
         {
                 if (*ptr1 != *ptr2)
@@ -350,7 +350,7 @@ cli_out_options ( char *substr, char *optstr, char *valstr)
                 if (!ptr2)
                         return;
         }
-        
+
         if (*ptr2 == '\0')
                 return;
         cli_out ("%s: %s",ptr2 , valstr);
@@ -2228,6 +2228,122 @@ out:
         return ret;
 }
 
+static int
+gf_cli3_1_fsm_log_cbk (struct rpc_req *req, struct iovec *iov,
+                       int count, void *myframe)
+{
+        gf1_cli_fsm_log_rsp        rsp   = {0,};
+        int                        ret   = -1;
+        dict_t                     *dict = NULL;
+        int                        tr_count = 0;
+        char                       key[256] = {0};
+        int                        i = 0;
+        char                       *old_state = NULL;
+        char                       *new_state = NULL;
+        char                       *event = NULL;
+        char                       *time = NULL;
+
+        if (-1 == req->rpc_status) {
+                goto out;
+        }
+
+        ret = gf_xdr_to_cli_fsm_log_rsp (*iov, &rsp);
+        if (ret < 0) {
+                gf_log ("", GF_LOG_ERROR, "error");
+                goto out;
+        }
+
+        if (rsp.op_ret) {
+                if (strcmp (rsp.op_errstr, "")) {
+                        cli_out (rsp.op_errstr);
+                } else if (rsp.op_ret) {
+                        cli_out ("fsm log unsuccessful");
+                }
+                ret = rsp.op_ret;
+                goto out;
+        }
+
+        dict = dict_new ();
+        if (!dict) {
+                ret = -1;
+                goto out;
+        }
+
+        ret = dict_unserialize (rsp.fsm_log.fsm_log_val,
+                                rsp.fsm_log.fsm_log_len,
+                                &dict);
+
+        if (ret) {
+                cli_out ("bad response");
+                goto out;
+        }
+
+        ret = dict_get_int32 (dict, "count", &tr_count);
+        if (tr_count)
+                cli_out("number of transitions: %d", tr_count);
+        else
+                cli_out("No transitions");
+        for (i = 0; i < tr_count; i++) {
+                memset (key, 0, sizeof (key));
+                snprintf (key, sizeof (key), "log%d-old-state", i);
+                ret = dict_get_str (dict, key, &old_state);
+                if (ret)
+                        goto out;
+
+                memset (key, 0, sizeof (key));
+                snprintf (key, sizeof (key), "log%d-event", i);
+                ret = dict_get_str (dict, key, &event);
+                if (ret)
+                        goto out;
+
+                memset (key, 0, sizeof (key));
+                snprintf (key, sizeof (key), "log%d-new-state", i);
+                ret = dict_get_str (dict, key, &new_state);
+                if (ret)
+                        goto out;
+
+                memset (key, 0, sizeof (key));
+                snprintf (key, sizeof (key), "log%d-time", i);
+                ret = dict_get_str (dict, key, &time);
+                if (ret)
+                        goto out;
+                cli_out ("Old State: [%s]\n"
+                         "New State: [%s]\n"
+                         "Event    : [%s]\n"
+                         "timestamp: [%s]\n", old_state, new_state, event, time);
+        }
+
+        ret = rsp.op_ret;
+
+out:
+        cli_cmd_broadcast_response (ret);
+        return ret;
+}
+
+int32_t
+gf_cli3_1_fsm_log (call_frame_t *frame, xlator_t *this, void *data)
+{
+        int                        ret = -1;
+        gf1_cli_fsm_log_req        req = {0,};
+
+        GF_ASSERT (frame);
+        GF_ASSERT (this);
+        GF_ASSERT (data);
+
+        if (!frame || !this || !data)
+                goto out;
+        req.name = data;
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GD_MGMT_CLI_FSM_LOG, NULL,
+                              gf_xdr_from_cli_fsm_log_req,
+                              this, gf_cli3_1_fsm_log_cbk);
+
+out:
+        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
+
+        return ret;
+}
+
 struct rpc_clnt_procedure gluster3_1_cli_actors[GF1_CLI_MAXVALUE] = {
         [GF1_CLI_NULL]        = {"NULL", NULL },
         [GF1_CLI_PROBE]  = { "PROBE_QUERY",  gf_cli3_1_probe},
@@ -2251,7 +2367,8 @@ struct rpc_clnt_procedure gluster3_1_cli_actors[GF1_CLI_MAXVALUE] = {
         [GF1_CLI_GETSPEC] = {"GETSPEC", gf_cli3_1_getspec},
         [GF1_CLI_PMAP_PORTBYBRICK] = {"PMAP PORTBYBRICK", gf_cli3_1_pmap_b2p},
         [GF1_CLI_SYNC_VOLUME] = {"SYNC_VOLUME", gf_cli3_1_sync_volume},
-        [GF1_CLI_RESET_VOLUME] = {"RESET_VOLUME", gf_cli3_1_reset_volume}
+        [GF1_CLI_RESET_VOLUME] = {"RESET_VOLUME", gf_cli3_1_reset_volume},
+        [GF1_CLI_FSM_LOG] = {"FSM_LOG", gf_cli3_1_fsm_log}
 };
 
 struct rpc_clnt_program cli3_1_prog = {