Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

always start regardless of resolution #85

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

always start regardless of resolution #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46ea08d
fix port doesnt use definition
splitice Apr 17, 2024
f395c2d
add ignore failure option
splitice Apr 17, 2024
5c291ee
override max_fails
splitice Oct 15, 2024
6b42421
fix critical memory error and support for the same peer multiple times
splitice Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,19 @@ server {
Syntax: jdomain <domain-name> [port=80] [max_ips=4] [interval=1] [strict]
Context: upstream
Attributes:
port: Backend's listening port. (Default: 80)
max_ips: IP buffer size. Maximum number of resolved IPs to cache. (Default: 4)
interval: How many seconds to resolve domain name. (Default: 1)
ipver: Only addresses of family IPv4 or IPv6 will be used if defined (Default: 0)
strict: Require the DNS resolution to succeed and return addresses,
otherwise marks the underlying server and peers as down and
forces use of other servers in the upstream block if there
are any present. A failed resolution can be a timeout, DNS
server failure, connection refusals, response with no
addresses, etc.
port: Backend's listening port. (Default: 80)
max_ips: IP buffer size. Maximum number of resolved IPs to cache. (Default: 4)
interval: How many seconds to resolve domain name. (Default: 1)
max_fails: How many failures to allow before disabling
This is the same as round robin max_fails (Default: 1)
ipver: Only addresses of family IPv4 or IPv6 will be used if defined (Default: 0)
ignore_failure: Allow nginx to start even if resolution fails (1 to enable) (Default: 0)
strict: Require the DNS resolution to succeed and return addresses,
otherwise marks the underlying server and peers as down and
forces use of other servers in the upstream block if there
are any present. A failed resolution can be a timeout, DNS
server failure, connection refusals, response with no
addresses, etc.
```

See https://www.nginx.com/resources/wiki/modules/domain_resolve/ for details.
Expand Down
52 changes: 46 additions & 6 deletions src/ngx_http_upstream_jdomain_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
#define NGX_JDOMAIN_FAMILY_IPV6 AF_INET6

#define NGX_JDOMAIN_ARG_STR_INTERVAL "interval="
#define NGX_JDOMAIN_ARG_STR_IGNORE_FAILURE "ignore_failure="
#define NGX_JDOMAIN_ARG_STR_MAX_IPS "max_ips="
#define NGX_JDOMAIN_ARG_STR_PORT "port="
#define NGX_JDOMAIN_ARG_STR_IPVER "ipver="
#define NGX_JDOMAIN_ARG_STR_MAX_CONNS "max_conns="
#define NGX_JDOMAIN_ARG_STR_MAX_FAILS "max_fails="
#define NGX_JDOMAIN_ARG_STR_STRICT "strict"

typedef struct
Expand All @@ -35,7 +37,8 @@ typedef struct
ngx_uint_t max_ips;
in_port_t port;
ngx_uint_t strict;
short addr_family; /* ipver= */
short addr_family; /* ipver= */
short ignore_failure; /* ignore_failure= */
} conf;
struct
{
Expand Down Expand Up @@ -135,8 +138,8 @@ ngx_http_upstream_init_jdomain(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
ngx_http_upstream_rr_peer_t *peer;
ngx_http_upstream_rr_peer_t **peerp;
ngx_http_upstream_rr_peers_t *peers;
ngx_uint_t i;
ngx_uint_t j;
ngx_uint_t i, k;
ngx_int_t j;

ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "ngx_http_upstream_jdomain_module: init jdomain");

Expand All @@ -158,14 +161,31 @@ ngx_http_upstream_init_jdomain(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
peerp = instance[i].state.data.peerps->elts;
j = 0;

/* Find the starting position for our peerps */
for (k = 0; k < i; k++) {
if (instance[i].state.data.server->name.len == instance[k].state.data.server->name.len &&
ngx_strncmp(instance[i].state.data.server->name.data, instance[k].state.data.server->name.data, peer->server.len) == 0) {
j -= instance[k].conf.max_ips;
}
}

for (peer = peers->peer; peer; peer = peer->next) {
if (instance[i].state.data.server->name.len == peer->server.len &&
ngx_strncmp(instance[i].state.data.server->name.data, peer->server.data, peer->server.len) == 0) {
if (j < 0) {
j++;
continue;
}

peerp[j++] = peer;

if ((ngx_uint_t)j == instance[i].conf.max_ips) {
break;
}
}
}

if (j != instance[i].conf.max_ips) {
if (j != (ngx_int_t)instance[i].conf.max_ips) {
ngx_conf_log_error(NGX_LOG_EMERG,
cf,
0,
Expand Down Expand Up @@ -400,6 +420,7 @@ ngx_http_upstream_jdomain_create_instance(ngx_conf_t *cf, ngx_http_upstream_jdom
instance->conf.max_ips = 4;
instance->conf.port = NGX_JDOMAIN_DEFAULT_PORT;
instance->conf.addr_family = NGX_JDOMAIN_FAMILY_DEFAULT;
instance->conf.ignore_failure = 0;

instance->state.resolve.status = NGX_JDOMAIN_STATUS_DONE;

Expand Down Expand Up @@ -556,6 +577,17 @@ ngx_http_upstream_jdomain(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
continue;
}

arglen = ngx_strlen(NGX_JDOMAIN_ARG_STR_IGNORE_FAILURE);
if (ngx_strncmp(value[i].data, NGX_JDOMAIN_ARG_STR_IGNORE_FAILURE, arglen) == 0) {
num = ngx_atoi(value[i].data + arglen, value[i].len - arglen);
if (num < 0 || num > 1) {
goto invalid;
}

instance->conf.ignore_failure = num;
continue;
}

arglen = ngx_strlen(NGX_JDOMAIN_ARG_STR_MAX_IPS);
if (ngx_strncmp(value[i].data, NGX_JDOMAIN_ARG_STR_MAX_IPS, arglen) == 0) {
Expand All @@ -568,7 +600,7 @@ ngx_http_upstream_jdomain(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}

arglen = ngx_strlen(NGX_JDOMAIN_ARG_STR_PORT);
if (ngx_strncmp(value[i].data, "port=", arglen) == 0) {
if (ngx_strncmp(value[i].data, NGX_JDOMAIN_ARG_STR_PORT, arglen) == 0) {
num = ngx_atoi(value[i].data + arglen, value[i].len - arglen);
if (num < 1 || num != (in_port_t)num) {
goto invalid;
Expand Down Expand Up @@ -612,6 +644,14 @@ ngx_http_upstream_jdomain(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
continue;
}

arglen = ngx_strlen(NGX_JDOMAIN_ARG_STR_MAX_FAILS);
if (ngx_strncmp(value[i].data, NGX_JDOMAIN_ARG_STR_MAX_FAILS, arglen) == 0) {
num = ngx_atoi(value[i].data + arglen, value[i].len - arglen);
server->max_fails = num;

continue;
}

goto invalid;
}

Expand Down Expand Up @@ -645,7 +685,7 @@ ngx_http_upstream_jdomain(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
/* Initial domain name resolution */
if (ngx_parse_url(cf->temp_pool, &u) != NGX_OK) {
ngx_sprintf(errstr, "ngx_http_upstream_jdomain_module: %s in upstream \"%V\"", u.err ? u.err : "error", &u.url);
if (!exists_alt_server) {
if (!exists_alt_server && !instance->conf.ignore_failure) {
goto failure;
}
ngx_conf_log_error(NGX_LOG_WARN, cf, 0, (const char *)errstr);
Expand Down
Loading