|
 |
3604df |
From 4923703a45ea10bbad8a84c7fd02fe3f9fa8db37 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Anuradha Talur <atalur@redhat.com>
|
|
|
3604df |
Date: Wed, 31 Aug 2016 15:27:31 +0530
|
|
|
3604df |
Subject: [PATCH 62/86] event: fix gf_event messages for replace/reset brick op
|
|
|
3604df |
|
|
|
3604df |
>Change-Id: I80ebeeaffd2b228d7d0796c8d08bc2a051c4ccac
|
|
|
3604df |
>BUG: 1266876
|
|
|
3604df |
>Signed-off-by: Anuradha Talur <atalur@redhat.com>
|
|
|
3604df |
>Reviewed-on: http://review.gluster.org/15370
|
|
|
3604df |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
Change-Id: I80ebeeaffd2b228d7d0796c8d08bc2a051c4ccac
|
|
|
3604df |
BUG: 1256524
|
|
|
3604df |
Signed-off-by: Ashish Pandey <aspandey@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/84810
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
cli/src/cli-cmd-volume.c | 28 ++++++++++++-------
|
|
|
3604df |
events/eventskeygen.py | 3 +-
|
|
|
3604df |
xlators/mgmt/glusterd/src/glusterd-replace-brick.c | 5 ---
|
|
|
3604df |
3 files changed, 20 insertions(+), 16 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
index 4b2653b..647505e 100644
|
|
|
3604df |
--- a/cli/src/cli-cmd-volume.c
|
|
|
3604df |
+++ b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
@@ -1844,10 +1844,10 @@ cli_cmd_volume_reset_brick_cbk (struct cli_state *state,
|
|
|
3604df |
int ret = -1;
|
|
|
3604df |
rpc_clnt_procedure_t *proc = NULL;
|
|
|
3604df |
call_frame_t *frame = NULL;
|
|
|
3604df |
- dict_t *options = NULL;
|
|
|
3604df |
- int sent = 0;
|
|
|
3604df |
- int parse_error = 0;
|
|
|
3604df |
- cli_local_t *local = NULL;
|
|
|
3604df |
+ dict_t *options = NULL;
|
|
|
3604df |
+ int sent = 0;
|
|
|
3604df |
+ int parse_error = 0;
|
|
|
3604df |
+ cli_local_t *local = NULL;
|
|
|
3604df |
|
|
|
3604df |
#ifdef GF_SOLARIS_HOST_OS
|
|
|
3604df |
cli_out ("Command not supported on Solaris");
|
|
|
3604df |
@@ -1875,14 +1875,22 @@ cli_cmd_volume_reset_brick_cbk (struct cli_state *state,
|
|
|
3604df |
|
|
|
3604df |
out:
|
|
|
3604df |
if (ret) {
|
|
|
3604df |
- gf_event (EVENT_BRICK_RESET, "Volume reset-brick failed.");
|
|
|
3604df |
cli_cmd_sent_status_get (&sent);
|
|
|
3604df |
if ((sent == 0) && (parse_error == 0))
|
|
|
3604df |
cli_out ("Volume reset-brick failed");
|
|
|
3604df |
} else {
|
|
|
3604df |
- gf_event (EVENT_BRICK_RESET, "Volume reset-brick succeeded.");
|
|
|
3604df |
+ if (wordcount > 5) {
|
|
|
3604df |
+ gf_event (EVENT_BRICK_RESET_COMMIT,
|
|
|
3604df |
+ "Volume=%s;source-brick=%s;"
|
|
|
3604df |
+ "destination-brick=%s",
|
|
|
3604df |
+ (char *)words[2], (char *)words[3],
|
|
|
3604df |
+ (char *)words[4]);
|
|
|
3604df |
+ } else {
|
|
|
3604df |
+ gf_event (EVENT_BRICK_RESET_START,
|
|
|
3604df |
+ "Volume=%s;source-brick=%s",
|
|
|
3604df |
+ (char *)words[2], (char *)words[3]);
|
|
|
3604df |
+ }
|
|
|
3604df |
}
|
|
|
3604df |
-
|
|
|
3604df |
CLI_STACK_DESTROY (frame);
|
|
|
3604df |
|
|
|
3604df |
return ret;
|
|
|
3604df |
@@ -1928,14 +1936,14 @@ cli_cmd_volume_replace_brick_cbk (struct cli_state *state,
|
|
|
3604df |
|
|
|
3604df |
out:
|
|
|
3604df |
if (ret) {
|
|
|
3604df |
- gf_event (EVENT_BRICK_REPLACE, "Volume replace-brick failed.");
|
|
|
3604df |
cli_cmd_sent_status_get (&sent);
|
|
|
3604df |
if ((sent == 0) && (parse_error == 0))
|
|
|
3604df |
cli_out ("Volume replace-brick failed");
|
|
|
3604df |
} else {
|
|
|
3604df |
- gf_event (EVENT_BRICK_RESET, "Volume replace-brick succeeded.");
|
|
|
3604df |
+ gf_event (EVENT_BRICK_REPLACE,
|
|
|
3604df |
+ "Volume=%s;source-brick=%s;destination-brick=%s",
|
|
|
3604df |
+ (char *)words[2], (char *)words[3], (char *)words[4]);
|
|
|
3604df |
}
|
|
|
3604df |
-
|
|
|
3604df |
CLI_STACK_DESTROY (frame);
|
|
|
3604df |
|
|
|
3604df |
return ret;
|
|
|
3604df |
diff --git a/events/eventskeygen.py b/events/eventskeygen.py
|
|
|
3604df |
index 2869e45..801bee3 100644
|
|
|
3604df |
--- a/events/eventskeygen.py
|
|
|
3604df |
+++ b/events/eventskeygen.py
|
|
|
3604df |
@@ -31,7 +31,8 @@ keys = (
|
|
|
3604df |
"EVENT_VOLUME_DELETE",
|
|
|
3604df |
"EVENT_VOLUME_SET",
|
|
|
3604df |
"EVENT_VOLUME_RESET",
|
|
|
3604df |
- "EVENT_BRICK_RESET",
|
|
|
3604df |
+ "EVENT_BRICK_RESET_START",
|
|
|
3604df |
+ "EVENT_BRICK_RESET_COMMIT",
|
|
|
3604df |
"EVENT_BRICK_REPLACE",
|
|
|
3604df |
|
|
|
3604df |
#geo-rep events
|
|
|
3604df |
diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
|
|
|
3604df |
index 7338843..aaa5a35 100644
|
|
|
3604df |
--- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
|
|
|
3604df |
+++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
|
|
|
3604df |
@@ -146,11 +146,6 @@ __glusterd_handle_replace_brick (rpcsvc_request_t *req)
|
|
|
3604df |
"Received %s request.",
|
|
|
3604df |
gd_rb_op_to_str (cli_op));
|
|
|
3604df |
|
|
|
3604df |
- gf_event ((op == GD_OP_REPLACE_BRICK) ? EVENT_BRICK_REPLACE :
|
|
|
3604df |
- EVENT_BRICK_RESET, "received %s request. Source bricks %s,"
|
|
|
3604df |
- "destination brick %s.", gd_rb_op_to_str (cli_op),
|
|
|
3604df |
- src_brick, (dst_brick) ? dst_brick : "");
|
|
|
3604df |
-
|
|
|
3604df |
ret = glusterd_mgmt_v3_initiate_replace_brick_cmd_phases (req,
|
|
|
3604df |
op, dict);
|
|
|
3604df |
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|