summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glusterfsd/src/glusterfsd-mgmt.c27
-rw-r--r--libglusterfs/src/graph.c4
2 files changed, 22 insertions, 9 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index c3b9a6d8cc2..479b49f461a 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -824,9 +824,9 @@ out:
int
glusterfs_handle_attach (rpcsvc_request_t *req)
{
- int32_t ret = -1;
- gd1_mgmt_brick_op_req xlator_req = {0,};
- xlator_t *this = NULL;
+ int32_t ret = -1;
+ gd1_mgmt_brick_op_req xlator_req = {0,};
+ xlator_t *this = NULL;
GF_ASSERT (req);
this = THIS;
@@ -838,15 +838,24 @@ glusterfs_handle_attach (rpcsvc_request_t *req)
if (ret < 0) {
/*failed to decode msg;*/
req->rpc_err = GARBAGE_ARGS;
- goto out;
+ return -1;
}
- gf_log (this->name, GF_LOG_INFO, "got attach for %s", xlator_req.name);
- glusterfs_graph_attach (this->ctx->active, xlator_req.name);
- glusterfs_autoscale_threads (this->ctx, 1);
+ if (this->ctx->active) {
+ gf_log (this->name, GF_LOG_INFO,
+ "got attach for %s", xlator_req.name);
+ ret = glusterfs_graph_attach (this->ctx->active,
+ xlator_req.name);
+ if (ret == 0) {
+ glusterfs_autoscale_threads (this->ctx, 1);
+ }
+ } else {
+ gf_log (this->name, GF_LOG_WARNING,
+ "got attach for %s but no active graph",
+ xlator_req.name);
+ }
-out:
- glusterfs_translator_info_response_send (req, 0, NULL, NULL);
+ glusterfs_translator_info_response_send (req, ret, NULL, NULL);
free (xlator_req.input.input_val);
free (xlator_req.name);
diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c
index 0c7d6cf6101..916942c3a2d 100644
--- a/libglusterfs/src/graph.c
+++ b/libglusterfs/src/graph.c
@@ -1040,6 +1040,10 @@ glusterfs_graph_attach (glusterfs_graph_t *orig_graph, char *path)
xlator_t *xl;
char *volfile_id;
+ if (!orig_graph) {
+ return -EINVAL;
+ }
+
fp = fopen (path, "r");
if (!fp) {
gf_log (THIS->name, GF_LOG_WARNING,