Skip to content

PROTO-1335: relay upload delay#6281

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
alecsavvy merged 7 commits into from
Oct 16, 2023
Merged

PROTO-1335: relay upload delay #6281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19867be
delay for indexing:
alecsavvy Oct 9, 2023
1069ccc
rm logs
alecsavvy Oct 9, 2023
1795a73
Merge branch 'main' into as/relay-uploads
alecsavvy Oct 16, 2023
7553e90
add retries to track upload
alecsavvy Oct 16, 2023
995a8f0
rm unused var
alecsavvy Oct 16, 2023
6350175
rm default
alecsavvy Oct 16, 2023
8e52c4a
reset package lock
alecsavvy Oct 16, 2023
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
7 changes: 7 additions & 0 deletions packages/libs/src/sdk/services/DiscoveryNodeSelector/DiscoveryNodeSelector.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,13 +224,20 @@ export class DiscoveryNodeSelector implements DiscoveryNodeSelectorService {
}
})
} else {
const userError = response !== undefined && response.status < 500

if (userError) {
this.logger.warn(`status code ${response.status} below 500, not reselecting`, endpoint, context)
return response
}
return await this.reselectAndRetry({ context, endpoint })
}
return response
},
onError: async (context: ErrorContext) => {
const endpoint = await this.getSelectedEndpoint()
const response = context.response

if (!endpoint) {
await this.select(endpoint)
} else {
Expand Down
30 changes: 22 additions & 8 deletions packages/web/src/common/store/upload/sagas.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,8 @@ import {
fork,
cancel,
all,
getContext
getContext,
delay
} from 'redux-saga/effects'

import { make } from 'common/store/analytics/actions'
Expand DownExpand Up@@ -796,6 +797,7 @@ function* uploadCollection(tracks, userId, collectionMetadata, isAlbum) {
`Could not confirm playlist creation for playlist id ${playlistId}`
)
}

return (yield call(audiusBackendInstance.getPlaylists, userId, [
playlistId
]))[0]
Expand DownExpand Up@@ -1010,14 +1012,25 @@ function* uploadSingleTrack(track) {
throw new Error(`Could not confirm upload single track ${trackId}`)
}

return yield apiClient.getTrack({
id: trackId,
currentUserId: userId,
unlistedArgs: {
urlTitle: formatUrlName(track.metadata.title),
handle
let retries = 30

@amendelsohnamendelsohnOct 16, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all post confirmation, right? so we're not depending on upload or confirmation time to fit within the retry window.

@alecsavvyalecsavvyOct 16, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, the upload has already succeeded, this is purely for indexing

@amendelsohnamendelsohnOct 16, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brilliant. Sounds good to me!

while (retries !== 0) {
const maybeTrackRes = yield apiClient.getTrack({
id: trackId,
currentUserId: userId,
unlistedArgs: {
urlTitle: formatUrlName(track.metadata.title),
handle
}
})
if (maybeTrackRes !== undefined && maybeTrackRes !== null) {
return maybeTrackRes
}
})
// lil bit of delay for retries
yield delay(1500)
Comment on lines 1028 to 1029

@amendelsohnamendelsohnOct 16, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use a variable delay to disperse groups of failed calls?

@alecsavvyalecsavvyOct 16, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

like add a back off of some kind?

@amendelsohnamendelsohnOct 16, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah... I'm not sure if it's necessary though. Concurrent upload volume shouldn't be high enough to stress anything on a 1.5s interval.

@alecsavvyalecsavvyOct 16, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't think so. This is also a GET query, not an actual write operation.

@amendelsohnamendelsohnOct 16, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ya let's leave as is. Ty for entertaining my thinking out loud lol

retries -= 1
}

throw new Error(`Exhausted retries querying for track ${trackId}`)
},
function* onSuccess(confirmedTrack) {
yield call(responseChan.put, { confirmedTrack })
Expand DownExpand Up@@ -1087,6 +1100,7 @@ function* uploadSingleTrack(track) {
status: ProgressStatus.COMPLETE
})
)

yield put(
uploadActions.uploadTracksSucceeded(confirmedTrack.track_id, [
confirmedTrack
Expand Down