Skip to content

Commit

Permalink
add tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZigzagAK
ZigzagAK committed Apr 19, 2019
1 parent 4760ff0 commit 02e65ec
Show file tree
Hide file tree
Showing 10 changed files with 886 additions and 3 deletions.
2 changes: 2 additions & 0 deletions build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ function build_release() {
--with-stream \
--with-cc-opt="-Wno-error=unused-value $ADDITIONAL_INCLUDES" \
--with-ld-opt="$ADDITIONAL_LIBS" \
--add-module=../echo-nginx-module \
--add-module=../ngx_dynamic_upstream \
--add-module=../ngx_dynamic_healthcheck \
--add-module=../.. >> $BUILD_LOG 2>>$ERR_LOG
Expand Down Expand Up @@ -320,6 +321,7 @@ function download() {

download_module ZigzagAK ngx_dynamic_upstream master
download_module ZigzagAK ngx_dynamic_healthcheck master
download_module openresty echo-nginx-module master

cd ..
}
Expand Down
8 changes: 5 additions & 3 deletions ngx_zookeeper_upstream_module.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1969,12 +1969,14 @@ zookeeper_sync_list_handler(ngx_http_request_t *r)
if (out->buf->last == out->buf->end)
return NGX_HTTP_INTERNAL_SERVER_ERROR;

if (j == zoo.len - 1)
out->buf->last -= 3;

content_length += out->buf->last - out->buf->start;
}

if (content_length > 2) {
out->buf->last-=3;
content_length-=3;
}

out->next = ngx_pcalloc(r->pool, sizeof(ngx_chain_t));
if (out->next == NULL)
return NGX_HTTP_INTERNAL_SERVER_ERROR;
Expand Down
113 changes: 113 additions & 0 deletions t/exclue.t
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
use Test::Nginx::Socket 'no_plan';
use Net::ZooKeeper qw(:node_flags :acls);

$ENV{TEST_NGINX_ZOOKEEPER_PORT} ||= 2181;

# prepare zoo data

my $zkh = Net::ZooKeeper->new('127.0.0.1:' . $ENV{TEST_NGINX_ZOOKEEPER_PORT});

sub create {
my ($path, $val) = @_;
$zkh->create($path, $val || '', 'acl' => ZOO_OPEN_ACL_UNSAFE) or
die("unable to create node " . $path . ", err:" . $zkh->get_error());
}

sub cleanup {
my ($path) = @_;
foreach my $znode ($zkh->get_children($path)) {
cleanup($path . '/' . $znode);
}
$zkh->delete($path);
}

cleanup('/test_upstream');

create('/test_upstream');
create('/test_upstream/app1');
create('/test_upstream/app1/nodes');
create('/test_upstream/app2');
create('/test_upstream/app2/nodes');
create('/test_upstream/app1/nodes/127.0.0.1:5555');
create('/test_upstream/app1/nodes/127.0.0.2:5555');
create('/test_upstream/app1/nodes/global-exclude-host1.com');
create('/test_upstream/app1/nodes/1.2.3.4');
create('/test_upstream/app2/nodes/127.0.0.3:4444');
create('/test_upstream/app2/nodes/localhost:4444');
create('/test_upstream/app2/nodes/global-exclude-host2.com');
create('/test_upstream/app2/nodes/1.2.3.4');
create('/test_upstream/.locks');
create('/test_upstream/.locks/app2');

add_cleanup_handler(sub {
cleanup('/test_upstream');
});

no_shuffle();
run_tests();

__DATA__
=== STEP 1: Init
--- http_config
zookeeper_upstream 127.0.0.1:$TEST_NGINX_ZOOKEEPER_PORT;
zookeeper_upstream_log_level debug;
zookeeper_upstream_recv_timeout 5000;
zookeeper_sync_global_exclude global-exclude-host1.com;
zookeeper_sync_global_exclude global-exclude-host2.com;
zookeeper_sync_global_exclude 1.2.3.4;
upstream app1 {
zone shm_app1 128k;
zookeeper_sync_path /test_upstream/app1/nodes;
zookeeper_sync_file app1.peers;
zookeeper_sync_exclude 127.0.0.2;
}
upstream app2 {
zone shm_app2 128k;
zookeeper_sync_path /test_upstream/app2/nodes;
zookeeper_sync_lock /test_upstream/.locks/app2;
zookeeper_sync_file app2.peers;
zookeeper_sync_exclude localhost;
}
--- config
location = /test {
return 200;
}
location = /list {
zookeeper_sync_list;
}
location = /dynamic {
dynamic_upstream;
}
--- request
GET /test
--- wait: 3
=== STEP 2: Check list
--- request
GET /list
--- response_body_like eval
qr/\[{"name":"app1","lock":"","params_tag":"\@params","filter":""},\r
{"name":"app2","lock":"\/test_upstream\/.locks\/app2\/.+","params_tag":"\@params","filter":""}\]/
=== STEP 3: Check peers
--- request eval
["GET /dynamic?upstream=app1","GET /dynamic?upstream=app2"]
--- response_body eval
["server 127.0.0.1:5555 addr=127.0.0.1:5555;
",
"server 127.0.0.3:4444 addr=127.0.0.3:4444;
"]
153 changes: 153 additions & 0 deletions t/filter.t
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@

use Test::Nginx::Socket 'no_plan';
use Net::ZooKeeper qw(:node_flags :acls);

$ENV{TEST_NGINX_ZOOKEEPER_PORT} ||= 2181;

# prepare zoo data

my $zkh = Net::ZooKeeper->new('127.0.0.1:' . $ENV{TEST_NGINX_ZOOKEEPER_PORT});

sub create {
my ($path, $val) = @_;
$zkh->create($path, $val || '', 'acl' => ZOO_OPEN_ACL_UNSAFE) or
die("unable to create node " . $path . ", err:" . $zkh->get_error());
}

sub cleanup {
my ($path) = @_;
foreach my $znode ($zkh->get_children($path)) {
cleanup($path . '/' . $znode);
}
$zkh->delete($path);
}

cleanup('/test_upstream');

create('/test_upstream');
create('/test_upstream/app1');
create('/test_upstream/app1/nodes');
create('/test_upstream/app2');
create('/test_upstream/app2/nodes');
create('/test_upstream/app1/nodes/127.0.1.1:5555');
create('/test_upstream/app1/nodes/127.0.0.1:5555', '@all');
create('/test_upstream/app1/nodes/127.0.0.2:5555', '@a');
create('/test_upstream/app1/nodes/127.0.0.3:5555', '@b');
create('/test_upstream/app2/nodes/127.0.1.4:4444');
create('/test_upstream/app2/nodes/127.0.0.4:4444', '@all');
create('/test_upstream/app2/nodes/127.0.0.5:4444', '@a');
create('/test_upstream/app2/nodes/127.0.0.6:4444', '@b');
create('/test_upstream/.locks');
create('/test_upstream/.locks/app2');
create('/test_upstream/.locks/app2-a');
create('/test_upstream/.locks/app2-b');

add_cleanup_handler(sub {
cleanup('/test_upstream');
});

no_shuffle();
run_tests();

__DATA__
=== STEP 1: Init
--- http_config
zookeeper_upstream 127.0.0.1:$TEST_NGINX_ZOOKEEPER_PORT;
zookeeper_upstream_log_level debug;
zookeeper_upstream_recv_timeout 5000;
upstream app1 {
zone shm_app1 128k;
zookeeper_sync_path /test_upstream/app1/nodes;
zookeeper_sync_file app1.peers;
}
upstream app1-a {
zone shm_app1-a 128k;
zookeeper_sync_path /test_upstream/app1/nodes;
zookeeper_sync_file app1.peers;
zookeeper_sync_filter @a;
}
upstream app1-b {
zone shm_app1-b 128k;
zookeeper_sync_path /test_upstream/app1/nodes;
zookeeper_sync_file app1.peers;
zookeeper_sync_filter @b;
}
upstream app2 {
zone shm_app2 128k;
zookeeper_sync_path /test_upstream/app2/nodes;
zookeeper_sync_lock /test_upstream/.locks/app2;
zookeeper_sync_file app2.peers;
}
upstream app2-a {
zone shm_app2-a 128k;
zookeeper_sync_path /test_upstream/app2/nodes;
zookeeper_sync_lock /test_upstream/.locks/app2-a;
zookeeper_sync_file app2.peers;
zookeeper_sync_filter @a;
}
upstream app2-b {
zone shm_app2-b 128k;
zookeeper_sync_path /test_upstream/app2/nodes;
zookeeper_sync_lock /test_upstream/.locks/app2-b;
zookeeper_sync_file app2.peers;
zookeeper_sync_filter @b;
}
--- config
location = /test {
return 200;
}
location = /list {
zookeeper_sync_list;
}
location = /dynamic {
dynamic_upstream;
}
--- request
GET /test
--- wait: 3
=== STEP 2: Check list
--- request
GET /list
--- response_body_like eval
qr/\[{"name":"app1","lock":"","params_tag":"\@params","filter":""},\r
{"name":"app1-a","lock":"","params_tag":"\@params","filter":"\@a"},\r
{"name":"app1-b","lock":"","params_tag":"\@params","filter":"\@b"},\r
{"name":"app2","lock":"\/test_upstream\/.locks\/app2\/.+","params_tag":"\@params","filter":""},\r
{"name":"app2-a","lock":"\/test_upstream\/.locks\/app2-a\/.+","params_tag":"\@params","filter":"\@a"},\r
{"name":"app2-b","lock":"\/test_upstream\/.locks\/app2-b\/.+","params_tag":"\@params","filter":"\@b"}\]/
=== STEP 3: Check peers
--- request eval
[
"GET /dynamic?upstream=app1",
"GET /dynamic?upstream=app1-a",
"GET /dynamic?upstream=app1-b",
"GET /dynamic?upstream=app2",
"GET /dynamic?upstream=app2-a",
"GET /dynamic?upstream=app2-b"
]
--- response_body_like eval
[
qr/(server 127\.0\.[01]\.[123]:5555 addr=127\.0\.[01]\.[123]:5555;\n){4}/,
qr/(server 127\.0\.[01]\.[12]:5555 addr=127\.0\.[01]\.[12]:5555;\n){2}/,
qr/(server 127\.0\.[01]\.[13]:5555 addr=127\.0\.[01]\.[13]:5555;\n){2}/,
qr/(server 127\.0\.[01]\.[456]:4444 addr=127\.0\.[01].[456]:4444;\n){4}/,
qr/(server 127\.0\.[01]\.[45]:4444 addr=127\.0\.[01]\.[45]:4444;\n){2}/,
qr/(server 127\.0\.[01]\.[46]:4444 addr=127\.0\.[01]\.[46]:4444;\n){2}/
]
Loading

0 comments on commit 02e65ec

Please sign in to comment.