Merge branch 'ydb-platform:stable-24-1' into stable-24-1

jepett0 · Mar 7, 2024 · 3acf9dd · 3acf9dd
2 parents 5e4aec9 + c206738
commit 3acf9dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ydb/core/grpc_services/rpc_rate_limiter_api.cpp b/ydb/core/grpc_services/rpc_rate_limiter_api.cpp
@@ -67,7 +67,7 @@ class TRateLimiterRequest : public TRpcOperationRequestActor<TDerived, TRequest>
         if (resource.has_metering_config()) {
             auto self = static_cast<TDerived*>(this);
             const auto& userTokenStr = self->Request_->GetSerializedToken();
-            bool allowed = false;
+            bool allowed = AppData()->AdministrationAllowedSIDs.empty();
             if (userTokenStr) {
                 NACLib::TUserToken userToken(userTokenStr);
                 for (auto &sid : AppData()->AdministrationAllowedSIDs) {

diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_write_actor.cpp b/ydb/services/deprecated/persqueue_v0/grpc_pq_write_actor.cpp
@@ -864,7 +864,9 @@ void TWriteSessionActor::LogSession(const TActorContext& ctx) {
 }
 
 void TWriteSessionActor::HandleWakeup(const TActorContext& ctx) {
-    Y_ABORT_UNLESS(State == ES_INITED);
+    if (State != ES_INITED) {
+        return;
+    }
 
     auto now = ctx.Now();