Update Retry.php, Table.php, RetryOnBadSessionTest.php

Author: ilyakharev

src/Retry/Retry.php

@@ -31,7 +31,7 @@ public function __construct()
 
     protected function retryDelay(int $retryCount, Backoff $backoff)
     {
-        return $backoff->getBackoffSlotMillis()*(1<<min($retryCount, $backoff->getBackoffCeiling()));
+        return $backoff->getBackoffSlotMillis() * (1 << min($retryCount, $backoff->getBackoffCeiling()));
     }
 
     /**
@@ -72,21 +72,22 @@ public function withParams(?RetryParams $params): Retry
      * @throws NonRetryableException
      * @throws RetryableException
      */
-    public function retry(Closure $closure, bool $idempotent){
+    public function retry(Closure $closure, bool $idempotent)
+    {
         $startTime = microtime(true);
         $retryCount = 0;
         $lastException = null;
-        while (microtime(true) < $startTime+$this->timeoutMs/1000){
+        while (microtime(true) < $startTime + $this->timeoutMs / 1000) {
             try {
                 return $closure();
-            } catch (RetryableException $e){
-                if (!isset(self::$idempotentOnly[get_class($e)])){
+            } catch (RetryableException $e) {
+                if (isset(self::$idempotentOnly[get_class($e)]) && $idempotent) {
                     throw $e;
                 }
                 $retryCount++;
-                $this->retryDelay($retryCount,$this->backoffType($e));
+                $this->retryDelay($retryCount, $this->backoffType($e));
                 $lastException = $e;
-            } catch (Exception $e){
+            } catch (Exception $e) {
                 throw $e;
             }
         }
@@ -99,23 +100,24 @@ public function retry(Closure $closure, bool $idempotent){
      */
     protected function backoffType(RetryableException $e): Backoff
     {
-        if ($e instanceof AbortedException){
-            return $this->fastBackOff;
-        } elseif ($e instanceof BadSessionException) {
-            return $this->fastBackOff;
-        } elseif ($e instanceof SessionBusyException) {
-            return $this->fastBackOff;
-        } elseif ($e instanceof UndeterminedException) {
-            return $this->fastBackOff;
-        } elseif ($e instanceof UnavailableException) {
-            return $this->fastBackOff;
-        } elseif ($e instanceof UndeterminedException) {
-            return $this->fastBackOff;
-        } elseif ($e instanceof DeadlineExceededException){
-            return $this->fastBackOff;
-        } else {
-            return $this->slowBackOff;
-        }
+        return $this->fastBackOff;
+//        if ($e instanceof AbortedException) {
+//            return $this->fastBackOff;
+//        } elseif ($e instanceof BadSessionException) {
+//            return $this->fastBackOff;
+//        } elseif ($e instanceof SessionBusyException) {
+//            return $this->fastBackOff;
+//        } elseif ($e instanceof UndeterminedException) {
+//            return $this->fastBackOff;
+//        } elseif ($e instanceof UnavailableException) {
+//            return $this->fastBackOff;
+//        } elseif ($e instanceof UndeterminedException) {
+//            return $this->fastBackOff;
+//        } elseif ($e instanceof DeadlineExceededException) {
+//            return $this->fastBackOff;
+//        } else {
+//            return $this->slowBackOff;
+//        }
     }
 
     private static $idempotentOnly = [

src/Table.php

@@ -457,7 +457,7 @@ public function retrySession(Closure $userFunc, bool $idempotent = false, RetryP
                 $session = $this->session();
                 return $userFunc($session);
             } catch (Exception $exception){
-                if (!is_null($session) && isset(self::$deleteSession[get_class($exception)])){
+                if ($session != null && in_array(get_class($exception), self::$deleteSession)){
                     $this->dropSession($session->id());
                 }
                 throw $exception;

tests/RetryOnBadSessionTest.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use YdbPlatform\Ydb\Auth\Implement\AnonymousAuthentication;
+use YdbPlatform\Ydb\Session;
 use YdbPlatform\Ydb\Table;
 use YdbPlatform\Ydb\Ydb;
 
@@ -71,14 +72,14 @@ private function backwardCompatibility(Table $table)
     private function retryTest(Table $table)
     {
         $i = 0;
-        $table->retrySession(function ($session) use (&$i){
+        $table->retrySession(function (Session $session) use (&$i){
             $i++;
             if($i==1)SessionManager::setSessionId($session, $this->oldSessionId);
             $tres = $session->query('select 1 as res')->rows()[0]['res'];
             self::assertEquals(
                 1,
                 $tres
             );
-        });
+        }, true);
     }
 }