Skip to content

diag: race in updateIndexingStatus #11274

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
awskii merged 2 commits into from
Jul 22, 2024
Merged

diag: race in updateIndexingStatus #11274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1b5555
save
AskAlexSharov Jul 22, 2024
739ea12
save
AskAlexSharov Jul 22, 2024
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
23 changes: 14 additions & 9 deletions erigon-lib/diagnostics/snapshots.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (d *DiagnosticClient) runSnapshotListener(rootCtx context.Context) {
downloadTimeLeft := CalculateTime(remainingBytes, info.DownloadRate)
totalDownloadTimeString := time.Duration(info.TotalTime) * time.Second

d.updateSnapshotStageStats(SyncStageStats{
d.UpdateSnapshotStageStats(SyncStageStats{
TimeElapsed: totalDownloadTimeString.String(),
TimeLeft: downloadTimeLeft,
Progress: downloadedPercent,
Expand Down Expand Up @@ -105,10 +105,14 @@ func GetShanpshotsPercentDownloaded(downloaded uint64, total uint64, torrentMeta
return fmt.Sprintf("%.2f%%", percent)
}

func (d *DiagnosticClient) updateSnapshotStageStats(stats SyncStageStats, subStageInfo string) {
func (d *DiagnosticClient) UpdateSnapshotStageStats(stats SyncStageStats, subStageInfo string) {
d.mu.Lock()
defer d.mu.Unlock()
idxs := d.GetCurrentSyncIdxs()
d.updateSnapshotStageStats(stats, subStageInfo)
}

func (d *DiagnosticClient) updateSnapshotStageStats(stats SyncStageStats, subStageInfo string) {
idxs := d.getCurrentSyncIdxs()
if idxs.Stage == -1 || idxs.SubStage == -1 {
log.Debug("[Diagnostics] Can't find running stage or substage while updating Snapshots stage stats.", "stages:", d.syncStages, "stats:", stats, "subStageInfo:", subStageInfo)
return
Expand Down Expand Up @@ -181,8 +185,8 @@ func (d *DiagnosticClient) runSegmentIndexingListener(rootCtx context.Context) {
return
case info := <-ch:
d.addOrUpdateSegmentIndexingState(info)
d.updateIndexingStatus()
if d.syncStats.SnapshotIndexing.IndexingFinished {
indexingFinished := d.UpdateIndexingStatus()
if indexingFinished {
d.SaveData()
return
}
Expand Down Expand Up @@ -222,20 +226,20 @@ func (d *DiagnosticClient) runSegmentIndexingFinishedListener(rootCtx context.Co

d.mu.Unlock()

d.updateIndexingStatus()
d.UpdateIndexingStatus()
}
}
}()
}

func (d *DiagnosticClient) updateIndexingStatus() {
func (d *DiagnosticClient) UpdateIndexingStatus() (indexingFinished bool) {
totalProgressPercent := 0
d.mu.Lock()
defer d.mu.Unlock()

for _, seg := range d.syncStats.SnapshotIndexing.Segments {
totalProgressPercent += seg.Percent
}
d.mu.Unlock()

totalProgress := totalProgressPercent / len(d.syncStats.SnapshotIndexing.Segments)

Expand All @@ -248,6 +252,7 @@ func (d *DiagnosticClient) updateIndexingStatus() {
if totalProgress >= 100 {
d.syncStats.SnapshotIndexing.IndexingFinished = true
}
return d.syncStats.SnapshotIndexing.IndexingFinished
}

func (d *DiagnosticClient) addOrUpdateSegmentIndexingState(upd SnapshotIndexingStatistics) {
Expand Down Expand Up @@ -399,7 +404,7 @@ func (d *DiagnosticClient) runFillDBListener(rootCtx context.Context) {

totalTimeString := time.Duration(info.TimeElapsed) * time.Second

d.updateSnapshotStageStats(SyncStageStats{
d.UpdateSnapshotStageStats(SyncStageStats{
TimeElapsed: totalTimeString.String(),
TimeLeft: "unknown",
Progress: fmt.Sprintf("%d%%", (info.Stage.Current*100)/info.Stage.Total),
Expand Down
6 changes: 6 additions & 0 deletions erigon-lib/diagnostics/stages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ func (d *DiagnosticClient) runSubStageListener(rootCtx context.Context) {
}

func (d *DiagnosticClient) GetCurrentSyncIdxs() CurrentSyncStagesIdxs {
d.mu.Lock()
defer d.mu.Unlock()
return d.getCurrentSyncIdxs()
}

func (d *DiagnosticClient) getCurrentSyncIdxs() CurrentSyncStagesIdxs {
currentIdxs := CurrentSyncStagesIdxs{
Stage: -1,
SubStage: -1,
Expand Down