summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-op-sm.c
diff options
context:
space:
mode:
authorshishir gowda <shishirng@gluster.com>2010-08-30 01:36:33 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-08-30 02:52:22 -0700
commitbaebaab45980e63f85622e70363fe898cdc572ad (patch)
treebe17d070370227989e04f5d595c295006c51dc4e /xlators/mgmt/glusterd/src/glusterd-op-sm.c
parent27f39a7c9d10e836295ae4ad1a88d1f0a911079f (diff)
Volume Add-brick validation for exports
Added checks for export already in use, duplicate exports in command, and check whether exports are valid. Also, cleaned up error handling in glusterd_handle_add_bricks Signed-off-by: shishir gowda <shishirng@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1457 (volume add brick validation for export) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1457
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 20a57660d0f..24cd1ab3310 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -535,6 +535,8 @@ glusterd_op_stage_add_brick (gd1_mgmt_stage_op_req *req)
char *brick = NULL;
glusterd_brickinfo_t *brickinfo = NULL;
glusterd_volinfo_t *volinfo = NULL;
+ struct stat st_buf = {0,};
+ char cmd_str[1024];
GF_ASSERT (req);
@@ -588,7 +590,20 @@ glusterd_op_stage_add_brick (gd1_mgmt_stage_op_req *req)
ret = -1;
goto out;
} else {
- ret = 0;
+ ret = glusterd_brickinfo_from_brick(brick, &brickinfo);
+ if (ret) {
+ gf_log ("", GF_LOG_ERROR, "Add-brick: Unable"
+ " to get brickinfo");
+ goto out;
+ }
+ }
+ snprintf (cmd_str, 1024, "%s", brickinfo->path);
+ ret = stat (cmd_str, &st_buf);
+ if (ret == -1) {
+ gf_log ("glusterd", GF_LOG_ERROR, "Volname %s, brick"
+ ":%s path %s not present", volname,
+ brick, brickinfo->path);
+ goto out;
}
brick = strtok_r (NULL, " \n", &saveptr);