Skip to content

fix(challenge): removed unused lock on challenge worker #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 9, 2022
Merged

fix(challenge): removed unused lock on challenge worker #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d76da9
fix(challenge): removed unused lock on challenge worker
cnlangzi Mar 7, 2022
6124cb0
fix(cleanup):improved lock code
cnlangzi Mar 7, 2022
d566ed9
fix(cleanup):improved lock code
cnlangzi Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions code/go/0chain.net/blobbercore/challenge/challenge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/0chain/blobber/code/go/0chain.net/blobbercore/datastore"
"github.com/0chain/blobber/code/go/0chain.net/core/chain"
"github.com/0chain/blobber/code/go/0chain.net/core/common"
"github.com/0chain/blobber/code/go/0chain.net/core/lock"
"github.com/0chain/blobber/code/go/0chain.net/core/node"
"github.com/0chain/blobber/code/go/0chain.net/core/transaction"
"github.com/remeh/sizedwaitgroup"
Expand Down Expand Up @@ -142,9 +141,6 @@ func processAccepted(ctx context.Context) {

// loadValidationTickets load validation tickets for challenge
func loadValidationTickets(ctx context.Context, challengeObj *ChallengeEntity) error {
mutex := lock.GetMutex(challengeObj.TableName(), challengeObj.ChallengeID)
mutex.Lock()

defer func() {
if r := recover(); r != nil {
logging.Logger.Error("[recover]LoadValidationTickets", zap.Any("err", r))
Expand Down Expand Up @@ -179,16 +175,15 @@ func commitProcessed(ctx context.Context) {
if err := openchallenge.UnmarshalFields(); err != nil {
logging.Logger.Error("ChallengeEntity_UnmarshalFields", zap.String("challenge_id", openchallenge.ChallengeID), zap.Error(err))
}
mutex := lock.GetMutex(openchallenge.TableName(), openchallenge.ChallengeID)
mutex.Lock()

redeemCtx := datastore.GetStore().CreateTransaction(ctx)
err := openchallenge.CommitChallenge(redeemCtx, false)
if err != nil {
logging.Logger.Error("Error committing to blockchain",
zap.Error(err),
zap.String("challenge_id", openchallenge.ChallengeID))
}
mutex.Unlock()

db := datastore.GetStore().GetTransaction(redeemCtx)
db.Commit()
if err == nil && openchallenge.Status == Committed {
Expand Down
40 changes: 23 additions & 17 deletions code/go/0chain.net/blobbercore/handler/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/0chain/blobber/code/go/0chain.net/blobbercore/reference"
"github.com/0chain/blobber/code/go/0chain.net/blobbercore/stats"
"github.com/0chain/blobber/code/go/0chain.net/core/lock"
"gorm.io/gorm"

"github.com/0chain/blobber/code/go/0chain.net/blobbercore/allocation"
"github.com/0chain/blobber/code/go/0chain.net/blobbercore/config"
Expand All @@ -31,27 +32,32 @@ func CleanupDiskFiles(ctx context.Context) error {
var allocations []allocation.Allocation
db.Find(&allocations)
for _, allocationObj := range allocations {
mutex := lock.GetMutex(allocationObj.TableName(), allocationObj.ID)
mutex.Lock()
_ = filestore.GetFileStore().IterateObjects(allocationObj.ID, func(contentHash string, contentSize int64) {
var refs []reference.Ref
err := db.Table((reference.Ref{}).TableName()).Where(reference.Ref{ContentHash: contentHash, Type: reference.FILE}).Or(reference.Ref{ThumbnailHash: contentHash, Type: reference.FILE}).Find(&refs).Error
if err != nil {
Logger.Error("Error in cleanup of disk files.", zap.Error(err))
return
}
if len(refs) == 0 {
Logger.Info("hash has no references. Deleting from disk", zap.Any("count", len(refs)), zap.String("hash", contentHash))
if err := filestore.GetFileStore().DeleteFile(allocationObj.ID, contentHash); err != nil {
Logger.Error("FileStore_DeleteFile", zap.String("content_hash", contentHash), zap.Error(err))
}
}
})
mutex.Unlock()
cleanupAllocationFiles(db, &allocationObj)
}
return nil
}

func cleanupAllocationFiles(db *gorm.DB, allocationObj *allocation.Allocation) {
mutex := lock.GetMutex(allocationObj.TableName(), allocationObj.ID)
mutex.Lock()
defer mutex.Unlock()
_ = filestore.GetFileStore().IterateObjects(allocationObj.ID, func(contentHash string, contentSize int64) {
var refs []reference.Ref
err := db.Table((reference.Ref{}).TableName()).Where(reference.Ref{ContentHash: contentHash, Type: reference.FILE}).Or(reference.Ref{ThumbnailHash: contentHash, Type: reference.FILE}).Find(&refs).Error
if err != nil {
Logger.Error("Error in cleanup of disk files.", zap.Error(err))
return
}
if len(refs) == 0 {
Logger.Info("hash has no references. Deleting from disk", zap.Any("count", len(refs)), zap.String("hash", contentHash))
if err := filestore.GetFileStore().DeleteFile(allocationObj.ID, contentHash); err != nil {
Logger.Error("FileStore_DeleteFile", zap.String("content_hash", contentHash), zap.Error(err))
}
}
})

}

func cleanupTempFiles(ctx context.Context) {
defer func() {
if r := recover(); r != nil {
Expand Down