don't block group in current generation after reassign

1 files changed, 7 insertions, 5 deletions

diff --git a/ydb/core/mind/hive/tx__update_tablet_groups.cpp b/ydb/core/mind/hive/tx__update_tablet_groups.cpp
index 9ca73c3dd3..abf4244984 100644
--- a/ydb/core/mind/hive/tx__update_tablet_groups.cpp
+++ b/ydb/core/mind/hive/tx__update_tablet_groups.cpp
@@ -28,6 +28,7 @@ public:
 
         ETabletState newTabletState = ETabletState::GroupAssignment;
         bool needToBlockStorage = false;
+        bool needToIncreaseGeneration = false;
         bool changed = false;
         TStringBuilder tabletBootState;
 
@@ -160,11 +161,8 @@ public:
             if (channel->History.empty()) {
                 fromGeneration = 0;
             } else {
-                if (!changed) {
-                    tablet->IncreaseGeneration();
-                    db.Table<Schema::Tablet>().Key(tablet->Id).Update<Schema::Tablet::KnownGeneration>(tablet->KnownGeneration);
-                }
-                fromGeneration = tablet->KnownGeneration;
+                needToIncreaseGeneration = true;
+                fromGeneration = tablet->KnownGeneration + 1;
             }
 
             if (!changed) {
@@ -282,6 +280,10 @@ public:
                 SideEffects.Register(CreateTabletKiller(TabletId, /* nodeId */ 0, tablet->KnownGeneration));
             }
         }
+        if (needToIncreaseGeneration) {
+            tablet->IncreaseGeneration();
+            db.Table<Schema::Tablet>().Key(tablet->Id).Update<Schema::Tablet::KnownGeneration>(tablet->KnownGeneration);
+        }
         if (!tablet->TryToBoot()) {
             BLOG_NOTICE("THive::TTxUpdateTabletGroups{" << (ui64)this << "}(" << TabletId << ")::Execute"
                         " - TryToBoot was not successfull");