diff options
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 44c382ca643..af14187cafe 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -1339,6 +1339,7 @@ glusterd_validate_and_create_brickpath (glusterd_brickinfo_t *brickinfo, struct stat root_st = {0,}; char msg[2048] = {0,}; gf_boolean_t is_created = _gf_false; + char index_basepath[PATH_MAX] = {0}; ret = sys_mkdir (brickinfo->path, 0777); if (ret) { @@ -1353,6 +1354,18 @@ glusterd_validate_and_create_brickpath (glusterd_brickinfo_t *brickinfo, is_created = _gf_true; } + glusterd_get_index_basepath (brickinfo, index_basepath, + sizeof(index_basepath)); + + ret = mkdir_p (index_basepath, 0600, _gf_true); + if (ret && (errno != EEXIST)) { + snprintf (msg, sizeof (msg), "Failed to create index " + "basepath (%s) for brick %s:%s. Reason : %s ", + index_basepath, brickinfo->hostname, + brickinfo->path, strerror (errno)); + goto out; + } + ret = sys_lstat (brickinfo->path, &brick_st); if (ret) { snprintf (msg, sizeof (msg), "lstat failed on %s. Reason : %s", @@ -1432,8 +1445,9 @@ glusterd_validate_and_create_brickpath (glusterd_brickinfo_t *brickinfo, ret = 0; out: - if (ret && is_created) - sys_rmdir (brickinfo->path); + if (ret && is_created) { + recursive_rmdir (brickinfo->path); + } if (ret && !*op_errstr && msg[0] != '\0') *op_errstr = gf_strdup (msg); |