diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2016-04-01 23:10:51 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2016-04-05 20:30:21 -0700 |
| commit | 13f18e61e70218121991bd761ef37f17a89c7edb (patch) | |
| tree | 79d0d73b4583785a1717d1805dd2e0bf2ee25c3e /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | fcca19e8a24751a3a966c7c20a52da89928161e4 (diff) | |
glusterd: fill real_path variable in brickinfo during volume import
Variable "real_path" in brick info was used to store absolute path
and using this we check the availability of the newly added bricks.
But we were not populating the variable when we import a volume
from peers. That caused to reset the real_path variable to zero,
which resulted in validation failure for all new brick creation.
Backport of>
>Change-Id: I62be7bf452f0dcdf6aec3a4ec33c2e1fba2951ca
>BUG: 1323287
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/13890
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
>Smoke: Gluster Build System <jenkins@build.gluster.com>
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
(cherry picked from commit 648357ffad482a1bda8915d42df9d5b055dae44f)
Change-Id: I6937f83bb50277a396944edc3cf0b0ed82facc3a
BUG: 1324156
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/13914
Smoke: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index c114f0349c7..15c83acbe9c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -3029,6 +3029,7 @@ glusterd_import_new_brick (dict_t *peer_data, int32_t vol_count, char msg[2048] = {0}; xlator_t *this = NULL; char *brick_uuid_str = NULL; + char abspath[PATH_MAX] = {0}; this = THIS; GF_ASSERT (this); @@ -3092,7 +3093,21 @@ glusterd_import_new_brick (dict_t *peer_data, int32_t vol_count, ret = dict_get_str (peer_data, key, &brick_uuid_str); if (ret) goto out; + gf_uuid_parse (brick_uuid_str, new_brickinfo->uuid); + if (!gf_uuid_compare(new_brickinfo->uuid, MY_UUID)) { + if (!realpath (new_brickinfo->path, abspath)) { + gf_msg (this->name, GF_LOG_CRITICAL, errno, + GD_MSG_BRICKINFO_CREATE_FAIL, "realpath() " + "failed for brick %s. The underlying file " + "system may be in bad state", + new_brickinfo->path); + ret = -1; + goto out; + } + strncpy (new_brickinfo->real_path, abspath, + strlen(abspath)); + } *brickinfo = new_brickinfo; out: |