technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Waiting for router instead of reporting to user on config update.

Browse Source
This commit is contained in:
Max Romanov
2020-05-12 16:25:24 +03:00
parent 50f9816daa
commit 3ec72362b9
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/nxt_controller.c
View File

@@ -76,6 +76,7 @@ static void nxt_controller_process_request(nxt_task_t *task,
nxt_controller_request_t *req); nxt_controller_request_t *req);
static void nxt_controller_process_config(nxt_task_t *task, static void nxt_controller_process_config(nxt_task_t *task,
nxt_controller_request_t *req, nxt_str_t *path); nxt_controller_request_t *req, nxt_str_t *path);
static nxt_bool_t nxt_controller_check_postpone_request(nxt_task_t *task);
#if (NXT_TLS) #if (NXT_TLS)
static void nxt_controller_process_cert(nxt_task_t *task, static void nxt_controller_process_cert(nxt_task_t *task,
nxt_controller_request_t *req, nxt_str_t *path); nxt_controller_request_t *req, nxt_str_t *path);
@@ -270,6 +271,8 @@ nxt_controller_send_current_conf(nxt_task_t *task)
} }
nxt_controller_listening = 1; nxt_controller_listening = 1;
nxt_controller_flush_requests(task);
} }
@@ -386,9 +389,8 @@ nxt_controller_conf_send(nxt_task_t *task, nxt_conf_value_t *conf,
router_port = rt->port_by_type[NXT_PROCESS_ROUTER]; router_port = rt->port_by_type[NXT_PROCESS_ROUTER];
if (nxt_slow_path(router_port == NULL || !nxt_controller_router_ready)) { nxt_assert(router_port != NULL);
return NXT_DECLINED; nxt_assert(nxt_controller_router_ready);
}
controller_port = rt->port_by_type[NXT_PROCESS_CONTROLLER]; controller_port = rt->port_by_type[NXT_PROCESS_CONTROLLER];
@@ -986,9 +988,7 @@ nxt_controller_process_config(nxt_task_t *task, nxt_controller_request_t *req,
if (post || nxt_str_eq(&req->parser.method, "PUT", 3)) { if (post || nxt_str_eq(&req->parser.method, "PUT", 3)) {
if (!nxt_queue_is_empty(&nxt_controller_waiting_requests) if (nxt_controller_check_postpone_request(task)) {
|| nxt_controller_waiting_init_conf)
{
nxt_queue_insert_tail(&nxt_controller_waiting_requests, &req->link); nxt_queue_insert_tail(&nxt_controller_waiting_requests, &req->link);
return; return;
} }
@@ -1085,10 +1085,6 @@ nxt_controller_process_config(nxt_task_t *task, nxt_controller_request_t *req,
if (nxt_slow_path(rc != NXT_OK)) { if (nxt_slow_path(rc != NXT_OK)) {
nxt_mp_destroy(mp); nxt_mp_destroy(mp);
if (rc == NXT_DECLINED) {
goto no_router;
}
/* rc == NXT_ERROR */ /* rc == NXT_ERROR */
goto alloc_fail; goto alloc_fail;
} }
@@ -1103,9 +1099,7 @@ nxt_controller_process_config(nxt_task_t *task, nxt_controller_request_t *req,
if (nxt_str_eq(&req->parser.method, "DELETE", 6)) { if (nxt_str_eq(&req->parser.method, "DELETE", 6)) {
if (!nxt_queue_is_empty(&nxt_controller_waiting_requests) if (nxt_controller_check_postpone_request(task)) {
|| nxt_controller_waiting_init_conf)
{
nxt_queue_insert_tail(&nxt_controller_waiting_requests, &req->link); nxt_queue_insert_tail(&nxt_controller_waiting_requests, &req->link);
return; return;
} }
@@ -1172,10 +1166,6 @@ nxt_controller_process_config(nxt_task_t *task, nxt_controller_request_t *req,
if (nxt_slow_path(rc != NXT_OK)) { if (nxt_slow_path(rc != NXT_OK)) {
nxt_mp_destroy(mp); nxt_mp_destroy(mp);
if (rc == NXT_DECLINED) {
goto no_router;
}
/* rc == NXT_ERROR */ /* rc == NXT_ERROR */
goto alloc_fail; goto alloc_fail;
} }
@@ -1222,16 +1212,27 @@ alloc_fail:
resp.offset = -1; resp.offset = -1;
nxt_controller_response(task, req, &resp); nxt_controller_response(task, req, &resp);
return; }
no_router:
resp.status = 500; static nxt_bool_t
resp.title = (u_char *) "Router process isn't available."; nxt_controller_check_postpone_request(nxt_task_t *task)
resp.offset = -1; {
nxt_port_t *router_port;
nxt_runtime_t *rt;
nxt_controller_response(task, req, &resp); if (!nxt_queue_is_empty(&nxt_controller_waiting_requests)
return; || nxt_controller_waiting_init_conf
|| !nxt_controller_router_ready)
{
return 1;
}
rt = task->thread->runtime;
router_port = rt->port_by_type[NXT_PROCESS_ROUTER];
return (router_port == NULL);
} }