[#1337] blobovniczatree: Add rebuild by overflow

Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>

pkg/local_object_storage/blobovnicza/sizes.go

@@ -61,3 +61,12 @@ func (b *Blobovnicza) IsFull() bool {
 func (b *Blobovnicza) FillPercent() int {
 	return int(100.0 * (float64(b.dataSize.Load()) / float64(b.fullSizeLimit)))
 }
+
+func (b *Blobovnicza) IsOverflowed() bool {
+	// put to blobovnicza is allowed if b.dataSize < b.fullSizeLimit (see `b.IsFull()`)
+	// but several parallel Put requests can be processed simultaneously
+	// so blobovnicza can store maximum `(b.fullSizeLimit - 1) + number of concurrent Put requests x b.objSizeLimit` bytes of data
+	// as number of concurrent Put requests is unknown, assume blobovnicza is overflowed if it stores more than one object's size
+	// bytes of data greater than limit
+	return b.dataSize.Load() > (b.fullSizeLimit-1)+b.objSizeLimit
+}

pkg/local_object_storage/blobstor/blobovniczatree/rebuild.go

@@ -172,7 +172,7 @@ func (b *Blobovniczas) selectDBsDoNotMatchFillPercent(ctx context.Context, targe
 				continue
 			}
 			path := filepath.Join(lvlPath, e.Name())
-			resettlementRequired, err := b.fillPercentIsLow(path, target)
+			resettlementRequired, err := b.rebuildBySize(path, target)
 			if err != nil {
 				return false, err
 			}
@@ -187,14 +187,14 @@ func (b *Blobovniczas) selectDBsDoNotMatchFillPercent(ctx context.Context, targe
 	return result, nil
 }
 
-func (b *Blobovniczas) fillPercentIsLow(path string, target int) (bool, error) {
+func (b *Blobovniczas) rebuildBySize(path string, targetFillPercent int) (bool, error) {
 	shDB := b.getBlobovnicza(path)
 	blz, err := shDB.Open()
 	if err != nil {
 		return false, err
 	}
 	defer shDB.Close()
-	return blz.FillPercent() < target, nil
+	return blz.FillPercent() < targetFillPercent || blz.IsOverflowed(), nil
 }
 
 func (b *Blobovniczas) rebuildDB(ctx context.Context, path string, meta common.MetaStorage, limiter common.ConcurrentWorkersLimiter) (uint64, error) {

pkg/local_object_storage/blobstor/blobovniczatree/rebuild_test.go

@@ -228,6 +228,80 @@ func TestBlobovniczaTreeFillPercentRebuild(t *testing.T) {
 
 		require.NoError(t, b.Close())
 	})
+
+	t.Run("rebuild by overflow", func(t *testing.T) {
+		t.Parallel()
+
+		dir := t.TempDir()
+		b := NewBlobovniczaTree(
+			context.Background(),
+			WithLogger(test.NewLogger(t)),
+			WithObjectSizeLimit(64*1024),
+			WithBlobovniczaShallowWidth(1), // single directory
+			WithBlobovniczaShallowDepth(1),
+			WithRootPath(dir),
+			WithBlobovniczaSize(100*1024), // 100 KB limit for each blobovnicza
+			WithWaitBeforeDropDB(0),
+			WithOpenedCacheSize(1000),
+			WithMoveBatchSize(3))
+		require.NoError(t, b.Open(mode.ComponentReadWrite))
+		require.NoError(t, b.Init())
+
+		storageIDs := make(map[oid.Address][]byte)
+		for i := 0; i < 100; i++ { // 2 objects for one blobovnicza, so 50 DBs total will be created
+			obj := blobstortest.NewObject(64 * 1024)
+			data, err := obj.Marshal()
+			require.NoError(t, err)
+			var prm common.PutPrm
+			prm.Address = object.AddressOf(obj)
+			prm.RawData = data
+			res, err := b.Put(context.Background(), prm)
+			require.NoError(t, err)
+			storageIDs[prm.Address] = res.StorageID
+		}
+		metaStub := &storageIDUpdateStub{
+			storageIDs: storageIDs,
+			guard:      &sync.Mutex{},
+		}
+		require.NoError(t, b.Close())
+		b = NewBlobovniczaTree(
+			context.Background(),
+			WithLogger(test.NewLogger(t)),
+			WithObjectSizeLimit(64*1024),
+			WithBlobovniczaShallowWidth(1),
+			WithBlobovniczaShallowDepth(1),
+			WithRootPath(dir),
+			WithBlobovniczaSize(50*1024), // 50 KB limit for each blobovnicza
+			WithWaitBeforeDropDB(0),
+			WithOpenedCacheSize(1000),
+			WithMoveBatchSize(3))
+		require.NoError(t, b.Open(mode.ComponentReadWrite))
+		require.NoError(t, b.Init())
+
+		rRes, err := b.Rebuild(context.Background(), common.RebuildPrm{
+			MetaStorage:   metaStub,
+			WorkerLimiter: &rebuildLimiterStub{},
+			Action: common.RebuildAction{
+				SchemaChange:     false,
+				FillPercent:      true,
+				FillPercentValue: 80,
+			},
+		})
+		require.NoError(t, err)
+		require.Equal(t, uint64(49), rRes.FilesRemoved)
+		require.Equal(t, uint64(98), rRes.ObjectsMoved) // 49 DBs with 2 objects
+		require.Equal(t, uint64(98), metaStub.updatedCount)
+
+		for addr, storageID := range storageIDs {
+			var gPrm common.GetPrm
+			gPrm.Address = addr
+			gPrm.StorageID = storageID
+			_, err := b.Get(context.Background(), gPrm)
+			require.NoError(t, err)
+		}
+
+		require.NoError(t, b.Close())
+	})
 }
 
 func TestBlobovniczaTreeRebuildLargeObject(t *testing.T) {