Fix for StickyRoundRobinSelector starts with second host (#1253)

* Improved the StickyRoundRobinSelector test * Fixed StickyRoundRobinSelector starts with second host
elastic · Sep 23, 2022 · 5def762 · 5def762
1 parent e1ed999
commit 5def762
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 7 deletions.
diff --git a/src/Elasticsearch/Connections/Connection.php b/src/Elasticsearch/Connections/Connection.php
@@ -99,7 +99,7 @@ class Connection implements ConnectionInterface
     /**
      * @var bool
      */
-    protected $isAlive = false;
+    protected $isAlive = true;
 
     /**
      * @var float

diff --git a/tests/Elasticsearch/Tests/ClientBuilderTest.php b/tests/Elasticsearch/Tests/ClientBuilderTest.php
@@ -18,11 +18,16 @@
 
 namespace Elasticsearch\Tests;
 
+use CurlHandle;
 use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
 use Elasticsearch\Common\Exceptions\ElasticsearchException;
 use Elasticsearch\Common\Exceptions\RuntimeException;
+use Elasticsearch\ConnectionPool\Selectors\StickyRoundRobinSelector;
+use Elasticsearch\ConnectionPool\StaticNoPingConnectionPool;
 use Elasticsearch\Tests\ClientBuilder\DummyLogger;
+use GuzzleHttp\Ring\Client\CurlHandler;
+use GuzzleHttp\Ring\Client\MockHandler;
 use PHPUnit\Framework\TestCase;
 
 class ClientBuilderTest extends TestCase
@@ -376,4 +381,36 @@ public function testFromConfigWithIncludePortInHostHeader()
             $this->assertEquals($url, $request['request']['headers']['Host'][0]);
         }
     }
+
+    /**
+     * @see https://github.com/elastic/elasticsearch-php/issues/1242
+     */
+    public function testRandomizedHostsDisableWithStickRoundRobinSelectorSelectFirstNode()
+    {
+        $hosts = ['one', 'two', 'three'];
+        $data = '{"foo":"bar}';
+
+        $handler = new MockHandler([
+            'status' => 200,
+            'transfer_stats' => [
+               'total_time' => 100
+            ],
+            'body' => fopen('data:text/plain,'.urlencode($data), 'rb'),
+            'effective_url' => 'one'
+          ]);
+
+        $client = ClientBuilder::create()
+            ->setHosts($hosts)
+            ->setHandler($handler)
+            ->setSelector(StickyRoundRobinSelector::class)
+            ->setConnectionPool(StaticNoPingConnectionPool::class, ['randomizeHosts' => false])
+            ->build();
+
+        try {
+            $result = $client->info();
+        } catch (ElasticsearchException $e) {
+            $request = $client->transport->getLastConnection()->getLastRequestInfo();
+            $this->assertEquals('one', $request['request']['headers']['Host'][0]);
+        }
+    }
 }
diff --git a/tests/Elasticsearch/Tests/ConnectionPool/Selectors/StickyRoundRobinSelectorTest.php b/tests/Elasticsearch/Tests/ConnectionPool/Selectors/StickyRoundRobinSelectorTest.php
@@ -29,15 +29,18 @@
  */
 class StickyRoundRobinSelectorTest extends \PHPUnit\Framework\TestCase
 {
+    public function setUp(): void
+    {
+        $this->roundRobin = new Elasticsearch\ConnectionPool\Selectors\StickyRoundRobinSelector();
+    }
+
     public function tearDown(): void
     {
         m::close();
     }
 
     public function testTenConnections()
     {
-        $roundRobin = new Elasticsearch\ConnectionPool\Selectors\StickyRoundRobinSelector();
-
         $mockConnections = [];
         $mockConnections[] = m::mock(ConnectionInterface::class)
             ->shouldReceive('isAlive')->times(16)->andReturn(true)->getMock();
@@ -47,16 +50,14 @@ public function testTenConnections()
         }
 
         foreach (range(0, 15) as $index) {
-            $retConnection = $roundRobin->select($mockConnections);
+            $retConnection = $this->roundRobin->select($mockConnections);
 
             $this->assertSame($mockConnections[0], $retConnection);
         }
     }
 
     public function testTenConnectionsFirstDies()
     {
-        $roundRobin = new Elasticsearch\ConnectionPool\Selectors\StickyRoundRobinSelector();
-
         $mockConnections = [];
         $mockConnections[] = m::mock(ConnectionInterface::class)
             ->shouldReceive('isAlive')->once()->andReturn(false)->getMock();
@@ -69,7 +70,7 @@ public function testTenConnectionsFirstDies()
         }
 
         foreach (range(0, 15) as $index) {
-            $retConnection = $roundRobin->select($mockConnections);
+            $retConnection = $this->roundRobin->select($mockConnections);
 
             $this->assertSame($mockConnections[1], $retConnection);
         }