|
 |
e7a346 |
From 85d0f78a989304cfe4ee74840f22bacf6685a659 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Sunny Kumar <sunkumar@redhat.com>
|
|
|
e7a346 |
Date: Tue, 2 Jan 2018 12:25:33 +0530
|
|
|
e7a346 |
Subject: [PATCH 118/128] snapshot : after brick reset/replace snapshot
|
|
|
e7a346 |
creation fails
|
|
|
e7a346 |
|
|
|
e7a346 |
Problem : after brick reset/replace snapshot creation fails
|
|
|
e7a346 |
|
|
|
e7a346 |
Solution : During brick reset/replace when we validate and aggrigate
|
|
|
e7a346 |
dictionary data from another node it was rewriting
|
|
|
e7a346 |
'mount_dir' value to NULL which is critical for snapshot
|
|
|
e7a346 |
creation.
|
|
|
e7a346 |
|
|
|
e7a346 |
Upstream patch : https://review.gluster.org/c/19049/
|
|
|
e7a346 |
|
|
|
e7a346 |
>BUG: 1512451
|
|
|
e7a346 |
>Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
|
|
|
e7a346 |
|
|
|
e7a346 |
Change-Id: Iabefbfcef7d8ac4cbd2a241e821c0e51492c093e
|
|
|
e7a346 |
BUG: 1507394
|
|
|
e7a346 |
Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/126712
|
|
|
e7a346 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
e7a346 |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
xlators/mgmt/glusterd/src/glusterd-replace-brick.c | 30 +++++++++++++++-------
|
|
|
e7a346 |
xlators/mgmt/glusterd/src/glusterd-reset-brick.c | 27 ++++++++++++-------
|
|
|
e7a346 |
xlators/mgmt/glusterd/src/glusterd-utils.c | 9 -------
|
|
|
e7a346 |
3 files changed, 39 insertions(+), 27 deletions(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
|
|
|
e7a346 |
index 0e28608..b11adf1 100644
|
|
|
e7a346 |
--- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
|
|
|
e7a346 |
+++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
|
|
|
e7a346 |
@@ -309,16 +309,28 @@ glusterd_op_stage_replace_brick (dict_t *dict, char **op_errstr,
|
|
|
e7a346 |
/* A bricks mount dir is required only by snapshots which were
|
|
|
e7a346 |
* introduced in gluster-3.6.0
|
|
|
e7a346 |
*/
|
|
|
e7a346 |
- ret = glusterd_get_brick_mount_dir (dst_brickinfo->path,
|
|
|
e7a346 |
- dst_brickinfo->hostname,
|
|
|
e7a346 |
- dst_brickinfo->mount_dir);
|
|
|
e7a346 |
- if (ret) {
|
|
|
e7a346 |
- gf_msg (this->name, GF_LOG_ERROR, 0,
|
|
|
e7a346 |
- GD_MSG_BRICK_MOUNTDIR_GET_FAIL,
|
|
|
e7a346 |
- "Failed to get brick mount_dir");
|
|
|
e7a346 |
- goto out;
|
|
|
e7a346 |
- }
|
|
|
e7a346 |
|
|
|
e7a346 |
+ if (!(gf_uuid_compare (dst_brickinfo->uuid, MY_UUID))) {
|
|
|
e7a346 |
+ ret = glusterd_get_brick_mount_dir
|
|
|
e7a346 |
+ (dst_brickinfo->path,
|
|
|
e7a346 |
+ dst_brickinfo->hostname,
|
|
|
e7a346 |
+ dst_brickinfo->mount_dir);
|
|
|
e7a346 |
+ if (ret) {
|
|
|
e7a346 |
+ gf_msg (this->name, GF_LOG_ERROR, 0,
|
|
|
e7a346 |
+ GD_MSG_BRICK_MOUNTDIR_GET_FAIL,
|
|
|
e7a346 |
+ "Failed to get brick mount_dir");
|
|
|
e7a346 |
+ goto out;
|
|
|
e7a346 |
+ }
|
|
|
e7a346 |
+ ret = dict_set_dynstr_with_alloc
|
|
|
e7a346 |
+ (rsp_dict, "brick1.mount_dir",
|
|
|
e7a346 |
+ dst_brickinfo->mount_dir);
|
|
|
e7a346 |
+ if (ret) {
|
|
|
e7a346 |
+ gf_msg (this->name, GF_LOG_ERROR, 0,
|
|
|
e7a346 |
+ GD_MSG_DICT_SET_FAILED,
|
|
|
e7a346 |
+ "Failed to set brick.mount_dir");
|
|
|
e7a346 |
+ goto out;
|
|
|
e7a346 |
+ }
|
|
|
e7a346 |
+ }
|
|
|
e7a346 |
|
|
|
e7a346 |
ret = dict_set_int32 (rsp_dict, "brick_count", 1);
|
|
|
e7a346 |
if (ret) {
|
|
|
e7a346 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-reset-brick.c b/xlators/mgmt/glusterd/src/glusterd-reset-brick.c
|
|
|
e7a346 |
index 10ee6f4..c1de043 100644
|
|
|
e7a346 |
--- a/xlators/mgmt/glusterd/src/glusterd-reset-brick.c
|
|
|
e7a346 |
+++ b/xlators/mgmt/glusterd/src/glusterd-reset-brick.c
|
|
|
e7a346 |
@@ -197,15 +197,24 @@ glusterd_reset_brick_prevalidate (dict_t *dict, char **op_errstr,
|
|
|
e7a346 |
|
|
|
e7a346 |
}
|
|
|
e7a346 |
|
|
|
e7a346 |
- ret = glusterd_get_brick_mount_dir
|
|
|
e7a346 |
- (dst_brickinfo->path,
|
|
|
e7a346 |
- dst_brickinfo->hostname,
|
|
|
e7a346 |
- dst_brickinfo->mount_dir);
|
|
|
e7a346 |
- if (ret) {
|
|
|
e7a346 |
- gf_msg (this->name, GF_LOG_ERROR, 0,
|
|
|
e7a346 |
- GD_MSG_BRICK_MOUNTDIR_GET_FAIL,
|
|
|
e7a346 |
- "Failed to get brick mount_dir.");
|
|
|
e7a346 |
- goto out;
|
|
|
e7a346 |
+ if (!(gf_uuid_compare (dst_brickinfo->uuid, MY_UUID))) {
|
|
|
e7a346 |
+ ret = glusterd_get_brick_mount_dir (dst_brickinfo->path,
|
|
|
e7a346 |
+ dst_brickinfo->hostname,
|
|
|
e7a346 |
+ dst_brickinfo->mount_dir);
|
|
|
e7a346 |
+ if (ret) {
|
|
|
e7a346 |
+ gf_msg (this->name, GF_LOG_ERROR, 0,
|
|
|
e7a346 |
+ GD_MSG_BRICK_MOUNTDIR_GET_FAIL,
|
|
|
e7a346 |
+ "Failed to get brick mount_dir");
|
|
|
e7a346 |
+ goto out;
|
|
|
e7a346 |
+ }
|
|
|
e7a346 |
+ ret = dict_set_dynstr_with_alloc (rsp_dict, "brick1.mount_dir",
|
|
|
e7a346 |
+ dst_brickinfo->mount_dir);
|
|
|
e7a346 |
+ if (ret) {
|
|
|
e7a346 |
+ gf_msg (this->name, GF_LOG_ERROR, 0,
|
|
|
e7a346 |
+ GD_MSG_DICT_SET_FAILED,
|
|
|
e7a346 |
+ "Failed to set brick.mount_dir");
|
|
|
e7a346 |
+ goto out;
|
|
|
e7a346 |
+ }
|
|
|
e7a346 |
}
|
|
|
e7a346 |
|
|
|
e7a346 |
ret = dict_set_int32 (rsp_dict, "brick_count", 1);
|
|
|
e7a346 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
e7a346 |
index 4b53898..1b2cc43 100644
|
|
|
e7a346 |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
e7a346 |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
e7a346 |
@@ -13696,15 +13696,6 @@ glusterd_brick_op_prerequisites (dict_t *dict,
|
|
|
e7a346 |
(*src_brickinfo)->port);
|
|
|
e7a346 |
}
|
|
|
e7a346 |
}
|
|
|
e7a346 |
- /* setting mount_dir */
|
|
|
e7a346 |
- ret = dict_set_dynstr_with_alloc (rsp_dict, "brick1.mount_dir",
|
|
|
e7a346 |
- (*src_brickinfo)->mount_dir);
|
|
|
e7a346 |
- if (ret) {
|
|
|
e7a346 |
- gf_msg (this->name, GF_LOG_ERROR, 0,
|
|
|
e7a346 |
- GD_MSG_DICT_SET_FAILED,
|
|
|
e7a346 |
- "Failed to set brick1.mount_dir");
|
|
|
e7a346 |
- goto out;
|
|
|
e7a346 |
- }
|
|
|
e7a346 |
|
|
|
e7a346 |
v = *volinfo;
|
|
|
e7a346 |
b = *src_brickinfo;
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|