move audio analysis retry logic to content#8996

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

move audio analysis retry logic to content #8996

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
0251ca5
move audio analysis retry logic to content
michellebrier Jun 28, 2024
fd3e455
clean up and adjust ba retry timing
michellebrier Jun 28, 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
66 changes: 54 additions & 12 deletions mediorum/server/audio_analysis.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,29 @@ func (ss *MediorumServer) startAudioAnalyzer() {
}

// poll periodically for uploads that slipped thru the cracks.
// mark uploads with timed out analyses as done
for {
time.Sleep(time.Second * 10)
ss.findMissedAnalysisJobs(work, myHost)
}
go func() {
ticker := time.NewTicker(10 * time.Second)
defer ticker.Stop()

retryTicker := time.NewTicker(30 * time.Second)
defer retryTicker.Stop()

for {
select {
case <-ticker.C:
// find missed legacy analysis jobs every 10 seconds
// mark uploads with timed out analyses as done
ss.findMissedAnalysisJobs(work, myHost)

case <-retryTicker.C:
// retry analysis jobs every 30 seconds
ss.retryAnalysisJobs(work, myHost)
}
}
}()

// block to keep running
select {}
}

func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost string) {
Expand DownExpand Up@@ -104,13 +122,6 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin

logger := ss.logger.With("upload", upload.ID, "upload_status", upload.Status, "my_rank", myRank)

// this is already handled by a callback and there's a chance this job gets enqueued twice
if myRank == 1 && upload.Status == JobStatusAudioAnalysis {
logger.Info("my upload's audio analysis not started")
work <- upload
continue
}

// determine if #1 rank worker dropped ball
timedOut := false
neverStarted := false
Expand DownExpand Up@@ -147,6 +158,37 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin
}
}

func (ss *MediorumServer) retryAnalysisJobs(work chan *Upload, myHost string) {
uploads := []*Upload{}
ss.crud.DB.Where("audio_analysis_status = ? OR (audio_analysis_status = ? AND audio_analysis_error_count < ?)", JobStatusTimeout, JobStatusError, 3).
Where("status = ?", JobStatusDone).
Where("CAST(transcoded_mirrors AS jsonb)->>0 = ?", myHost).
Order("audio_analyzed_at ASC").
Limit(2).
Find(&uploads)

for _, upload := range uploads {
myIdx := slices.Index(upload.TranscodedMirrors, myHost)
if myIdx != 0 {
continue
}
myRank := myIdx + 1

logger := ss.logger.With("upload", upload.ID, "audio_analysis_status", upload.AudioAnalysisStatus, "my_rank", myRank)

if upload.AudioAnalysisStatus == JobStatusError {
logger.Info("retrying my errored audio analysis")
}
if upload.AudioAnalysisStatus == JobStatusTimeout {
logger.Info("retrying my timed out audio analysis")
}
upload.AudioAnalyzedAt = time.Now().UTC()
// op callback will enqueue the job
upload.Status = JobStatusAudioAnalysis
ss.crud.Update(upload)
}
}

func (ss *MediorumServer) startAudioAnalysisWorker(n int, work chan *Upload) {
for upload := range work {
logger := ss.logger.With("upload", upload.ID)
Expand Down
66 changes: 53 additions & 13 deletions mediorum/server/legacy_audio_analysis.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,14 +68,31 @@ func (ss *MediorumServer) startLegacyAudioAnalyzer() {
}

// poll periodically for analyses that slipped thru the cracks
for {
time.Sleep(time.Minute)
ss.findMissedLegacyAnalysisJobs(work, myHost)
}
go func() {
ticker := time.NewTicker(1 * time.Minute)
defer ticker.Stop()

retryTicker := time.NewTicker(30 * time.Minute)
defer retryTicker.Stop()

for {
select {
case <-ticker.C:
// find missed legacy analysis jobs every minute
// mark analyses as timed out
ss.findMissedLegacyAnalysisJobs(work, myHost)

case <-retryTicker.C:
// retry legacy analysis jobs every 30 minutes
ss.retryLegacyAnalysisJobs(work, myHost)
}
}
}()

// block to keep running
select {}
}

// do not bother setting a timeout like in findMissedAnalysisJobs. this is not triggered
// by the client during the upload flow so it can afford to take > 1 minute
func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
analyses := []*QmAudioAnalysis{}
ss.crud.DB.Where("status in ?", []string{JobStatusAudioAnalysis, JobStatusBusyAudioAnalysis}).Find(&analyses)
Expand All@@ -101,13 +118,6 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi

logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

// this is already handled by a callback and there's a chance this job gets enqueued twice
if myRank == 1 && analysis.Status == JobStatusAudioAnalysis {
logger.Info("my legacy cid's audio analysis not started")
work <- analysis
continue
}

// determine if #1 rank worker dropped ball
timedOut := false
neverStarted := false
Expand DownExpand Up@@ -155,6 +165,36 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi
}
}

func (ss *MediorumServer) retryLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
analyses := []*QmAudioAnalysis{}
ss.crud.DB.Where("status = ? OR (status = ? AND error_count < ?)", JobStatusTimeout, JobStatusError, 3).
Where("CAST(mirrors AS jsonb)->>0 ?", myHost).
Order("analyzed_at ASC").
Limit(100).
Find(&analyses)

for _, analysis := range analyses {
myIdx := slices.Index(analysis.Mirrors, myHost)
if myIdx != 0 {
continue
}
myRank := myIdx + 1

logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

if analysis.Status == JobStatusError {
logger.Info("retrying my errored legacy audio analysis")
}
if analysis.Status == JobStatusTimeout {
logger.Info("retrying my timed out legacy audio analysis")
}
analysis.AnalyzedAt = time.Now().UTC()
// op callback will enqueue the job
analysis.Status = JobStatusAudioAnalysis
ss.crud.Update(analysis)
}
}

func (ss *MediorumServer) startLegacyAudioAnalysisWorker(n int, work chan *QmAudioAnalysis) {
for analysis := range work {
logger := ss.logger.With("analysis_cid", analysis.CID)
Expand Down
55 changes: 27 additions & 28 deletions mediorum/server/serve_audio_analysis.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
package server

import (
"net/http"
"time"

"github.com/labstack/echo/v4"
Expand All@@ -16,17 +15,17 @@ func (ss *MediorumServer) analyzeUpload(c echo.Context) error {
return echo.NewHTTPError(404, err.Error())
}

if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
upload.AudioAnalyzedAt = time.Now().UTC()
upload.AudioAnalysisStatus = ""
upload.AudioAnalysisError = ""
upload.Status = JobStatusAudioAnalysis
err = ss.crud.Update(upload)
if err != nil {
ss.logger.Warn("update upload failed", "err", err)
return c.String(500, "failed to trigger audio analysis")
}
}
// if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
// upload.AudioAnalyzedAt = time.Now().UTC()
// upload.AudioAnalysisStatus = ""
// upload.AudioAnalysisError = ""
// upload.Status = JobStatusAudioAnalysis
// err = ss.crud.Update(upload)
// if err != nil {
// ss.logger.Warn("update upload failed", "err", err)
// return c.String(500, "failed to trigger audio analysis")
// }
// }

return c.JSON(200, upload)
}
Expand All@@ -52,22 +51,22 @@ func (ss *MediorumServer) analyzeLegacyBlob(c echo.Context) error {
}
return c.JSON(200, newAnalysis)
}
if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
if analysis.Error == "blob is not an audio file" {
// set ErrorCount to 3 so discovery repairer stops retrying this cid
analysis.ErrorCount = 3
ss.crud.Update(analysis)
return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
}
analysis.Status = JobStatusAudioAnalysis
analysis.AnalyzedAt = time.Now().UTC()
analysis.Error = ""
err = ss.crud.Update(analysis)
if err != nil {
ss.logger.Warn("update legacy audio analysis failed", "err", err)
return c.String(500, "failed to trigger audio analysis")
}
}
// if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
// if analysis.Error == "blob is not an audio file" {
// // set ErrorCount to 3 so discovery repairer stops retrying this cid
// analysis.ErrorCount = 3
// ss.crud.Update(analysis)
// return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
// }
// analysis.Status = JobStatusAudioAnalysis
// analysis.AnalyzedAt = time.Now().UTC()
// analysis.Error = ""
// err = ss.crud.Update(analysis)
// if err != nil {
// ss.logger.Warn("update legacy audio analysis failed", "err", err)
// return c.String(500, "failed to trigger audio analysis")
// }
// }
return c.JSON(200, analysis)
}

Expand Down
20 changes: 10 additions & 10 deletions packages/discovery-provider/src/tasks/repair_audio_analyses.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,16 @@ def repair(session: Session, redis: Redis):
num_tracks_updated += 1

# Failures get retried up to 3 times
if (not key or not bpm) and error_count < 3:
# Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
num_analyses_retriggered += 1
retrigger_audio_analysis(
nodes,
track.track_id,
track.track_cid,
track.audio_upload_id,
legacy_track,
)
# if (not key or not bpm) and error_count < 3:
# # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
# num_analyses_retriggered += 1
# retrigger_audio_analysis(
# nodes,
# track.track_id,
# track.track_cid,
# track.audio_upload_id,
# legacy_track,
# )
if error_count >= 3:
logger.warning(
f"repair_audio_analyses.py | Track ID {track.track_id} (track_cid: {track.track_cid}, audio_upload_id: {track.audio_upload_id}) failed audio analysis >= 3 times"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
move audio analysis retry logic to content#8996

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

stereosteve
merged 2 commits into

from

Jul 1, 2024
 Merged


move audio analysis retry logic to content
#8996
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
0251ca5

move audio analysis retry logic to content


michellebrier Jun 28, 2024
fd3e455

clean up and adjust ba retry timing


michellebrier Jun 28, 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


66 changes: 54 additions & 12 deletions
mediorum/server/audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,29 @@ func (ss *MediorumServer) startAudioAnalyzer() {
	}

	// poll periodically for uploads that slipped thru the cracks.
	// mark uploads with timed out analyses as done
	for {
 time.Sleep(time.Second * 10)
 ss.findMissedAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(10 * time.Second)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Second)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every 10 seconds
 // mark uploads with timed out analyses as done
 ss.findMissedAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry analysis jobs every 30 seconds
 ss.retryAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost string) {
Expand DownExpand Up@@ -104,13 +122,6 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin

 logger := ss.logger.With("upload", upload.ID, "upload_status", upload.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && upload.Status == JobStatusAudioAnalysis {
 logger.Info("my upload's audio analysis not started")
 work <- upload
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -147,6 +158,37 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin
	}
}

func (ss *MediorumServer) retryAnalysisJobs(work chan *Upload, myHost string) {
	uploads := []*Upload{}
	ss.crud.DB.Where("audio_analysis_status = ? OR (audio_analysis_status = ? AND audio_analysis_error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("status = ?", JobStatusDone).
 Where("CAST(transcoded_mirrors AS jsonb)->>0 = ?", myHost).
 Order("audio_analyzed_at ASC").
 Limit(2).
 Find(&uploads)

	for _, upload := range uploads {
 myIdx := slices.Index(upload.TranscodedMirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("upload", upload.ID, "audio_analysis_status", upload.AudioAnalysisStatus, "my_rank", myRank)

 if upload.AudioAnalysisStatus == JobStatusError {
 logger.Info("retrying my errored audio analysis")
 }
 if upload.AudioAnalysisStatus == JobStatusTimeout {
 logger.Info("retrying my timed out audio analysis")
 }
 upload.AudioAnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 upload.Status = JobStatusAudioAnalysis
 ss.crud.Update(upload)
	}
}

func (ss *MediorumServer) startAudioAnalysisWorker(n int, work chan *Upload) {
	for upload := range work {
 logger := ss.logger.With("upload", upload.ID)
Expand Down

66 changes: 53 additions & 13 deletions
mediorum/server/legacy_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,14 +68,31 @@ func (ss *MediorumServer) startLegacyAudioAnalyzer() {
	}

	// poll periodically for analyses that slipped thru the cracks
	for {
 time.Sleep(time.Minute)
 ss.findMissedLegacyAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(1 * time.Minute)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Minute)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every minute
 // mark analyses as timed out
 ss.findMissedLegacyAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry legacy analysis jobs every 30 minutes
 ss.retryLegacyAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

// do not bother setting a timeout like in findMissedAnalysisJobs. this is not triggered
// by the client during the upload flow so it can afford to take > 1 minute
func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status in ?", []string{JobStatusAudioAnalysis, JobStatusBusyAudioAnalysis}).Find(&analyses)
Expand All@@ -101,13 +118,6 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && analysis.Status == JobStatusAudioAnalysis {
 logger.Info("my legacy cid's audio analysis not started")
 work <- analysis
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -155,6 +165,36 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi
	}
}

func (ss *MediorumServer) retryLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status = ? OR (status = ? AND error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("CAST(mirrors AS jsonb)->>0 ?", myHost).
 Order("analyzed_at ASC").
 Limit(100).
 Find(&analyses)

	for _, analysis := range analyses {
 myIdx := slices.Index(analysis.Mirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 if analysis.Status == JobStatusError {
 logger.Info("retrying my errored legacy audio analysis")
 }
 if analysis.Status == JobStatusTimeout {
 logger.Info("retrying my timed out legacy audio analysis")
 }
 analysis.AnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 analysis.Status = JobStatusAudioAnalysis
 ss.crud.Update(analysis)
	}
}

func (ss *MediorumServer) startLegacyAudioAnalysisWorker(n int, work chan *QmAudioAnalysis) {
	for analysis := range work {
 logger := ss.logger.With("analysis_cid", analysis.CID)
Expand Down

55 changes: 27 additions & 28 deletions
mediorum/server/serve_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
package server

import (
	"net/http"
	"time"

	"github.com/labstack/echo/v4"
Expand All@@ -16,17 +15,17 @@ func (ss *MediorumServer) analyzeUpload(c echo.Context) error {
 return echo.NewHTTPError(404, err.Error())
	}

	if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
 upload.AudioAnalyzedAt = time.Now().UTC()
 upload.AudioAnalysisStatus = ""
 upload.AudioAnalysisError = ""
 upload.Status = JobStatusAudioAnalysis
 err = ss.crud.Update(upload)
 if err != nil {
 ss.logger.Warn("update upload failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
// 	upload.AudioAnalyzedAt = time.Now().UTC()
// 	upload.AudioAnalysisStatus = ""
// 	upload.AudioAnalysisError = ""
// 	upload.Status = JobStatusAudioAnalysis
// 	err = ss.crud.Update(upload)
// 	if err != nil {
//  ss.logger.Warn("update upload failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }

	return c.JSON(200, upload)
}
Expand All@@ -52,22 +51,22 @@ func (ss *MediorumServer) analyzeLegacyBlob(c echo.Context) error {
 }
 return c.JSON(200, newAnalysis)
	}
	if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
 if analysis.Error == "blob is not an audio file" {
 // set ErrorCount to 3 so discovery repairer stops retrying this cid
 analysis.ErrorCount = 3
 ss.crud.Update(analysis)
 return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
 }
 analysis.Status = JobStatusAudioAnalysis
 analysis.AnalyzedAt = time.Now().UTC()
 analysis.Error = ""
 err = ss.crud.Update(analysis)
 if err != nil {
 ss.logger.Warn("update legacy audio analysis failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
// 	if analysis.Error == "blob is not an audio file" {
//  // set ErrorCount to 3 so discovery repairer stops retrying this cid
//  analysis.ErrorCount = 3
//  ss.crud.Update(analysis)
//  return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
// 	}
// 	analysis.Status = JobStatusAudioAnalysis
// 	analysis.AnalyzedAt = time.Now().UTC()
// 	analysis.Error = ""
// 	err = ss.crud.Update(analysis)
// 	if err != nil {
//  ss.logger.Warn("update legacy audio analysis failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }
	return c.JSON(200, analysis)
}

Expand Down

20 changes: 10 additions & 10 deletions
packages/discovery-provider/src/tasks/repair_audio_analyses.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,16 @@ def repair(session: Session, redis: Redis):
 num_tracks_updated += 1

 # Failures get retried up to 3 times
 if (not key or not bpm) and error_count < 3:
 # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
 num_analyses_retriggered += 1
 retrigger_audio_analysis(
 nodes,
 track.track_id,
 track.track_cid,
 track.audio_upload_id,
 legacy_track,
 )
# if (not key or not bpm) and error_count < 3:
#  # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
#  num_analyses_retriggered += 1
#  retrigger_audio_analysis(
#  nodes,
#  track.track_id,
#  track.track_cid,
#  track.audio_upload_id,
#  legacy_track,
#  )
 if error_count >= 3:
 logger.warning(
 f"repair_audio_analyses.py | Track ID {track.track_id} (track_cid: {track.track_cid}, audio_upload_id: {track.audio_upload_id}) failed audio analysis >= 3 times"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
move audio analysis retry logic to content#8996

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

stereosteve
merged 2 commits into

from

Jul 1, 2024
 Merged


move audio analysis retry logic to content
#8996
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
0251ca5

move audio analysis retry logic to content


michellebrier Jun 28, 2024
fd3e455

clean up and adjust ba retry timing


michellebrier Jun 28, 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


66 changes: 54 additions & 12 deletions
mediorum/server/audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,29 @@ func (ss *MediorumServer) startAudioAnalyzer() {
	}

	// poll periodically for uploads that slipped thru the cracks.
	// mark uploads with timed out analyses as done
	for {
 time.Sleep(time.Second * 10)
 ss.findMissedAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(10 * time.Second)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Second)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every 10 seconds
 // mark uploads with timed out analyses as done
 ss.findMissedAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry analysis jobs every 30 seconds
 ss.retryAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost string) {
Expand DownExpand Up@@ -104,13 +122,6 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin

 logger := ss.logger.With("upload", upload.ID, "upload_status", upload.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && upload.Status == JobStatusAudioAnalysis {
 logger.Info("my upload's audio analysis not started")
 work <- upload
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -147,6 +158,37 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin
	}
}

func (ss *MediorumServer) retryAnalysisJobs(work chan *Upload, myHost string) {
	uploads := []*Upload{}
	ss.crud.DB.Where("audio_analysis_status = ? OR (audio_analysis_status = ? AND audio_analysis_error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("status = ?", JobStatusDone).
 Where("CAST(transcoded_mirrors AS jsonb)->>0 = ?", myHost).
 Order("audio_analyzed_at ASC").
 Limit(2).
 Find(&uploads)

	for _, upload := range uploads {
 myIdx := slices.Index(upload.TranscodedMirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("upload", upload.ID, "audio_analysis_status", upload.AudioAnalysisStatus, "my_rank", myRank)

 if upload.AudioAnalysisStatus == JobStatusError {
 logger.Info("retrying my errored audio analysis")
 }
 if upload.AudioAnalysisStatus == JobStatusTimeout {
 logger.Info("retrying my timed out audio analysis")
 }
 upload.AudioAnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 upload.Status = JobStatusAudioAnalysis
 ss.crud.Update(upload)
	}
}

func (ss *MediorumServer) startAudioAnalysisWorker(n int, work chan *Upload) {
	for upload := range work {
 logger := ss.logger.With("upload", upload.ID)
Expand Down

66 changes: 53 additions & 13 deletions
mediorum/server/legacy_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,14 +68,31 @@ func (ss *MediorumServer) startLegacyAudioAnalyzer() {
	}

	// poll periodically for analyses that slipped thru the cracks
	for {
 time.Sleep(time.Minute)
 ss.findMissedLegacyAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(1 * time.Minute)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Minute)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every minute
 // mark analyses as timed out
 ss.findMissedLegacyAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry legacy analysis jobs every 30 minutes
 ss.retryLegacyAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

// do not bother setting a timeout like in findMissedAnalysisJobs. this is not triggered
// by the client during the upload flow so it can afford to take > 1 minute
func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status in ?", []string{JobStatusAudioAnalysis, JobStatusBusyAudioAnalysis}).Find(&analyses)
Expand All@@ -101,13 +118,6 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && analysis.Status == JobStatusAudioAnalysis {
 logger.Info("my legacy cid's audio analysis not started")
 work <- analysis
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -155,6 +165,36 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi
	}
}

func (ss *MediorumServer) retryLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status = ? OR (status = ? AND error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("CAST(mirrors AS jsonb)->>0 ?", myHost).
 Order("analyzed_at ASC").
 Limit(100).
 Find(&analyses)

	for _, analysis := range analyses {
 myIdx := slices.Index(analysis.Mirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 if analysis.Status == JobStatusError {
 logger.Info("retrying my errored legacy audio analysis")
 }
 if analysis.Status == JobStatusTimeout {
 logger.Info("retrying my timed out legacy audio analysis")
 }
 analysis.AnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 analysis.Status = JobStatusAudioAnalysis
 ss.crud.Update(analysis)
	}
}

func (ss *MediorumServer) startLegacyAudioAnalysisWorker(n int, work chan *QmAudioAnalysis) {
	for analysis := range work {
 logger := ss.logger.With("analysis_cid", analysis.CID)
Expand Down

55 changes: 27 additions & 28 deletions
mediorum/server/serve_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
package server

import (
	"net/http"
	"time"

	"github.com/labstack/echo/v4"
Expand All@@ -16,17 +15,17 @@ func (ss *MediorumServer) analyzeUpload(c echo.Context) error {
 return echo.NewHTTPError(404, err.Error())
	}

	if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
 upload.AudioAnalyzedAt = time.Now().UTC()
 upload.AudioAnalysisStatus = ""
 upload.AudioAnalysisError = ""
 upload.Status = JobStatusAudioAnalysis
 err = ss.crud.Update(upload)
 if err != nil {
 ss.logger.Warn("update upload failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
// 	upload.AudioAnalyzedAt = time.Now().UTC()
// 	upload.AudioAnalysisStatus = ""
// 	upload.AudioAnalysisError = ""
// 	upload.Status = JobStatusAudioAnalysis
// 	err = ss.crud.Update(upload)
// 	if err != nil {
//  ss.logger.Warn("update upload failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }

	return c.JSON(200, upload)
}
Expand All@@ -52,22 +51,22 @@ func (ss *MediorumServer) analyzeLegacyBlob(c echo.Context) error {
 }
 return c.JSON(200, newAnalysis)
	}
	if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
 if analysis.Error == "blob is not an audio file" {
 // set ErrorCount to 3 so discovery repairer stops retrying this cid
 analysis.ErrorCount = 3
 ss.crud.Update(analysis)
 return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
 }
 analysis.Status = JobStatusAudioAnalysis
 analysis.AnalyzedAt = time.Now().UTC()
 analysis.Error = ""
 err = ss.crud.Update(analysis)
 if err != nil {
 ss.logger.Warn("update legacy audio analysis failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
// 	if analysis.Error == "blob is not an audio file" {
//  // set ErrorCount to 3 so discovery repairer stops retrying this cid
//  analysis.ErrorCount = 3
//  ss.crud.Update(analysis)
//  return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
// 	}
// 	analysis.Status = JobStatusAudioAnalysis
// 	analysis.AnalyzedAt = time.Now().UTC()
// 	analysis.Error = ""
// 	err = ss.crud.Update(analysis)
// 	if err != nil {
//  ss.logger.Warn("update legacy audio analysis failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }
	return c.JSON(200, analysis)
}

Expand Down

20 changes: 10 additions & 10 deletions
packages/discovery-provider/src/tasks/repair_audio_analyses.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,16 @@ def repair(session: Session, redis: Redis):
 num_tracks_updated += 1

 # Failures get retried up to 3 times
 if (not key or not bpm) and error_count < 3:
 # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
 num_analyses_retriggered += 1
 retrigger_audio_analysis(
 nodes,
 track.track_id,
 track.track_cid,
 track.audio_upload_id,
 legacy_track,
 )
# if (not key or not bpm) and error_count < 3:
#  # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
#  num_analyses_retriggered += 1
#  retrigger_audio_analysis(
#  nodes,
#  track.track_id,
#  track.track_cid,
#  track.audio_upload_id,
#  legacy_track,
#  )
 if error_count >= 3:
 logger.warning(
 f"repair_audio_analyses.py | Track ID {track.track_id} (track_cid: {track.track_cid}, audio_upload_id: {track.audio_upload_id}) failed audio analysis >= 3 times"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
move audio analysis retry logic to content#8996

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

stereosteve
merged 2 commits into

from

Jul 1, 2024
 Merged


move audio analysis retry logic to content
#8996
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
0251ca5

move audio analysis retry logic to content


michellebrier Jun 28, 2024
fd3e455

clean up and adjust ba retry timing


michellebrier Jun 28, 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


66 changes: 54 additions & 12 deletions
mediorum/server/audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,29 @@ func (ss *MediorumServer) startAudioAnalyzer() {
	}

	// poll periodically for uploads that slipped thru the cracks.
	// mark uploads with timed out analyses as done
	for {
 time.Sleep(time.Second * 10)
 ss.findMissedAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(10 * time.Second)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Second)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every 10 seconds
 // mark uploads with timed out analyses as done
 ss.findMissedAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry analysis jobs every 30 seconds
 ss.retryAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost string) {
Expand DownExpand Up@@ -104,13 +122,6 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin

 logger := ss.logger.With("upload", upload.ID, "upload_status", upload.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && upload.Status == JobStatusAudioAnalysis {
 logger.Info("my upload's audio analysis not started")
 work <- upload
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -147,6 +158,37 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin
	}
}

func (ss *MediorumServer) retryAnalysisJobs(work chan *Upload, myHost string) {
	uploads := []*Upload{}
	ss.crud.DB.Where("audio_analysis_status = ? OR (audio_analysis_status = ? AND audio_analysis_error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("status = ?", JobStatusDone).
 Where("CAST(transcoded_mirrors AS jsonb)->>0 = ?", myHost).
 Order("audio_analyzed_at ASC").
 Limit(2).
 Find(&uploads)

	for _, upload := range uploads {
 myIdx := slices.Index(upload.TranscodedMirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("upload", upload.ID, "audio_analysis_status", upload.AudioAnalysisStatus, "my_rank", myRank)

 if upload.AudioAnalysisStatus == JobStatusError {
 logger.Info("retrying my errored audio analysis")
 }
 if upload.AudioAnalysisStatus == JobStatusTimeout {
 logger.Info("retrying my timed out audio analysis")
 }
 upload.AudioAnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 upload.Status = JobStatusAudioAnalysis
 ss.crud.Update(upload)
	}
}

func (ss *MediorumServer) startAudioAnalysisWorker(n int, work chan *Upload) {
	for upload := range work {
 logger := ss.logger.With("upload", upload.ID)
Expand Down

66 changes: 53 additions & 13 deletions
mediorum/server/legacy_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,14 +68,31 @@ func (ss *MediorumServer) startLegacyAudioAnalyzer() {
	}

	// poll periodically for analyses that slipped thru the cracks
	for {
 time.Sleep(time.Minute)
 ss.findMissedLegacyAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(1 * time.Minute)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Minute)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every minute
 // mark analyses as timed out
 ss.findMissedLegacyAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry legacy analysis jobs every 30 minutes
 ss.retryLegacyAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

// do not bother setting a timeout like in findMissedAnalysisJobs. this is not triggered
// by the client during the upload flow so it can afford to take > 1 minute
func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status in ?", []string{JobStatusAudioAnalysis, JobStatusBusyAudioAnalysis}).Find(&analyses)
Expand All@@ -101,13 +118,6 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && analysis.Status == JobStatusAudioAnalysis {
 logger.Info("my legacy cid's audio analysis not started")
 work <- analysis
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -155,6 +165,36 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi
	}
}

func (ss *MediorumServer) retryLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status = ? OR (status = ? AND error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("CAST(mirrors AS jsonb)->>0 ?", myHost).
 Order("analyzed_at ASC").
 Limit(100).
 Find(&analyses)

	for _, analysis := range analyses {
 myIdx := slices.Index(analysis.Mirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 if analysis.Status == JobStatusError {
 logger.Info("retrying my errored legacy audio analysis")
 }
 if analysis.Status == JobStatusTimeout {
 logger.Info("retrying my timed out legacy audio analysis")
 }
 analysis.AnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 analysis.Status = JobStatusAudioAnalysis
 ss.crud.Update(analysis)
	}
}

func (ss *MediorumServer) startLegacyAudioAnalysisWorker(n int, work chan *QmAudioAnalysis) {
	for analysis := range work {
 logger := ss.logger.With("analysis_cid", analysis.CID)
Expand Down

55 changes: 27 additions & 28 deletions
mediorum/server/serve_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
package server

import (
	"net/http"
	"time"

	"github.com/labstack/echo/v4"
Expand All@@ -16,17 +15,17 @@ func (ss *MediorumServer) analyzeUpload(c echo.Context) error {
 return echo.NewHTTPError(404, err.Error())
	}

	if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
 upload.AudioAnalyzedAt = time.Now().UTC()
 upload.AudioAnalysisStatus = ""
 upload.AudioAnalysisError = ""
 upload.Status = JobStatusAudioAnalysis
 err = ss.crud.Update(upload)
 if err != nil {
 ss.logger.Warn("update upload failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
// 	upload.AudioAnalyzedAt = time.Now().UTC()
// 	upload.AudioAnalysisStatus = ""
// 	upload.AudioAnalysisError = ""
// 	upload.Status = JobStatusAudioAnalysis
// 	err = ss.crud.Update(upload)
// 	if err != nil {
//  ss.logger.Warn("update upload failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }

	return c.JSON(200, upload)
}
Expand All@@ -52,22 +51,22 @@ func (ss *MediorumServer) analyzeLegacyBlob(c echo.Context) error {
 }
 return c.JSON(200, newAnalysis)
	}
	if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
 if analysis.Error == "blob is not an audio file" {
 // set ErrorCount to 3 so discovery repairer stops retrying this cid
 analysis.ErrorCount = 3
 ss.crud.Update(analysis)
 return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
 }
 analysis.Status = JobStatusAudioAnalysis
 analysis.AnalyzedAt = time.Now().UTC()
 analysis.Error = ""
 err = ss.crud.Update(analysis)
 if err != nil {
 ss.logger.Warn("update legacy audio analysis failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
// 	if analysis.Error == "blob is not an audio file" {
//  // set ErrorCount to 3 so discovery repairer stops retrying this cid
//  analysis.ErrorCount = 3
//  ss.crud.Update(analysis)
//  return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
// 	}
// 	analysis.Status = JobStatusAudioAnalysis
// 	analysis.AnalyzedAt = time.Now().UTC()
// 	analysis.Error = ""
// 	err = ss.crud.Update(analysis)
// 	if err != nil {
//  ss.logger.Warn("update legacy audio analysis failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }
	return c.JSON(200, analysis)
}

Expand Down

20 changes: 10 additions & 10 deletions
packages/discovery-provider/src/tasks/repair_audio_analyses.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,16 @@ def repair(session: Session, redis: Redis):
 num_tracks_updated += 1

 # Failures get retried up to 3 times
 if (not key or not bpm) and error_count < 3:
 # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
 num_analyses_retriggered += 1
 retrigger_audio_analysis(
 nodes,
 track.track_id,
 track.track_cid,
 track.audio_upload_id,
 legacy_track,
 )
# if (not key or not bpm) and error_count < 3:
#  # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
#  num_analyses_retriggered += 1
#  retrigger_audio_analysis(
#  nodes,
#  track.track_id,
#  track.track_cid,
#  track.audio_upload_id,
#  legacy_track,
#  )
 if error_count >= 3:
 logger.warning(
 f"repair_audio_analyses.py | Track ID {track.track_id} (track_cid: {track.track_cid}, audio_upload_id: {track.audio_upload_id}) failed audio analysis >= 3 times"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
move audio analysis retry logic to content#8996

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

stereosteve
merged 2 commits into

from

Jul 1, 2024
 Merged


move audio analysis retry logic to content
#8996
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
0251ca5

move audio analysis retry logic to content


michellebrier Jun 28, 2024
fd3e455

clean up and adjust ba retry timing


michellebrier Jun 28, 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


66 changes: 54 additions & 12 deletions
mediorum/server/audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,29 @@ func (ss *MediorumServer) startAudioAnalyzer() {
	}

	// poll periodically for uploads that slipped thru the cracks.
	// mark uploads with timed out analyses as done
	for {
 time.Sleep(time.Second * 10)
 ss.findMissedAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(10 * time.Second)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Second)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every 10 seconds
 // mark uploads with timed out analyses as done
 ss.findMissedAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry analysis jobs every 30 seconds
 ss.retryAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost string) {
Expand DownExpand Up@@ -104,13 +122,6 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin

 logger := ss.logger.With("upload", upload.ID, "upload_status", upload.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && upload.Status == JobStatusAudioAnalysis {
 logger.Info("my upload's audio analysis not started")
 work <- upload
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -147,6 +158,37 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin
	}
}

func (ss *MediorumServer) retryAnalysisJobs(work chan *Upload, myHost string) {
	uploads := []*Upload{}
	ss.crud.DB.Where("audio_analysis_status = ? OR (audio_analysis_status = ? AND audio_analysis_error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("status = ?", JobStatusDone).
 Where("CAST(transcoded_mirrors AS jsonb)->>0 = ?", myHost).
 Order("audio_analyzed_at ASC").
 Limit(2).
 Find(&uploads)

	for _, upload := range uploads {
 myIdx := slices.Index(upload.TranscodedMirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("upload", upload.ID, "audio_analysis_status", upload.AudioAnalysisStatus, "my_rank", myRank)

 if upload.AudioAnalysisStatus == JobStatusError {
 logger.Info("retrying my errored audio analysis")
 }
 if upload.AudioAnalysisStatus == JobStatusTimeout {
 logger.Info("retrying my timed out audio analysis")
 }
 upload.AudioAnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 upload.Status = JobStatusAudioAnalysis
 ss.crud.Update(upload)
	}
}

func (ss *MediorumServer) startAudioAnalysisWorker(n int, work chan *Upload) {
	for upload := range work {
 logger := ss.logger.With("upload", upload.ID)
Expand Down

66 changes: 53 additions & 13 deletions
mediorum/server/legacy_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,14 +68,31 @@ func (ss *MediorumServer) startLegacyAudioAnalyzer() {
	}

	// poll periodically for analyses that slipped thru the cracks
	for {
 time.Sleep(time.Minute)
 ss.findMissedLegacyAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(1 * time.Minute)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Minute)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every minute
 // mark analyses as timed out
 ss.findMissedLegacyAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry legacy analysis jobs every 30 minutes
 ss.retryLegacyAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

// do not bother setting a timeout like in findMissedAnalysisJobs. this is not triggered
// by the client during the upload flow so it can afford to take > 1 minute
func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status in ?", []string{JobStatusAudioAnalysis, JobStatusBusyAudioAnalysis}).Find(&analyses)
Expand All@@ -101,13 +118,6 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && analysis.Status == JobStatusAudioAnalysis {
 logger.Info("my legacy cid's audio analysis not started")
 work <- analysis
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -155,6 +165,36 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi
	}
}

func (ss *MediorumServer) retryLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status = ? OR (status = ? AND error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("CAST(mirrors AS jsonb)->>0 ?", myHost).
 Order("analyzed_at ASC").
 Limit(100).
 Find(&analyses)

	for _, analysis := range analyses {
 myIdx := slices.Index(analysis.Mirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 if analysis.Status == JobStatusError {
 logger.Info("retrying my errored legacy audio analysis")
 }
 if analysis.Status == JobStatusTimeout {
 logger.Info("retrying my timed out legacy audio analysis")
 }
 analysis.AnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 analysis.Status = JobStatusAudioAnalysis
 ss.crud.Update(analysis)
	}
}

func (ss *MediorumServer) startLegacyAudioAnalysisWorker(n int, work chan *QmAudioAnalysis) {
	for analysis := range work {
 logger := ss.logger.With("analysis_cid", analysis.CID)
Expand Down

55 changes: 27 additions & 28 deletions
mediorum/server/serve_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
package server

import (
	"net/http"
	"time"

	"github.com/labstack/echo/v4"
Expand All@@ -16,17 +15,17 @@ func (ss *MediorumServer) analyzeUpload(c echo.Context) error {
 return echo.NewHTTPError(404, err.Error())
	}

	if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
 upload.AudioAnalyzedAt = time.Now().UTC()
 upload.AudioAnalysisStatus = ""
 upload.AudioAnalysisError = ""
 upload.Status = JobStatusAudioAnalysis
 err = ss.crud.Update(upload)
 if err != nil {
 ss.logger.Warn("update upload failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
// 	upload.AudioAnalyzedAt = time.Now().UTC()
// 	upload.AudioAnalysisStatus = ""
// 	upload.AudioAnalysisError = ""
// 	upload.Status = JobStatusAudioAnalysis
// 	err = ss.crud.Update(upload)
// 	if err != nil {
//  ss.logger.Warn("update upload failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }

	return c.JSON(200, upload)
}
Expand All@@ -52,22 +51,22 @@ func (ss *MediorumServer) analyzeLegacyBlob(c echo.Context) error {
 }
 return c.JSON(200, newAnalysis)
	}
	if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
 if analysis.Error == "blob is not an audio file" {
 // set ErrorCount to 3 so discovery repairer stops retrying this cid
 analysis.ErrorCount = 3
 ss.crud.Update(analysis)
 return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
 }
 analysis.Status = JobStatusAudioAnalysis
 analysis.AnalyzedAt = time.Now().UTC()
 analysis.Error = ""
 err = ss.crud.Update(analysis)
 if err != nil {
 ss.logger.Warn("update legacy audio analysis failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
// 	if analysis.Error == "blob is not an audio file" {
//  // set ErrorCount to 3 so discovery repairer stops retrying this cid
//  analysis.ErrorCount = 3
//  ss.crud.Update(analysis)
//  return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
// 	}
// 	analysis.Status = JobStatusAudioAnalysis
// 	analysis.AnalyzedAt = time.Now().UTC()
// 	analysis.Error = ""
// 	err = ss.crud.Update(analysis)
// 	if err != nil {
//  ss.logger.Warn("update legacy audio analysis failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }
	return c.JSON(200, analysis)
}

Expand Down

20 changes: 10 additions & 10 deletions
packages/discovery-provider/src/tasks/repair_audio_analyses.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,16 @@ def repair(session: Session, redis: Redis):
 num_tracks_updated += 1

 # Failures get retried up to 3 times
 if (not key or not bpm) and error_count < 3:
 # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
 num_analyses_retriggered += 1
 retrigger_audio_analysis(
 nodes,
 track.track_id,
 track.track_cid,
 track.audio_upload_id,
 legacy_track,
 )
# if (not key or not bpm) and error_count < 3:
#  # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
#  num_analyses_retriggered += 1
#  retrigger_audio_analysis(
#  nodes,
#  track.track_id,
#  track.track_cid,
#  track.audio_upload_id,
#  legacy_track,
#  )
 if error_count >= 3:
 logger.warning(
 f"repair_audio_analyses.py | Track ID {track.track_id} (track_cid: {track.track_cid}, audio_upload_id: {track.audio_upload_id}) failed audio analysis >= 3 times"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
move audio analysis retry logic to content#8996

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

stereosteve
merged 2 commits into

from

Jul 1, 2024
 Merged


move audio analysis retry logic to content
#8996
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
0251ca5

move audio analysis retry logic to content


michellebrier Jun 28, 2024
fd3e455

clean up and adjust ba retry timing


michellebrier Jun 28, 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


66 changes: 54 additions & 12 deletions
mediorum/server/audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,29 @@ func (ss *MediorumServer) startAudioAnalyzer() {
	}

	// poll periodically for uploads that slipped thru the cracks.
	// mark uploads with timed out analyses as done
	for {
 time.Sleep(time.Second * 10)
 ss.findMissedAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(10 * time.Second)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Second)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every 10 seconds
 // mark uploads with timed out analyses as done
 ss.findMissedAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry analysis jobs every 30 seconds
 ss.retryAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost string) {
Expand DownExpand Up@@ -104,13 +122,6 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin

 logger := ss.logger.With("upload", upload.ID, "upload_status", upload.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && upload.Status == JobStatusAudioAnalysis {
 logger.Info("my upload's audio analysis not started")
 work <- upload
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -147,6 +158,37 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin
	}
}

func (ss *MediorumServer) retryAnalysisJobs(work chan *Upload, myHost string) {
	uploads := []*Upload{}
	ss.crud.DB.Where("audio_analysis_status = ? OR (audio_analysis_status = ? AND audio_analysis_error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("status = ?", JobStatusDone).
 Where("CAST(transcoded_mirrors AS jsonb)->>0 = ?", myHost).
 Order("audio_analyzed_at ASC").
 Limit(2).
 Find(&uploads)

	for _, upload := range uploads {
 myIdx := slices.Index(upload.TranscodedMirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("upload", upload.ID, "audio_analysis_status", upload.AudioAnalysisStatus, "my_rank", myRank)

 if upload.AudioAnalysisStatus == JobStatusError {
 logger.Info("retrying my errored audio analysis")
 }
 if upload.AudioAnalysisStatus == JobStatusTimeout {
 logger.Info("retrying my timed out audio analysis")
 }
 upload.AudioAnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 upload.Status = JobStatusAudioAnalysis
 ss.crud.Update(upload)
	}
}

func (ss *MediorumServer) startAudioAnalysisWorker(n int, work chan *Upload) {
	for upload := range work {
 logger := ss.logger.With("upload", upload.ID)
Expand Down

66 changes: 53 additions & 13 deletions
mediorum/server/legacy_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,14 +68,31 @@ func (ss *MediorumServer) startLegacyAudioAnalyzer() {
	}

	// poll periodically for analyses that slipped thru the cracks
	for {
 time.Sleep(time.Minute)
 ss.findMissedLegacyAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(1 * time.Minute)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Minute)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every minute
 // mark analyses as timed out
 ss.findMissedLegacyAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry legacy analysis jobs every 30 minutes
 ss.retryLegacyAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

// do not bother setting a timeout like in findMissedAnalysisJobs. this is not triggered
// by the client during the upload flow so it can afford to take > 1 minute
func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status in ?", []string{JobStatusAudioAnalysis, JobStatusBusyAudioAnalysis}).Find(&analyses)
Expand All@@ -101,13 +118,6 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && analysis.Status == JobStatusAudioAnalysis {
 logger.Info("my legacy cid's audio analysis not started")
 work <- analysis
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -155,6 +165,36 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi
	}
}

func (ss *MediorumServer) retryLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status = ? OR (status = ? AND error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("CAST(mirrors AS jsonb)->>0 ?", myHost).
 Order("analyzed_at ASC").
 Limit(100).
 Find(&analyses)

	for _, analysis := range analyses {
 myIdx := slices.Index(analysis.Mirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 if analysis.Status == JobStatusError {
 logger.Info("retrying my errored legacy audio analysis")
 }
 if analysis.Status == JobStatusTimeout {
 logger.Info("retrying my timed out legacy audio analysis")
 }
 analysis.AnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 analysis.Status = JobStatusAudioAnalysis
 ss.crud.Update(analysis)
	}
}

func (ss *MediorumServer) startLegacyAudioAnalysisWorker(n int, work chan *QmAudioAnalysis) {
	for analysis := range work {
 logger := ss.logger.With("analysis_cid", analysis.CID)
Expand Down

55 changes: 27 additions & 28 deletions
mediorum/server/serve_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
package server

import (
	"net/http"
	"time"

	"github.com/labstack/echo/v4"
Expand All@@ -16,17 +15,17 @@ func (ss *MediorumServer) analyzeUpload(c echo.Context) error {
 return echo.NewHTTPError(404, err.Error())
	}

	if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
 upload.AudioAnalyzedAt = time.Now().UTC()
 upload.AudioAnalysisStatus = ""
 upload.AudioAnalysisError = ""
 upload.Status = JobStatusAudioAnalysis
 err = ss.crud.Update(upload)
 if err != nil {
 ss.logger.Warn("update upload failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
// 	upload.AudioAnalyzedAt = time.Now().UTC()
// 	upload.AudioAnalysisStatus = ""
// 	upload.AudioAnalysisError = ""
// 	upload.Status = JobStatusAudioAnalysis
// 	err = ss.crud.Update(upload)
// 	if err != nil {
//  ss.logger.Warn("update upload failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }

	return c.JSON(200, upload)
}
Expand All@@ -52,22 +51,22 @@ func (ss *MediorumServer) analyzeLegacyBlob(c echo.Context) error {
 }
 return c.JSON(200, newAnalysis)
	}
	if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
 if analysis.Error == "blob is not an audio file" {
 // set ErrorCount to 3 so discovery repairer stops retrying this cid
 analysis.ErrorCount = 3
 ss.crud.Update(analysis)
 return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
 }
 analysis.Status = JobStatusAudioAnalysis
 analysis.AnalyzedAt = time.Now().UTC()
 analysis.Error = ""
 err = ss.crud.Update(analysis)
 if err != nil {
 ss.logger.Warn("update legacy audio analysis failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
// 	if analysis.Error == "blob is not an audio file" {
//  // set ErrorCount to 3 so discovery repairer stops retrying this cid
//  analysis.ErrorCount = 3
//  ss.crud.Update(analysis)
//  return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
// 	}
// 	analysis.Status = JobStatusAudioAnalysis
// 	analysis.AnalyzedAt = time.Now().UTC()
// 	analysis.Error = ""
// 	err = ss.crud.Update(analysis)
// 	if err != nil {
//  ss.logger.Warn("update legacy audio analysis failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }
	return c.JSON(200, analysis)
}

Expand Down

20 changes: 10 additions & 10 deletions
packages/discovery-provider/src/tasks/repair_audio_analyses.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,16 @@ def repair(session: Session, redis: Redis):
 num_tracks_updated += 1

 # Failures get retried up to 3 times
 if (not key or not bpm) and error_count < 3:
 # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
 num_analyses_retriggered += 1
 retrigger_audio_analysis(
 nodes,
 track.track_id,
 track.track_cid,
 track.audio_upload_id,
 legacy_track,
 )
# if (not key or not bpm) and error_count < 3:
#  # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
#  num_analyses_retriggered += 1
#  retrigger_audio_analysis(
#  nodes,
#  track.track_id,
#  track.track_cid,
#  track.audio_upload_id,
#  legacy_track,
#  )
 if error_count >= 3:
 logger.warning(
 f"repair_audio_analyses.py | Track ID {track.track_id} (track_cid: {track.track_cid}, audio_upload_id: {track.audio_upload_id}) failed audio analysis >= 3 times"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
move audio analysis retry logic to content#8996

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

stereosteve
merged 2 commits into

from

Jul 1, 2024
 Merged


move audio analysis retry logic to content
#8996
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
0251ca5

move audio analysis retry logic to content


michellebrier Jun 28, 2024
fd3e455

clean up and adjust ba retry timing


michellebrier Jun 28, 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


66 changes: 54 additions & 12 deletions
mediorum/server/audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,29 @@ func (ss *MediorumServer) startAudioAnalyzer() {
	}

	// poll periodically for uploads that slipped thru the cracks.
	// mark uploads with timed out analyses as done
	for {
 time.Sleep(time.Second * 10)
 ss.findMissedAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(10 * time.Second)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Second)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every 10 seconds
 // mark uploads with timed out analyses as done
 ss.findMissedAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry analysis jobs every 30 seconds
 ss.retryAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost string) {
Expand DownExpand Up@@ -104,13 +122,6 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin

 logger := ss.logger.With("upload", upload.ID, "upload_status", upload.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && upload.Status == JobStatusAudioAnalysis {
 logger.Info("my upload's audio analysis not started")
 work <- upload
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -147,6 +158,37 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin
	}
}

func (ss *MediorumServer) retryAnalysisJobs(work chan *Upload, myHost string) {
	uploads := []*Upload{}
	ss.crud.DB.Where("audio_analysis_status = ? OR (audio_analysis_status = ? AND audio_analysis_error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("status = ?", JobStatusDone).
 Where("CAST(transcoded_mirrors AS jsonb)->>0 = ?", myHost).
 Order("audio_analyzed_at ASC").
 Limit(2).
 Find(&uploads)

	for _, upload := range uploads {
 myIdx := slices.Index(upload.TranscodedMirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("upload", upload.ID, "audio_analysis_status", upload.AudioAnalysisStatus, "my_rank", myRank)

 if upload.AudioAnalysisStatus == JobStatusError {
 logger.Info("retrying my errored audio analysis")
 }
 if upload.AudioAnalysisStatus == JobStatusTimeout {
 logger.Info("retrying my timed out audio analysis")
 }
 upload.AudioAnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 upload.Status = JobStatusAudioAnalysis
 ss.crud.Update(upload)
	}
}

func (ss *MediorumServer) startAudioAnalysisWorker(n int, work chan *Upload) {
	for upload := range work {
 logger := ss.logger.With("upload", upload.ID)
Expand Down

66 changes: 53 additions & 13 deletions
mediorum/server/legacy_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,14 +68,31 @@ func (ss *MediorumServer) startLegacyAudioAnalyzer() {
	}

	// poll periodically for analyses that slipped thru the cracks
	for {
 time.Sleep(time.Minute)
 ss.findMissedLegacyAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(1 * time.Minute)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Minute)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every minute
 // mark analyses as timed out
 ss.findMissedLegacyAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry legacy analysis jobs every 30 minutes
 ss.retryLegacyAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

// do not bother setting a timeout like in findMissedAnalysisJobs. this is not triggered
// by the client during the upload flow so it can afford to take > 1 minute
func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status in ?", []string{JobStatusAudioAnalysis, JobStatusBusyAudioAnalysis}).Find(&analyses)
Expand All@@ -101,13 +118,6 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && analysis.Status == JobStatusAudioAnalysis {
 logger.Info("my legacy cid's audio analysis not started")
 work <- analysis
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -155,6 +165,36 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi
	}
}

func (ss *MediorumServer) retryLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status = ? OR (status = ? AND error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("CAST(mirrors AS jsonb)->>0 ?", myHost).
 Order("analyzed_at ASC").
 Limit(100).
 Find(&analyses)

	for _, analysis := range analyses {
 myIdx := slices.Index(analysis.Mirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 if analysis.Status == JobStatusError {
 logger.Info("retrying my errored legacy audio analysis")
 }
 if analysis.Status == JobStatusTimeout {
 logger.Info("retrying my timed out legacy audio analysis")
 }
 analysis.AnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 analysis.Status = JobStatusAudioAnalysis
 ss.crud.Update(analysis)
	}
}

func (ss *MediorumServer) startLegacyAudioAnalysisWorker(n int, work chan *QmAudioAnalysis) {
	for analysis := range work {
 logger := ss.logger.With("analysis_cid", analysis.CID)
Expand Down

55 changes: 27 additions & 28 deletions
mediorum/server/serve_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
package server

import (
	"net/http"
	"time"

	"github.com/labstack/echo/v4"
Expand All@@ -16,17 +15,17 @@ func (ss *MediorumServer) analyzeUpload(c echo.Context) error {
 return echo.NewHTTPError(404, err.Error())
	}

	if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
 upload.AudioAnalyzedAt = time.Now().UTC()
 upload.AudioAnalysisStatus = ""
 upload.AudioAnalysisError = ""
 upload.Status = JobStatusAudioAnalysis
 err = ss.crud.Update(upload)
 if err != nil {
 ss.logger.Warn("update upload failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
// 	upload.AudioAnalyzedAt = time.Now().UTC()
// 	upload.AudioAnalysisStatus = ""
// 	upload.AudioAnalysisError = ""
// 	upload.Status = JobStatusAudioAnalysis
// 	err = ss.crud.Update(upload)
// 	if err != nil {
//  ss.logger.Warn("update upload failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }

	return c.JSON(200, upload)
}
Expand All@@ -52,22 +51,22 @@ func (ss *MediorumServer) analyzeLegacyBlob(c echo.Context) error {
 }
 return c.JSON(200, newAnalysis)
	}
	if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
 if analysis.Error == "blob is not an audio file" {
 // set ErrorCount to 3 so discovery repairer stops retrying this cid
 analysis.ErrorCount = 3
 ss.crud.Update(analysis)
 return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
 }
 analysis.Status = JobStatusAudioAnalysis
 analysis.AnalyzedAt = time.Now().UTC()
 analysis.Error = ""
 err = ss.crud.Update(analysis)
 if err != nil {
 ss.logger.Warn("update legacy audio analysis failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
// 	if analysis.Error == "blob is not an audio file" {
//  // set ErrorCount to 3 so discovery repairer stops retrying this cid
//  analysis.ErrorCount = 3
//  ss.crud.Update(analysis)
//  return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
// 	}
// 	analysis.Status = JobStatusAudioAnalysis
// 	analysis.AnalyzedAt = time.Now().UTC()
// 	analysis.Error = ""
// 	err = ss.crud.Update(analysis)
// 	if err != nil {
//  ss.logger.Warn("update legacy audio analysis failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }
	return c.JSON(200, analysis)
}

Expand Down

20 changes: 10 additions & 10 deletions
packages/discovery-provider/src/tasks/repair_audio_analyses.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,16 @@ def repair(session: Session, redis: Redis):
 num_tracks_updated += 1

 # Failures get retried up to 3 times
 if (not key or not bpm) and error_count < 3:
 # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
 num_analyses_retriggered += 1
 retrigger_audio_analysis(
 nodes,
 track.track_id,
 track.track_cid,
 track.audio_upload_id,
 legacy_track,
 )
# if (not key or not bpm) and error_count < 3:
#  # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
#  num_analyses_retriggered += 1
#  retrigger_audio_analysis(
#  nodes,
#  track.track_id,
#  track.track_cid,
#  track.audio_upload_id,
#  legacy_track,
#  )
 if error_count >= 3:
 logger.warning(
 f"repair_audio_analyses.py | Track ID {track.track_id} (track_cid: {track.track_cid}, audio_upload_id: {track.audio_upload_id}) failed audio analysis >= 3 times"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
move audio analysis retry logic to content#8996

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

stereosteve
merged 2 commits into

from

Jul 1, 2024
 Merged


move audio analysis retry logic to content
#8996
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
0251ca5

move audio analysis retry logic to content


michellebrier Jun 28, 2024
fd3e455

clean up and adjust ba retry timing


michellebrier Jun 28, 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


66 changes: 54 additions & 12 deletions
mediorum/server/audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,29 @@ func (ss *MediorumServer) startAudioAnalyzer() {
	}

	// poll periodically for uploads that slipped thru the cracks.
	// mark uploads with timed out analyses as done
	for {
 time.Sleep(time.Second * 10)
 ss.findMissedAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(10 * time.Second)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Second)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every 10 seconds
 // mark uploads with timed out analyses as done
 ss.findMissedAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry analysis jobs every 30 seconds
 ss.retryAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost string) {
Expand DownExpand Up@@ -104,13 +122,6 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin

 logger := ss.logger.With("upload", upload.ID, "upload_status", upload.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && upload.Status == JobStatusAudioAnalysis {
 logger.Info("my upload's audio analysis not started")
 work <- upload
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -147,6 +158,37 @@ func (ss *MediorumServer) findMissedAnalysisJobs(work chan *Upload, myHost strin
	}
}

func (ss *MediorumServer) retryAnalysisJobs(work chan *Upload, myHost string) {
	uploads := []*Upload{}
	ss.crud.DB.Where("audio_analysis_status = ? OR (audio_analysis_status = ? AND audio_analysis_error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("status = ?", JobStatusDone).
 Where("CAST(transcoded_mirrors AS jsonb)->>0 = ?", myHost).
 Order("audio_analyzed_at ASC").
 Limit(2).
 Find(&uploads)

	for _, upload := range uploads {
 myIdx := slices.Index(upload.TranscodedMirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("upload", upload.ID, "audio_analysis_status", upload.AudioAnalysisStatus, "my_rank", myRank)

 if upload.AudioAnalysisStatus == JobStatusError {
 logger.Info("retrying my errored audio analysis")
 }
 if upload.AudioAnalysisStatus == JobStatusTimeout {
 logger.Info("retrying my timed out audio analysis")
 }
 upload.AudioAnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 upload.Status = JobStatusAudioAnalysis
 ss.crud.Update(upload)
	}
}

func (ss *MediorumServer) startAudioAnalysisWorker(n int, work chan *Upload) {
	for upload := range work {
 logger := ss.logger.With("upload", upload.ID)
Expand Down

66 changes: 53 additions & 13 deletions
mediorum/server/legacy_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,14 +68,31 @@ func (ss *MediorumServer) startLegacyAudioAnalyzer() {
	}

	// poll periodically for analyses that slipped thru the cracks
	for {
 time.Sleep(time.Minute)
 ss.findMissedLegacyAnalysisJobs(work, myHost)
	}
	go func() {
 ticker := time.NewTicker(1 * time.Minute)
 defer ticker.Stop()

 retryTicker := time.NewTicker(30 * time.Minute)
 defer retryTicker.Stop()

 for {
 select {
 case <-ticker.C:
 // find missed legacy analysis jobs every minute
 // mark analyses as timed out
 ss.findMissedLegacyAnalysisJobs(work, myHost)

 case <-retryTicker.C:
 // retry legacy analysis jobs every 30 minutes
 ss.retryLegacyAnalysisJobs(work, myHost)
 }
 }
	}()

	// block to keep running
	select {}
}

// do not bother setting a timeout like in findMissedAnalysisJobs. this is not triggered
// by the client during the upload flow so it can afford to take > 1 minute
func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status in ?", []string{JobStatusAudioAnalysis, JobStatusBusyAudioAnalysis}).Find(&analyses)
Expand All@@ -101,13 +118,6 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 // this is already handled by a callback and there's a chance this job gets enqueued twice
 if myRank == 1 && analysis.Status == JobStatusAudioAnalysis {
 logger.Info("my legacy cid's audio analysis not started")
 work <- analysis
 continue
 }

 // determine if #1 rank worker dropped ball
 timedOut := false
 neverStarted := false
Expand DownExpand Up@@ -155,6 +165,36 @@ func (ss *MediorumServer) findMissedLegacyAnalysisJobs(work chan *QmAudioAnalysi
	}
}

func (ss *MediorumServer) retryLegacyAnalysisJobs(work chan *QmAudioAnalysis, myHost string) {
	analyses := []*QmAudioAnalysis{}
	ss.crud.DB.Where("status = ? OR (status = ? AND error_count < ?)", JobStatusTimeout, JobStatusError, 3).
 Where("CAST(mirrors AS jsonb)->>0 ?", myHost).
 Order("analyzed_at ASC").
 Limit(100).
 Find(&analyses)

	for _, analysis := range analyses {
 myIdx := slices.Index(analysis.Mirrors, myHost)
 if myIdx != 0 {
 continue
 }
 myRank := myIdx + 1

 logger := ss.logger.With("analysis_cid", analysis.CID, "analysis_status", analysis.Status, "my_rank", myRank)

 if analysis.Status == JobStatusError {
 logger.Info("retrying my errored legacy audio analysis")
 }
 if analysis.Status == JobStatusTimeout {
 logger.Info("retrying my timed out legacy audio analysis")
 }
 analysis.AnalyzedAt = time.Now().UTC()
 // op callback will enqueue the job
 analysis.Status = JobStatusAudioAnalysis
 ss.crud.Update(analysis)
	}
}

func (ss *MediorumServer) startLegacyAudioAnalysisWorker(n int, work chan *QmAudioAnalysis) {
	for analysis := range work {
 logger := ss.logger.With("analysis_cid", analysis.CID)
Expand Down

55 changes: 27 additions & 28 deletions
mediorum/server/serve_audio_analysis.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
package server

import (
	"net/http"
	"time"

	"github.com/labstack/echo/v4"
Expand All@@ -16,17 +15,17 @@ func (ss *MediorumServer) analyzeUpload(c echo.Context) error {
 return echo.NewHTTPError(404, err.Error())
	}

	if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
 upload.AudioAnalyzedAt = time.Now().UTC()
 upload.AudioAnalysisStatus = ""
 upload.AudioAnalysisError = ""
 upload.Status = JobStatusAudioAnalysis
 err = ss.crud.Update(upload)
 if err != nil {
 ss.logger.Warn("update upload failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if upload.Template == "audio" && upload.Status == JobStatusDone && upload.AudioAnalysisStatus != JobStatusDone {
// 	upload.AudioAnalyzedAt = time.Now().UTC()
// 	upload.AudioAnalysisStatus = ""
// 	upload.AudioAnalysisError = ""
// 	upload.Status = JobStatusAudioAnalysis
// 	err = ss.crud.Update(upload)
// 	if err != nil {
//  ss.logger.Warn("update upload failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }

	return c.JSON(200, upload)
}
Expand All@@ -52,22 +51,22 @@ func (ss *MediorumServer) analyzeLegacyBlob(c echo.Context) error {
 }
 return c.JSON(200, newAnalysis)
	}
	if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
 if analysis.Error == "blob is not an audio file" {
 // set ErrorCount to 3 so discovery repairer stops retrying this cid
 analysis.ErrorCount = 3
 ss.crud.Update(analysis)
 return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
 }
 analysis.Status = JobStatusAudioAnalysis
 analysis.AnalyzedAt = time.Now().UTC()
 analysis.Error = ""
 err = ss.crud.Update(analysis)
 if err != nil {
 ss.logger.Warn("update legacy audio analysis failed", "err", err)
 return c.String(500, "failed to trigger audio analysis")
 }
	}
// if analysis.Status == JobStatusError || analysis.Status == JobStatusTimeout {
// 	if analysis.Error == "blob is not an audio file" {
//  // set ErrorCount to 3 so discovery repairer stops retrying this cid
//  analysis.ErrorCount = 3
//  ss.crud.Update(analysis)
//  return c.String(http.StatusBadRequest, "must specify a cid for an audio file")
// 	}
// 	analysis.Status = JobStatusAudioAnalysis
// 	analysis.AnalyzedAt = time.Now().UTC()
// 	analysis.Error = ""
// 	err = ss.crud.Update(analysis)
// 	if err != nil {
//  ss.logger.Warn("update legacy audio analysis failed", "err", err)
//  return c.String(500, "failed to trigger audio analysis")
// 	}
// }
	return c.JSON(200, analysis)
}

Expand Down

20 changes: 10 additions & 10 deletions
packages/discovery-provider/src/tasks/repair_audio_analyses.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,16 +157,16 @@ def repair(session: Session, redis: Redis):
 num_tracks_updated += 1

 # Failures get retried up to 3 times
 if (not key or not bpm) and error_count < 3:
 # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
 num_analyses_retriggered += 1
 retrigger_audio_analysis(
 nodes,
 track.track_id,
 track.track_cid,
 track.audio_upload_id,
 legacy_track,
 )
# if (not key or not bpm) and error_count < 3:
#  # Trigger another audio analysis but don't bother polling for result. Will read it in next batch.
#  num_analyses_retriggered += 1
#  retrigger_audio_analysis(
#  nodes,
#  track.track_id,
#  track.track_cid,
#  track.audio_upload_id,
#  legacy_track,
#  )
 if error_count >= 3:
 logger.warning(
 f"repair_audio_analyses.py | Track ID {track.track_id} (track_cid: {track.track_cid}, audio_upload_id: {track.audio_upload_id}) failed audio analysis >= 3 times"
Expand Down