Skip to content
New issue

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

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

Make task queues configurable #655

Merged
merged 1 commit into from
Nov 2, 2023
Merged

Conversation

Diogenesoftoronto
Copy link
Contributor

@Diogenesoftoronto Diogenesoftoronto commented Aug 3, 2023

refs #621

@Diogenesoftoronto Diogenesoftoronto force-pushed the dev/issue-621-task-queues-configurable branch 3 times, most recently from 6962224 to aeac203 Compare August 3, 2023 00:53
@sevein sevein closed this Sep 18, 2023
@sevein sevein reopened this Sep 22, 2023
@Diogenesoftoronto Diogenesoftoronto force-pushed the dev/issue-621-task-queues-configurable branch from aeac203 to f3b1e36 Compare September 28, 2023 00:08
Copy link
Contributor

@sevein sevein left a comment

Choose a reason for hiding this comment

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

I've suggested a number of minor modifications. I realize there are quite a few and I hope it's not overwhelming.

internal/package_/workflow.go Outdated Show resolved Hide resolved
internal/package_/package_.go Outdated Show resolved Hide resolved
internal/config/config.go Outdated Show resolved Hide resolved
internal/package_/goa.go Outdated Show resolved Hide resolved
internal/workflow/processing.go Show resolved Hide resolved
internal/storage/service_test.go Outdated Show resolved Hide resolved
internal/storage/service_test.go Outdated Show resolved Hide resolved
internal/storage/workflow.go Outdated Show resolved Hide resolved
internal/storage/workflow.go Outdated Show resolved Hide resolved
internal/workflow/move.go Outdated Show resolved Hide resolved
@Diogenesoftoronto Diogenesoftoronto force-pushed the dev/issue-621-task-queues-configurable branch from c91465a to 036deec Compare October 11, 2023 20:58
@Diogenesoftoronto
Copy link
Contributor Author

Hey, this is ready to review again. I added all of your suggestions.

@sevein
Copy link
Contributor

sevein commented Oct 13, 2023

There is a failing test:

--- FAIL: TestServiceMoveStatus (0.01s)
    --- FAIL: TestServiceMoveStatus/Returns_move_done_if_workflow_completed (0.00s)

@Diogenesoftoronto Diogenesoftoronto force-pushed the dev/issue-621-task-queues-configurable branch 2 times, most recently from 34128fc to 0081cc6 Compare October 16, 2023 21:47
@Diogenesoftoronto
Copy link
Contributor Author

It works!

@Diogenesoftoronto Diogenesoftoronto force-pushed the dev/issue-621-task-queues-configurable branch from 1fce59b to 9592b11 Compare October 17, 2023 16:39
Copy link
Contributor

@sevein sevein left a comment

Choose a reason for hiding this comment

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

A few small suggestions/questions.

go.mod Outdated
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.13.0 // indirect
golang.org/x/tools v0.14.0 // indirect
Copy link
Contributor

Choose a reason for hiding this comment

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

It'd be nice if you don't include unrelated changes to go.mod in your commit if they're not strictly related.

internal/package_/package_.go Outdated Show resolved Hide resolved
internal/workflow/activities/bundle.go Outdated Show resolved Hide resolved
internal/workflow/move.go Outdated Show resolved Hide resolved
main.go Outdated Show resolved Hide resolved
@sevein
Copy link
Contributor

sevein commented Oct 30, 2023

Just realized this is ready for another review, will do tomorrow! Sorry for the late response.

@Diogenesoftoronto
Copy link
Contributor Author

Just realized this is ready for another review, will do tomorrow! Sorry for the late response.

Perfectly fine. Should have sent you a DM.

@sevein sevein force-pushed the dev/issue-621-task-queues-configurable branch from 0f3b50f to 60ee7f9 Compare November 2, 2023 09:13
Copy link
Contributor

@sevein sevein left a comment

Choose a reason for hiding this comment

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

GitHub won't allow me to comment on the specific line, but the storage.Submit method (L117) was not updated to pass the task queue to the upload workflow request. I had to make this change:

-       _, err = InitStorageUploadWorkflow(ctx, s.tc, &StorageUploadWorkflowRequest{AIPID: aipID})
+       _, err = InitStorageUploadWorkflow(ctx, s.tc, &StorageUploadWorkflowRequest{
+               AIPID:     aipID,
+               TaskQueue: s.config.TaskQueue,
+       })

Other than that, 👍. I'll merge, thank you!

This link shows the changes I had to make but it's confusing because it also includes the rebase work I did in preparation for the merge: compare:0f3b/60ee. The relevant bits are in internal/storage/service.go and internal/storage/service_test.go in case you're interested.

@sevein sevein merged commit 07f2497 into main Nov 2, 2023
8 checks passed
@sevein sevein deleted the dev/issue-621-task-queues-configurable branch November 2, 2023 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants