-
Notifications
You must be signed in to change notification settings - Fork 8
/
Copy pathnginx-stable-1.12+.patch
227 lines (207 loc) · 7.88 KB
/
nginx-stable-1.12+.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
From 9ae81407fcafb99ef1653e2573b106bb9631654d Mon Sep 17 00:00:00 2001
From: z0575 <[email protected]>
Date: Thu, 27 Jul 2017 15:07:22 +0800
Subject: [PATCH] add stream upstream health check patch.
---
src/stream/ngx_stream_upstream_hash_module.c | 19 +++++++++
src/stream/ngx_stream_upstream_least_conn_module.c | 20 ++++++++++
src/stream/ngx_stream_upstream_round_robin.c | 45 +++++++++++++++++++++-
src/stream/ngx_stream_upstream_round_robin.h | 4 ++
4 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/src/stream/ngx_stream_upstream_hash_module.c b/src/stream/ngx_stream_upstream_hash_module.c
index cb44fcd..5df7380 100644
--- a/src/stream/ngx_stream_upstream_hash_module.c
+++ b/src/stream/ngx_stream_upstream_hash_module.c
@@ -8,6 +8,9 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_stream.h>
+#if (NGX_STREAM_UPSTREAM_CHECK)
+#include "ngx_stream_upstream_check_module.h"
+#endif
typedef struct {
@@ -233,7 +236,15 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
if (peer->down) {
goto next;
}
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ ngx_log_debug1(NGX_LOG_DEBUG_STREAM, pc->log, 0,
+ "(stream_module)get least_conn peer, check_index: %ui",
+ peer->check_index);
+ if (ngx_stream_upstream_check_peer_down(peer->check_index)) {
+ goto next;
+ }
+#endif
if (peer->max_fails
&& peer->fails >= peer->max_fails
&& now - peer->checked <= peer->fail_timeout)
@@ -538,7 +549,15 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
if (peer->down) {
continue;
}
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ ngx_log_debug1(NGX_LOG_DEBUG_STREAM, pc->log, 0,
+ "(stream_module)get least_conn peer, check_index: %ui",
+ peer->check_index);
+ if (ngx_stream_upstream_check_peer_down(peer->check_index)) {
+ continue;
+ }
+#endif
if (peer->server.len != server->len
|| ngx_strncmp(peer->server.data, server->data, server->len)
!= 0)
diff --git a/src/stream/ngx_stream_upstream_least_conn_module.c b/src/stream/ngx_stream_upstream_least_conn_module.c
index 739b20a..b805110 100644
--- a/src/stream/ngx_stream_upstream_least_conn_module.c
+++ b/src/stream/ngx_stream_upstream_least_conn_module.c
@@ -8,6 +8,9 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_stream.h>
+#if (NGX_STREAM_UPSTREAM_CHECK)
+#include "ngx_stream_upstream_check_module.h"
+#endif
static ngx_int_t ngx_stream_upstream_init_least_conn_peer(
@@ -142,6 +145,15 @@ ngx_stream_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
if (peer->down) {
continue;
}
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ ngx_log_debug1(NGX_LOG_DEBUG_STREAM, pc->log, 0,
+ "(stream_module)get least_conn peer, check_index: %ui",
+ peer->check_index);
+
+ if (ngx_stream_upstream_check_peer_down(peer->check_index)) {
+ continue;
+ }
+#endif
if (peer->max_fails
&& peer->fails >= peer->max_fails
@@ -197,7 +209,15 @@ ngx_stream_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
if (peer->down) {
continue;
}
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ ngx_log_debug1(NGX_LOG_DEBUG_STREAM, pc->log, 0,
+ "(stream_module)get least_conn peer, check_index: %ui",
+ peer->check_index);
+ if (ngx_stream_upstream_check_peer_down(peer->check_index)) {
+ continue;
+ }
+#endif
if (peer->conns * best->weight != best->conns * peer->weight) {
continue;
}
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
index 526de3a..13c4956 100644
--- a/src/stream/ngx_stream_upstream_round_robin.c
+++ b/src/stream/ngx_stream_upstream_round_robin.c
@@ -9,6 +9,10 @@
#include <ngx_core.h>
#include <ngx_stream.h>
+#if (NGX_STREAM_UPSTREAM_CHECK)
+#include "ngx_stream_upstream_check_module.h"
+#endif
+
#define ngx_stream_upstream_tries(p) ((p)->number \
+ ((p)->next ? (p)->next->number : 0))
@@ -104,6 +108,16 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
peer[n].down = server[i].down;
peer[n].server = server[i].name;
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ if (!server[i].down) {
+ peer[n].check_index =
+ ngx_stream_upstream_check_add_peer(cf, us, &server[i].addrs[j]);
+ }
+ else {
+ peer[n].check_index = (ngx_uint_t) NGX_ERROR;
+ }
+#endif
+
*peerp = &peer[n];
peerp = &peer[n].next;
n++;
@@ -168,6 +182,16 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
peer[n].down = server[i].down;
peer[n].server = server[i].name;
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ if (!server[i].down) {
+ peer[n].check_index =
+ ngx_stream_upstream_check_add_peer(cf, us, &server[i].addrs[j]);
+ }
+ else {
+ peer[n].check_index = (ngx_uint_t) NGX_ERROR;
+ }
+#endif
+
*peerp = &peer[n];
peerp = &peer[n].next;
n++;
@@ -234,6 +258,9 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
peer[i].max_conns = 0;
peer[i].max_fails = 1;
peer[i].fail_timeout = 10;
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ peer[i].check_index = (ngx_uint_t) NGX_ERROR;
+#endif
*peerp = &peer[i];
peerp = &peer[i].next;
}
@@ -354,6 +381,9 @@ ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
peer[0].max_conns = 0;
peer[0].max_fails = 1;
peer[0].fail_timeout = 10;
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ peer[0].check_index = (ngx_uint_t) NGX_ERROR;
+#endif
peers->peer = peer;
} else {
@@ -388,6 +418,9 @@ ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
peer[i].max_conns = 0;
peer[i].max_fails = 1;
peer[i].fail_timeout = 10;
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ peer[i].check_index = (ngx_uint_t) NGX_ERROR;
+#endif
*peerp = &peer[i];
peerp = &peer[i].next;
}
@@ -451,7 +484,11 @@ ngx_stream_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
if (peer->max_conns && peer->conns >= peer->max_conns) {
goto failed;
}
-
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ if (ngx_stream_upstream_check_peer_down(peer->check_index)) {
+ goto failed;
+ }
+#endif
rrp->current = peer;
} else {
@@ -556,7 +593,11 @@ ngx_stream_upstream_get_peer(ngx_stream_upstream_rr_peer_data_t *rrp)
if (peer->max_conns && peer->conns >= peer->max_conns) {
continue;
}
-
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ if (ngx_stream_upstream_check_peer_down(peer->check_index)) {
+ continue;
+ }
+#endif
peer->current_weight += peer->effective_weight;
total += peer->effective_weight;
diff --git a/src/stream/ngx_stream_upstream_round_robin.h b/src/stream/ngx_stream_upstream_round_robin.h
index 35d9fce..ff6398e 100644
--- a/src/stream/ngx_stream_upstream_round_robin.h
+++ b/src/stream/ngx_stream_upstream_round_robin.h
@@ -49,6 +49,10 @@ struct ngx_stream_upstream_rr_peer_s {
ngx_stream_upstream_rr_peer_t *next;
+#if (NGX_STREAM_UPSTREAM_CHECK)
+ ngx_uint_t check_index;
+#endif
+
NGX_COMPAT_BEGIN(25)
NGX_COMPAT_END
};
--
1.9.5.msysgit.0