Skip to content

Commit

Permalink
fixup: benchmark
Browse files Browse the repository at this point in the history
  • Loading branch information
ronag committed Nov 4, 2024
1 parent 43f6244 commit aec6f29
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 14 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,8 @@ Refs: https://tools.ietf.org/html/rfc7231#section-5.1.1
### Pipelining

Undici will only use pipelining if configured with a `pipelining` factor
greater than `1`.
greater than `1`. Also it is important to pass `blocking: false` to the
request options to properly pipeline requests.

Undici always assumes that connections are persistent and will immediately
pipeline requests, without checking whether the connection is persistent.
Expand Down
2 changes: 2 additions & 0 deletions benchmarks/benchmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ const superagentAgent = new http.Agent({
const undiciOptions = {
path: '/',
method: 'GET',
blocking: false,
reset: false,
headersTimeout,
bodyTimeout
}
Expand Down
3 changes: 2 additions & 1 deletion test/client-connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ test('connect aborted after connect', async (t) => {
client.connect({
path: '/',
signal,
opaque: 'asd'
opaque: 'asd',
blocking: false
}, (err, { opaque }) => {
t.strictEqual(opaque, 'asd')
t.ok(err instanceof errors.RequestAbortedError)
Expand Down
1 change: 1 addition & 0 deletions test/client-idempotent-body.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ test('idempotent retry', async (t) => {
path: '/',
method: 'PUT',
idempotent: true,
blocking: false,
body
}, () => {
throw _err
Expand Down
3 changes: 2 additions & 1 deletion test/client-upgrade.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ test('upgrade wait for empty pipeline', async (t) => {

client.request({
path: '/',
method: 'GET'
method: 'GET',
blocking: false
}, (err) => {
t.ifError(err)
})
Expand Down
6 changes: 4 additions & 2 deletions test/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,8 @@ test('increase pipelining', async (t) => {

client.request({
path: '/',
method: 'GET'
method: 'GET',
blocking: false
}, () => {
if (!client.destroyed) {
t.fail()
Expand All @@ -1451,7 +1452,8 @@ test('increase pipelining', async (t) => {

client.request({
path: '/',
method: 'GET'
method: 'GET',
blocking: false
}, () => {
if (!client.destroyed) {
t.fail()
Expand Down
6 changes: 4 additions & 2 deletions test/node-test/client-abort.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ test('abort pipelined', async (t) => {
let counter = 0
client.dispatch({
method: 'GET',
path: '/'
path: '/',
blocking: false
}, {
onConnect (abort) {
// This request will be retried
Expand All @@ -151,7 +152,8 @@ test('abort pipelined', async (t) => {

client.dispatch({
method: 'GET',
path: '/'
path: '/',
blocking: false
}, {
onConnect (abort) {
abort()
Expand Down
3 changes: 2 additions & 1 deletion test/node-test/client-connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ test('connect wait for empty pipeline', async (t) => {

client.request({
path: '/',
method: 'GET'
method: 'GET',
blocking: false
}, (err) => {
p.ifError(err)
})
Expand Down
15 changes: 10 additions & 5 deletions test/pipeline-pipelining.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,17 @@ test('pipeline pipelining', async (t) => {
t.equal(client[kRunning], 0)
client.pipeline({
method: 'GET',
path: '/'
path: '/',
blocking: false
}, ({ body }) => body).end().resume()
t.equal(client[kBusy], true)
t.deepStrictEqual(client[kRunning], 0)
t.deepStrictEqual(client[kPending], 1)

client.pipeline({
method: 'GET',
path: '/'
path: '/',
blocking: false
}, ({ body }) => body).end().resume()
t.equal(client[kBusy], true)
t.deepStrictEqual(client[kRunning], 0)
Expand Down Expand Up @@ -74,7 +76,8 @@ test('pipeline pipelining retry', async (t) => {
client[kConnect](() => {
client.pipeline({
method: 'GET',
path: '/'
path: '/',
blocking: false
}, ({ body }) => body).end().resume()
.on('error', (err) => {
t.ok(err)
Expand All @@ -85,15 +88,17 @@ test('pipeline pipelining retry', async (t) => {

client.pipeline({
method: 'GET',
path: '/'
path: '/',
blocking: false
}, ({ body }) => body).end().resume()
t.equal(client[kBusy], true)
t.deepStrictEqual(client[kRunning], 0)
t.deepStrictEqual(client[kPending], 2)

client.pipeline({
method: 'GET',
path: '/'
path: '/',
blocking: false
}, ({ body }) => body).end().resume()
t.equal(client[kBusy], true)
t.deepStrictEqual(client[kRunning], 0)
Expand Down
2 changes: 1 addition & 1 deletion test/promises.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ test('20 times GET with pipelining 10, async await support', async (t) => {

async function makeRequestAndExpectUrl (client, i, t) {
try {
const { statusCode, body } = await client.request({ path: '/' + i, method: 'GET' })
const { statusCode, body } = await client.request({ path: '/' + i, method: 'GET', blocking: false })
t.strictEqual(statusCode, 200)
const bufs = []
body.on('data', (buf) => {
Expand Down

0 comments on commit aec6f29

Please sign in to comment.