Merge pull request #641 from ydb-platform/v3.42-fix-remove-recursive-topic

Remove topic in sugar.RemoveRecursive

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Supported `scheme.EntryTopic` path child entry in `sugar.RemoveRecursive`
+
 ## v3.42.13
 * Fixed default state of `internal/xerrors.retryableError`: it inherit properties from parent error as possible
 * Marked event `grpc/stats.End` as ignored at observing status of grpc connection
@@ -12,7 +14,7 @@
 * Fixed validation error for topicoptions.WithPartitionID option of start topic writer.
 
 ## v3.42.10
-* Added exit from retryer if got grpc-error `Unauthenticated` on `discovery/ListEndpoints` call  
+* Added exit from retryer if got grpc-error `Unauthenticated` on `discovery/ListEndpoints` call
 
 ## v3.42.9
 * Added `internal/xerrors.Errorf` error for wrap multiple errors and check them with `errors.Is` of `errors.As`

sugar/path.go

@@ -105,9 +105,7 @@ func RemoveRecursive(ctx context.Context, db ydb.Connection, pathToRemove string
 				if err = list(i+1, pt); err != nil {
 					return xerrors.WithStackTrace(err)
 				}
-				err = retry.Retry(ctx, func(ctx context.Context) (err error) {
-					return db.Scheme().RemoveDirectory(ctx, pt)
-				}, retry.WithIdempotent(true))
+				err = db.Scheme().RemoveDirectory(ctx, pt)
 				if err != nil {
 					return xerrors.WithStackTrace(err)
 				}
@@ -120,7 +118,14 @@ func RemoveRecursive(ctx context.Context, db ydb.Connection, pathToRemove string
 					return xerrors.WithStackTrace(err)
 				}
 
+			case scheme.EntryTopic:
+				err = db.Topic().Drop(ctx, pt)
+				if err != nil {
+					return xerrors.WithStackTrace(err)
+				}
+
 			default:
+				return xerrors.WithStackTrace(fmt.Errorf("unknown entry type: %s", child.Type.String()))
 			}
 		}
 		return nil