Bug 1400923

+++ This bug was initially created as a clone of Bug #1395660 +++

+++ This bug was initially created as a clone of Bug #1388755 +++

Description of problem:

The message returned at checkpoint completion event is missing the master node detail (contains only brick_path). This is insufficient data to parse and update the info maintained in dependent applications like oVirt or other scripts/

Version-Release number of selected component (if applicable):


How reproducible:
Always

Steps to Reproduce:
NA

--- Additional comment from Sahina Bose on 2016-10-26 02:08:47 EDT ---

Is it possible to return session_key in message?

--- Additional comment from Worker Ant on 2016-11-16 06:23:25 EST ---

REVIEW: http://review.gluster.org/15858 (geo-rep/eventsapi: Add Master node information in Checkpoint Event) posted (#1) for review on master by Aravinda VK (avishwan)

--- Additional comment from Worker Ant on 2016-11-30 06:53:21 EST ---

REVIEW: http://review.gluster.org/15858 (geo-rep/eventsapi: Add Master node information in Geo-rep Events) posted (#2) for review on master by Aravinda VK (avishwan)

--- Additional comment from Worker Ant on 2016-12-02 05:16:35 EST ---

COMMIT: http://review.gluster.org/15858 committed in master by Aravinda VK (avishwan) 
------
commit 91e72a0f2e4e51ce20550946578a6d50cbb88e26
Author: Aravinda VK <avishwan>
Date:   Wed Nov 16 16:50:50 2016 +0530

    geo-rep/eventsapi: Add Master node information in Geo-rep Events
    
    Added Master node information to GEOREP_ACTIVE, GEOREP_PASSIVE, GEOREP_FAULTY
    and GEOREP_CHECKPOINT_COMPLETED events.
    
    EVENT_GEOREP_ACTIVE(master_node and master_node_id are new fields)
    {
        "nodeid": NODEID,
        "ts": TIMESTAMP,
        "event": "GEOREP_ACTIVE",
        "message": {
            "master_volume": MASTER_VOLUME_NAME,
            "master_node": MASTER_NODE,
            "master_node_id": MASTER_NODE_ID,
            "slave_host": SLAVE_HOST,
            "slave_volume": SLAVE_VOLUME,
            "brick_path": BRICK_PATH
        }
    }
    
    EVENT_GEOREP_PASSIVE(master_node and master_node_id are new fields)
    {
        "nodeid": NODEID,
        "ts": TIMESTAMP,
        "event": "GEOREP_PASSIVE",
        "message": {
            "master_volume": MASTER_VOLUME_NAME,
            "master_node": MASTER_NODE,
            "master_node_id": MASTER_NODE_ID,
            "slave_host": SLAVE_HOST,
            "slave_volume": SLAVE_VOLUME,
            "brick_path": BRICK_PATH
        }
    }
    
    EVENT_GEOREP_FAULTY(master_node and master_node_id are new fields)
    {
        "nodeid": NODEID,
        "ts": TIMESTAMP,
        "event": "GEOREP_FAULTY",
        "message": {
            "master_volume": MASTER_VOLUME_NAME,
            "master_node": MASTER_NODE,
            "master_node_id": MASTER_NODE_ID,
            "current_slave_host": CURRENT_SLAVE_HOST,
            "slave_host": SLAVE_HOST,
            "slave_volume": SLAVE_VOLUME,
            "brick_path": BRICK_PATH
        }
    }
    
    EVENT_GEOREP_CHECKPOINT_COMPLETED(master_node and master_node_id are new fields)
    {
        "nodeid": NODEID,
        "ts": TIMESTAMP,
        "event": "GEOREP_CHECKPOINT_COMPLETED",
        "message": {
            "master_volume": MASTER_VOLUME_NAME,
            "master_node": MASTER_NODE,
            "master_node_id": MASTER_NODE_ID,
            "slave_host": SLAVE_HOST,
            "slave_volume": SLAVE_VOLUME,
            "brick_path": BRICK_PATH,
            "checkpoint_time": CHECKPOINT_TIME,
            "checkpoint_completion_time": CHECKPOINT_COMPLETION_TIME
        }
    }
    
    BUG: 1395660
    Change-Id: Ic91af52fa248c8e982e93a06be861dfd69689f34
    Signed-off-by: Aravinda VK <avishwan>
    Reviewed-on: http://review.gluster.org/15858
    NetBSD-regression: NetBSD Build System <jenkins.org>
    Smoke: Gluster Build System <jenkins.org>
    CentOS-regression: Gluster Build System <jenkins.org>
    Reviewed-by: Kotresh HR <khiremat>