From 7e00626b0dcd04b4f38d7cb1a3288ba6740ed9b6 Mon Sep 17 00:00:00 2001 From: Aravinda VK Date: Tue, 19 Jul 2016 17:28:14 +0530 Subject: eventsapi: Volume Set and Reset Events Example of published data for Volume Set: { "nodeid": NODEID, "ts": TIMESTAMP, "event": "VOLUME_SET", "message": { "name": VOLUME_NAME, "options": [[KEY1, VALUE1], [KEY2, VALUE2],..] } } Example of published data for Volume Reset: { "nodeid": NODEID, "ts": TIMESTAMP, "event": "VOLUME_RESET", "message": { "name": VOLUME_NAME, "option": KEY } } BUG: 1358671 Change-Id: If30cc95396459b2a9993b3412ee6d05d27f6a86a Signed-off-by: Aravinda VK Reviewed-on: http://review.gluster.org/14973 NetBSD-regression: NetBSD Build System Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Atin Mukherjee --- events/eventskeygen.py | 2 ++ events/src/eventtypes.py | 2 ++ events/src/handlers.py | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) (limited to 'events') diff --git a/events/eventskeygen.py b/events/eventskeygen.py index 656a7dce9f1..f9bdb9fed52 100644 --- a/events/eventskeygen.py +++ b/events/eventskeygen.py @@ -25,6 +25,8 @@ keys = ( "EVENT_VOLUME_START", "EVENT_VOLUME_STOP", "EVENT_VOLUME_DELETE", + "EVENT_VOLUME_SET", + "EVENT_VOLUME_RESET", ) LAST_EVENT = "EVENT_LAST" diff --git a/events/src/eventtypes.py b/events/src/eventtypes.py index 4812e659de3..b09e5bcff9a 100644 --- a/events/src/eventtypes.py +++ b/events/src/eventtypes.py @@ -6,4 +6,6 @@ all_events = [ "EVENT_VOLUME_START", "EVENT_VOLUME_STOP", "EVENT_VOLUME_DELETE", + "EVENT_VOLUME_SET", + "EVENT_VOLUME_RESET", ] diff --git a/events/src/handlers.py b/events/src/handlers.py index 9b756a91d51..21d3e83de54 100644 --- a/events/src/handlers.py +++ b/events/src/handlers.py @@ -19,3 +19,22 @@ def generic_handler(ts, key, data): Ex: handle_event_volume_create(ts, key, data) """ utils.publish(ts, key, data) + + +def handle_event_volume_set(ts, key, data): + """ + Recieved data will have all the options as one string, split into + list of options. "key1,value1,key2,value2" into + [[key1, value1], [key2, value2]] + """ + opts = data.get("options", "").strip(",").split(",") + data["options"] = [] + for i, opt in enumerate(opts): + if i % 2 == 0: + # Add new array with key + data["options"].append([opt]) + else: + # Add to the last added array + data["options"][-1].append(opt) + + utils.publish(ts, key, data) -- cgit