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

feature: support detective 'zone' #67

Closed
wants to merge 8 commits into from
Closed

feature: support detective 'zone' #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
caabf13
add tests for detective zone
chronolaw Oct 25, 2018
66069e6
more cases for upstream zone
chronolaw Oct 25, 2018
1ddd809
add some lock%unlock
chronolaw Oct 26, 2018
a438c11
remove some test cases
chronolaw Oct 26, 2018
db19624
fix get_xxx_peer
chronolaw Oct 26, 2018
d8f1976
fix set_peer_down
chronolaw Oct 26, 2018
8aaf17d
add a miss test case
chronolaw Oct 26, 2018
5f2c153
dev: some code clean
chronolaw Oct 26, 2018
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
63 changes: 44 additions & 19 deletions src/ngx_http_lua_upstream_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ static int ngx_http_lua_get_peer(lua_State *L,
ngx_http_upstream_rr_peer_t *peer, ngx_uint_t id);
static ngx_http_upstream_srv_conf_t *
ngx_http_lua_upstream_find_upstream(lua_State *L, ngx_str_t *host);
static ngx_http_upstream_rr_peer_t *
ngx_http_lua_upstream_lookup_peer(lua_State *L);
static ngx_http_upstream_rr_peers_t *
ngx_http_lua_upstream_lookup_peers(lua_State *L);
static int ngx_http_lua_upstream_set_peer_down(lua_State * L);
static int ngx_http_lua_upstream_current_upstream_name(lua_State *L);

Expand Down Expand Up @@ -251,6 +251,7 @@ ngx_http_lua_upstream_get_primary_peers(lua_State * L)
{
ngx_str_t host;
ngx_uint_t i;
ngx_http_upstream_rr_peer_t *peer;
ngx_http_upstream_rr_peers_t *peers;
ngx_http_upstream_srv_conf_t *us;

Expand All @@ -277,11 +278,17 @@ ngx_http_lua_upstream_get_primary_peers(lua_State * L)

lua_createtable(L, peers->number, 0);

for (i = 0; i < peers->number; i++) {
ngx_http_lua_get_peer(L, &peers->peer[i], i);
ngx_http_upstream_rr_peers_rlock(peers);

for (i = 0, peer = peers->peer; i < peers->number;
i++, peer = peer->next) {

ngx_http_lua_get_peer(L, peer, i);
lua_rawseti(L, -2, i + 1);
}

ngx_http_upstream_rr_peers_unlock(peers);

return 1;
}

Expand All @@ -291,6 +298,7 @@ ngx_http_lua_upstream_get_backup_peers(lua_State * L)
{
ngx_str_t host;
ngx_uint_t i;
ngx_http_upstream_rr_peer_t *peer;
ngx_http_upstream_rr_peers_t *peers;
ngx_http_upstream_srv_conf_t *us;

Expand Down Expand Up @@ -323,44 +331,68 @@ ngx_http_lua_upstream_get_backup_peers(lua_State * L)

lua_createtable(L, peers->number, 0);

for (i = 0; i < peers->number; i++) {
ngx_http_lua_get_peer(L, &peers->peer[i], i);
ngx_http_upstream_rr_peers_rlock(peers);

for (i = 0, peer = peers->peer; i < peers->number;
i++, peer = peer->next) {

ngx_http_lua_get_peer(L, peer, i);
lua_rawseti(L, -2, i + 1);
}

ngx_http_upstream_rr_peers_unlock(peers);

return 1;
}


static int
ngx_http_lua_upstream_set_peer_down(lua_State * L)
{
int id, i;
ngx_http_upstream_rr_peer_t *peer;
ngx_http_upstream_rr_peers_t *peers;

if (lua_gettop(L) != 4) {
return luaL_error(L, "exactly 4 arguments expected");
}

peer = ngx_http_lua_upstream_lookup_peer(L);
if (peer == NULL) {
peers = ngx_http_lua_upstream_lookup_peers(L);
if (peers == NULL) {
return 2;
}

id = luaL_checkint(L, 3);
if (id < 0 || (ngx_uint_t) id >= peers->number) {
lua_pushnil(L);
lua_pushliteral(L, "bad peer id");
return 2;
}

for (i = 0, peer = peers->peer; i < id;
i++, peer = peer->next) {
/*void*/
}

ngx_http_upstream_rr_peers_wlock(peers);

peer->down = lua_toboolean(L, 4);

if (!peer->down) {
peer->fails = 0;
}

ngx_http_upstream_rr_peers_unlock(peers);

lua_pushboolean(L, 1);
return 1;
}


static ngx_http_upstream_rr_peer_t *
ngx_http_lua_upstream_lookup_peer(lua_State *L)
static ngx_http_upstream_rr_peers_t *
ngx_http_lua_upstream_lookup_peers(lua_State *L)
{
int id, backup;
int backup;
ngx_str_t host;
ngx_http_upstream_srv_conf_t *us;
ngx_http_upstream_rr_peers_t *peers;
Expand Down Expand Up @@ -393,14 +425,7 @@ ngx_http_lua_upstream_lookup_peer(lua_State *L)
return NULL;
}

id = luaL_checkint(L, 3);
if (id < 0 || (ngx_uint_t) id >= peers->number) {
lua_pushnil(L);
lua_pushliteral(L, "bad peer id");
return NULL;
}

return &peers->peer[id];
return peers;
}


Expand Down
Loading