abandon dependent on check_index(check_module) if deleting backend se…

…rver
weibocom · Jan 7, 2016 · e252c6d · e252c6d · xiaokai-wang · Jan 7, 2016
1 parent 351f9bc
commit e252c6d
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/ngx_http_upsync_module.c b/src/ngx_http_upsync_module.c
@@ -1046,9 +1046,10 @@ ngx_http_upsync_del_peer(ngx_cycle_t *cycle,
 #if (NGX_HTTP_UPSTREAM_CHECK) 
                     ngx_http_upstream_check_delete_dynamic_peer(
                                                 tmp_peers->name, &us->addrs[j]);
-                    tmp_peers->peer[i].check_index = NGX_MAX_VALUE;
 #endif
                     w -= tmp_peers->peer[i].weight;
+                    tmp_peers->peer[i].down = NGX_MAX_VALUE;
+
                     break;
                 }
             }
@@ -2742,11 +2743,9 @@ ngx_http_upsync_del_delay_delete(ngx_event_t *event)
     if (tmp_peers != NULL) {
         for (i = 0; i < tmp_peers->number; i++) {
 
-#if (NGX_HTTP_UPSTREAM_CHECK) 
-            if (tmp_peers->peer[i].check_index != NGX_MAX_VALUE) {
+            if (tmp_peers->peer[i].down != NGX_MAX_VALUE) {
                 continue;
             }
-#endif
 
             saddr = tmp_peers->peer[i].sockaddr;
             if (saddr != NULL) {