return grandchildren flag

ydb-platform · Jan 13, 2025 · 0e0efc8 · 0e0efc8
1 parent 0ae852e
commit 0e0efc8
Show file tree

Hide file tree

Showing 44 changed files with 238 additions and 6 deletions.
diff --git a/ydb/core/protos/flat_scheme_op.proto b/ydb/core/protos/flat_scheme_op.proto
@@ -1862,6 +1862,7 @@ message TDirEntry {
     optional uint64 PathVersion = 13;
     optional EPathSubType PathSubType = 14;
     optional TPathVersion Version = 15;
+    optional bool ChildrenExist = 16;
 
     optional uint64 BalancerTabletID = 999; //temporary optimization for old PQ read/write protocol. Must be removed later
 }

diff --git a/ydb/core/tx/schemeshard/olap/operations/create_store.cpp b/ydb/core/tx/schemeshard/olap/operations/create_store.cpp
@@ -505,6 +505,10 @@ class TCreateOlapStore: public TSubOperation {
         dstPath.Base()->IncShardsInside(shardsToCreate);
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/olap/operations/create_table.cpp b/ydb/core/tx/schemeshard/olap/operations/create_table.cpp
@@ -868,6 +868,10 @@ class TCreateColumnTable: public TSubOperation {
         }
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState(!!storeInfo));
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/olap/operations/drop_store.cpp b/ydb/core/tx/schemeshard/olap/operations/drop_store.cpp
@@ -95,6 +95,13 @@ class TPropose: public TSubOperationState {
         domainInfo->DecPathsInside();
         parentDir->DecAliveChildren();
 
+        if (parentDir->GetChildren().size() == 0 && !parentDir->IsDomainRoot()) { // for correct discard of ChildrenExist prop
+            auto grandParentDir = context.SS->PathsById.at(parentDir->ParentPathId);
+            ++grandParentDir->DirAlterVersion;
+            context.SS->ClearDescribePathCaches(grandParentDir);
+            context.OnComplete.PublishToSchemeBoard(OperationId, grandParentDir->PathId);
+        }
+
         context.SS->TabletCounters->Simple()[COUNTER_USER_ATTRIBUTES_COUNT].Sub(path->UserAttrs->Size());
         context.SS->PersistUserAttributes(db, path->PathId, path->UserAttrs, nullptr);
 

diff --git a/ydb/core/tx/schemeshard/olap/operations/drop_table.cpp b/ydb/core/tx/schemeshard/olap/operations/drop_table.cpp
@@ -134,6 +134,13 @@ class TPropose: public TSubOperationState {
         domainInfo->DecPathsInside();
         parentDir->DecAliveChildren();
 
+        if (parentDir->GetChildren().size() == 0 && !parentDir->IsDomainRoot()) { // for correct discard of ChildrenExist prop
+            auto grandParentDir = context.SS->PathsById.at(parentDir->ParentPathId);
+            ++grandParentDir->DirAlterVersion;
+            context.SS->ClearDescribePathCaches(grandParentDir);
+            context.OnComplete.PublishToSchemeBoard(OperationId, grandParentDir->PathId);
+        }
+
         context.SS->TabletCounters->Simple()[COUNTER_USER_ATTRIBUTES_COUNT].Sub(path->UserAttrs->Size());
         context.SS->PersistUserAttributes(db, path->PathId, path->UserAttrs, nullptr);
 

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_blob_depot.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_blob_depot.cpp
@@ -93,7 +93,7 @@ namespace NKikimr::NSchemeShard {
 
                     return !txState->ShardsInProgress;
                 }
-                
+
                 TString DebugHint() const override {
                     return TStringBuilder() << "TConfigureBlobDepotParts id# " << OperationId;
                 }
@@ -379,8 +379,12 @@ namespace NKikimr::NSchemeShard {
                 dstPath->IncShardsInside();
                 parentPath->IncAliveChildren();
 
+                if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+                    IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+                }
+
                 SetState(TTxState::CreateParts);
-                
+
                 auto resp = MakeHolder<TProposeResponse>(NKikimrScheme::StatusAccepted, txId, ssId);
                 resp->SetPathId(pathId.LocalPathId);
                 return resp;

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_copy_sequence.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_copy_sequence.cpp
@@ -734,6 +734,10 @@ class TCopySequence: public TSubOperation {
         domainInfo->IncPathsInside();
         parentPath->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_backup_collection.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_backup_collection.cpp
@@ -222,6 +222,10 @@ class TCreateBackupCollection : public TSubOperation {
 
         UpdatePathSizeCounts(rootPath, dstPath);
 
+        if (rootPath.Base()->GetChildren().size() == 1 && !rootPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, rootPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_bsv.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_bsv.cpp
@@ -367,6 +367,10 @@ class TCreateBlockStoreVolume: public TSubOperation {
         dstPath.Base()->IncShardsInside(shardsToCreate);
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp
@@ -327,6 +327,10 @@ class TNewCdcStream: public TSubOperation {
         streamPath.DomainInfo()->IncPathsInside();
         tablePath.Base()->IncAliveChildren();
 
+        if (tablePath.Base()->GetChildren().size() == 1 && !tablePath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, tablePath, context.SS, context.OnComplete);
+        }
+
         context.OnComplete.ActivateTx(OperationId);
 
         SetState(NextState());

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_external_data_source.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_external_data_source.cpp
@@ -285,6 +285,10 @@ class TCreateExternalDataSource : public TSubOperation {
 
         UpdatePathSizeCounts(parentPath, dstPath);
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_external_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_external_table.cpp
@@ -378,6 +378,10 @@ class TCreateExternalTable: public TSubOperation {
 
         UpdatePathSizeCounts(parentPath, dstPath);
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_extsubdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_extsubdomain.cpp
@@ -264,6 +264,10 @@ class TCreateExtSubDomain: public TSubOperation {
         parentPath.DomainInfo()->IncPathsInside();
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_fs.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_fs.cpp
@@ -433,6 +433,10 @@ THolder<TProposeResponse> TCreateFileStore::Propose(
     dstPath.Base()->IncShardsInside(shardsToCreate);
     parentPath.Base()->IncAliveChildren();
 
+    if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+        IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+    }
+
     SetState(NextState());
     return result;
 }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_index.cpp
@@ -248,6 +248,10 @@ class TCreateTableIndex: public TSubOperation {
         dstPath.DomainInfo()->IncPathsInside();
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp
@@ -408,6 +408,10 @@ class TCreateKesus: public TSubOperation {
         dstPath.Base()->IncShardsInside();
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp
@@ -560,6 +560,10 @@ class TCreatePQ: public TSubOperation {
         dstPath.Base()->IncShardsInside(shardsToCreate);
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_replication.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_replication.cpp
@@ -400,6 +400,10 @@ class TCreateReplication: public TSubOperation {
         parentPath->IncAliveChildren();
         parentPath.DomainInfo()->IncPathsInside();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         if (desc.GetConfig().GetSrcConnectionParams().GetCredentialsCase() == NKikimrReplication::TConnectionParams::CREDENTIALS_NOT_SET) {
             desc.MutableConfig()->MutableSrcConnectionParams()->MutableOAuthToken()->SetToken(BUILTIN_ACL_ROOT);
         }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_resource_pool.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_resource_pool.cpp
@@ -189,6 +189,10 @@ class TCreateResourcePool : public TSubOperation {
 
         UpdatePathSizeCounts(parentPath, dstPath);
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_rtmr.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_rtmr.cpp
@@ -374,6 +374,10 @@ class TCreateRTMR: public TSubOperation {
         dstPath.Base()->IncShardsInside(shardsToCreate);
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp
@@ -579,6 +579,10 @@ class TCreateSequence : public TSubOperation {
         domainInfo->IncPathsInside();
         parentPath->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp
@@ -424,6 +424,10 @@ class TCreateSolomon: public TSubOperation {
         dstPath.Base()->IncShardsInside(shardsToCreate);
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_subdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_subdomain.cpp
@@ -346,6 +346,10 @@ class TCreateSubDomain: public TSubOperation {
         dstPath.Base()->IncShardsInside(shardsToCreate);
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         SetState(NextState());
         return result;
     }

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp
@@ -730,6 +730,10 @@ class TCreateTable: public TSubOperation {
         dstPath.Base()->IncShardsInside(shardsToCreate);
         parentPath.Base()->IncAliveChildren();
 
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         LOG_TRACE_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
                 "TCreateTable Propose creating new table"
                 << " opId# " << OperationId

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_view.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_view.cpp
@@ -199,6 +199,11 @@ class TCreateView: public TSubOperation {
         dstPath.MaterializeLeaf(owner, viewPathId);
         dstPath.DomainInfo()->IncPathsInside();
         parentPath.Base()->IncAliveChildren();
+
+        if (parentPath.Base()->GetChildren().size() == 1 && !parentPath.IsDomain()) { // for correct discard of ChildrenExist prop
+            IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, parentPath, context.SS, context.OnComplete);
+        }
+
         result->SetPathId(viewPathId.LocalPathId);
 
         TPathElement::TPtr viewPath = dstPath.Base();

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_backup_collection.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_backup_collection.cpp
@@ -50,6 +50,13 @@ class TPropose : public TSubOperationState {
         parentDirPtr->DecAliveChildren();
         context.SS->TabletCounters->Simple()[COUNTER_BACKUP_COLLECTION_COUNT].Sub(1);
 
+        if (parentDirPtr->GetChildren().size() == 0 && !parentDirPtr->IsDomainRoot()) { // for correct discard of ChildrenExist prop
+            auto grandParentDir = context.SS->PathsById.at(parentDirPtr->ParentPathId);
+            ++grandParentDir->DirAlterVersion;
+            context.SS->ClearDescribePathCaches(grandParentDir);
+            context.OnComplete.PublishToSchemeBoard(OperationId, grandParentDir->PathId);
+        }
+
         ++parentDirPtr->DirAlterVersion;
         context.SS->PersistPathDirAlterVersion(db, parentDirPtr);
         context.SS->ClearDescribePathCaches(parentDirPtr);

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp
@@ -55,6 +55,13 @@ class TPropose: public TSubOperationState {
         domainInfo->DecPathsInside();
         parentDir->DecAliveChildren();
 
+        if (parentDir->GetChildren().size() == 0 && !parentDir->IsDomainRoot()) { // for correct discard of ChildrenExist prop
+            auto grandParentDir = context.SS->PathsById.at(parentDir->ParentPathId);
+            ++grandParentDir->DirAlterVersion;
+            context.SS->ClearDescribePathCaches(grandParentDir);
+            context.OnComplete.PublishToSchemeBoard(OperationId, grandParentDir->PathId);
+        }
+
         // KIKIMR-13173
         // Repeat it here for a while, delete it from TDeleteParts after
         // Initiate asynchronous deletion of all shards
@@ -219,7 +226,7 @@ class TDropBlockStoreVolume: public TSubOperation {
             double rate = 0;
             double capacity = 0;
             auto& attrs = domainDir->UserAttrs->Attrs;
-            if (TryFromString(attrs[RateLimiterRateAttrName], rate) && 
+            if (TryFromString(attrs[RateLimiterRateAttrName], rate) &&
                 TryFromString(attrs[RateLimiterCapacityAttrName], capacity))
             {
                 rateLimiter.SetRate(rate);

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_cdc_stream.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_cdc_stream.cpp
@@ -70,6 +70,13 @@ class TPropose: public TSubOperationState {
         context.SS->ResolveDomainInfo(pathId)->DecPathsInside();
         parent->DecAliveChildren();
 
+        if (parent->GetChildren().size() == 0 && !parent->IsDomainRoot()) { // for correct discard of ChildrenExist prop
+            auto grandParentDir = context.SS->PathsById.at(parent->ParentPathId);
+            ++grandParentDir->DirAlterVersion;
+            context.SS->ClearDescribePathCaches(grandParentDir);
+            context.OnComplete.PublishToSchemeBoard(OperationId, grandParentDir->PathId);
+        }
+
         context.SS->ClearDescribePathCaches(path);
         context.OnComplete.PublishToSchemeBoard(OperationId, pathId);
 

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_external_data_source.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_external_data_source.cpp
@@ -54,6 +54,13 @@ class TPropose: public TSubOperationState {
         domainInfo->DecPathsInside();
         parentDir->DecAliveChildren();
 
+        if (parentDir->GetChildren().size() == 0 && !parentDir->IsDomainRoot()) { // for correct discard of ChildrenExist prop
+            auto grandParentDir = context.SS->PathsById.at(parentDir->ParentPathId);
+            ++grandParentDir->DirAlterVersion;
+            context.SS->ClearDescribePathCaches(grandParentDir);
+            context.OnComplete.PublishToSchemeBoard(OperationId, grandParentDir->PathId);
+        }
+
         context.SS->TabletCounters->Simple()[COUNTER_EXTERNAL_DATA_SOURCE_COUNT].Sub(1);
         context.SS->PersistRemoveExternalDataSource(db, pathId);
 

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_external_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_external_table.cpp
@@ -56,6 +56,13 @@ class TPropose: public TSubOperationState {
         domainInfo->DecPathsInside();
         parentDir->DecAliveChildren();
 
+        if (parentDir->GetChildren().size() == 0 && !parentDir->IsDomainRoot()) { // for correct discard of ChildrenExist prop
+            auto grandParentDir = context.SS->PathsById.at(parentDir->ParentPathId);
+            ++grandParentDir->DirAlterVersion;
+            context.SS->ClearDescribePathCaches(grandParentDir);
+            context.OnComplete.PublishToSchemeBoard(OperationId, grandParentDir->PathId);
+        }
+
         TExternalDataSourceInfo::TPtr externalDataSourceInfo = context.SS->ExternalDataSources.Value(dataSourcePathId, nullptr);
         Y_ABORT_UNLESS(externalDataSourceInfo);
         EraseIf(*externalDataSourceInfo->ExternalTableReferences.MutableReferences(), [pathId](const NKikimrSchemeOp::TExternalTableReferences::TReference& reference) { return TPathId::FromProto(reference.GetPathId()) == pathId; });

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_fs.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_fs.cpp
@@ -61,6 +61,13 @@ class TPropose: public TSubOperationState {
         domainInfo->DecPathsInside();
         parentDir->DecAliveChildren();
 
+        if (parentDir->GetChildren().size() == 0 && !parentDir->IsDomainRoot()) { // for correct discard of ChildrenExist prop
+            auto grandParentDir = context.SS->PathsById.at(parentDir->ParentPathId);
+            ++grandParentDir->DirAlterVersion;
+            context.SS->ClearDescribePathCaches(grandParentDir);
+            context.OnComplete.PublishToSchemeBoard(OperationId, grandParentDir->PathId);
+        }
+
         // KIKIMR-13173
         // Repeat it here for a while, delete it from TDeleteParts after
         // Initiate asynchronous deletion of all shards