Merge pull request #2 from weibocom/delay_delete_router-old

Delay delete router-old

Author: xiaokai-wang

README.md

@@ -15,7 +15,6 @@ Table of Contents
     * [update_interval](#update_interval)
     * [update_timeout](#update_timeout)
     * [strong_dependency](#strong_dependency)
-    * [delay_delete](#delay_delete)
     * [upstream_show](#upstream_show)
 * [Consul_interface](#consul_interface)
 * [TODO](#todo)
@@ -104,11 +103,17 @@ description: Pull upstream servers from consul.
 
 The parameters' meanings are:
 
-* update_interval: pulling servers from consul interval time.
-* update_timeout: pulling servers from consul request timeout.
-* strong_dependency: when nginx start up if depending on consul, and consul is not working, nginx will boot failed, otherwise booting normally.
+* update_interval
 
-* delay_delete: being setted carefully. Defaultly it is 75s, and it is enough content be feeding back during adding or deleting servers removing old router information. But if content is very large, and it needs minutes, then delay_delete should be setted longer than that time.
+    pulling servers from consul interval time.
+
+* update_timeout
+
+    pulling servers from consul request timeout.
+
+* strong_dependency
+
+    when nginx start up if depending on consul, and consul is not working, nginx will boot failed, otherwise booting normally.
 
 [Back to TOC](#table-of-contents)       
 
@@ -167,7 +172,6 @@ http_interface example:
 TODO
 ====
 
-* timely resolve consul server domain, if it is domain
 * support least_conn load_balancing
 
 [Back to TOC](#table-of-contents)

src/ngx_http_dynamic_update_upstream_module.c

@@ -19,6 +19,8 @@
 
 #define NGX_MAX_VALUE 65535
 
+#define NGX_DELAY_DELETE 150 * 1000
+
 #define NGX_ADD 0
 #define NGX_DEL 1
 
@@ -118,6 +120,9 @@ typedef struct {
 
     ngx_queue_t                              queue;
 
+    time_t                                   start_sec;
+    ngx_msec_t                               start_msec;
+
     void                                    *data;
 } ngx_delay_event_t;
 
@@ -2077,6 +2082,7 @@ static void
 ngx_http_dynamic_update_upstream_event_init(ngx_http_upstream_rr_peers_t *tmp_peers, 
         ngx_http_dynamic_update_upstream_server_t *conf_server, ngx_flag_t flag)
 {
+    ngx_time_t                                  *tp;
     ngx_delay_event_t                           *delay_event;
     ngx_http_dynamic_update_upstream_srv_conf_t *conf;
 
@@ -2089,6 +2095,10 @@ ngx_http_dynamic_update_upstream_event_init(ngx_http_upstream_rr_peers_t *tmp_pe
         return;
     }
 
+    tp = ngx_timeofday();
+    delay_event->start_sec = tp->sec;
+    delay_event->start_msec = tp->msec;
+
     if (flag == NGX_ADD) {
         delay_event->delay_delete_ev.handler = ngx_http_dynamic_update_upstream_add_delay_delete;
         delay_event->delay_delete_ev.log = ngx_cycle->log;
@@ -2117,10 +2127,44 @@ ngx_http_dynamic_update_upstream_event_init(ngx_http_upstream_rr_peers_t *tmp_pe
 static void
 ngx_http_dynamic_update_upstream_add_delay_delete(ngx_event_t *event)
 {
+    ngx_uint_t                     i;
+    ngx_connection_t              *c;
     ngx_delay_event_t             *delay_event;
+    ngx_http_request_t            *r=NULL;
+    ngx_http_log_ctx_t            *ctx=NULL;
     ngx_http_upstream_rr_peers_t  *tmp_peers=NULL, *tmp_backup=NULL;
 
     delay_event = event->data;
+
+    c = ngx_cycle->connections;
+    for (i = 0; i < ngx_cycle->connection_n; i++) {
+
+        if (c[i].fd == (ngx_socket_t) -1) {
+            continue;
+        } else {
+
+            if (c[i].log->data != NULL) {
+                ctx = c[i].log->data;
+                r = ctx->current_request;
+            }
+        }
+
+        if (r) {
+            if (r->start_sec < delay_event->start_sec) {
+                ngx_add_timer(&delay_event->delay_delete_ev, NGX_DELAY_DELETE);
+                return;
+            }
+
+            if (r->start_sec == delay_event->start_sec) {
+
+                if (r->start_msec <= delay_event->start_msec) {
+                    ngx_add_timer(&delay_event->delay_delete_ev, NGX_DELAY_DELETE);
+                    return;
+                }
+            }
+        }
+    }
+
     tmp_peers = delay_event->data;
     tmp_backup = tmp_peers->next;
 
@@ -2149,7 +2193,10 @@ static void
 ngx_http_dynamic_update_upstream_del_delay_delete(ngx_event_t *event)
 {
     ngx_uint_t                     i;
+    ngx_connection_t              *c;
     ngx_delay_event_t             *delay_event;
+    ngx_http_request_t            *r=NULL;
+    ngx_http_log_ctx_t            *ctx=NULL;
     ngx_http_upstream_rr_peers_t  *tmp_peers=NULL;
 
     u_char *namep = NULL;
@@ -2158,6 +2205,35 @@ ngx_http_dynamic_update_upstream_del_delay_delete(ngx_event_t *event)
     delay_event = event->data;
     tmp_peers = delay_event->data;
 
+    c = ngx_cycle->connections;
+    for (i = 0; i < ngx_cycle->connection_n; i++) {
+
+        if (c[i].fd == (ngx_socket_t) -1) {
+            continue;
+        } else {
+
+            if (c[i].log->data != NULL) {
+                ctx = c[i].log->data;
+                r = ctx->request;
+            }
+        }
+
+        if (r) {
+            if (r->start_sec < delay_event->start_sec) {
+                ngx_add_timer(&delay_event->delay_delete_ev, NGX_DELAY_DELETE);
+                return;
+            }
+
+            if (r->start_sec == delay_event->start_sec) {
+
+                if (r->start_msec <= delay_event->start_msec) {
+                    ngx_add_timer(&delay_event->delay_delete_ev, NGX_DELAY_DELETE);
+                    return;
+                }
+            }
+        }
+    }
+
     if (tmp_peers != NULL) {
         for (i = 0; i < tmp_peers->number; i++) {