Merge pull request #87 from ydb-platform/remove-overload

remove-overload

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.7.2
+* Retry remove directory in sugar.RemoveRecursive for retriable error
+
 ## 3.7.1
 * Fixed panic on `result.Reset(nil)`
 

internal/meta/version.go

@@ -1,5 +1,5 @@
 package meta
 
 const (
-	Version = "ydb-go-sdk/3.7.1"
+	Version = "ydb-go-sdk/3.7.2"
 )

sugar/sugar.go

@@ -8,6 +8,7 @@ import (
 
 	ydb "github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
+	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/scheme"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 )
@@ -66,14 +67,20 @@ func RemoveRecursive(ctx context.Context, db ydb.Connection, pathToRemove string
 	fullSysTablePath := path.Join(db.Name(), sysTable)
 	var list func(int, string) error
 	list = func(i int, p string) error {
-		dir, err := db.Scheme().ListDirectory(ctx, p)
+		var dir scheme.Directory
+		var err error
+		err = retry.Retry(ctx, true, func(ctx context.Context) (err error) {
+			dir, err = db.Scheme().ListDirectory(ctx, p)
+			return err
+		})
 		var opErr *errors.OpError
 		if errors.As(err, &opErr) && opErr.Reason == errors.StatusSchemeError {
 			return nil
 		}
 		if err != nil {
 			return err
 		}
+
 		for _, child := range dir.Children {
 			pt := path.Join(p, child.Name)
 			if pt == fullSysTablePath {
@@ -84,7 +91,10 @@ func RemoveRecursive(ctx context.Context, db ydb.Connection, pathToRemove string
 				if err = list(i+1, pt); err != nil {
 					return err
 				}
-				if err = db.Scheme().RemoveDirectory(ctx, pt); err != nil {
+				err = retry.Retry(ctx, true, func(ctx context.Context) (err error) {
+					return db.Scheme().RemoveDirectory(ctx, pt)
+				})
+				if err != nil {
 					return err
 				}