fix alloc file stats delete size when removing file from fs

Author: Hitenjain14

code/go/0chain.net/blobbercore/allocation/deletefilechange.go

@@ -3,18 +3,11 @@ package allocation
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"path/filepath"
 	"sync"
 
-	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/datastore"
-	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/filestore"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/reference"
 	"github.com/0chain/blobber/code/go/0chain.net/core/common"
-	"github.com/0chain/blobber/code/go/0chain.net/core/logging"
-	"gorm.io/gorm"
-
-	"go.uber.org/zap"
 )
 
 var (
@@ -58,73 +51,8 @@ func (nf *DeleteFileChange) DeleteTempFile() error {
 	return nil
 }
 
-func (nf *DeleteFileChange) CommitToFileStore(ctx context.Context, mut *sync.Mutex) error {
-	db := datastore.GetStore().GetTransaction(ctx)
-	type Result struct {
-		Id               string
-		ValidationRoot   string
-		ThumbnailHash    string
-		FilestoreVersion int
-	}
-
-	limitCh := make(chan struct{}, 10)
-	wg := &sync.WaitGroup{}
-	var results []Result
-	mut.Lock()
-	err := db.Model(&reference.Ref{}).Unscoped().
-		Select("id", "validation_root", "thumbnail_hash", "filestore_version").
-		Where("allocation_id=? AND path LIKE ? AND type=? AND deleted_at is not NULL",
-			nf.AllocationID, nf.Path+"%", reference.FILE).
-		FindInBatches(&results, 100, func(tx *gorm.DB, batch int) error {
-
-			for _, res := range results {
-				var count int64
-				tx.Model(&reference.Ref{}).
-					Where("allocation_id=? AND validation_root=?", nf.AllocationID, res.ValidationRoot).
-					Count(&count)
-
-				if count != 0 && res.ThumbnailHash == "" {
-					continue
-				}
-
-				limitCh <- struct{}{}
-				wg.Add(1)
-
-				go func(res Result, count int64) {
-					defer func() {
-						<-limitCh
-						wg.Done()
-					}()
-
-					if count == 0 {
-						err := filestore.GetFileStore().DeleteFile(nf.AllocationID, res.ValidationRoot, res.FilestoreVersion)
-						if err != nil {
-							logging.Logger.Error(fmt.Sprintf("Error while deleting file: %s", err.Error()),
-								zap.String("validation_root", res.ValidationRoot))
-						}
-					}
-					// We don't increase alloc size for thumbnail so we don't need to decrease it
-					// if res.ThumbnailHash != "" {
-					// 	err := filestore.GetFileStore().DeleteFile(nf.AllocationID, res.ThumbnailHash)
-					// 	if err != nil {
-					// 		logging.Logger.Error(fmt.Sprintf("Error while deleting thumbnail: %s", err.Error()),
-					// 			zap.String("thumbnail", res.ThumbnailHash))
-					// 	}
-					// }
-
-				}(res, count)
-
-			}
-			return nil
-		}).Error
-	mut.Unlock()
-	wg.Wait()
-
-	return err
-	// return db.Model(&reference.Ref{}).Unscoped().
-	// 	Delete(&reference.Ref{},
-	// 		"allocation_id = ? AND path LIKE ? AND deleted_at IS NOT NULL",
-	// 		nf.AllocationID, nf.Path+"%").Error
+func (nf *DeleteFileChange) CommitToFileStore(_ context.Context, _ *sync.Mutex) error {
+	return nil
 }
 
 func (nf *DeleteFileChange) GetPath() []string {

code/go/0chain.net/blobbercore/allocation/file_changer_update.go

@@ -6,14 +6,11 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/datastore"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/filestore"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/reference"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/util"
-	"go.uber.org/zap"
 
 	"github.com/0chain/blobber/code/go/0chain.net/core/common"
-	"github.com/0chain/blobber/code/go/0chain.net/core/logging"
 )
 
 type UpdateFileChanger struct {
@@ -105,23 +102,6 @@ func (nf *UpdateFileChanger) ApplyChange(ctx context.Context, rootRef *reference
 }
 
 func (nf *UpdateFileChanger) CommitToFileStore(ctx context.Context, mut *sync.Mutex) error {
-	db := datastore.GetStore().GetTransaction(ctx)
-	for hash, version := range nf.deleteHash {
-		var count int64
-		mut.Lock()
-		err := db.Table((&reference.Ref{}).TableName()).
-			Where(&reference.Ref{ValidationRoot: hash}).
-			Where(&reference.Ref{AllocationID: nf.AllocationID}).
-			Count(&count).Error
-		mut.Unlock()
-		if err == nil && count == 0 {
-			logging.Logger.Info("Deleting content file", zap.String("validation_root", hash))
-			if err := filestore.GetFileStore().DeleteFile(nf.AllocationID, hash, version); err != nil {
-				logging.Logger.Error("FileStore_DeleteFile", zap.String("allocation_id", nf.AllocationID), zap.Error(err))
-			}
-		}
-	}
-
 	return nf.BaseFileChanger.CommitToFileStore(ctx, mut)
 }
 

code/go/0chain.net/blobbercore/filestore/storage.go

@@ -166,11 +166,18 @@ func (fs *FileStore) DeleteFromFilestore(allocID, hash string, version int) erro
 	if err != nil {
 		return common.NewError("get_file_path_error", err.Error())
 	}
+
+	stat, err := os.Stat(fPath)
+	if err != nil {
+		return common.NewError("file_stat_error", err.Error())
+	}
+
 	logging.Logger.Info("Deleting file from filestore", zap.String("path", fPath))
 	err = os.Remove(fPath)
 	if err != nil {
 		return common.NewError("blob_object_dir_creation_error", err.Error())
 	}
+	fs.incrDecrAllocFileSizeAndNumber(allocID, -stat.Size(), -1)
 
 	return nil
 }

code/go/0chain.net/blobbercore/handler/handler_common.go

@@ -2,7 +2,6 @@ package handler
 
 import (
 	"context"
-	"database/sql"
 	"errors"
 	"fmt"
 	"net/http"
@@ -134,9 +133,7 @@ func WithStatusConnectionForWM(handler common.StatusCodeResponderF) common.Statu
 		}
 		mutex.Lock()
 		defer mutex.Unlock()
-		ctx = GetMetaDataStore().CreateTransaction(ctx, &sql.TxOptions{
-			Isolation: sql.LevelRepeatableRead,
-		})
+		ctx = GetMetaDataStore().CreateTransaction(ctx)
 		tx := GetMetaDataStore().GetTransaction(ctx)
 		resp, statusCode, err = handler(ctx, r)