|
 |
3604df |
From 2fc95e14cbdf856015eb813da4ee59273b297e47 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Kotresh HR <khiremat@redhat.com>
|
|
|
3604df |
Date: Sat, 22 Oct 2016 23:50:02 +0530
|
|
|
3604df |
Subject: [PATCH 152/157] bitrot/cli: Add ondemand scrub event
|
|
|
3604df |
|
|
|
3604df |
Following Bitrot Events are added
|
|
|
3604df |
|
|
|
3604df |
BITROT_SCRUB_ONDEMAND
|
|
|
3604df |
{
|
|
|
3604df |
"nodeid": NODEID,
|
|
|
3604df |
"ts": TIMESTAMP,
|
|
|
3604df |
"event": EVENT_TYPE,
|
|
|
3604df |
"message": {
|
|
|
3604df |
"name": VOLUME_NAME,
|
|
|
3604df |
}
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
> Change-Id: I85e668e254e6f29c447ddb4ad2ce2fc04f98bf3c
|
|
|
3604df |
> BUG: 1387864
|
|
|
3604df |
> Signed-off-by: Kotresh HR <khiremat@redhat.com>
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15700
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
>Change-Id: I85e668e254e6f29c447ddb4ad2ce2fc04f98bf3c
|
|
|
3604df |
>BUG: 1387964
|
|
|
3604df |
>Signed-off-by: Kotresh HR <khiremat@redhat.com>
|
|
|
3604df |
>Reviewed-on: http://review.gluster.org/15705
|
|
|
3604df |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
Change-Id: I85e668e254e6f29c447ddb4ad2ce2fc04f98bf3c
|
|
|
3604df |
BUG: 1384311
|
|
|
3604df |
Signed-off-by: Kotresh HR <khiremat@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/89264
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
Tested-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
cli/src/cli-cmd-volume.c | 3 +++
|
|
|
3604df |
events/eventskeygen.py | 1 +
|
|
|
3604df |
2 files changed, 4 insertions(+), 0 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
index d7037d3..67da5a6 100644
|
|
|
3604df |
--- a/cli/src/cli-cmd-volume.c
|
|
|
3604df |
+++ b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
@@ -1794,6 +1794,9 @@ out:
|
|
|
3604df |
case GF_BITROT_OPTION_TYPE_DISABLE:
|
|
|
3604df |
event_type = EVENT_BITROT_DISABLE;
|
|
|
3604df |
break;
|
|
|
3604df |
+ case GF_BITROT_CMD_SCRUB_ONDEMAND:
|
|
|
3604df |
+ event_type = EVENT_BITROT_SCRUB_ONDEMAND;
|
|
|
3604df |
+ break;
|
|
|
3604df |
case GF_BITROT_OPTION_TYPE_SCRUB_THROTTLE:
|
|
|
3604df |
event_type = EVENT_BITROT_SCRUB_THROTTLE;
|
|
|
3604df |
ret1 = dict_get_str (options, "scrub-throttle-value",
|
|
|
3604df |
diff --git a/events/eventskeygen.py b/events/eventskeygen.py
|
|
|
3604df |
index 06953b2..33398ee 100644
|
|
|
3604df |
--- a/events/eventskeygen.py
|
|
|
3604df |
+++ b/events/eventskeygen.py
|
|
|
3604df |
@@ -51,6 +51,7 @@ keys = (
|
|
|
3604df |
"EVENT_BITROT_SCRUB_THROTTLE",
|
|
|
3604df |
"EVENT_BITROT_SCRUB_FREQ",
|
|
|
3604df |
"EVENT_BITROT_SCRUB_OPTION",
|
|
|
3604df |
+ "EVENT_BITROT_SCRUB_ONDEMAND",
|
|
|
3604df |
|
|
|
3604df |
#quota events
|
|
|
3604df |
"EVENT_QUOTA_ENABLE",
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|