Decommit real group in tests, add seed manual setup,

seed

3 files changed, 33 insertions, 17 deletions

diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp b/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp
index 8b3ce400ca..8fa631b0ad 100644
--- a/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp
+++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp
@@ -3,14 +3,21 @@
 
 #include "blob_depot_test_functions.h"
 
-#include <util/random/entropy.h>
-
 using namespace NKikimr::NBlobDepot;
 
 Y_UNIT_TEST_SUITE(BlobDepot) {
+    void LoadSeed(ui32& seed) {
+        ui32 constantSeed = 0;
+        if (TryIntFromString<10, ui32>(GetEnv("MERSENNE_SEED"), constantSeed)) {
+            seed = constantSeed;
+        } else {
+            Seed().LoadOrFail(&seed, sizeof(seed));
+        }
+    }
+
     Y_UNIT_TEST(BasicPutAndGet) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
         
         TestBasicPutAndGet(tenv, 1, tenv.RegularGroups[0]);
@@ -19,7 +26,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
 
     Y_UNIT_TEST(TestBlockedEvGetRequest) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
 
         constexpr ui32 tabletId = 10;
@@ -69,7 +76,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
 
     Y_UNIT_TEST(BasicRange) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
         
         TestBasicRange(tenv, 1, tenv.RegularGroups[0]);
@@ -78,7 +85,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
 
     Y_UNIT_TEST(BasicDiscover) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
         
         TestBasicDiscover(tenv, 1000, tenv.RegularGroups[0]);
@@ -87,7 +94,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
 
     Y_UNIT_TEST(BasicBlock) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
         
         TestBasicBlock(tenv, 15, tenv.RegularGroups[0]);
@@ -96,7 +103,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
 
     Y_UNIT_TEST(BasicCollectGarbage) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
         
         TestBasicCollectGarbage(tenv, 15, tenv.RegularGroups[0]);
@@ -105,7 +112,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
 
     Y_UNIT_TEST(VerifiedRandom) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
         
         // TestVerifiedRandom(tenv, 8, 15, tenv.RegularGroups[0], 1000);
@@ -114,7 +121,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
 
     Y_UNIT_TEST(LoadPutAndRead) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
         
         // TestLoadPutAndGet(tenv, 100, tenv.BlobDepot, 1 << 10, 1 << 15, 500);
@@ -123,7 +130,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
 
     Y_UNIT_TEST(DecommitPutAndRead) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
         
         TestLoadPutAndGet(tenv, 15, tenv.RegularGroups[0], 100, 1 << 10, 500, true, 10, { 5, 1, 5, 1, 1, 0 });
@@ -132,7 +139,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
 
     Y_UNIT_TEST(DecommitVerifiedRandom) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed);
         
         TestVerifiedRandom(tenv, 8, 15, tenv.RegularGroups[0], 1000, 500, 10, { 10, 10, 3, 3, 2, 1, 1, 3, 3, 0 });
diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot_fat.cpp b/ydb/core/blobstorage/ut_blobstorage/blob_depot_fat.cpp
index a57d7858f2..e5a8832090 100644
--- a/ydb/core/blobstorage/ut_blobstorage/blob_depot_fat.cpp
+++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot_fat.cpp
@@ -5,14 +5,21 @@
 #include "blob_depot_test_env.h"
 #include "blob_depot_test_functions.h"
 
-#include <util/random/entropy.h>
-
 using namespace NKikimr::NBlobDepot;
 
 Y_UNIT_TEST_SUITE(BlobDepotFat) {
+    void LoadSeed(ui32& seed) {
+        ui32 constantSeed = 0;
+        if (TryIntFromString<10, ui32>(GetEnv("MERSENNE_SEED"), constantSeed)) {
+            seed = constantSeed;
+        } else {
+            Seed().LoadOrFail(&seed, sizeof(seed));
+        }
+    }
+
     Y_UNIT_TEST(FatVerifiedRandom) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed, 1, 8, TBlobStorageGroupType::ErasureMirror3of4);
         
         TestVerifiedRandom(tenv, 8, 100, tenv.BlobDepot, 1e9, 1e9, 1500);
@@ -20,10 +27,10 @@ Y_UNIT_TEST_SUITE(BlobDepotFat) {
 
     Y_UNIT_TEST(FatDecommitVerifiedRandom) {
         ui32 seed;
-        Seed().LoadOrFail(&seed, sizeof(seed));
+        LoadSeed(seed);
         TBlobDepotTestEnvironment tenv(seed, 1, 8, TBlobStorageGroupType::ErasureMirror3of4);
         
-        TestVerifiedRandom(tenv, 8, 100, tenv.BlobDepot, 1e9, 1000, 1500);
+        TestVerifiedRandom(tenv, 8, 100, tenv.RegularGroups[0], 1e9, 1000, 1500);
     }
 
 /* ----- Restore is not implemented in blob depot ------
diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h
index 76bfb32411..51ccbf361e 100644
--- a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h
+++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h
@@ -2,8 +2,10 @@
 
 #include <ydb/core/base/logoblob.h>
 
+#include <util/random/entropy.h>
 #include <util/random/mersenne.h>
 #include <util/random/random.h>
+#include <util/system/env.h>
 
 #include <vector>
 #include <map>