diff options
Diffstat (limited to 'xlators/protocol/server/src/server.c')
| -rw-r--r-- | xlators/protocol/server/src/server.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 68254cf0c..589bd7b36 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -145,6 +145,7 @@ server_submit_reply (call_frame_t *frame, rpcsvc_request_t *req, void *arg, server_conf_t *conf = NULL; gf_barrier_t *barrier = NULL; gf_barrier_payload_t *stub = NULL; + gf_boolean_t barriered = _gf_false; GF_VALIDATE_OR_GOTO ("server", req, ret); @@ -189,7 +190,7 @@ server_submit_reply (call_frame_t *frame, rpcsvc_request_t *req, void *arg, iob, new_iobref); if (stub) { gf_barrier_enqueue (barrier, stub); - goto ret; + barriered = _gf_true; } else { gf_log ("", GF_LOG_ERROR, "Failed to " " barrier fop %"PRIu64, @@ -198,6 +199,8 @@ server_submit_reply (call_frame_t *frame, rpcsvc_request_t *req, void *arg, } } UNLOCK (&barrier->lock); + if (barriered == _gf_true) + goto out; } /* Then, submit the message for transmission. */ ret = rpcsvc_submit_generic (req, &rsp, 1, payload, payloadcount, @@ -240,6 +243,7 @@ ret: if (new_iobref) { iobref_unref (iobref); } +out: return ret; } @@ -967,6 +971,8 @@ init (xlator_t *this) } LOCK_INIT (&barrier->lock); + INIT_LIST_HEAD (&barrier->queue); + barrier->on = _gf_false; GF_OPTION_INIT ("barrier-queue-length", barrier->max_size, int64, out); @@ -1050,8 +1056,7 @@ notify (xlator_t *this, int32_t event, void *data, ...) va_end (ap); switch (event) { - /* todo: GF_EVENT_BARRIER */ - case 100: + case GF_EVENT_VOLUME_BARRIER_OP: ret = dict_get_int32 (dict, "barrier", &val); if (ret) { gf_log (this->name, GF_LOG_ERROR, @@ -1070,7 +1075,7 @@ notify (xlator_t *this, int32_t event, void *data, ...) gf_log (this->name, GF_LOG_ERROR, "Barrier stop failed"); } - ret = dict_set_int32 (dict, "barrier-status", ret); + ret = dict_set_int32 (output, "barrier-status", ret); if (ret) gf_log (this->name, GF_LOG_ERROR, "Failed to set barrier-status in dict"); |