Skip to content

Use round robin for happy eyeballs DNS responses (load balancing) #247

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

Merged
jsor merged 1 commit into from
Sep 6, 2020
Merged

Use round robin for happy eyeballs DNS responses (load balancing) #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/HappyEyeBallsConnectionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ public function hasBeenResolved()
*/
public function mixIpsIntoConnectQueue(array $ips)
{
\shuffle($ips);
$this->ipsCount += \count($ips);
$connectQueueStash = $this->connectQueue;
$this->connectQueue = array();
Expand Down
64 changes: 58 additions & 6 deletions tests/HappyEyeBallsConnectionBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ public function testConnectWillStartConnectingWithAlternatingIPv6AndIPv4WhenReso
$connector->expects($this->exactly(4))->method('connect')->withConsecutive(
array('tcp://[::1]:80?hostname=reactphp.org'),
array('tcp://127.0.0.1:80?hostname=reactphp.org'),
array('tcp://[::2]:80?hostname=reactphp.org'),
array('tcp://127.0.0.2:80?hostname=reactphp.org')
array('tcp://[::1]:80?hostname=reactphp.org'),
array('tcp://127.0.0.1:80?hostname=reactphp.org')
)->willReturnOnConsecutiveCalls(
$deferred->promise(),
$deferred->promise(),
Expand All @@ -316,8 +316,8 @@ public function testConnectWillStartConnectingWithAlternatingIPv6AndIPv4WhenReso
array('reactphp.org', Message::TYPE_AAAA),
array('reactphp.org', Message::TYPE_A)
)->willReturnOnConsecutiveCalls(
\React\Promise\resolve(array('::1', '::2')),
\React\Promise\resolve(array('127.0.0.1', '127.0.0.2'))
\React\Promise\resolve(array('::1', '::1')),
\React\Promise\resolve(array('127.0.0.1', '127.0.0.1'))
);

$uri = 'tcp://reactphp.org:80';
Expand All @@ -341,7 +341,7 @@ public function testConnectWillStartConnectingWithAttemptTimerWhenOnlyIpv6Resolv
$connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
$connector->expects($this->exactly(2))->method('connect')->withConsecutive(
array('tcp://[::1]:80?hostname=reactphp.org'),
array('tcp://[::2]:80?hostname=reactphp.org')
array('tcp://[::1]:80?hostname=reactphp.org')
)->willReturnOnConsecutiveCalls(
\React\Promise\reject(new \RuntimeException()),
new Promise(function () { })
Expand All @@ -352,7 +352,7 @@ public function testConnectWillStartConnectingWithAttemptTimerWhenOnlyIpv6Resolv
array('reactphp.org', Message::TYPE_AAAA),
array('reactphp.org', Message::TYPE_A)
)->willReturnOnConsecutiveCalls(
\React\Promise\resolve(array('::1', '::2')),
\React\Promise\resolve(array('::1', '::1')),
\React\Promise\reject(new \RuntimeException())
);

Expand Down Expand Up @@ -799,4 +799,56 @@ public function testCleanUpCancelsAllPendingConnectionAttemptsWithoutStartingNew

$builder->cleanUp();
}

public function testMixIpsIntoConnectQueueSometimesAssignsInOriginalOrder()
{
$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
$connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
$resolver = $this->getMockBuilder('React\Dns\Resolver\ResolverInterface')->getMock();

$uri = 'tcp://reactphp.org:80/path?test=yes#start';
$host = 'reactphp.org';
$parts = parse_url($uri);

for ($i = 0; $i < 100; ++$i) {
$builder = new HappyEyeBallsConnectionBuilder($loop, $connector, $resolver, $uri, $host, $parts);
$builder->mixIpsIntoConnectQueue(array('::1', '::2'));

$ref = new \ReflectionProperty($builder, 'connectQueue');
$ref->setAccessible(true);
$value = $ref->getValue($builder);

if ($value === array('::1', '::2')) {
break;
}
}

$this->assertEquals(array('::1', '::2'), $value);
}

public function testMixIpsIntoConnectQueueSometimesAssignsInReverseOrder()
{
$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
$connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
$resolver = $this->getMockBuilder('React\Dns\Resolver\ResolverInterface')->getMock();

$uri = 'tcp://reactphp.org:80/path?test=yes#start';
$host = 'reactphp.org';
$parts = parse_url($uri);

for ($i = 0; $i < 100; ++$i) {
$builder = new HappyEyeBallsConnectionBuilder($loop, $connector, $resolver, $uri, $host, $parts);
$builder->mixIpsIntoConnectQueue(array('::1', '::2'));

$ref = new \ReflectionProperty($builder, 'connectQueue');
$ref->setAccessible(true);
$value = $ref->getValue($builder);

if ($value === array('::2', '::1')) {
break;
}
}

$this->assertEquals(array('::2', '::1'), $value);
}
}
44 changes: 0 additions & 44 deletions tests/HappyEyeBallsConnectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,50 +270,6 @@ public function testCancelDuringTcpConnectionCancelsTcpConnectionIfGivenIp()
$this->loop->run();
}

/**
* @dataProvider provideIpvAddresses
*/
public function testShouldConnectOverIpv4WhenIpv6LookupFails(array $ipv6, array $ipv4)
{
$this->resolver->expects($this->exactly(2))->method('resolveAll')->withConsecutive(
array($this->equalTo('example.com'), Message::TYPE_AAAA),
array($this->equalTo('example.com'), Message::TYPE_A)
)->willReturnOnConsecutiveCalls(
Promise\reject(new \Exception('failure')),
Promise\resolve($ipv4)
);
$this->tcp->expects($this->exactly(1))->method('connect')->with($this->equalTo('1.2.3.4:80?hostname=example.com'))->willReturn(Promise\resolve($this->connection));

$promise = $this->connector->connect('example.com:80');;
$resolvedConnection = Block\await($promise, $this->loop);

self::assertSame($this->connection, $resolvedConnection);
}

/**
* @dataProvider provideIpvAddresses
*/
public function testShouldConnectOverIpv6WhenIpv4LookupFails(array $ipv6, array $ipv4)
{
if (count($ipv6) === 0) {
$ipv6[] = '1:2:3:4';
}

$this->resolver->expects($this->exactly(2))->method('resolveAll')->withConsecutive(
array($this->equalTo('example.com'), Message::TYPE_AAAA),
array($this->equalTo('example.com'), Message::TYPE_A)
)->willReturnOnConsecutiveCalls(
Promise\resolve($ipv6),
Promise\reject(new \Exception('failure'))
);
$this->tcp->expects($this->exactly(1))->method('connect')->with($this->equalTo('[1:2:3:4]:80?hostname=example.com'))->willReturn(Promise\resolve($this->connection));

$promise = $this->connector->connect('example.com:80');;
$resolvedConnection = Block\await($promise, $this->loop);

self::assertSame($this->connection, $resolvedConnection);
}

/**
* @internal
*/
Expand Down