Added exceptions

ilyakharev · ilyakharev · commit 996511d76b76 · 2023-06-19T18:15:46.000+03:00
diff --git a/src/Exceptions/Grpc/AbortedException.php b/src/Exceptions/Grpc/AbortedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\RetryableException;
+
+class AbortedException extends RetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/AlreadyExistsException.php b/src/Exceptions/Grpc/AlreadyExistsException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+class AlreadyExistsException extends \YdbPlatform\Ydb\Exceptions\NonRetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/DataLossException.php b/src/Exceptions/Grpc/DataLossException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\NonRetryableException;
+
+class DataLossException extends NonRetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/FailedPreconditionException.php b/src/Exceptions/Grpc/FailedPreconditionException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\NonRetryableException;
+
+class FailedPreconditionException extends NonRetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/InternalException.php b/src/Exceptions/Grpc/InternalException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\RetryableException;
+
+class InternalException extends RetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/NotFoundException.php b/src/Exceptions/Grpc/NotFoundException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\NonRetryableException;
+
+class NotFoundException extends NonRetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/OutOfRangeException.php b/src/Exceptions/Grpc/OutOfRangeException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\NonRetryableException;
+
+class OutOfRangeException extends NonRetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/PermissionDeniedException.php b/src/Exceptions/Grpc/PermissionDeniedException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+class PermissionDeniedException extends \YdbPlatform\Ydb\Exceptions\NonRetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/ResourceExhaustedException.php b/src/Exceptions/Grpc/ResourceExhaustedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\RetryableException;
+
+class ResourceExhaustedException extends RetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/UnauthenticatedException.php b/src/Exceptions/Grpc/UnauthenticatedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\NonRetryableException;
+
+class UnauthenticatedException extends  NonRetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/UnavailableException.php b/src/Exceptions/Grpc/UnavailableException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\RetryableException;
+
+class UnavailableException extends RetryableException
+{
+
+}
diff --git a/src/Exceptions/Grpc/UnimplementedException.php b/src/Exceptions/Grpc/UnimplementedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Grpc;
+
+use YdbPlatform\Ydb\Exceptions\NonRetryableException;
+
+class UnimplementedException extends NonRetryableException
+{
+
+}
diff --git a/src/Exceptions/Ydb/OverloadedException.php b/src/Exceptions/Ydb/OverloadedException.php
@@ -2,7 +2,7 @@
 
 namespace YdbPlatform\Ydb\Exceptions\Ydb;
 
-class OverloadException extends \YdbPlatform\Ydb\Exceptions\RetryableException
+class OverloadedException extends \YdbPlatform\Ydb\Exceptions\RetryableException
 {
     public function isFastBackoff(): bool
     {
diff --git a/src/Exceptions/Ydb/SchemeError.php b/src/Exceptions/Ydb/SchemeError.php
diff --git a/src/Exceptions/Ydb/SchemeErrorException.php b/src/Exceptions/Ydb/SchemeErrorException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace YdbPlatform\Ydb\Exceptions\Ydb;
+
+class SchemeErrorException extends \YdbPlatform\Ydb\Exceptions\NonRetryableException
+{
+
+}
diff --git a/src/Retry/Retry.php b/src/Retry/Retry.php
@@ -79,14 +79,10 @@ public function retry(Closure $closure, bool $idempotent){
         while (microtime(true) < $startTime+$this->timeoutMs/1000){
             try {
                 return $closure();
-            } catch (UndeterminedException $undeterminedException){
-                $lastException = $undeterminedException;
-                if (!$idempotent){
-                    break;
-                }
-                $retryCount++;
-                $this->retryDelay($retryCount,$this->backoffType($e));
             } catch (RetryableException $e){
+                if (!isset(self::$idempotentOnly[get_class($e)])){
+                    throw $e;
+                }
                 $retryCount++;
                 $this->retryDelay($retryCount,$this->backoffType($e));
                 $lastException = $e;
@@ -122,4 +118,16 @@ protected function backoffType(RetryableException $e): Backoff
         }
     }
 
+    private static $idempotentOnly = [
+        \YdbPlatform\Ydb\Exceptions\Grpc\CanceledException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\DeadlineExceededException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\InternalException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\UnavailableException::class,
+        \YdbPlatform\Ydb\Exceptions\Ydb\UndeterminedException::class
+    ];
+
+    private static $fastBackoff = [
+
+    ];
+
 }
diff --git a/src/Table.php b/src/Table.php
@@ -456,26 +456,9 @@ public function retrySession(Closure $userFunc, bool $idempotent = false, RetryP
             try {
                 $session = $this->session();
                 return $userFunc($session);
-            } catch (UnknownException $unknownException) {
-                $this->dropSession($session->id());
-                throw $unknownException;
-            } catch (InvalidArgumentException $invalidArgumentException){
-                $this->dropSession($session->id());
-                throw $invalidArgumentException;
-            } catch (BadSessionException $badSessionException){
-                $this->dropSession($session->id());
-                throw $badSessionException;
-            } catch (SessionBusyException $sessionBusyException){
-                $this->dropSession($session->id());
-                throw $sessionBusyException;
-            } catch (SessionExpiredException $sessionExpiredException){
-                $this->dropSession($session->id());
-                throw $sessionExpiredException;
             } catch (Exception $exception){
-                try {
-                    $session->rollbackTransaction();
-                } catch (Exception $e){
-
+                if (!is_null($session) && isset(self::$deleteSession[get_class($exception)])){
+                    $this->dropSession($session->id());
                 }
                 throw $exception;
             }
@@ -485,34 +468,43 @@ public function retrySession(Closure $userFunc, bool $idempotent = false, RetryP
 
     public function retryTransaction(Closure $userFunc, bool $idempotent = false, RetryParams $params = null){
 
-        return $this->retry->withParams($params)->retry(function () use ($userFunc){
-            $session = null;
-            try{
-                $session = $this->session();
-                $session->beginTransaction();
-                $result = $userFunc($session);
-                $session->commitTransaction();
-                return $result;
-            } catch (BadSessionException $badSessionException){
-                $this->dropSession($session->id());
-                throw $badSessionException;
-            } catch (SessionBusyException $sessionBusyException){
-                $this->dropSession($session->id());
-                throw $sessionBusyException;
-            } catch (SessionExpiredException $sessionExpiredException){
-                $this->dropSession($session->id());
-                throw $sessionExpiredException;
-            } catch (Exception $exception){
-                try {
-                    $session->rollbackTransaction();
-                } catch (Exception $e){
-
+        return $this->retry->withParams($params)->retry(function () use ($params, $idempotent, $userFunc){
+            $this->retrySession(function (Session $session) use ($userFunc) {
+                try{
+                        $session->beginTransaction();
+                        $result = $userFunc($session);
+                        $session->commitTransaction();
+                        return $result;
+                } catch (Exception $exception){
+                    try {
+                        $session->rollbackTransaction();
+                    } catch (Exception $e){}
+                    throw $exception;
                 }
-                throw $exception;
-            }
-
+            }, $idempotent, $params);
         }, $idempotent);
 
     }
 
+
+    private static $deleteSession = [
+        \YdbPlatform\Ydb\Exceptions\Grpc\CanceledException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\UnknownException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\InvalidArgumentException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\DeadlineExceededException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\NotFoundException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\AlreadyExistsException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\PermissionDeniedException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\FailedPreconditionException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\AbortedException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\UnimplementedException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\InternalException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\UnavailableException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\DataLossException::class,
+        \YdbPlatform\Ydb\Exceptions\Grpc\UnauthenticatedException::class,
+        \YdbPlatform\Ydb\Exceptions\Ydb\BadSessionException::class,
+        \YdbPlatform\Ydb\Exceptions\Ydb\SessionExpiredException::class,
+        \YdbPlatform\Ydb\Exceptions\Ydb\SessionBusyException::class
+    ];
+
 }
diff --git a/src/Traits/RequestTrait.php b/src/Traits/RequestTrait.php
diff --git a/tests/RetryOnBadSessionTest.php b/tests/RetryOnBadSessionTest.php

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +<?php
++
 +namespace YdbPlatform\Ydb\Exceptions\Grpc;
++
 +class AlreadyExistsException extends \YdbPlatform\Ydb\Exceptions\NonRetryableException
 +{
++
 +}