Merge pull request #56 from ydb-platform/fix-retry

Fixed retry at BAD_SESSION

Author: ilyakharev

CHANGELOG.md

@@ -1,3 +1,4 @@
+* fixed retry at BAD_SESSION
 * added credentials authentication
 * added CI test
 

src/Traits/RequestTrait.php

@@ -222,13 +222,18 @@ protected function processResponse($service, $method, $response, $resultClass)
             case StatusCode::BAD_SESSION:
                 if (method_exists($this, 'refresh'))
                 {
+                    $data = $this->last_request_data;
+
                     $session = $this->refresh();
 
                     if (isset($this->last_request_data['session_id']))
                     {
                         $this->last_request_data['session_id'] = $session->id();
                     }
 
+                    $data['session_id'] = $session->id();
+                    $this->saveLastRequest($service, $method, $data);
+
                     // only 10 retries are allowed!
                     if ($this->last_request_try_count < 10)
                     {
@@ -313,7 +318,7 @@ protected function retryLastRequest($sleep = 100)
             $this->logger()->info('Going to retry the last request!');
 
             usleep(max($this->last_request_try_count, 1) * $sleep * 1000); // waiting 100 ms more
-            $this->doRequest($this->last_request_service, $this->last_request_method, $this->last_request_data);
+            return $this->doRequest($this->last_request_service, $this->last_request_method, $this->last_request_data);
         }
     }
 

tests/RetryOnBadSessionTest.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace YdbPlatform\Ydb\Test;
+
+use PHPUnit\Framework\TestCase;
+use YdbPlatform\Ydb\Auth\Implement\AnonymousAuthentication;
+use YdbPlatform\Ydb\Ydb;
+
+class SessionManager extends \YdbPlatform\Ydb\Session{
+    public static function setSessionId(\YdbPlatform\Ydb\Session $session, string $id){
+        $session->session_id = $id;
+        return $session;
+    }
+    public static function getSessionId(\YdbPlatform\Ydb\Session $session){
+        return $session->session_id;
+    }
+}
+
+class RetryOnBadSessionTest extends TestCase
+{
+    public function test(){
+
+        $config = [
+
+            // Database path
+            'database'    => '/local',
+
+            // Database endpoint
+            'endpoint'    => 'localhost:2136',
+
+            // Auto discovery (dedicated server only)
+            'discovery'   => false,
+
+            // IAM config
+            'iam_config'  => [
+                'insecure' => true,
+            ],
+            'credentials' => new AnonymousAuthentication()
+        ];
+        $ydb = new Ydb($config);
+        $table = $ydb->table();
+        $session = $table->session();
+        $oldSessionId = SessionManager::getSessionId($session);
+        $session->delete();
+        $session = $table->session();
+        SessionManager::setSessionId($session,$oldSessionId);
+        print_r($session->query('select 1 as res'));
+        self::assertEquals(
+            1,
+            $session->query('select 1 as res')->rows()[0]['res']
+        );
+    }
+}