Merge e64195d into 0839dc3

Author: VPolka

ydb/core/blobstorage/dsproxy/dsproxy_get.cpp

@@ -418,11 +418,14 @@ class TBlobStorageGroupGetRequest : public TBlobStorageGroupRequestActor {
                     (History, GetImpl.PrintHistory()));
         }
 
-        STLOG(GetImpl.WasNotOkResponses() && PopAllowToken(handleClass) ? PRI_NOTICE : PRI_DEBUG,
+        auto resultStatusPriority = PriorityForStatusResult(evResult->Status);
+        if (IS_LOG_PRIORITY_ENABLED(resultStatusPriority, LogCtx.LogComponent) && PopAllowToken(handleClass)) {
+            STLOG(resultStatusPriority,
                 BS_PROXY_GET, BPG72, "Query history",
                 (GroupId, Info->GroupID),
                 (HandleClass, NKikimrBlobStorage::EGetHandleClass_Name(handleClass)),
                 (History, GetImpl.PrintHistory()));
+        }
 
         return SendResponseAndDie(std::unique_ptr<TEvBlobStorage::TEvGetResult>(evResult.Release()));
     }

ydb/core/blobstorage/dsproxy/dsproxy_get_impl.h

@@ -54,8 +54,6 @@ class TGetImpl {
 
     THistory History;
 
-    bool AtLeastOneResponseWasNotOk = false;
-
     friend class TBlobStorageGroupGetRequest;
     friend class THistory;
 
@@ -237,7 +235,6 @@ class TGetImpl {
                 DSP_LOG_DEBUG_SX(logCtx, "BPG60", "Got# " << NKikimrProto::EReplyStatus_Name(replyStatus).data()
                     << " orderNumber# " << orderNumber << " vDiskId# " << vdisk.ToString());
                 Blackboard.AddErrorResponse(blobId, orderNumber, record.GetErrorReason());
-                AtLeastOneResponseWasNotOk = true;
             } else if (replyStatus == NKikimrProto::NOT_YET) {
                 DSP_LOG_DEBUG_SX(logCtx, "BPG67", "Got# NOT_YET orderNumber# " << orderNumber
                         << " vDiskId# " << vdisk.ToString());
@@ -296,10 +293,6 @@ class TGetImpl {
         return History.Print((QuerySize == 0) ? nullptr : &Queries[0].Id);
     }
 
-    bool WasNotOkResponses() {
-        return AtLeastOneResponseWasNotOk;
-    }
-
 protected:
     EStrategyOutcome RunBoldStrategy(TLogContext &logCtx);
     EStrategyOutcome RunMirror3dcStrategy(TLogContext &logCtx);

ydb/core/blobstorage/dsproxy/dsproxy_impl.cpp

@@ -74,10 +74,11 @@ namespace NKikimr {
             case NKikimrProto::BLOCKED:
             case NKikimrProto::DEADLINE:
             case NKikimrProto::RACE:
-            case NKikimrProto::ERROR:
                 return NActors::NLog::EPriority::PRI_INFO;
             case NKikimrProto::NODATA:
                 return NActors::NLog::EPriority::PRI_NOTICE;
+            case NKikimrProto::ERROR:
+                return NActors::NLog::EPriority::PRI_ERROR;
             default:
                 return NActors::NLog::EPriority::PRI_ERROR;
         }

ydb/core/blobstorage/dsproxy/dsproxy_put.cpp

@@ -461,8 +461,8 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor {
                     (History, PutImpl.PrintHistory()));
         }
 
-        if (ResponsesSent == PutImpl.Blobs.size()) {
-            STLOG(PutImpl.WasNotOkResponses() && PopAllowToken(HandleClass) ? PRI_NOTICE : PRI_DEBUG,
+        if (ResponsesSent == PutImpl.Blobs.size() && IS_LOG_PRIORITY_ENABLED(PutImpl.ResultPriority, LogCtx.LogComponent) && PopAllowToken(HandleClass)) {
+            STLOG(PutImpl.ResultPriority,
                     BS_PROXY_PUT, BPP72, "Query history",
                     (GroupId, Info->GroupID),
                     (HandleClass, NKikimrBlobStorage::EPutHandleClass_Name(HandleClass)),

ydb/core/blobstorage/dsproxy/dsproxy_put_impl.cpp

@@ -70,6 +70,7 @@ void TPutImpl::PrepareOneReply(NKikimrProto::EReplyStatus status, size_t blobIdx
         ev->ErrorReason = std::move(errorReason);
         const NLog::EPriority priority = GetPriorityForReply(Info->PutErrorMuteChecker, status);
         DSP_LOG_LOG_SX(logCtx, priority, "BPP12", "Result# " << ev->Print(false) << " GroupId# " << Info->GroupID);
+        ResultPriority = std::min(ResultPriority, PriorityForStatusResult(status));
         outPutResults.emplace_back(blobIdx, std::move(ev));
     }
 }

ydb/core/blobstorage/dsproxy/dsproxy_put_impl.h

@@ -40,7 +40,7 @@ class TPutImpl {
     ui32 VPutResponses = 0;
     ui32 VMultiPutRequests = 0;
     ui32 VMultiPutResponses = 0;
-    bool AtLeastOneResponseWasNotOk = false;
+    NActors::NLog::EPriority ResultPriority = NActors::NLog::PRI_DEBUG;
     bool EnableRequestMod3x3ForMinLatecy = false;
 
     const TEvBlobStorage::TEvPut::ETactic Tactic;
@@ -299,10 +299,6 @@ class TPutImpl {
         return it->second;
     }
 
-    bool WasNotOkResponses() {
-        return AtLeastOneResponseWasNotOk;
-    }
-
 protected:
     void RunStrategies(TLogContext &logCtx, TPutResultVec &outPutResults, const TBlobStorageGroupInfo::TGroupVDisks& expired,
         bool accelerate);
@@ -328,7 +324,6 @@ class TPutImpl {
             case NKikimrProto::VDISK_ERROR_STATE:
             case NKikimrProto::OUT_OF_SPACE:
                 Blackboard.AddErrorResponse(blobId, orderNumber, record.GetErrorReason());
-                AtLeastOneResponseWasNotOk = true;
                 break;
             case NKikimrProto::OK:
             case NKikimrProto::ALREADY:

ydb/core/blobstorage/dsproxy/request_history.h

@@ -73,7 +73,7 @@ class THistory {
                 << " NodeId# "      << info->GetActorId(OrderNumber).NodeId()
                 << " Status# "      << NKikimrProto::EReplyStatus_Name(Status);
             if (ErrorReason) {
-                str << "ErrorReason# \"" << ErrorReason << "\"";
+                str << " ErrorReason# \"" << ErrorReason << "\"";
             }
             str << " }";
         }