Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix pass rates #2695

Merged
merged 3 commits into from Aug 9, 2023
Merged

Fix pass rates #2695

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53712b2
Fix pass rates
Jayashsatolia403 Aug 9, 2023
2c6ddc3
Added cancelled boolean
Jayashsatolia403 Aug 9, 2023
9fe9ea4
Revert "Added cancelled boolean"
Jayashsatolia403 Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
81 changes: 25 additions & 56 deletions code/go/0chain.net/smartcontract/storagesc/allocation.go
View file
Open in desktop
Expand Up @@ -1249,51 +1249,9 @@ func checkExists(c *StorageNode, sl []*StorageNode) bool {
return false
}

func (sc *StorageSmartContract) finalizedPassRates(alloc *StorageAllocation, balances chainstate.StateContextI) ([]float64, error) {
if alloc.Stats == nil {
alloc.Stats = &StorageAllocationStats{}
}
var failed, succesful int64 = 0, 0
var passRates = make([]float64, 0, len(alloc.BlobberAllocs))
for _, ba := range alloc.BlobberAllocs {
if ba.Stats == nil {
ba.Stats = new(StorageAllocationStats)
passRates = append(passRates, 1.0)
continue
}
ba.Stats.SuccessChallenges += ba.Stats.OpenChallenges
ba.Stats.OpenChallenges = 0

baTotal := ba.Stats.FailedChallenges + ba.Stats.SuccessChallenges
if baTotal == 0 {
passRates = append(passRates, 1.0)
continue
}

if ba.Stats.TotalChallenges == 0 {
logging.Logger.Warn("empty total challenges on finalizedPassRates",
zap.Int64("OpenChallenges", ba.Stats.OpenChallenges),
zap.Int64("FailedChallenges", ba.Stats.FailedChallenges),
zap.Int64("SuccessChallenges", ba.Stats.SuccessChallenges))
return nil, errors.New("empty total challenges")
}

passRates = append(passRates, float64(ba.Stats.SuccessChallenges)/float64(ba.Stats.TotalChallenges))
succesful += ba.Stats.SuccessChallenges
failed += ba.Stats.FailedChallenges
}
alloc.Stats.SuccessChallenges = succesful
alloc.Stats.FailedChallenges = failed
alloc.Stats.OpenChallenges = 0

emitUpdateAllocationAndBlobberStats(alloc, balances)

return passRates, nil
}

// a blobber can not send a challenge response, thus we have to check out
// challenge requests and their expiration
func (sc *StorageSmartContract) canceledPassRates(
func (sc *StorageSmartContract) settleOpenChallengesAndGetPassRates(
alloc *StorageAllocation,
now common.Timestamp,
maxChallengeCompletionTime time.Duration,
Expand Down Expand Up @@ -1321,25 +1279,36 @@ func (sc *StorageSmartContract) canceledPassRates(
}

var expire = oc.CreatedAt + toSeconds(maxChallengeCompletionTime)

ba.Stats.OpenChallenges--
alloc.Stats.OpenChallenges--

if expire < now {
ba.Stats.FailedChallenges++
alloc.Stats.FailedChallenges++

err := emitUpdateChallenge(&StorageChallenge{
ID: oc.ID,
AllocationID: alloc.ID,
BlobberID: oc.BlobberID,
}, true, ChallengeRespondedLate, balances, alloc.Stats, ba.Stats)
if err != nil {
return nil, err
}

} else {
ba.Stats.SuccessChallenges++
alloc.Stats.SuccessChallenges++
}
ba.Stats.OpenChallenges--
alloc.Stats.OpenChallenges--

err := emitUpdateChallenge(&StorageChallenge{
ID: oc.ID,
AllocationID: alloc.ID,
BlobberID: oc.BlobberID,
}, true, ChallengeResponded, balances, alloc.Stats, ba.Stats)
if err != nil {
return nil, err
err := emitUpdateChallenge(&StorageChallenge{
ID: oc.ID,
AllocationID: alloc.ID,
BlobberID: oc.BlobberID,
}, true, ChallengeResponded, balances, alloc.Stats, ba.Stats)
if err != nil {
return nil, err
}
}

}

default:
Expand Down Expand Up @@ -1404,7 +1373,7 @@ func (sc *StorageSmartContract) cancelAllocationRequest(
return "", common.NewError("can't get config", err.Error())
}
var passRates []float64
passRates, err = sc.canceledPassRates(alloc, t.CreationDate, conf.MaxChallengeCompletionTime, balances)
passRates, err = sc.settleOpenChallengesAndGetPassRates(alloc, t.CreationDate, conf.MaxChallengeCompletionTime, balances)
if err != nil {
return "", common.NewError("alloc_cancel_failed",
"calculating rest challenges success/fail rates: "+err.Error())
Expand Down Expand Up @@ -1493,7 +1462,7 @@ func (sc *StorageSmartContract) finalizeAllocation(
}

var passRates []float64
passRates, err = sc.finalizedPassRates(alloc, balances)
passRates, err = sc.settleOpenChallengesAndGetPassRates(alloc, t.CreationDate, conf.MaxChallengeCompletionTime, balances)
if err != nil {
return "", common.NewError("fini_alloc_failed",
"calculating rest challenges success/fail rates: "+err.Error())
Expand Down