Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 11 additions & 23 deletions t/023-preread/socket-keepalive.t
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
# vim:set ft= ts=4 sw=4 et fdm=marker:

our $SkipReason;

BEGIN {
use Test::Nginx::Util;

my $nginx_version = Test::Nginx::Util::get_nginx_version();

if (eval "$nginx_version >= 1.25.5") {
$SkipReason = "Nginx version greater than 1.25.5 have changed behavior, current version $nginx_version";
}
}

use Test::Nginx::Socket::Lua::Stream $SkipReason ? (skip_all => $SkipReason) : ();
use Test::Nginx::Socket::Lua::Stream;

repeat_each(2);

Expand Down Expand Up @@ -62,7 +50,7 @@ function go(port)

ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())

local req = "flush_all\r\n"
local req = "set abc 0 60 5\r\nhello\r\n"

local bytes, err = sock:send(req)
if not bytes then
Expand All @@ -86,11 +74,11 @@ function go(port)
end
--- stream_response_like
^connected: 1, reused: \d+
request sent: 11
received: OK
request sent: 23
received: STORED
connected: 1, reused: [1-9]\d*
request sent: 11
received: OK
request sent: 23
received: STORED
--- no_error_log eval
["[error]",
"lua tcp socket keepalive: free connection pool for "]
Expand Down Expand Up @@ -134,7 +122,7 @@ function go(port, keepalive)
ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
local req = "flush_all\r\n"
local req = "set abc 0 60 5\r\nhello\r\n"
local bytes, err = sock:send(req)
if not bytes then
Expand Down Expand Up @@ -163,11 +151,11 @@ function go(port, keepalive)
end
--- stream_response_like
^connected: 1, reused: \d+
request sent: 11
received: OK
request sent: 23
received: STORED
connected: 1, reused: [1-9]\d*
request sent: 11
received: OK
request sent: 23
received: STORED
--- no_error_log
[error]
--- error_log eval
Expand Down
12 changes: 6 additions & 6 deletions t/025-codecache.t
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ qr/\[alert\] \S+ stream lua_code_cache is off; this will hurt performance/,
=== TEST 22: cosocket connection pool timeout (after Lua VM destroys)
=== TEST 22: cosocket connection pool cleanup when the Lua VM is destroyed
--- stream_config eval
"lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
--- stream_server_config
Expand All @@ -803,7 +803,7 @@ function go(port)

ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())

local req = "flush_all\r\n"
local req = "get __nil\r\n"

local bytes, err = sock:send(req)
if not bytes then
Expand All @@ -820,15 +820,15 @@ function go(port)
ngx.say("failed to receive a line: ", err, " [", part, "]")
end

local ok, err = sock:setkeepalive(1)
local ok, err = sock:setkeepalive(0)
if not ok then
ngx.say("failed to set reusable: ", err)
end
end
--- stream_response
connected: 1, reused: 0
request sent: 11
received: OK
received: END
--- no_error_log
[error]
stream lua tcp socket keepalive max idle timeout
Expand Down Expand Up @@ -866,7 +866,7 @@ function go(port)
ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
local req = "flush_all\r\n"
local req = "get __nil\r\n"
local bytes, err = sock:send(req)
if not bytes then
Expand All @@ -892,7 +892,7 @@ end
--- stream_response
connected: 1, reused: 0
request sent: 11
received: OK
received: END
--- no_error_log
[error]
--- error_log eval
Expand Down
24 changes: 12 additions & 12 deletions t/058-tcp-socket.t
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ function go(port)
ngx.say("connected: ", ok)
end

local req = "flush_all\r\n"
local req = "get __nil\r\n"

local bytes, err = sock:send(req)
if not bytes then
Expand All @@ -992,7 +992,7 @@ end
--- stream_response_like eval
"^(?:connected: 1
request sent: 11
received: OK|failed to send request: closed)\$"
received: END|failed to send request: closed)\$"



Expand Down Expand Up @@ -1032,7 +1032,7 @@ function go(port)
return
end

local req = "flush_all\r\n"
local req = "get __nil\r\n"

local bytes, err = sock:send(req)
if not bytes then
Expand All @@ -1058,7 +1058,7 @@ M(http-lua-info) {
--- stream_response_like eval
qr/^(?:connected: 1
request sent: 11
received: OK|failed to receive a line: closed \[nil\])$/
received: END|failed to receive a line: closed \[nil\])$/



Expand Down Expand Up @@ -1098,7 +1098,7 @@ function go(port)
return
end

local req = "flush_all\r\n"
local req = "get __nil\r\n"

local bytes, err = sock:send(req)
if not bytes then
Expand All @@ -1118,7 +1118,7 @@ end
--- stream_response_like eval
qr/^(?:connected: 1
request sent: 11
received: OK|failed to close: closed)$/
received: END|failed to close: closed)$/



Expand Down Expand Up @@ -1158,7 +1158,7 @@ function go(port)
ngx.say("connected again: ", ok)
end

local req = "flush_all\r\n"
local req = "get __nil\r\n"

local bytes, err = sock:send(req)
if not bytes then
Expand All @@ -1178,7 +1178,7 @@ end
--- stream_response_like eval
qr/^(?:connected(?: again)?: 1
request sent: 11
received: OK
received: END
){2}$/
--- error_log
lua reuse socket upstream ctx
Expand Down Expand Up @@ -1210,7 +1210,7 @@ lua reuse socket upstream ctx

ngx.say("connected again: ", ok)

local req = "flush_all\r\n"
local req = "get __nil\r\n"

local bytes, err = sock:send(req)
if not bytes then
Expand All @@ -1234,7 +1234,7 @@ lua reuse socket upstream ctx
connected: 1
connected again: 1
request sent: 11
received: OK
received: END
close: 1 nil
--- no_error_log
[error]
Expand Down Expand Up @@ -1268,7 +1268,7 @@ close: 1 nil

ngx.say("2: connected: ", ok)

local req1 = "flush_all\r\n"
local req1 = "get __nil\r\n"
local bytes, err = sock1:send(req1)
if not bytes then
ngx.say("1: failed to send request: ", err)
Expand Down Expand Up @@ -1318,7 +1318,7 @@ close: 1 nil
2: connected: 1
1: request sent: 11
2: request sent: 57
1: received: OK
1: received: END
2: received: HTTP/1.1 200 OK
1: close: 1 nil
2: close: 1 nil
Expand Down
10 changes: 6 additions & 4 deletions t/060-lua-memcached.t
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ plan tests => repeat_each() * (blocks() * 3 + 1);
our $HtmlDir = html_dir;

$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
# Isolate keys from other files and concurrent runs of this file.
$ENV{TEST_NGINX_MEMCACHED_PREFIX} = "stream_lua_nginx_060_memcached_$$";

my $pwd = `pwd`;
chomp $pwd;
Expand All @@ -34,8 +36,8 @@ __DATA__

local memc = Memcached.Connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)

memc:set("some_key", "hello 1234")
local data = memc:get("some_key")
memc:set("$TEST_NGINX_MEMCACHED_PREFIX:1:some_key", "hello 1234", 600)
local data = memc:get("$TEST_NGINX_MEMCACHED_PREFIX:1:some_key")
ngx.say("some_key: ", data)
}
--- stream_response
Expand All @@ -53,13 +55,13 @@ some_key: hello 1234
local memcached = require "resty.memcached"
local memc, err = memcached.connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)

local ok, err = memc:set("some_key", "hello 1234")
local ok, err = memc:set("$TEST_NGINX_MEMCACHED_PREFIX:2:some_key", "hello 1234", 600)
if not ok then
ngx.log(ngx.ERR, "failed to set some_key: ", err)
ngx.exit(500)
end

local data, err = memc:get("some_key")
local data, err = memc:get("$TEST_NGINX_MEMCACHED_PREFIX:2:some_key")
if not data and err then
ngx.log(ngx.ERR, "failed to get some_key: ", err)
ngx.exit(500)
Expand Down
2 changes: 1 addition & 1 deletion t/065-tcp-socket-timeout.t
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ lua tcp socket read timed out
ngx.sleep(0.001)
end

local bytes, err = sock:send("flush_all")
local bytes, err = sock:send("get __nil")
ngx.say("send: ", bytes, " ", err)

local ok, err = sock:close()
Expand Down
4 changes: 2 additions & 2 deletions t/066-socket-receiveuntil.t
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ __DATA__

ngx.say("connected: ", ok)

local req = "flush_all\r\n"
local req = "get __nil\r\n"

local bytes, err = sock:send(req)
if not bytes then
Expand All @@ -56,7 +56,7 @@ __DATA__
--- stream_response
connected: 1
request sent: 11
received: OK
received: END
close: 1 nil
--- no_error_log
[error]
Expand Down
40 changes: 26 additions & 14 deletions t/067-req-socket.t
Original file line number Diff line number Diff line change
Expand Up @@ -836,11 +836,20 @@ GC cycle done
return
end
ngx.log(ngx.INFO, "Got raw req socket")
local data, err = sock:receiveany(500)
if not data then
ngx.log(ngx.ERR, "server: failed to receive: ", err)
return
local chunks = {}
local received = 0
while received < 5 do
local data, err = sock:receiveany(500)
if not data then
ngx.log(ngx.ERR, "server: failed to receive: ", err)
return
end

chunks[#chunks + 1] = data
received = received + #data
end

local data = table.concat(chunks)
ngx.log(ngx.INFO, "Got: ", #data, " bytes")

local bytes, err = sock:send("1: received: " .. data .. "\n")
Expand Down Expand Up @@ -874,6 +883,7 @@ Got: 5 bytes
ngx.sleep(0.2)
ngx.log(ngx.INFO, 'receiveany every 3 bytes per read ...')
local i = 0
local chunks = {}
while true do
i = i + 1
ngx.log(ngx.INFO, 'reading: ', i)
Expand All @@ -899,22 +909,24 @@ Got: 5 bytes
end
end
ngx.log(ngx.INFO, "Time ", i, " - got ", #data, " bytes: ", data)
sock:send("receive: " .. data .. "\n")
if #data == 0 or #data > 3 then
ngx.log(ngx.ERR, "unexpected receiveany chunk size: ", #data)
return
end

chunks[i] = data
end

local ok, err = sock:send("receive: " .. table.concat(chunks) .. "\n")
if not ok then
ngx.log(ngx.ERR, "failed to send: ", err)
end
}

--- stream_request: hello, stream receiveany!
--- stream_response
ok
receive: hel
receive: lo,
receive: st
receive: rea
receive: m r
receive: ece
receive: ive
receive: any
receive: !
receive: hello, stream receiveany!
--- no_error_log
receiveany error:
--- error_log
Expand Down
Loading
Loading