Merge e8dad24 into be7fe5b

Author: va-kuznecov

ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp

@@ -557,6 +557,16 @@ class TPDiskActor : public TActorBootstrapped<TPDiskActor> {
                         << "We are sure you did this or something even more creative, like killing the formatter.";
                     LOG_ERROR_S(*TlsActivationContext, NKikimrServices::BS_PDISK, str.Str());
                     InitError(str.Str());
+                } else if (!PDisk->CheckPlainChunksNotUsed()) {
+                    *PDisk->Mon.PDiskState = NKikimrBlobStorage::TPDiskState::InitialFormatReadError;
+                    *PDisk->Mon.PDiskBriefState = TPDiskMon::TPDisk::Error;
+                    *PDisk->Mon.PDiskDetailedState = TPDiskMon::TPDisk::ErrorInitialFormatRead;
+                    PDisk->ErrorStr = "This disk used plain chunks. The feature is not supported in current version!";
+                    TStringStream str;
+                    str << "PDiskId# " << PDisk->PDiskId << " " << PDisk->ErrorStr << " "
+                        << "data is not corrupted, but can be retrieved only with PDisk of newer version (25-1+)";
+                    LOG_ERROR_S(*TlsActivationContext, NKikimrServices::BS_PDISK, str.Str());
+                    InitError(str.Str());
                 } else {
                     // PDisk GUID is OK and format is complete
                     *PDisk->Mon.PDiskState = NKikimrBlobStorage::TPDiskState::InitialSysLogRead;

ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h

@@ -159,6 +159,8 @@ struct TPDiskConfig : public TThrRefBase {
 
     ui32 CompletionThreadsCount = 1;
 
+    bool PlainDataChunks = false;
+
     TPDiskConfig(ui64 pDiskGuid, ui32 pdiskId, ui64 pDiskCategory)
         : TPDiskConfig({}, pDiskGuid, pdiskId, pDiskCategory)
     {}
@@ -307,6 +309,7 @@ struct TPDiskConfig : public TThrRefBase {
         str << " YellowLogChunksMultiplier# " << YellowLogChunksMultiplier << x;
         str << " SpaceColorBorder# " << SpaceColorBorder << x;
         str << " CompletionThreadsCount# " << CompletionThreadsCount << x;
+        str << " PlainDataChunks# " << PlainDataChunks << x;
         str << "}";
         return str.Str();
     }
@@ -392,6 +395,9 @@ struct TPDiskConfig : public TThrRefBase {
         if (cfg->HasCompletionThreadsCount()) {
             CompletionThreadsCount = cfg->GetCompletionThreadsCount();
         }
+        if (cfg->HasPlainDataChunks()) {
+            PlainDataChunks = cfg->GetPlainDataChunks();
+        }
     }
 };
 

ydb/core/blobstorage/pdisk/blobstorage_pdisk_data.h

@@ -484,6 +484,7 @@ enum EFormatFlags {
     FormatFlagEncryptFormat = 1 << 5,  // Always on, flag is useless
     FormatFlagEncryptData = 1 << 6,  // Always on, flag is useless
     FormatFlagFormatInProgress = 1 << 7,  // Not implemented (Must be OFF for a formatted disk)
+    FormatFlagPlainDataChunks = 1 << 8, // Default is off, means "encrypted", for backward compatibility
 };
 
 struct TDiskFormat {
@@ -530,6 +531,7 @@ struct TDiskFormat {
         isFirst = NText::OutFlag(isFirst, flags & FormatFlagEncryptFormat, "EncryptFormat", str);
         isFirst = NText::OutFlag(isFirst, flags & FormatFlagEncryptData, "EncryptData", str);
         isFirst = NText::OutFlag(isFirst, flags & FormatFlagFormatInProgress, "FormatFlagFormatInProgress", str);
+        isFirst = NText::OutFlag(isFirst, flags & FormatFlagPlainDataChunks, "FormatFlagPlainDataChunks", str);
         NText::OutFlag(isFirst, isFirst, "Unknown", str);
         return str.Str();
     }
@@ -599,6 +601,10 @@ struct TDiskFormat {
         return FormatFlags & FormatFlagFormatInProgress;
     }
 
+    bool IsPlainDataChunks() const {
+        return FormatFlags & FormatFlagPlainDataChunks;
+    }
+
     void SetFormatInProgress(bool isInProgress) {
         FormatFlags &= ~FormatFlagFormatInProgress;
         if (isInProgress) {

ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp

@@ -230,6 +230,10 @@ bool TPDisk::CheckFormatComplete() {
     return !Format.IsFormatInProgress();
 }
 
+bool TPDisk::CheckPlainChunksNotUsed() {
+    return !Format.IsPlainDataChunks();
+}
+
 void TPDisk::InitFreeChunks() {
     TGuard<TMutex> guard(StateMutex);
     for (ui32 i = 0; i < ChunkState.size(); ++i) {

ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h

@@ -209,6 +209,7 @@ class TPDisk : public IPDisk {
     bool IsFormatMagicValid(ui8 *magicData, ui32 magicDataSize); // Called by actor
     bool CheckGuid(TString *outReason); // Called by actor
     bool CheckFormatComplete(); // Called by actor
+    bool CheckPlainChunksNotUsed(); // Called by actor
     void ReadSysLog(const TActorId &pDiskActor); // Called by actor
     bool ProcessChunk0(const TEvReadLogResult &readLogResult, TString& errorReason);
     void PrintChunksDebugInfo();

ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp

@@ -80,6 +80,22 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
                         }
                     }
                 }
+                TABLER() {
+                    TABLED() {str << "PlainDataChunks";}
+                    TABLED() {
+                        if (Format.IsPlainDataChunks()) {
+                            RED_TEXT(str, "Plain data chunks are not supported in this version");
+                            if (!Cfg->PlainDataChunks) {
+                                YELLOW_TEXT(str, "notice: config is set for encrypted chunks");
+                            }
+                        } else {
+                            GREEN_TEXT(str, "Encrypted data chunks are in use");
+                            if (Cfg->PlainDataChunks) {
+                                YELLOW_TEXT(str, "notice: config is set for plain chunks<br>(not supported in this version, nothing is gonna happen)");
+                            }
+                        }
+                    }
+                }
             }
         }
         TAG(TH4) {str << "State description"; }

ydb/core/protos/blobstorage_pdisk_config.proto

@@ -93,4 +93,6 @@ message TPDiskConfig {
     optional uint32 ChunkBaseLimit = 2002; // Free chunk permille that triggers Cyan color (e.g. 100 is 10%). Between 130 (default) and 13.
 
     optional uint32 CompletionThreadsCount = 2003;
+    reserved 2004;
+    optional bool PlainDataChunks = 2005;
 };