mirror of
https://github.com/hibiken/asynq.git
synced 2025-06-08 15:52:39 +08:00
Compare commits
No commits in common. "master" and "v0.8.1" have entirely different histories.
4
.github/FUNDING.yml
vendored
4
.github/FUNDING.yml
vendored
@ -1,4 +0,0 @@
|
|||||||
# These are supported funding model platforms
|
|
||||||
|
|
||||||
github: [hibiken]
|
|
||||||
open_collective: ken-hibino
|
|
13
.github/ISSUE_TEMPLATE/bug_report.md
vendored
13
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -3,20 +3,13 @@ name: Bug report
|
|||||||
about: Create a report to help us improve
|
about: Create a report to help us improve
|
||||||
title: "[BUG] Description of the bug"
|
title: "[BUG] Description of the bug"
|
||||||
labels: bug
|
labels: bug
|
||||||
assignees:
|
assignees: hibiken
|
||||||
- hibiken
|
|
||||||
- kamikazechaser
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**Describe the bug**
|
**Describe the bug**
|
||||||
A clear and concise description of what the bug is.
|
A clear and concise description of what the bug is.
|
||||||
|
|
||||||
**Environment (please complete the following information):**
|
|
||||||
- OS: [e.g. MacOS, Linux]
|
|
||||||
- `asynq` package version [e.g. v0.25.0]
|
|
||||||
- Redis/Valkey version
|
|
||||||
|
|
||||||
**To Reproduce**
|
**To Reproduce**
|
||||||
Steps to reproduce the behavior (Code snippets if applicable):
|
Steps to reproduce the behavior (Code snippets if applicable):
|
||||||
1. Setup background processing ...
|
1. Setup background processing ...
|
||||||
@ -29,5 +22,9 @@ A clear and concise description of what you expected to happen.
|
|||||||
**Screenshots**
|
**Screenshots**
|
||||||
If applicable, add screenshots to help explain your problem.
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
|
||||||
|
**Environment (please complete the following information):**
|
||||||
|
- OS: [e.g. MacOS, Linux]
|
||||||
|
- Version of `asynq` package [e.g. v1.0.0]
|
||||||
|
|
||||||
**Additional context**
|
**Additional context**
|
||||||
Add any other context about the problem here.
|
Add any other context about the problem here.
|
||||||
|
4
.github/ISSUE_TEMPLATE/feature_request.md
vendored
4
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@ -3,9 +3,7 @@ name: Feature request
|
|||||||
about: Suggest an idea for this project
|
about: Suggest an idea for this project
|
||||||
title: "[FEATURE REQUEST] Description of the feature request"
|
title: "[FEATURE REQUEST] Description of the feature request"
|
||||||
labels: enhancement
|
labels: enhancement
|
||||||
assignees:
|
assignees: hibiken
|
||||||
- hibiken
|
|
||||||
- kamikazechaser
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
24
.github/dependabot.yaml
vendored
24
.github/dependabot.yaml
vendored
@ -1,24 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: "gomod"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
||||||
labels:
|
|
||||||
- "pr-deps"
|
|
||||||
- package-ecosystem: "gomod"
|
|
||||||
directory: "/tools"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
||||||
labels:
|
|
||||||
- "pr-deps"
|
|
||||||
- package-ecosystem: "gomod"
|
|
||||||
directory: "/x"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
||||||
labels:
|
|
||||||
- "pr-deps"
|
|
||||||
- package-ecosystem: "github-actions"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
82
.github/workflows/benchstat.yml
vendored
82
.github/workflows/benchstat.yml
vendored
@ -1,82 +0,0 @@
|
|||||||
# This workflow runs benchmarks against the current branch,
|
|
||||||
# compares them to benchmarks against master,
|
|
||||||
# and uploads the results as an artifact.
|
|
||||||
|
|
||||||
name: benchstat
|
|
||||||
|
|
||||||
on: [pull_request]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
incoming:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
services:
|
|
||||||
redis:
|
|
||||||
image: redis:7
|
|
||||||
ports:
|
|
||||||
- 6379:6379
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: 1.23.x
|
|
||||||
- name: Benchmark
|
|
||||||
run: go test -run=^$ -bench=. -count=5 -timeout=60m ./... | tee -a new.txt
|
|
||||||
- name: Upload Benchmark
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: bench-incoming
|
|
||||||
path: new.txt
|
|
||||||
|
|
||||||
current:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
services:
|
|
||||||
redis:
|
|
||||||
image: redis:7
|
|
||||||
ports:
|
|
||||||
- 6379:6379
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
ref: master
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: 1.23.x
|
|
||||||
- name: Benchmark
|
|
||||||
run: go test -run=^$ -bench=. -count=5 -timeout=60m ./... | tee -a old.txt
|
|
||||||
- name: Upload Benchmark
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: bench-current
|
|
||||||
path: old.txt
|
|
||||||
|
|
||||||
benchstat:
|
|
||||||
needs: [incoming, current]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: 1.23.x
|
|
||||||
- name: Install benchstat
|
|
||||||
run: go get -u golang.org/x/perf/cmd/benchstat
|
|
||||||
- name: Download Incoming
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: bench-incoming
|
|
||||||
- name: Download Current
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: bench-current
|
|
||||||
- name: Benchstat Results
|
|
||||||
run: benchstat old.txt new.txt | tee -a benchstat.txt
|
|
||||||
- name: Upload benchstat results
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: benchstat
|
|
||||||
path: benchstat.txt
|
|
83
.github/workflows/build.yml
vendored
83
.github/workflows/build.yml
vendored
@ -1,83 +0,0 @@
|
|||||||
name: build
|
|
||||||
|
|
||||||
on: [push, pull_request]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
os: [ubuntu-latest]
|
|
||||||
go-version: [1.22.x, 1.23.x]
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
services:
|
|
||||||
redis:
|
|
||||||
image: redis:7
|
|
||||||
ports:
|
|
||||||
- 6379:6379
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: ${{ matrix.go-version }}
|
|
||||||
cache: false
|
|
||||||
|
|
||||||
- name: Build core module
|
|
||||||
run: go build -v ./...
|
|
||||||
|
|
||||||
- name: Build x module
|
|
||||||
run: cd x && go build -v ./... && cd ..
|
|
||||||
|
|
||||||
- name: Test core module
|
|
||||||
run: go test -race -v -coverprofile=coverage.txt -covermode=atomic ./...
|
|
||||||
|
|
||||||
- name: Test x module
|
|
||||||
run: cd x && go test -race -v ./... && cd ..
|
|
||||||
|
|
||||||
- name: Benchmark Test
|
|
||||||
run: go test -run=^$ -bench=. -loglevel=debug ./...
|
|
||||||
|
|
||||||
- name: Upload coverage to Codecov
|
|
||||||
uses: codecov/codecov-action@v5
|
|
||||||
|
|
||||||
build-tool:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
os: [ubuntu-latest]
|
|
||||||
go-version: [1.22.x, 1.23.x]
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
services:
|
|
||||||
redis:
|
|
||||||
image: redis:7
|
|
||||||
ports:
|
|
||||||
- 6379:6379
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: ${{ matrix.go-version }}
|
|
||||||
cache: false
|
|
||||||
|
|
||||||
- name: Build tools module
|
|
||||||
run: cd tools && go build -v ./... && cd ..
|
|
||||||
|
|
||||||
- name: Test tools module
|
|
||||||
run: cd tools && go test -race -v ./... && cd ..
|
|
||||||
|
|
||||||
golangci:
|
|
||||||
name: lint
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: stable
|
|
||||||
|
|
||||||
- name: golangci-lint
|
|
||||||
uses: golangci/golangci-lint-action@v6
|
|
||||||
with:
|
|
||||||
version: v1.61
|
|
8
.gitignore
vendored
8
.gitignore
vendored
@ -1,4 +1,3 @@
|
|||||||
vendor
|
|
||||||
# Binaries for programs and plugins
|
# Binaries for programs and plugins
|
||||||
*.exe
|
*.exe
|
||||||
*.exe~
|
*.exe~
|
||||||
@ -15,13 +14,8 @@ vendor
|
|||||||
# Ignore examples for now
|
# Ignore examples for now
|
||||||
/examples
|
/examples
|
||||||
|
|
||||||
# Ignore tool binaries
|
# Ignore command binary
|
||||||
/tools/asynq/asynq
|
/tools/asynq/asynq
|
||||||
/tools/metrics_exporter/metrics_exporter
|
|
||||||
|
|
||||||
# Ignore asynq config file
|
# Ignore asynq config file
|
||||||
.asynq.*
|
.asynq.*
|
||||||
|
|
||||||
# Ignore editor config files
|
|
||||||
.vscode
|
|
||||||
.idea
|
|
||||||
|
12
.travis.yml
Normal file
12
.travis.yml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
language: go
|
||||||
|
go_import_path: github.com/hibiken/asynq
|
||||||
|
git:
|
||||||
|
depth: 1
|
||||||
|
go: [1.13.x, 1.14.x]
|
||||||
|
script:
|
||||||
|
- go test -race -v -coverprofile=coverage.txt -covermode=atomic ./...
|
||||||
|
services:
|
||||||
|
- redis-server
|
||||||
|
after_success:
|
||||||
|
- bash ./.travis/benchcmp.sh
|
||||||
|
- bash <(curl -s https://codecov.io/bash)
|
15
.travis/benchcmp.sh
Executable file
15
.travis/benchcmp.sh
Executable file
@ -0,0 +1,15 @@
|
|||||||
|
if [ "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" != "master" ]; then
|
||||||
|
REMOTE_URL="$(git config --get remote.origin.url)";
|
||||||
|
cd ${TRAVIS_BUILD_DIR}/.. && \
|
||||||
|
git clone ${REMOTE_URL} "${TRAVIS_REPO_SLUG}-bench" && \
|
||||||
|
cd "${TRAVIS_REPO_SLUG}-bench" && \
|
||||||
|
# Benchmark master
|
||||||
|
git checkout master && \
|
||||||
|
go test -run=XXX -bench=. ./... > master.txt && \
|
||||||
|
# Benchmark feature branch
|
||||||
|
git checkout ${TRAVIS_COMMIT} && \
|
||||||
|
go test -run=XXX -bench=. ./... > feature.txt && \
|
||||||
|
go get -u golang.org/x/tools/cmd/benchcmp && \
|
||||||
|
# compare two benchmarks
|
||||||
|
benchcmp master.txt feature.txt;
|
||||||
|
fi
|
438
CHANGELOG.md
438
CHANGELOG.md
@ -7,444 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
## [0.25.1] - 2024-12-11
|
|
||||||
|
|
||||||
### Upgrades
|
|
||||||
|
|
||||||
* Some packages
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
* Add `HeartbeatInterval` option to the scheduler (PR: https://github.com/hibiken/asynq/pull/956)
|
|
||||||
* Add `RedisUniversalClient` support to periodic task manager (PR: https://github.com/hibiken/asynq/pull/958)
|
|
||||||
* Add `--insecure` flag to CLI dash command (PR: https://github.com/hibiken/asynq/pull/980)
|
|
||||||
* Add logging for registration errors (PR: https://github.com/hibiken/asynq/pull/657)
|
|
||||||
|
|
||||||
### Fixes
|
|
||||||
- Perf: Use string concat inplace of fmt.Sprintf in hotpath (PR: https://github.com/hibiken/asynq/pull/962)
|
|
||||||
- Perf: Init map with size (PR: https://github.com/hibiken/asynq/pull/673)
|
|
||||||
- Fix: `Scheduler` and `PeriodicTaskManager` graceful shutdown (PR: https://github.com/hibiken/asynq/pull/977)
|
|
||||||
- Fix: `Server` graceful shutdown on UNIX systems (PR: https://github.com/hibiken/asynq/pull/982)
|
|
||||||
|
|
||||||
## [0.25.0] - 2024-10-29
|
|
||||||
|
|
||||||
### Upgrades
|
|
||||||
- Minumum go version is set to 1.22 (PR: https://github.com/hibiken/asynq/pull/925)
|
|
||||||
- Internal protobuf package is upgraded to address security advisories (PR: https://github.com/hibiken/asynq/pull/925)
|
|
||||||
- Most packages are upgraded
|
|
||||||
- CI/CD spec upgraded
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- `IsPanicError` function is introduced to support catching of panic errors when processing tasks (PR: https://github.com/hibiken/asynq/pull/491)
|
|
||||||
- `JanitorInterval` and `JanitorBatchSize` are added as Server options (PR: https://github.com/hibiken/asynq/pull/715)
|
|
||||||
- `NewClientFromRedisClient` is introduced to allow reusing an existing redis client (PR: https://github.com/hibiken/asynq/pull/742)
|
|
||||||
- `TaskCheckInterval` config option is added to specify the interval between checks for new tasks to process when all queues are empty (PR: https://github.com/hibiken/asynq/pull/694)
|
|
||||||
- `Ping` method is added to Client, Server and Scheduler ((PR: https://github.com/hibiken/asynq/pull/585))
|
|
||||||
- `RevokeTask` error type is introduced to prevent a task from being retried or archived (PR: https://github.com/hibiken/asynq/pull/882)
|
|
||||||
- `SentinelUsername` is added as a redis config option (PR: https://github.com/hibiken/asynq/pull/924)
|
|
||||||
- Some jitter is introduced to improve latency when fetching jobs in the processor (PR: https://github.com/hibiken/asynq/pull/868)
|
|
||||||
- Add task enqueue command to the CLI (PR: https://github.com/hibiken/asynq/pull/918)
|
|
||||||
- Add a map cache (concurrent safe) to keep track of queues that ultimately reduces redis load when enqueuing tasks (PR: https://github.com/hibiken/asynq/pull/946)
|
|
||||||
|
|
||||||
### Fixes
|
|
||||||
- Archived tasks that are trimmed should now be deleted (PR: https://github.com/hibiken/asynq/pull/743)
|
|
||||||
- Fix lua script when listing task messages with an expired lease (PR: https://github.com/hibiken/asynq/pull/709)
|
|
||||||
- Fix potential context leaks due to cancellation not being called (PR: https://github.com/hibiken/asynq/pull/926)
|
|
||||||
- Misc documentation fixes
|
|
||||||
- Misc test fixes
|
|
||||||
|
|
||||||
|
|
||||||
## [0.24.1] - 2023-05-01
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Updated package version dependency for go-redis
|
|
||||||
|
|
||||||
## [0.24.0] - 2023-01-02
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- `PreEnqueueFunc`, `PostEnqueueFunc` is added in `Scheduler` and deprecated `EnqueueErrorHandler` (PR: https://github.com/hibiken/asynq/pull/476)
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Removed error log when `Scheduler` failed to enqueue a task. Use `PostEnqueueFunc` to check for errors and task actions if needed.
|
|
||||||
- Changed log level from ERROR to WARNINING when `Scheduler` failed to record `SchedulerEnqueueEvent`.
|
|
||||||
|
|
||||||
## [0.23.0] - 2022-04-11
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `Group` option is introduced to enqueue task in a group.
|
|
||||||
- `GroupAggregator` and related types are introduced for task aggregation feature.
|
|
||||||
- `GroupGracePeriod`, `GroupMaxSize`, `GroupMaxDelay`, and `GroupAggregator` fields are added to `Config`.
|
|
||||||
- `Inspector` has new methods related to "aggregating tasks".
|
|
||||||
- `Group` field is added to `TaskInfo`.
|
|
||||||
- (CLI): `group ls` command is added
|
|
||||||
- (CLI): `task ls` supports listing aggregating tasks via `--state=aggregating --group=<GROUP>` flags
|
|
||||||
- Enable rediss url parsing support
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Fixed overflow issue with 32-bit systems (For details, see https://github.com/hibiken/asynq/pull/426)
|
|
||||||
|
|
||||||
## [0.22.1] - 2022-02-20
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Fixed Redis version compatibility: Keep support for redis v4.0+
|
|
||||||
|
|
||||||
## [0.22.0] - 2022-02-19
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `BaseContext` is introduced in `Config` to specify callback hook to provide a base `context` from which `Handler` `context` is derived
|
|
||||||
- `IsOrphaned` field is added to `TaskInfo` to describe a task left in active state with no worker processing it.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- `Server` now recovers tasks with an expired lease. Recovered tasks are retried/archived with `ErrLeaseExpired` error.
|
|
||||||
|
|
||||||
## [0.21.0] - 2022-01-22
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `PeriodicTaskManager` is added. Prefer using this over `Scheduler` as it has better support for dynamic periodic tasks.
|
|
||||||
- The `asynq stats` command now supports a `--json` option, making its output a JSON object
|
|
||||||
- Introduced new configuration for `DelayedTaskCheckInterval`. See [godoc](https://godoc.org/github.com/hibiken/asynq) for more details.
|
|
||||||
|
|
||||||
## [0.20.0] - 2021-12-19
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- Package `x/metrics` is added.
|
|
||||||
- Tool `tools/metrics_exporter` binary is added.
|
|
||||||
- `ProcessedTotal` and `FailedTotal` fields were added to `QueueInfo` struct.
|
|
||||||
|
|
||||||
## [0.19.1] - 2021-12-12
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `Latency` field is added to `QueueInfo`.
|
|
||||||
- `EnqueueContext` method is added to `Client`.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Fixed an error when user pass a duration less than 1s to `Unique` option
|
|
||||||
|
|
||||||
## [0.19.0] - 2021-11-06
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- `NewTask` takes `Option` as variadic argument
|
|
||||||
- Bumped minimum supported go version to 1.14 (i.e. go1.14 or higher is required).
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `Retention` option is added to allow user to specify task retention duration after completion.
|
|
||||||
- `TaskID` option is added to allow user to specify task ID.
|
|
||||||
- `ErrTaskIDConflict` sentinel error value is added.
|
|
||||||
- `ResultWriter` type is added and provided through `Task.ResultWriter` method.
|
|
||||||
- `TaskInfo` has new fields `CompletedAt`, `Result` and `Retention`.
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
|
|
||||||
- `Client.SetDefaultOptions` is removed. Use `NewTask` instead to pass default options for tasks.
|
|
||||||
|
|
||||||
## [0.18.6] - 2021-10-03
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- Updated `github.com/go-redis/redis` package to v8
|
|
||||||
|
|
||||||
## [0.18.5] - 2021-09-01
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `IsFailure` config option is added to determine whether error returned from Handler counts as a failure.
|
|
||||||
|
|
||||||
## [0.18.4] - 2021-08-17
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Scheduler methods are now thread-safe. It's now safe to call `Register` and `Unregister` concurrently.
|
|
||||||
|
|
||||||
## [0.18.3] - 2021-08-09
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- `Client.Enqueue` no longer enqueues tasks with empty typename; Error message is returned.
|
|
||||||
|
|
||||||
## [0.18.2] - 2021-07-15
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- Changed `Queue` function to not to convert the provided queue name to lowercase. Queue names are now case-sensitive.
|
|
||||||
- `QueueInfo.MemoryUsage` is now an approximate usage value.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Fixed latency issue around memory usage (see https://github.com/hibiken/asynq/issues/309).
|
|
||||||
|
|
||||||
## [0.18.1] - 2021-07-04
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- Changed to execute task recovering logic when server starts up; Previously it needed to wait for a minute for task recovering logic to exeucte.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Fixed task recovering logic to execute every minute
|
|
||||||
|
|
||||||
## [0.18.0] - 2021-06-29
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- NewTask function now takes array of bytes as payload.
|
|
||||||
- Task `Type` and `Payload` should be accessed by a method call.
|
|
||||||
- `Server` API has changed. Renamed `Quiet` to `Stop`. Renamed `Stop` to `Shutdown`. _Note:_ As a result of this renaming, the behavior of `Stop` has changed. Please update the exising code to call `Shutdown` where it used to call `Stop`.
|
|
||||||
- `Scheduler` API has changed. Renamed `Stop` to `Shutdown`.
|
|
||||||
- Requires redis v4.0+ for multiple field/value pair support
|
|
||||||
- `Client.Enqueue` now returns `TaskInfo`
|
|
||||||
- `Inspector.RunTaskByKey` is replaced with `Inspector.RunTask`
|
|
||||||
- `Inspector.DeleteTaskByKey` is replaced with `Inspector.DeleteTask`
|
|
||||||
- `Inspector.ArchiveTaskByKey` is replaced with `Inspector.ArchiveTask`
|
|
||||||
- `inspeq` package is removed. All types and functions from the package is moved to `asynq` package.
|
|
||||||
- `WorkerInfo` field names have changed.
|
|
||||||
- `Inspector.CancelActiveTask` is renamed to `Inspector.CancelProcessing`
|
|
||||||
|
|
||||||
## [0.17.2] - 2021-06-06
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Free unique lock when task is deleted (https://github.com/hibiken/asynq/issues/275).
|
|
||||||
|
|
||||||
## [0.17.1] - 2021-04-04
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Fix bug in internal `RDB.memoryUsage` method.
|
|
||||||
|
|
||||||
## [0.17.0] - 2021-03-24
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `DialTimeout`, `ReadTimeout`, and `WriteTimeout` options are added to `RedisConnOpt`.
|
|
||||||
|
|
||||||
## [0.16.1] - 2021-03-20
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Replace `KEYS` command with `SCAN` as recommended by [redis doc](https://redis.io/commands/KEYS).
|
|
||||||
|
|
||||||
## [0.16.0] - 2021-03-10
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `Unregister` method is added to `Scheduler` to remove a registered entry.
|
|
||||||
|
|
||||||
## [0.15.0] - 2021-01-31
|
|
||||||
|
|
||||||
**IMPORTATNT**: All `Inspector` related code are moved to subpackage "github.com/hibiken/asynq/inspeq"
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- `Inspector` related code are moved to subpackage "github.com/hibken/asynq/inspeq".
|
|
||||||
- `RedisConnOpt` interface has changed slightly. If you have been passing `RedisClientOpt`, `RedisFailoverClientOpt`, or `RedisClusterClientOpt` as a pointer,
|
|
||||||
update your code to pass as a value.
|
|
||||||
- `ErrorMsg` field in `RetryTask` and `ArchivedTask` was renamed to `LastError`.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `MaxRetry`, `Retried`, `LastError` fields were added to all task types returned from `Inspector`.
|
|
||||||
- `MemoryUsage` field was added to `QueueStats`.
|
|
||||||
- `DeleteAllPendingTasks`, `ArchiveAllPendingTasks` were added to `Inspector`
|
|
||||||
- `DeleteTaskByKey` and `ArchiveTaskByKey` now supports deleting/archiving `PendingTask`.
|
|
||||||
- asynq CLI now supports deleting/archiving pending tasks.
|
|
||||||
|
|
||||||
## [0.14.1] - 2021-01-19
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- `go.mod` file for CLI
|
|
||||||
|
|
||||||
## [0.14.0] - 2021-01-14
|
|
||||||
|
|
||||||
**IMPORTATNT**: Please run `asynq migrate` command to migrate from the previous versions.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- Renamed `DeadTask` to `ArchivedTask`.
|
|
||||||
- Renamed the operation `Kill` to `Archive` in `Inpsector`.
|
|
||||||
- Print stack trace when Handler panics.
|
|
||||||
- Include a file name and a line number in the error message when recovering from a panic.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `DefaultRetryDelayFunc` is now a public API, which can be used in the custom `RetryDelayFunc`.
|
|
||||||
- `SkipRetry` error is added to be used as a return value from `Handler`.
|
|
||||||
- `Servers` method is added to `Inspector`
|
|
||||||
- `CancelActiveTask` method is added to `Inspector`.
|
|
||||||
- `ListSchedulerEnqueueEvents` method is added to `Inspector`.
|
|
||||||
- `SchedulerEntries` method is added to `Inspector`.
|
|
||||||
- `DeleteQueue` method is added to `Inspector`.
|
|
||||||
|
|
||||||
## [0.13.1] - 2020-11-22
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Fixed processor to wait for specified time duration before forcefully shutdown workers.
|
|
||||||
|
|
||||||
## [0.13.0] - 2020-10-13
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `Scheduler` type is added to enable periodic tasks. See the godoc for its APIs and [wiki](https://github.com/hibiken/asynq/wiki/Periodic-Tasks) for the getting-started guide.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- interface `Option` has changed. See the godoc for the new interface.
|
|
||||||
This change would have no impact as long as you are using exported functions (e.g. `MaxRetry`, `Queue`, etc)
|
|
||||||
to create `Option`s.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `Payload.String() string` method is added
|
|
||||||
- `Payload.MarshalJSON() ([]byte, error)` method is added
|
|
||||||
|
|
||||||
## [0.12.0] - 2020-09-12
|
|
||||||
|
|
||||||
**IMPORTANT**: If you are upgrading from a previous version, please install the latest version of the CLI `go get -u github.com/hibiken/asynq/tools/asynq` and run `asynq migrate` command. No process should be writing to Redis while you run the migration command.
|
|
||||||
|
|
||||||
## The semantics of queue have changed
|
|
||||||
|
|
||||||
Previously, we called tasks that are ready to be processed _"Enqueued tasks"_, and other tasks that are scheduled to be processed in the future _"Scheduled tasks"_, etc.
|
|
||||||
We changed the semantics of _"Enqueue"_ slightly; All tasks that client pushes to Redis are _Enqueued_ to a queue. Within a queue, tasks will transition from one state to another.
|
|
||||||
Possible task states are:
|
|
||||||
|
|
||||||
- `Pending`: task is ready to be processed (previously called "Enqueued")
|
|
||||||
- `Active`: tasks is currently being processed (previously called "InProgress")
|
|
||||||
- `Scheduled`: task is scheduled to be processed in the future
|
|
||||||
- `Retry`: task failed to be processed and will be retried again in the future
|
|
||||||
- `Dead`: task has exhausted all of its retries and stored for manual inspection purpose
|
|
||||||
|
|
||||||
**These semantics change is reflected in the new `Inspector` API and CLI commands.**
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
#### `Client`
|
|
||||||
|
|
||||||
Use `ProcessIn` or `ProcessAt` option to schedule a task instead of `EnqueueIn` or `EnqueueAt`.
|
|
||||||
|
|
||||||
| Previously | v0.12.0 |
|
|
||||||
| --------------------------- | ------------------------------------------ |
|
|
||||||
| `client.EnqueueAt(t, task)` | `client.Enqueue(task, asynq.ProcessAt(t))` |
|
|
||||||
| `client.EnqueueIn(d, task)` | `client.Enqueue(task, asynq.ProcessIn(d))` |
|
|
||||||
|
|
||||||
#### `Inspector`
|
|
||||||
|
|
||||||
All Inspector methods are scoped to a queue, and the methods take `qname (string)` as the first argument.
|
|
||||||
`EnqueuedTask` is renamed to `PendingTask` and its corresponding methods.
|
|
||||||
`InProgressTask` is renamed to `ActiveTask` and its corresponding methods.
|
|
||||||
Command "Enqueue" is replaced by the verb "Run" (e.g. `EnqueueAllScheduledTasks` --> `RunAllScheduledTasks`)
|
|
||||||
|
|
||||||
#### `CLI`
|
|
||||||
|
|
||||||
CLI commands are restructured to use subcommands. Commands are organized into a few management commands:
|
|
||||||
To view details on any command, use `asynq help <command> <subcommand>`.
|
|
||||||
|
|
||||||
- `asynq stats`
|
|
||||||
- `asynq queue [ls inspect history rm pause unpause]`
|
|
||||||
- `asynq task [ls cancel delete kill run delete-all kill-all run-all]`
|
|
||||||
- `asynq server [ls]`
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
#### `RedisConnOpt`
|
|
||||||
|
|
||||||
- `RedisClusterClientOpt` is added to connect to Redis Cluster.
|
|
||||||
- `Username` field is added to all `RedisConnOpt` types in order to authenticate connection when Redis ACLs are used.
|
|
||||||
|
|
||||||
#### `Client`
|
|
||||||
|
|
||||||
- `ProcessIn(d time.Duration) Option` and `ProcessAt(t time.Time) Option` are added to replace `EnqueueIn` and `EnqueueAt` functionality.
|
|
||||||
|
|
||||||
#### `Inspector`
|
|
||||||
|
|
||||||
- `Queues() ([]string, error)` method is added to get all queue names.
|
|
||||||
- `ClusterKeySlot(qname string) (int64, error)` method is added to get queue's hash slot in Redis cluster.
|
|
||||||
- `ClusterNodes(qname string) ([]ClusterNode, error)` method is added to get a list of Redis cluster nodes for the given queue.
|
|
||||||
- `Close() error` method is added to close connection with redis.
|
|
||||||
|
|
||||||
### `Handler`
|
|
||||||
|
|
||||||
- `GetQueueName(ctx context.Context) (string, bool)` helper is added to extract queue name from a context.
|
|
||||||
|
|
||||||
## [0.11.0] - 2020-07-28
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `Inspector` type was added to monitor and mutate state of queues and tasks.
|
|
||||||
- `HealthCheckFunc` and `HealthCheckInterval` fields were added to `Config` to allow user to specify a callback
|
|
||||||
function to check for broker connection.
|
|
||||||
|
|
||||||
## [0.10.0] - 2020-07-06
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- All tasks now requires timeout or deadline. By default, timeout is set to 30 mins.
|
|
||||||
- Tasks that exceed its deadline are automatically retried.
|
|
||||||
- Encoding schema for task message has changed. Please install the latest CLI and run `migrate` command if
|
|
||||||
you have tasks enqueued with the previous version of asynq.
|
|
||||||
- API of `(*Client).Enqueue`, `(*Client).EnqueueIn`, and `(*Client).EnqueueAt` has changed to return a `*Result`.
|
|
||||||
- API of `ErrorHandler` has changed. It now takes context as the first argument and removed `retried`, `maxRetry` from the argument list.
|
|
||||||
Use `GetRetryCount` and/or `GetMaxRetry` to get the count values.
|
|
||||||
|
|
||||||
## [0.9.4] - 2020-06-13
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Fixes issue of same tasks processed by more than one worker (https://github.com/hibiken/asynq/issues/90).
|
|
||||||
|
|
||||||
## [0.9.3] - 2020-06-12
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Fixes the JSON number overflow issue (https://github.com/hibiken/asynq/issues/166).
|
|
||||||
|
|
||||||
## [0.9.2] - 2020-06-08
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- The `pause` and `unpause` commands were added to the CLI. See README for the CLI for details.
|
|
||||||
|
|
||||||
## [0.9.1] - 2020-05-29
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `GetTaskID`, `GetRetryCount`, and `GetMaxRetry` functions were added to extract task metadata from context.
|
|
||||||
|
|
||||||
## [0.9.0] - 2020-05-16
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- `Logger` interface has changed. Please see the godoc for the new interface.
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `LogLevel` type is added. Server's log level can be specified through `LogLevel` field in `Config`.
|
|
||||||
|
|
||||||
## [0.8.3] - 2020-05-08
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `Close` method is added to `Client`.
|
|
||||||
|
|
||||||
## [0.8.2] - 2020-05-03
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- [Fixed cancelfunc leak](https://github.com/hibiken/asynq/pull/145)
|
|
||||||
|
|
||||||
## [0.8.1] - 2020-04-27
|
## [0.8.1] - 2020-04-27
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
@ -1,128 +0,0 @@
|
|||||||
# Contributor Covenant Code of Conduct
|
|
||||||
|
|
||||||
## Our Pledge
|
|
||||||
|
|
||||||
We as members, contributors, and leaders pledge to make participation in our
|
|
||||||
community a harassment-free experience for everyone, regardless of age, body
|
|
||||||
size, visible or invisible disability, ethnicity, sex characteristics, gender
|
|
||||||
identity and expression, level of experience, education, socio-economic status,
|
|
||||||
nationality, personal appearance, race, religion, or sexual identity
|
|
||||||
and orientation.
|
|
||||||
|
|
||||||
We pledge to act and interact in ways that contribute to an open, welcoming,
|
|
||||||
diverse, inclusive, and healthy community.
|
|
||||||
|
|
||||||
## Our Standards
|
|
||||||
|
|
||||||
Examples of behavior that contributes to a positive environment for our
|
|
||||||
community include:
|
|
||||||
|
|
||||||
* Demonstrating empathy and kindness toward other people
|
|
||||||
* Being respectful of differing opinions, viewpoints, and experiences
|
|
||||||
* Giving and gracefully accepting constructive feedback
|
|
||||||
* Accepting responsibility and apologizing to those affected by our mistakes,
|
|
||||||
and learning from the experience
|
|
||||||
* Focusing on what is best not just for us as individuals, but for the
|
|
||||||
overall community
|
|
||||||
|
|
||||||
Examples of unacceptable behavior include:
|
|
||||||
|
|
||||||
* The use of sexualized language or imagery, and sexual attention or
|
|
||||||
advances of any kind
|
|
||||||
* Trolling, insulting or derogatory comments, and personal or political attacks
|
|
||||||
* Public or private harassment
|
|
||||||
* Publishing others' private information, such as a physical or email
|
|
||||||
address, without their explicit permission
|
|
||||||
* Other conduct which could reasonably be considered inappropriate in a
|
|
||||||
professional setting
|
|
||||||
|
|
||||||
## Enforcement Responsibilities
|
|
||||||
|
|
||||||
Community leaders are responsible for clarifying and enforcing our standards of
|
|
||||||
acceptable behavior and will take appropriate and fair corrective action in
|
|
||||||
response to any behavior that they deem inappropriate, threatening, offensive,
|
|
||||||
or harmful.
|
|
||||||
|
|
||||||
Community leaders have the right and responsibility to remove, edit, or reject
|
|
||||||
comments, commits, code, wiki edits, issues, and other contributions that are
|
|
||||||
not aligned to this Code of Conduct, and will communicate reasons for moderation
|
|
||||||
decisions when appropriate.
|
|
||||||
|
|
||||||
## Scope
|
|
||||||
|
|
||||||
This Code of Conduct applies within all community spaces, and also applies when
|
|
||||||
an individual is officially representing the community in public spaces.
|
|
||||||
Examples of representing our community include using an official e-mail address,
|
|
||||||
posting via an official social media account, or acting as an appointed
|
|
||||||
representative at an online or offline event.
|
|
||||||
|
|
||||||
## Enforcement
|
|
||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
|
||||||
reported to the community leaders responsible for enforcement at
|
|
||||||
ken.hibino7@gmail.com.
|
|
||||||
All complaints will be reviewed and investigated promptly and fairly.
|
|
||||||
|
|
||||||
All community leaders are obligated to respect the privacy and security of the
|
|
||||||
reporter of any incident.
|
|
||||||
|
|
||||||
## Enforcement Guidelines
|
|
||||||
|
|
||||||
Community leaders will follow these Community Impact Guidelines in determining
|
|
||||||
the consequences for any action they deem in violation of this Code of Conduct:
|
|
||||||
|
|
||||||
### 1. Correction
|
|
||||||
|
|
||||||
**Community Impact**: Use of inappropriate language or other behavior deemed
|
|
||||||
unprofessional or unwelcome in the community.
|
|
||||||
|
|
||||||
**Consequence**: A private, written warning from community leaders, providing
|
|
||||||
clarity around the nature of the violation and an explanation of why the
|
|
||||||
behavior was inappropriate. A public apology may be requested.
|
|
||||||
|
|
||||||
### 2. Warning
|
|
||||||
|
|
||||||
**Community Impact**: A violation through a single incident or series
|
|
||||||
of actions.
|
|
||||||
|
|
||||||
**Consequence**: A warning with consequences for continued behavior. No
|
|
||||||
interaction with the people involved, including unsolicited interaction with
|
|
||||||
those enforcing the Code of Conduct, for a specified period of time. This
|
|
||||||
includes avoiding interactions in community spaces as well as external channels
|
|
||||||
like social media. Violating these terms may lead to a temporary or
|
|
||||||
permanent ban.
|
|
||||||
|
|
||||||
### 3. Temporary Ban
|
|
||||||
|
|
||||||
**Community Impact**: A serious violation of community standards, including
|
|
||||||
sustained inappropriate behavior.
|
|
||||||
|
|
||||||
**Consequence**: A temporary ban from any sort of interaction or public
|
|
||||||
communication with the community for a specified period of time. No public or
|
|
||||||
private interaction with the people involved, including unsolicited interaction
|
|
||||||
with those enforcing the Code of Conduct, is allowed during this period.
|
|
||||||
Violating these terms may lead to a permanent ban.
|
|
||||||
|
|
||||||
### 4. Permanent Ban
|
|
||||||
|
|
||||||
**Community Impact**: Demonstrating a pattern of violation of community
|
|
||||||
standards, including sustained inappropriate behavior, harassment of an
|
|
||||||
individual, or aggression toward or disparagement of classes of individuals.
|
|
||||||
|
|
||||||
**Consequence**: A permanent ban from any sort of public interaction within
|
|
||||||
the community.
|
|
||||||
|
|
||||||
## Attribution
|
|
||||||
|
|
||||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
|
||||||
version 2.0, available at
|
|
||||||
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
|
|
||||||
|
|
||||||
Community Impact Guidelines were inspired by [Mozilla's code of conduct
|
|
||||||
enforcement ladder](https://github.com/mozilla/diversity).
|
|
||||||
|
|
||||||
[homepage]: https://www.contributor-covenant.org
|
|
||||||
|
|
||||||
For answers to common questions about this code of conduct, see the FAQ at
|
|
||||||
https://www.contributor-covenant.org/faq. Translations are available at
|
|
||||||
https://www.contributor-covenant.org/translations.
|
|
@ -38,14 +38,13 @@ Thank you! We'll try to respond as quickly as possible.
|
|||||||
## Contributing Code
|
## Contributing Code
|
||||||
|
|
||||||
1. Fork this repo
|
1. Fork this repo
|
||||||
2. Download your fork `git clone git@github.com:your-username/asynq.git && cd asynq`
|
2. Download your fork `git clone https://github.com/your-username/asynq && cd asynq`
|
||||||
3. Create your branch `git checkout -b your-branch-name`
|
3. Create your branch `git checkout -b your-branch-name`
|
||||||
4. Make and commit your changes
|
4. Make and commit your changes
|
||||||
5. Push the branch `git push origin your-branch-name`
|
5. Push the branch `git push origin your-branch-name`
|
||||||
6. Create a new pull request
|
6. Create a new pull request
|
||||||
|
|
||||||
Please try to keep your pull request focused in scope and avoid including unrelated commits.
|
Please try to keep your pull request focused in scope and avoid including unrelated commits.
|
||||||
Please run tests against redis cluster locally with `--redis_cluster` flag to ensure that code works for Redis cluster. TODO: Run tests using Redis cluster on CI.
|
|
||||||
|
|
||||||
After you have submitted your pull request, we'll try to get back to you as soon as possible. We may suggest some changes or improvements.
|
After you have submitted your pull request, we'll try to get back to you as soon as possible. We may suggest some changes or improvements.
|
||||||
|
|
||||||
|
11
Makefile
11
Makefile
@ -1,11 +0,0 @@
|
|||||||
ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
|
|
||||||
|
|
||||||
proto: internal/proto/asynq.proto
|
|
||||||
protoc -I=$(ROOT_DIR)/internal/proto \
|
|
||||||
--go_out=$(ROOT_DIR)/internal/proto \
|
|
||||||
--go_opt=module=github.com/hibiken/asynq/internal/proto \
|
|
||||||
$(ROOT_DIR)/internal/proto/asynq.proto
|
|
||||||
|
|
||||||
.PHONY: lint
|
|
||||||
lint:
|
|
||||||
golangci-lint run
|
|
322
README.md
322
README.md
@ -1,167 +1,141 @@
|
|||||||
<img src="https://user-images.githubusercontent.com/11155743/114697792-ffbfa580-9d26-11eb-8e5b-33bef69476dc.png" alt="Asynq logo" width="360px" />
|
# Asynq
|
||||||
|
|
||||||
# Simple, reliable & efficient distributed task queue in Go
|
[](https://travis-ci.com/hibiken/asynq)
|
||||||
|
|
||||||
[](https://godoc.org/github.com/hibiken/asynq)
|
|
||||||
[](https://goreportcard.com/report/github.com/hibiken/asynq)
|
|
||||||

|
|
||||||
[](https://opensource.org/licenses/MIT)
|
[](https://opensource.org/licenses/MIT)
|
||||||
|
[](https://goreportcard.com/report/github.com/hibiken/asynq)
|
||||||
|
[](https://godoc.org/github.com/hibiken/asynq)
|
||||||
[](https://gitter.im/go-asynq/community)
|
[](https://gitter.im/go-asynq/community)
|
||||||
|
[](https://codecov.io/gh/hibiken/asynq)
|
||||||
|
|
||||||
Asynq is a Go library for queueing tasks and processing them asynchronously with workers. It's backed by [Redis](https://redis.io/) and is designed to be scalable yet easy to get started.
|
## Overview
|
||||||
|
|
||||||
|
Asynq is a Go library for queueing tasks and processing them in the background with workers. It is backed by Redis and it is designed to have a low barrier to entry. It should be integrated in your web stack easily.
|
||||||
|
|
||||||
Highlevel overview of how Asynq works:
|
Highlevel overview of how Asynq works:
|
||||||
|
|
||||||
- Client puts tasks on a queue
|
- Client puts task on a queue
|
||||||
- Server pulls tasks off queues and starts a worker goroutine for each task
|
- Server pulls task off queues and starts a worker goroutine for each task
|
||||||
- Tasks are processed concurrently by multiple workers
|
- Tasks are processed concurrently by multiple workers
|
||||||
|
|
||||||
Task queues are used as a mechanism to distribute work across multiple machines. A system can consist of multiple worker servers and brokers, giving way to high availability and horizontal scaling.
|
Task queues are used as a mechanism to distribute work across multiple machines.
|
||||||
|
A system can consist of multiple worker servers and brokers, giving way to high availability and horizontal scaling.
|
||||||
|
|
||||||
**Example use case**
|

|
||||||
|
|
||||||

|
## Stability and Compatibility
|
||||||
|
|
||||||
|
**Important Note**: Current major version is zero (v0.x.x) to accomodate rapid development and fast iteration while getting early feedback from users (Feedback on APIs are appreciated!). The public API could change without a major version update before v1.0.0 release.
|
||||||
|
|
||||||
|
**Status**: The library is currently undergoing heavy development with frequent, breaking API changes.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- Guaranteed [at least one execution](https://www.cloudcomputingpatterns.org/at_least_once_delivery/) of a task
|
- Guaranteed [at least one execution](https://www.cloudcomputingpatterns.org/at_least_once_delivery/) of a task
|
||||||
- Scheduling of tasks
|
- Scheduling of tasks
|
||||||
|
- Durability since tasks are written to Redis
|
||||||
- [Retries](https://github.com/hibiken/asynq/wiki/Task-Retry) of failed tasks
|
- [Retries](https://github.com/hibiken/asynq/wiki/Task-Retry) of failed tasks
|
||||||
- Automatic recovery of tasks in the event of a worker crash
|
- [Weighted priority queues](https://github.com/hibiken/asynq/wiki/Priority-Queues#weighted-priority-queues)
|
||||||
- [Weighted priority queues](https://github.com/hibiken/asynq/wiki/Queue-Priority#weighted-priority)
|
- [Strict priority queues](https://github.com/hibiken/asynq/wiki/Priority-Queues#strict-priority-queues)
|
||||||
- [Strict priority queues](https://github.com/hibiken/asynq/wiki/Queue-Priority#strict-priority)
|
|
||||||
- Low latency to add a task since writes are fast in Redis
|
- Low latency to add a task since writes are fast in Redis
|
||||||
- De-duplication of tasks using [unique option](https://github.com/hibiken/asynq/wiki/Unique-Tasks)
|
- De-duplication of tasks using [unique option](https://github.com/hibiken/asynq/wiki/Unique-Tasks)
|
||||||
- Allow [timeout and deadline per task](https://github.com/hibiken/asynq/wiki/Task-Timeout-and-Cancelation)
|
- Allow timeout and deadline per task
|
||||||
- Allow [aggregating group of tasks](https://github.com/hibiken/asynq/wiki/Task-aggregation) to batch multiple successive operations
|
- Flexible handler interface with support for middlewares
|
||||||
- [Flexible handler interface with support for middlewares](https://github.com/hibiken/asynq/wiki/Handler-Deep-Dive)
|
- [Support Redis Sentinels](https://github.com/hibiken/asynq/wiki/Automatic-Failover) for HA
|
||||||
- [Ability to pause queue](/tools/asynq/README.md#pause) to stop processing tasks from the queue
|
|
||||||
- [Periodic Tasks](https://github.com/hibiken/asynq/wiki/Periodic-Tasks)
|
|
||||||
- [Support Redis Sentinels](https://github.com/hibiken/asynq/wiki/Automatic-Failover) for high availability
|
|
||||||
- Integration with [Prometheus](https://prometheus.io/) to collect and visualize queue metrics
|
|
||||||
- [Web UI](#web-ui) to inspect and remote-control queues and tasks
|
|
||||||
- [CLI](#command-line-tool) to inspect and remote-control queues and tasks
|
- [CLI](#command-line-tool) to inspect and remote-control queues and tasks
|
||||||
|
|
||||||
## Stability and Compatibility
|
|
||||||
|
|
||||||
**Status**: The library relatively stable and is currently undergoing **moderate development** with less frequent breaking API changes.
|
|
||||||
|
|
||||||
> ☝️ **Important Note**: Current major version is zero (`v0.x.x`) to accommodate rapid development and fast iteration while getting early feedback from users (_feedback on APIs are appreciated!_). The public API could change without a major version update before `v1.0.0` release.
|
|
||||||
|
|
||||||
### Redis Cluster Compatibility
|
|
||||||
|
|
||||||
Some of the lua scripts in this library may not be compatible with Redis Cluster.
|
|
||||||
|
|
||||||
## Sponsoring
|
|
||||||
If you are using this package in production, **please consider sponsoring the project to show your support!**
|
|
||||||
|
|
||||||
## Quickstart
|
## Quickstart
|
||||||
Make sure you have Go installed ([download](https://golang.org/dl/)). The **last two** Go versions are supported (See https://go.dev/dl).
|
|
||||||
|
|
||||||
Initialize your project by creating a folder and then running `go mod init github.com/your/repo` ([learn more](https://blog.golang.org/using-go-modules)) inside the folder. Then install Asynq library with the [`go get`](https://golang.org/cmd/go/#hdr-Add_dependencies_to_current_module_and_install_them) command:
|
First, make sure you are running a Redis server locally.
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
go get -u github.com/hibiken/asynq
|
$ redis-server
|
||||||
```
|
```
|
||||||
|
|
||||||
Make sure you're running a Redis server locally or from a [Docker](https://hub.docker.com/_/redis) container. Version `4.0` or higher is required.
|
|
||||||
|
|
||||||
Next, write a package that encapsulates task creation and task handling.
|
Next, write a package that encapsulates task creation and task handling.
|
||||||
|
|
||||||
```go
|
```go
|
||||||
package tasks
|
package tasks
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"time"
|
|
||||||
"github.com/hibiken/asynq"
|
"github.com/hibiken/asynq"
|
||||||
)
|
)
|
||||||
|
|
||||||
// A list of task types.
|
// A list of task types.
|
||||||
const (
|
const (
|
||||||
TypeEmailDelivery = "email:deliver"
|
EmailDelivery = "email:deliver"
|
||||||
TypeImageResize = "image:resize"
|
ImageProcessing = "image:process"
|
||||||
)
|
)
|
||||||
|
|
||||||
type EmailDeliveryPayload struct {
|
//--------------------------------------------
|
||||||
UserID int
|
// Write function NewXXXTask to create a task.
|
||||||
TemplateID string
|
//--------------------------------------------
|
||||||
|
|
||||||
|
func NewEmailDeliveryTask(userID int, tmplID string) *asynq.Task {
|
||||||
|
payload := map[string]interface{}{"user_id": userID, "template_id": tmplID}
|
||||||
|
return asynq.NewTask(EmailDelivery, payload)
|
||||||
}
|
}
|
||||||
|
|
||||||
type ImageResizePayload struct {
|
func NewImageProcessingTask(src, dst string) *asynq.Task {
|
||||||
SourceURL string
|
payload := map[string]interface{}{"src": src, "dst": dst}
|
||||||
|
return asynq.NewTask(ImageProcessing, payload)
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------
|
//-------------------------------------------------------------
|
||||||
// Write a function NewXXXTask to create a task.
|
// Write function HandleXXXTask to handle the given task.
|
||||||
// A task consists of a type and a payload.
|
// NOTE: It satisfies the asynq.HandlerFunc interface.
|
||||||
//----------------------------------------------
|
|
||||||
|
|
||||||
func NewEmailDeliveryTask(userID int, tmplID string) (*asynq.Task, error) {
|
|
||||||
payload, err := json.Marshal(EmailDeliveryPayload{UserID: userID, TemplateID: tmplID})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return asynq.NewTask(TypeEmailDelivery, payload), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewImageResizeTask(src string) (*asynq.Task, error) {
|
|
||||||
payload, err := json.Marshal(ImageResizePayload{SourceURL: src})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
// task options can be passed to NewTask, which can be overridden at enqueue time.
|
|
||||||
return asynq.NewTask(TypeImageResize, payload, asynq.MaxRetry(5), asynq.Timeout(20 * time.Minute)), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
//---------------------------------------------------------------
|
|
||||||
// Write a function HandleXXXTask to handle the input task.
|
|
||||||
// Note that it satisfies the asynq.HandlerFunc interface.
|
|
||||||
//
|
//
|
||||||
// Handler doesn't need to be a function. You can define a type
|
// Handler doesn't need to be a function. You can define a type
|
||||||
// that satisfies asynq.Handler interface. See examples below.
|
// that satisfies asynq.Handler interface. See example below.
|
||||||
//---------------------------------------------------------------
|
//-------------------------------------------------------------
|
||||||
|
|
||||||
func HandleEmailDeliveryTask(ctx context.Context, t *asynq.Task) error {
|
func HandleEmailDeliveryTask(ctx context.Context, t *asynq.Task) error {
|
||||||
var p EmailDeliveryPayload
|
userID, err := t.Payload.GetInt("user_id")
|
||||||
if err := json.Unmarshal(t.Payload(), &p); err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("json.Unmarshal failed: %v: %w", err, asynq.SkipRetry)
|
return err
|
||||||
}
|
}
|
||||||
log.Printf("Sending Email to User: user_id=%d, template_id=%s", p.UserID, p.TemplateID)
|
tmplID, err := t.Payload.GetString("template_id")
|
||||||
// Email delivery code ...
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
fmt.Printf("Send Email to User: user_id = %d, template_id = %s\n", userID, tmplID)
|
||||||
|
// Email delivery logic ...
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ImageProcessor implements asynq.Handler interface.
|
type ImageProcesser struct {
|
||||||
type ImageProcessor struct {
|
|
||||||
// ... fields for struct
|
// ... fields for struct
|
||||||
}
|
}
|
||||||
|
|
||||||
func (processor *ImageProcessor) ProcessTask(ctx context.Context, t *asynq.Task) error {
|
// ImageProcessor implements asynq.Handler.
|
||||||
var p ImageResizePayload
|
func (p *ImageProcessor) ProcessTask(ctx context.Context, t *asynq.Task) error {
|
||||||
if err := json.Unmarshal(t.Payload(), &p); err != nil {
|
src, err := t.Payload.GetString("src")
|
||||||
return fmt.Errorf("json.Unmarshal failed: %v: %w", err, asynq.SkipRetry)
|
if err != nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
log.Printf("Resizing image: src=%s", p.SourceURL)
|
dst, err := t.Payload.GetString("dst")
|
||||||
// Image resizing code ...
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
fmt.Printf("Process image: src = %s, dst = %s\n", src, dst)
|
||||||
|
// Image processing logic ...
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewImageProcessor() *ImageProcessor {
|
func NewImageProcessor() *ImageProcessor {
|
||||||
return &ImageProcessor{}
|
// ... return an instance
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
In your application code, import the above package and use [`Client`](https://pkg.go.dev/github.com/hibiken/asynq?tab=doc#Client) to put tasks on queues.
|
In your web application code, import the above package and use [`Client`](https://pkg.go.dev/github.com/hibiken/asynq?tab=doc#Client) to put tasks on the queue.
|
||||||
|
A task will be processed asynchronously by a background worker as soon as the task gets enqueued.
|
||||||
|
Scheduled tasks will be stored in Redis and will be enqueued at the specified time.
|
||||||
|
|
||||||
```go
|
```go
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/hibiken/asynq"
|
"github.com/hibiken/asynq"
|
||||||
@ -171,57 +145,63 @@ import (
|
|||||||
const redisAddr = "127.0.0.1:6379"
|
const redisAddr = "127.0.0.1:6379"
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
client := asynq.NewClient(asynq.RedisClientOpt{Addr: redisAddr})
|
r := asynq.RedisClientOpt{Addr: redisAddr}
|
||||||
defer client.Close()
|
c := asynq.NewClient(r)
|
||||||
|
|
||||||
// ------------------------------------------------------
|
// ----------------------------------------------------
|
||||||
// Example 1: Enqueue task to be processed immediately.
|
// Example 1: Enqueue task to be processed immediately.
|
||||||
// Use (*Client).Enqueue method.
|
// Use (*Client).Enqueue method.
|
||||||
// ------------------------------------------------------
|
// ----------------------------------------------------
|
||||||
|
|
||||||
task, err := tasks.NewEmailDeliveryTask(42, "some:template:id")
|
t := tasks.NewEmailDeliveryTask(42, "some:template:id")
|
||||||
|
err := c.Enqueue(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("could not create task: %v", err)
|
log.Fatal("could not enqueue task: %v", err)
|
||||||
}
|
}
|
||||||
info, err := client.Enqueue(task)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("could not enqueue task: %v", err)
|
|
||||||
}
|
|
||||||
log.Printf("enqueued task: id=%s queue=%s", info.ID, info.Queue)
|
|
||||||
|
|
||||||
|
|
||||||
// ------------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
// Example 2: Schedule task to be processed in the future.
|
// Example 2: Schedule task to be processed in the future.
|
||||||
// Use ProcessIn or ProcessAt option.
|
// Use (*Client).EnqueueIn or (*Client).EnqueueAt.
|
||||||
// ------------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
|
|
||||||
info, err = client.Enqueue(task, asynq.ProcessIn(24*time.Hour))
|
t = tasks.NewEmailDeliveryTask(42, "other:template:id")
|
||||||
|
err = c.EnqueueIn(24*time.Hour, t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("could not schedule task: %v", err)
|
log.Fatal("could not schedule task: %v", err)
|
||||||
}
|
}
|
||||||
log.Printf("enqueued task: id=%s queue=%s", info.ID, info.Queue)
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
// Example 3: Set other options to tune task processing behavior.
|
// Example 3: Set options to tune task processing behavior.
|
||||||
// Options include MaxRetry, Queue, Timeout, Deadline, Unique etc.
|
// Options include MaxRetry, Queue, Timeout, Deadline, Unique etc.
|
||||||
// ----------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
|
|
||||||
task, err = tasks.NewImageResizeTask("https://example.com/myassets/image.jpg")
|
c.SetDefaultOptions(tasks.ImageProcessing, asynq.MaxRetry(10), asynq.Timeout(time.Minute))
|
||||||
|
|
||||||
|
t = tasks.NewImageProcessingTask("some/blobstore/url", "other/blobstore/url")
|
||||||
|
err = c.Enqueue(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("could not create task: %v", err)
|
log.Fatal("could not enqueue task: %v", err)
|
||||||
}
|
}
|
||||||
info, err = client.Enqueue(task, asynq.MaxRetry(10), asynq.Timeout(3 * time.Minute))
|
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
// Example 4: Pass options to tune task processing behavior at enqueue time.
|
||||||
|
// Options passed at enqueue time override default ones, if any.
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
|
||||||
|
t = tasks.NewImageProcessingTask("some/blobstore/url", "other/blobstore/url")
|
||||||
|
err = c.Enqueue(t, asynq.Queue("critical"), asynq.Timeout(30*time.Second))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("could not enqueue task: %v", err)
|
log.Fatal("could not enqueue task: %v", err)
|
||||||
}
|
}
|
||||||
log.Printf("enqueued task: id=%s queue=%s", info.ID, info.Queue)
|
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Next, start a worker server to process these tasks in the background. To start the background workers, use [`Server`](https://pkg.go.dev/github.com/hibiken/asynq?tab=doc#Server) and provide your [`Handler`](https://pkg.go.dev/github.com/hibiken/asynq?tab=doc#Handler) to process the tasks.
|
Next, create a worker server to process these tasks in the background.
|
||||||
|
To start the background workers, use [`Server`](https://pkg.go.dev/github.com/hibiken/asynq?tab=doc#Server) and provide your [`Handler`](https://pkg.go.dev/github.com/hibiken/asynq?tab=doc#Handler) to process the tasks.
|
||||||
|
|
||||||
You can optionally use [`ServeMux`](https://pkg.go.dev/github.com/hibiken/asynq?tab=doc#ServeMux) to create a handler, just as you would with [`net/http`](https://golang.org/pkg/net/http/) Handler.
|
You can optionally use [`ServeMux`](https://pkg.go.dev/github.com/hibiken/asynq?tab=doc#ServeMux) to create a handler, just as you would with [`"net/http"`](https://golang.org/pkg/net/http/) Handler.
|
||||||
|
|
||||||
```go
|
```go
|
||||||
package main
|
package main
|
||||||
@ -236,25 +216,24 @@ import (
|
|||||||
const redisAddr = "127.0.0.1:6379"
|
const redisAddr = "127.0.0.1:6379"
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
srv := asynq.NewServer(
|
r := asynq.RedisClientOpt{Addr: redisAddr}
|
||||||
asynq.RedisClientOpt{Addr: redisAddr},
|
|
||||||
asynq.Config{
|
srv := asynq.NewServer(r, asynq.Config{
|
||||||
// Specify how many concurrent workers to use
|
// Specify how many concurrent workers to use
|
||||||
Concurrency: 10,
|
Concurrency: 10,
|
||||||
// Optionally specify multiple queues with different priority.
|
// Optionally specify multiple queues with different priority.
|
||||||
Queues: map[string]int{
|
Queues: map[string]int{
|
||||||
"critical": 6,
|
"critical": 6,
|
||||||
"default": 3,
|
"default": 3,
|
||||||
"low": 1,
|
"low": 1,
|
||||||
},
|
|
||||||
// See the godoc for other configuration options
|
|
||||||
},
|
},
|
||||||
)
|
// See the godoc for other configuration options
|
||||||
|
})
|
||||||
|
|
||||||
// mux maps a type to a handler
|
// mux maps a type to a handler
|
||||||
mux := asynq.NewServeMux()
|
mux := asynq.NewServeMux()
|
||||||
mux.HandleFunc(tasks.TypeEmailDelivery, tasks.HandleEmailDeliveryTask)
|
mux.HandleFunc(tasks.EmailDelivery, tasks.HandleEmailDeliveryTask)
|
||||||
mux.Handle(tasks.TypeImageResize, tasks.NewImageProcessor())
|
mux.Handle(tasks.ImageProcessing, tasks.NewImageProcessor())
|
||||||
// ...register other handlers...
|
// ...register other handlers...
|
||||||
|
|
||||||
if err := srv.Run(mux); err != nil {
|
if err := srv.Run(mux); err != nil {
|
||||||
@ -263,55 +242,52 @@ func main() {
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
For a more detailed walk-through of the library, see our [Getting Started](https://github.com/hibiken/asynq/wiki/Getting-Started) guide.
|
For a more detailed walk-through of the library, see our [Getting Started Guide](https://github.com/hibiken/asynq/wiki/Getting-Started).
|
||||||
|
|
||||||
To learn more about `asynq` features and APIs, see the package [godoc](https://godoc.org/github.com/hibiken/asynq).
|
To Learn more about `asynq` features and APIs, see our [Wiki](https://github.com/hibiken/asynq/wiki) and [godoc](https://godoc.org/github.com/hibiken/asynq).
|
||||||
|
|
||||||
## Web UI
|
|
||||||
|
|
||||||
[Asynqmon](https://github.com/hibiken/asynqmon) is a web based tool for monitoring and administrating Asynq queues and tasks.
|
|
||||||
|
|
||||||
Here's a few screenshots of the Web UI:
|
|
||||||
|
|
||||||
**Queues view**
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
**Tasks view**
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
**Metrics view**
|
|
||||||
<img width="1532" alt="Screen Shot 2021-12-19 at 4 37 19 PM" src="https://user-images.githubusercontent.com/10953044/146777420-cae6c476-bac6-469c-acce-b2f6584e8707.png">
|
|
||||||
|
|
||||||
**Settings and adaptive dark mode**
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
For details on how to use the tool, refer to the tool's [README](https://github.com/hibiken/asynqmon#readme).
|
|
||||||
|
|
||||||
## Command Line Tool
|
## Command Line Tool
|
||||||
|
|
||||||
Asynq ships with a command line tool to inspect the state of queues and tasks.
|
Asynq ships with a command line tool to inspect the state of queues and tasks.
|
||||||
|
|
||||||
To install the CLI tool, run the following command:
|
Here's an example of running the `stats` command.
|
||||||
|
|
||||||
```sh
|

|
||||||
go install github.com/hibiken/asynq/tools/asynq@latest
|
|
||||||
```
|
|
||||||
|
|
||||||
Here's an example of running the `asynq dash` command:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
For details on how to use the tool, refer to the tool's [README](/tools/asynq/README.md).
|
For details on how to use the tool, refer to the tool's [README](/tools/asynq/README.md).
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
To install `asynq` library, run the following command:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
go get -u github.com/hibiken/asynq
|
||||||
|
```
|
||||||
|
|
||||||
|
To install the CLI tool, run the following command:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
go get -u github.com/hibiken/asynq/tools/asynq
|
||||||
|
```
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
| Dependency | Version |
|
||||||
|
| -------------------------- | ------- |
|
||||||
|
| [Redis](https://redis.io/) | v2.8+ |
|
||||||
|
| [Go](https://golang.org/) | v1.13+ |
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
We are open to, and grateful for, any contributions (GitHub issues/PRs, feedback on [Gitter channel](https://gitter.im/go-asynq/community), etc) made by the community.
|
We are open to, and grateful for, any contributions (Github issues/pull-requests, feedback on Gitter channel, etc) made by the community.
|
||||||
|
|
||||||
Please see the [Contribution Guide](/CONTRIBUTING.md) before contributing.
|
Please see the [Contribution Guide](/CONTRIBUTING.md) before contributing.
|
||||||
|
|
||||||
|
## Acknowledgements
|
||||||
|
|
||||||
|
- [Sidekiq](https://github.com/mperham/sidekiq) : Many of the design ideas are taken from sidekiq and its Web UI
|
||||||
|
- [RQ](https://github.com/rq/rq) : Client APIs are inspired by rq library.
|
||||||
|
- [Cobra](https://github.com/spf13/cobra) : Asynq CLI is built with cobra
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
Copyright (c) 2019-present [Ken Hibino](https://github.com/hibiken) and [Contributors](https://github.com/hibiken/asynq/graphs/contributors). `Asynq` is free and open-source software licensed under the [MIT License](https://github.com/hibiken/asynq/blob/master/LICENSE). Official logo was created by [Vic Shóstak](https://github.com/koddr) and distributed under [Creative Commons](https://creativecommons.org/publicdomain/zero/1.0/) license (CC0 1.0 Universal).
|
Asynq is released under the MIT license. See [LICENSE](https://github.com/hibiken/asynq/blob/master/LICENSE).
|
||||||
|
176
aggregator.go
176
aggregator.go
@ -1,176 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
)
|
|
||||||
|
|
||||||
// An aggregator is responsible for checking groups and aggregate into one task
|
|
||||||
// if any of the grouping condition is met.
|
|
||||||
type aggregator struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
client *Client
|
|
||||||
|
|
||||||
// channel to communicate back to the long running "aggregator" goroutine.
|
|
||||||
done chan struct{}
|
|
||||||
|
|
||||||
// list of queue names to check and aggregate.
|
|
||||||
queues []string
|
|
||||||
|
|
||||||
// Group configurations
|
|
||||||
gracePeriod time.Duration
|
|
||||||
maxDelay time.Duration
|
|
||||||
maxSize int
|
|
||||||
|
|
||||||
// User provided group aggregator.
|
|
||||||
ga GroupAggregator
|
|
||||||
|
|
||||||
// interval used to check for aggregation
|
|
||||||
interval time.Duration
|
|
||||||
|
|
||||||
// sema is a counting semaphore to ensure the number of active aggregating function
|
|
||||||
// does not exceed the limit.
|
|
||||||
sema chan struct{}
|
|
||||||
}
|
|
||||||
|
|
||||||
type aggregatorParams struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
queues []string
|
|
||||||
gracePeriod time.Duration
|
|
||||||
maxDelay time.Duration
|
|
||||||
maxSize int
|
|
||||||
groupAggregator GroupAggregator
|
|
||||||
}
|
|
||||||
|
|
||||||
const (
|
|
||||||
// Maximum number of aggregation checks in flight concurrently.
|
|
||||||
maxConcurrentAggregationChecks = 3
|
|
||||||
|
|
||||||
// Default interval used for aggregation checks. If the provided gracePeriod is less than
|
|
||||||
// the default, use the gracePeriod.
|
|
||||||
defaultAggregationCheckInterval = 7 * time.Second
|
|
||||||
)
|
|
||||||
|
|
||||||
func newAggregator(params aggregatorParams) *aggregator {
|
|
||||||
interval := defaultAggregationCheckInterval
|
|
||||||
if params.gracePeriod < interval {
|
|
||||||
interval = params.gracePeriod
|
|
||||||
}
|
|
||||||
return &aggregator{
|
|
||||||
logger: params.logger,
|
|
||||||
broker: params.broker,
|
|
||||||
client: &Client{broker: params.broker},
|
|
||||||
done: make(chan struct{}),
|
|
||||||
queues: params.queues,
|
|
||||||
gracePeriod: params.gracePeriod,
|
|
||||||
maxDelay: params.maxDelay,
|
|
||||||
maxSize: params.maxSize,
|
|
||||||
ga: params.groupAggregator,
|
|
||||||
sema: make(chan struct{}, maxConcurrentAggregationChecks),
|
|
||||||
interval: interval,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *aggregator) shutdown() {
|
|
||||||
if a.ga == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
a.logger.Debug("Aggregator shutting down...")
|
|
||||||
// Signal the aggregator goroutine to stop.
|
|
||||||
a.done <- struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *aggregator) start(wg *sync.WaitGroup) {
|
|
||||||
if a.ga == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
wg.Add(1)
|
|
||||||
go func() {
|
|
||||||
defer wg.Done()
|
|
||||||
ticker := time.NewTicker(a.interval)
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-a.done:
|
|
||||||
a.logger.Debug("Waiting for all aggregation checks to finish...")
|
|
||||||
// block until all aggregation checks released the token
|
|
||||||
for i := 0; i < cap(a.sema); i++ {
|
|
||||||
a.sema <- struct{}{}
|
|
||||||
}
|
|
||||||
a.logger.Debug("Aggregator done")
|
|
||||||
ticker.Stop()
|
|
||||||
return
|
|
||||||
case t := <-ticker.C:
|
|
||||||
a.exec(t)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *aggregator) exec(t time.Time) {
|
|
||||||
select {
|
|
||||||
case a.sema <- struct{}{}: // acquire token
|
|
||||||
go a.aggregate(t)
|
|
||||||
default:
|
|
||||||
// If the semaphore blocks, then we are currently running max number of
|
|
||||||
// aggregation checks. Skip this round and log warning.
|
|
||||||
a.logger.Warnf("Max number of aggregation checks in flight. Skipping")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *aggregator) aggregate(t time.Time) {
|
|
||||||
defer func() { <-a.sema /* release token */ }()
|
|
||||||
for _, qname := range a.queues {
|
|
||||||
groups, err := a.broker.ListGroups(qname)
|
|
||||||
if err != nil {
|
|
||||||
a.logger.Errorf("Failed to list groups in queue: %q", qname)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
for _, gname := range groups {
|
|
||||||
aggregationSetID, err := a.broker.AggregationCheck(
|
|
||||||
qname, gname, t, a.gracePeriod, a.maxDelay, a.maxSize)
|
|
||||||
if err != nil {
|
|
||||||
a.logger.Errorf("Failed to run aggregation check: queue=%q group=%q", qname, gname)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if aggregationSetID == "" {
|
|
||||||
a.logger.Debugf("No aggregation needed at this time: queue=%q group=%q", qname, gname)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Aggregate and enqueue.
|
|
||||||
msgs, deadline, err := a.broker.ReadAggregationSet(qname, gname, aggregationSetID)
|
|
||||||
if err != nil {
|
|
||||||
a.logger.Errorf("Failed to read aggregation set: queue=%q, group=%q, setID=%q",
|
|
||||||
qname, gname, aggregationSetID)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
tasks := make([]*Task, len(msgs))
|
|
||||||
for i, m := range msgs {
|
|
||||||
tasks[i] = NewTask(m.Type, m.Payload)
|
|
||||||
}
|
|
||||||
aggregatedTask := a.ga.Aggregate(gname, tasks)
|
|
||||||
ctx, cancel := context.WithDeadline(context.Background(), deadline)
|
|
||||||
if _, err := a.client.EnqueueContext(ctx, aggregatedTask, Queue(qname)); err != nil {
|
|
||||||
a.logger.Errorf("Failed to enqueue aggregated task (queue=%q, group=%q, setID=%q): %v",
|
|
||||||
qname, gname, aggregationSetID, err)
|
|
||||||
cancel()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if err := a.broker.DeleteAggregationSet(ctx, qname, gname, aggregationSetID); err != nil {
|
|
||||||
a.logger.Warnf("Failed to delete aggregation set: queue=%q, group=%q, setID=%q",
|
|
||||||
qname, gname, aggregationSetID)
|
|
||||||
}
|
|
||||||
cancel()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,165 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
|
||||||
h "github.com/hibiken/asynq/internal/testutil"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestAggregator(t *testing.T) {
|
|
||||||
r := setup(t)
|
|
||||||
defer r.Close()
|
|
||||||
rdbClient := rdb.NewRDB(r)
|
|
||||||
client := Client{broker: rdbClient}
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
gracePeriod time.Duration
|
|
||||||
maxDelay time.Duration
|
|
||||||
maxSize int
|
|
||||||
aggregateFunc func(gname string, tasks []*Task) *Task
|
|
||||||
tasks []*Task // tasks to enqueue
|
|
||||||
enqueueFrequency time.Duration // time between one enqueue event to another
|
|
||||||
waitTime time.Duration // time to wait
|
|
||||||
wantGroups map[string]map[string][]base.Z
|
|
||||||
wantPending map[string][]*base.TaskMessage
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "group older than the grace period should be aggregated",
|
|
||||||
gracePeriod: 1 * time.Second,
|
|
||||||
maxDelay: 0, // no maxdelay limit
|
|
||||||
maxSize: 0, // no maxsize limit
|
|
||||||
aggregateFunc: func(gname string, tasks []*Task) *Task {
|
|
||||||
return NewTask(gname, nil, MaxRetry(len(tasks))) // use max retry to see how many tasks were aggregated
|
|
||||||
},
|
|
||||||
tasks: []*Task{
|
|
||||||
NewTask("task1", nil, Group("mygroup")),
|
|
||||||
NewTask("task2", nil, Group("mygroup")),
|
|
||||||
NewTask("task3", nil, Group("mygroup")),
|
|
||||||
},
|
|
||||||
enqueueFrequency: 300 * time.Millisecond,
|
|
||||||
waitTime: 3 * time.Second,
|
|
||||||
wantGroups: map[string]map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
"mygroup": {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
wantPending: map[string][]*base.TaskMessage{
|
|
||||||
"default": {
|
|
||||||
h.NewTaskMessageBuilder().SetType("mygroup").SetRetry(3).Build(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "group older than the max-delay should be aggregated",
|
|
||||||
gracePeriod: 2 * time.Second,
|
|
||||||
maxDelay: 4 * time.Second,
|
|
||||||
maxSize: 0, // no maxsize limit
|
|
||||||
aggregateFunc: func(gname string, tasks []*Task) *Task {
|
|
||||||
return NewTask(gname, nil, MaxRetry(len(tasks))) // use max retry to see how many tasks were aggregated
|
|
||||||
},
|
|
||||||
tasks: []*Task{
|
|
||||||
NewTask("task1", nil, Group("mygroup")), // time 0
|
|
||||||
NewTask("task2", nil, Group("mygroup")), // time 1s
|
|
||||||
NewTask("task3", nil, Group("mygroup")), // time 2s
|
|
||||||
NewTask("task4", nil, Group("mygroup")), // time 3s
|
|
||||||
},
|
|
||||||
enqueueFrequency: 1 * time.Second,
|
|
||||||
waitTime: 4 * time.Second,
|
|
||||||
wantGroups: map[string]map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
"mygroup": {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
wantPending: map[string][]*base.TaskMessage{
|
|
||||||
"default": {
|
|
||||||
h.NewTaskMessageBuilder().SetType("mygroup").SetRetry(4).Build(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "group reached the max-size should be aggregated",
|
|
||||||
gracePeriod: 1 * time.Minute,
|
|
||||||
maxDelay: 0, // no maxdelay limit
|
|
||||||
maxSize: 5,
|
|
||||||
aggregateFunc: func(gname string, tasks []*Task) *Task {
|
|
||||||
return NewTask(gname, nil, MaxRetry(len(tasks))) // use max retry to see how many tasks were aggregated
|
|
||||||
},
|
|
||||||
tasks: []*Task{
|
|
||||||
NewTask("task1", nil, Group("mygroup")),
|
|
||||||
NewTask("task2", nil, Group("mygroup")),
|
|
||||||
NewTask("task3", nil, Group("mygroup")),
|
|
||||||
NewTask("task4", nil, Group("mygroup")),
|
|
||||||
NewTask("task5", nil, Group("mygroup")),
|
|
||||||
},
|
|
||||||
enqueueFrequency: 300 * time.Millisecond,
|
|
||||||
waitTime: defaultAggregationCheckInterval * 2,
|
|
||||||
wantGroups: map[string]map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
"mygroup": {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
wantPending: map[string][]*base.TaskMessage{
|
|
||||||
"default": {
|
|
||||||
h.NewTaskMessageBuilder().SetType("mygroup").SetRetry(5).Build(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
h.FlushDB(t, r)
|
|
||||||
|
|
||||||
aggregator := newAggregator(aggregatorParams{
|
|
||||||
logger: testLogger,
|
|
||||||
broker: rdbClient,
|
|
||||||
queues: []string{"default"},
|
|
||||||
gracePeriod: tc.gracePeriod,
|
|
||||||
maxDelay: tc.maxDelay,
|
|
||||||
maxSize: tc.maxSize,
|
|
||||||
groupAggregator: GroupAggregatorFunc(tc.aggregateFunc),
|
|
||||||
})
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
aggregator.start(&wg)
|
|
||||||
|
|
||||||
for _, task := range tc.tasks {
|
|
||||||
if _, err := client.Enqueue(task); err != nil {
|
|
||||||
t.Errorf("%s: Client Enqueue failed: %v", tc.desc, err)
|
|
||||||
aggregator.shutdown()
|
|
||||||
wg.Wait()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
time.Sleep(tc.enqueueFrequency)
|
|
||||||
}
|
|
||||||
|
|
||||||
time.Sleep(tc.waitTime)
|
|
||||||
|
|
||||||
for qname, groups := range tc.wantGroups {
|
|
||||||
for gname, want := range groups {
|
|
||||||
gotGroup := h.GetGroupEntries(t, r, qname, gname)
|
|
||||||
if diff := cmp.Diff(want, gotGroup, h.SortZSetEntryOpt); diff != "" {
|
|
||||||
t.Errorf("%s: mismatch found in %q; (-want,+got)\n%s", tc.desc, base.GroupKey(qname, gname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for qname, want := range tc.wantPending {
|
|
||||||
gotPending := h.GetPendingMessages(t, r, qname)
|
|
||||||
if diff := cmp.Diff(want, gotPending, h.SortMsgOpt, h.IgnoreIDOpt); diff != "" {
|
|
||||||
t.Errorf("%s: mismatch found in %q; (-want,+got)\n%s", tc.desc, base.PendingKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
aggregator.shutdown()
|
|
||||||
wg.Wait()
|
|
||||||
}
|
|
||||||
}
|
|
458
asynq.go
458
asynq.go
@ -5,238 +5,40 @@
|
|||||||
package asynq
|
package asynq
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
|
||||||
"net/url"
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/redis/go-redis/v9"
|
"github.com/go-redis/redis/v7"
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Task represents a unit of work to be performed.
|
// Task represents a unit of work to be performed.
|
||||||
type Task struct {
|
type Task struct {
|
||||||
// typename indicates the type of task to be performed.
|
// Type indicates the type of task to be performed.
|
||||||
typename string
|
|
||||||
|
|
||||||
// payload holds data needed to perform the task.
|
|
||||||
payload []byte
|
|
||||||
|
|
||||||
// opts holds options for the task.
|
|
||||||
opts []Option
|
|
||||||
|
|
||||||
// w is the ResultWriter for the task.
|
|
||||||
w *ResultWriter
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *Task) Type() string { return t.typename }
|
|
||||||
func (t *Task) Payload() []byte { return t.payload }
|
|
||||||
|
|
||||||
// ResultWriter returns a pointer to the ResultWriter associated with the task.
|
|
||||||
//
|
|
||||||
// Nil pointer is returned if called on a newly created task (i.e. task created by calling NewTask).
|
|
||||||
// Only the tasks passed to Handler.ProcessTask have a valid ResultWriter pointer.
|
|
||||||
func (t *Task) ResultWriter() *ResultWriter { return t.w }
|
|
||||||
|
|
||||||
// NewTask returns a new Task given a type name and payload data.
|
|
||||||
// Options can be passed to configure task processing behavior.
|
|
||||||
func NewTask(typename string, payload []byte, opts ...Option) *Task {
|
|
||||||
return &Task{
|
|
||||||
typename: typename,
|
|
||||||
payload: payload,
|
|
||||||
opts: opts,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// newTask creates a task with the given typename, payload and ResultWriter.
|
|
||||||
func newTask(typename string, payload []byte, w *ResultWriter) *Task {
|
|
||||||
return &Task{
|
|
||||||
typename: typename,
|
|
||||||
payload: payload,
|
|
||||||
w: w,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// A TaskInfo describes a task and its metadata.
|
|
||||||
type TaskInfo struct {
|
|
||||||
// ID is the identifier of the task.
|
|
||||||
ID string
|
|
||||||
|
|
||||||
// Queue is the name of the queue in which the task belongs.
|
|
||||||
Queue string
|
|
||||||
|
|
||||||
// Type is the type name of the task.
|
|
||||||
Type string
|
Type string
|
||||||
|
|
||||||
// Payload is the payload data of the task.
|
// Payload holds data needed to perform the task.
|
||||||
Payload []byte
|
Payload Payload
|
||||||
|
|
||||||
// State indicates the task state.
|
|
||||||
State TaskState
|
|
||||||
|
|
||||||
// MaxRetry is the maximum number of times the task can be retried.
|
|
||||||
MaxRetry int
|
|
||||||
|
|
||||||
// Retried is the number of times the task has retried so far.
|
|
||||||
Retried int
|
|
||||||
|
|
||||||
// LastErr is the error message from the last failure.
|
|
||||||
LastErr string
|
|
||||||
|
|
||||||
// LastFailedAt is the time time of the last failure if any.
|
|
||||||
// If the task has no failures, LastFailedAt is zero time (i.e. time.Time{}).
|
|
||||||
LastFailedAt time.Time
|
|
||||||
|
|
||||||
// Timeout is the duration the task can be processed by Handler before being retried,
|
|
||||||
// zero if not specified
|
|
||||||
Timeout time.Duration
|
|
||||||
|
|
||||||
// Deadline is the deadline for the task, zero value if not specified.
|
|
||||||
Deadline time.Time
|
|
||||||
|
|
||||||
// Group is the name of the group in which the task belongs.
|
|
||||||
//
|
|
||||||
// Tasks in the same queue can be grouped together by Group name and will be aggregated into one task
|
|
||||||
// by a Server processing the queue.
|
|
||||||
//
|
|
||||||
// Empty string (default) indicates task does not belong to any groups, and no aggregation will be applied to the task.
|
|
||||||
Group string
|
|
||||||
|
|
||||||
// NextProcessAt is the time the task is scheduled to be processed,
|
|
||||||
// zero if not applicable.
|
|
||||||
NextProcessAt time.Time
|
|
||||||
|
|
||||||
// IsOrphaned describes whether the task is left in active state with no worker processing it.
|
|
||||||
// An orphaned task indicates that the worker has crashed or experienced network failures and was not able to
|
|
||||||
// extend its lease on the task.
|
|
||||||
//
|
|
||||||
// This task will be recovered by running a server against the queue the task is in.
|
|
||||||
// This field is only applicable to tasks with TaskStateActive.
|
|
||||||
IsOrphaned bool
|
|
||||||
|
|
||||||
// Retention is duration of the retention period after the task is successfully processed.
|
|
||||||
Retention time.Duration
|
|
||||||
|
|
||||||
// CompletedAt is the time when the task is processed successfully.
|
|
||||||
// Zero value (i.e. time.Time{}) indicates no value.
|
|
||||||
CompletedAt time.Time
|
|
||||||
|
|
||||||
// Result holds the result data associated with the task.
|
|
||||||
// Use ResultWriter to write result data from the Handler.
|
|
||||||
Result []byte
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If t is non-zero, returns time converted from t as unix time in seconds.
|
// NewTask returns a new Task given a type name and payload data.
|
||||||
// If t is zero, returns zero value of time.Time.
|
//
|
||||||
func fromUnixTimeOrZero(t int64) time.Time {
|
// The payload values must be serializable.
|
||||||
if t == 0 {
|
func NewTask(typename string, payload map[string]interface{}) *Task {
|
||||||
return time.Time{}
|
return &Task{
|
||||||
|
Type: typename,
|
||||||
|
Payload: Payload{payload},
|
||||||
}
|
}
|
||||||
return time.Unix(t, 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func newTaskInfo(msg *base.TaskMessage, state base.TaskState, nextProcessAt time.Time, result []byte) *TaskInfo {
|
|
||||||
info := TaskInfo{
|
|
||||||
ID: msg.ID,
|
|
||||||
Queue: msg.Queue,
|
|
||||||
Type: msg.Type,
|
|
||||||
Payload: msg.Payload, // Do we need to make a copy?
|
|
||||||
MaxRetry: msg.Retry,
|
|
||||||
Retried: msg.Retried,
|
|
||||||
LastErr: msg.ErrorMsg,
|
|
||||||
Group: msg.GroupKey,
|
|
||||||
Timeout: time.Duration(msg.Timeout) * time.Second,
|
|
||||||
Deadline: fromUnixTimeOrZero(msg.Deadline),
|
|
||||||
Retention: time.Duration(msg.Retention) * time.Second,
|
|
||||||
NextProcessAt: nextProcessAt,
|
|
||||||
LastFailedAt: fromUnixTimeOrZero(msg.LastFailedAt),
|
|
||||||
CompletedAt: fromUnixTimeOrZero(msg.CompletedAt),
|
|
||||||
Result: result,
|
|
||||||
}
|
|
||||||
|
|
||||||
switch state {
|
|
||||||
case base.TaskStateActive:
|
|
||||||
info.State = TaskStateActive
|
|
||||||
case base.TaskStatePending:
|
|
||||||
info.State = TaskStatePending
|
|
||||||
case base.TaskStateScheduled:
|
|
||||||
info.State = TaskStateScheduled
|
|
||||||
case base.TaskStateRetry:
|
|
||||||
info.State = TaskStateRetry
|
|
||||||
case base.TaskStateArchived:
|
|
||||||
info.State = TaskStateArchived
|
|
||||||
case base.TaskStateCompleted:
|
|
||||||
info.State = TaskStateCompleted
|
|
||||||
case base.TaskStateAggregating:
|
|
||||||
info.State = TaskStateAggregating
|
|
||||||
default:
|
|
||||||
panic(fmt.Sprintf("internal error: unknown state: %d", state))
|
|
||||||
}
|
|
||||||
return &info
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskState denotes the state of a task.
|
|
||||||
type TaskState int
|
|
||||||
|
|
||||||
const (
|
|
||||||
// Indicates that the task is currently being processed by Handler.
|
|
||||||
TaskStateActive TaskState = iota + 1
|
|
||||||
|
|
||||||
// Indicates that the task is ready to be processed by Handler.
|
|
||||||
TaskStatePending
|
|
||||||
|
|
||||||
// Indicates that the task is scheduled to be processed some time in the future.
|
|
||||||
TaskStateScheduled
|
|
||||||
|
|
||||||
// Indicates that the task has previously failed and scheduled to be processed some time in the future.
|
|
||||||
TaskStateRetry
|
|
||||||
|
|
||||||
// Indicates that the task is archived and stored for inspection purposes.
|
|
||||||
TaskStateArchived
|
|
||||||
|
|
||||||
// Indicates that the task is processed successfully and retained until the retention TTL expires.
|
|
||||||
TaskStateCompleted
|
|
||||||
|
|
||||||
// Indicates that the task is waiting in a group to be aggregated into one task.
|
|
||||||
TaskStateAggregating
|
|
||||||
)
|
|
||||||
|
|
||||||
func (s TaskState) String() string {
|
|
||||||
switch s {
|
|
||||||
case TaskStateActive:
|
|
||||||
return "active"
|
|
||||||
case TaskStatePending:
|
|
||||||
return "pending"
|
|
||||||
case TaskStateScheduled:
|
|
||||||
return "scheduled"
|
|
||||||
case TaskStateRetry:
|
|
||||||
return "retry"
|
|
||||||
case TaskStateArchived:
|
|
||||||
return "archived"
|
|
||||||
case TaskStateCompleted:
|
|
||||||
return "completed"
|
|
||||||
case TaskStateAggregating:
|
|
||||||
return "aggregating"
|
|
||||||
}
|
|
||||||
panic("asynq: unknown task state")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// RedisConnOpt is a discriminated union of types that represent Redis connection configuration option.
|
// RedisConnOpt is a discriminated union of types that represent Redis connection configuration option.
|
||||||
//
|
//
|
||||||
// RedisConnOpt represents a sum of following types:
|
// RedisConnOpt represents a sum of following types:
|
||||||
//
|
//
|
||||||
// - RedisClientOpt
|
// RedisClientOpt | *RedisClientOpt | RedisFailoverClientOpt | *RedisFailoverClientOpt
|
||||||
// - RedisFailoverClientOpt
|
type RedisConnOpt interface{}
|
||||||
// - RedisClusterClientOpt
|
|
||||||
type RedisConnOpt interface {
|
|
||||||
// MakeRedisClient returns a new redis client instance.
|
|
||||||
// Return value is intentionally opaque to hide the implementation detail of redis client.
|
|
||||||
MakeRedisClient() interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// RedisClientOpt is used to create a redis client that connects
|
// RedisClientOpt is used to create a redis client that connects
|
||||||
// to a redis server directly.
|
// to a redis server directly.
|
||||||
@ -248,38 +50,13 @@ type RedisClientOpt struct {
|
|||||||
// Redis server address in "host:port" format.
|
// Redis server address in "host:port" format.
|
||||||
Addr string
|
Addr string
|
||||||
|
|
||||||
// Username to authenticate the current connection when Redis ACLs are used.
|
// Redis server password.
|
||||||
// See: https://redis.io/commands/auth.
|
|
||||||
Username string
|
|
||||||
|
|
||||||
// Password to authenticate the current connection.
|
|
||||||
// See: https://redis.io/commands/auth.
|
|
||||||
Password string
|
Password string
|
||||||
|
|
||||||
// Redis DB to select after connecting to a server.
|
// Redis DB to select after connecting to a server.
|
||||||
// See: https://redis.io/commands/select.
|
// See: https://redis.io/commands/select.
|
||||||
DB int
|
DB int
|
||||||
|
|
||||||
// Dial timeout for establishing new connections.
|
|
||||||
// Default is 5 seconds.
|
|
||||||
DialTimeout time.Duration
|
|
||||||
|
|
||||||
// Timeout for socket reads.
|
|
||||||
// If timeout is reached, read commands will fail with a timeout error
|
|
||||||
// instead of blocking.
|
|
||||||
//
|
|
||||||
// Use value -1 for no timeout and 0 for default.
|
|
||||||
// Default is 3 seconds.
|
|
||||||
ReadTimeout time.Duration
|
|
||||||
|
|
||||||
// Timeout for socket writes.
|
|
||||||
// If timeout is reached, write commands will fail with a timeout error
|
|
||||||
// instead of blocking.
|
|
||||||
//
|
|
||||||
// Use value -1 for no timeout and 0 for default.
|
|
||||||
// Default is ReadTimout.
|
|
||||||
WriteTimeout time.Duration
|
|
||||||
|
|
||||||
// Maximum number of socket connections.
|
// Maximum number of socket connections.
|
||||||
// Default is 10 connections per every CPU as reported by runtime.NumCPU.
|
// Default is 10 connections per every CPU as reported by runtime.NumCPU.
|
||||||
PoolSize int
|
PoolSize int
|
||||||
@ -289,21 +66,6 @@ type RedisClientOpt struct {
|
|||||||
TLSConfig *tls.Config
|
TLSConfig *tls.Config
|
||||||
}
|
}
|
||||||
|
|
||||||
func (opt RedisClientOpt) MakeRedisClient() interface{} {
|
|
||||||
return redis.NewClient(&redis.Options{
|
|
||||||
Network: opt.Network,
|
|
||||||
Addr: opt.Addr,
|
|
||||||
Username: opt.Username,
|
|
||||||
Password: opt.Password,
|
|
||||||
DB: opt.DB,
|
|
||||||
DialTimeout: opt.DialTimeout,
|
|
||||||
ReadTimeout: opt.ReadTimeout,
|
|
||||||
WriteTimeout: opt.WriteTimeout,
|
|
||||||
PoolSize: opt.PoolSize,
|
|
||||||
TLSConfig: opt.TLSConfig,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// RedisFailoverClientOpt is used to creates a redis client that talks
|
// RedisFailoverClientOpt is used to creates a redis client that talks
|
||||||
// to redis sentinels for service discovery and has an automatic failover
|
// to redis sentinels for service discovery and has an automatic failover
|
||||||
// capability.
|
// capability.
|
||||||
@ -316,44 +78,16 @@ type RedisFailoverClientOpt struct {
|
|||||||
// https://redis.io/topics/sentinel.
|
// https://redis.io/topics/sentinel.
|
||||||
SentinelAddrs []string
|
SentinelAddrs []string
|
||||||
|
|
||||||
// Redis sentinel username.
|
|
||||||
SentinelUsername string
|
|
||||||
|
|
||||||
// Redis sentinel password.
|
// Redis sentinel password.
|
||||||
SentinelPassword string
|
SentinelPassword string
|
||||||
|
|
||||||
// Username to authenticate the current connection when Redis ACLs are used.
|
// Redis server password.
|
||||||
// See: https://redis.io/commands/auth.
|
|
||||||
Username string
|
|
||||||
|
|
||||||
// Password to authenticate the current connection.
|
|
||||||
// See: https://redis.io/commands/auth.
|
|
||||||
Password string
|
Password string
|
||||||
|
|
||||||
// Redis DB to select after connecting to a server.
|
// Redis DB to select after connecting to a server.
|
||||||
// See: https://redis.io/commands/select.
|
// See: https://redis.io/commands/select.
|
||||||
DB int
|
DB int
|
||||||
|
|
||||||
// Dial timeout for establishing new connections.
|
|
||||||
// Default is 5 seconds.
|
|
||||||
DialTimeout time.Duration
|
|
||||||
|
|
||||||
// Timeout for socket reads.
|
|
||||||
// If timeout is reached, read commands will fail with a timeout error
|
|
||||||
// instead of blocking.
|
|
||||||
//
|
|
||||||
// Use value -1 for no timeout and 0 for default.
|
|
||||||
// Default is 3 seconds.
|
|
||||||
ReadTimeout time.Duration
|
|
||||||
|
|
||||||
// Timeout for socket writes.
|
|
||||||
// If timeout is reached, write commands will fail with a timeout error
|
|
||||||
// instead of blocking.
|
|
||||||
//
|
|
||||||
// Use value -1 for no timeout and 0 for default.
|
|
||||||
// Default is ReadTimeout
|
|
||||||
WriteTimeout time.Duration
|
|
||||||
|
|
||||||
// Maximum number of socket connections.
|
// Maximum number of socket connections.
|
||||||
// Default is 10 connections per every CPU as reported by runtime.NumCPU.
|
// Default is 10 connections per every CPU as reported by runtime.NumCPU.
|
||||||
PoolSize int
|
PoolSize int
|
||||||
@ -363,87 +97,12 @@ type RedisFailoverClientOpt struct {
|
|||||||
TLSConfig *tls.Config
|
TLSConfig *tls.Config
|
||||||
}
|
}
|
||||||
|
|
||||||
func (opt RedisFailoverClientOpt) MakeRedisClient() interface{} {
|
|
||||||
return redis.NewFailoverClient(&redis.FailoverOptions{
|
|
||||||
MasterName: opt.MasterName,
|
|
||||||
SentinelAddrs: opt.SentinelAddrs,
|
|
||||||
SentinelUsername: opt.SentinelUsername,
|
|
||||||
SentinelPassword: opt.SentinelPassword,
|
|
||||||
Username: opt.Username,
|
|
||||||
Password: opt.Password,
|
|
||||||
DB: opt.DB,
|
|
||||||
DialTimeout: opt.DialTimeout,
|
|
||||||
ReadTimeout: opt.ReadTimeout,
|
|
||||||
WriteTimeout: opt.WriteTimeout,
|
|
||||||
PoolSize: opt.PoolSize,
|
|
||||||
TLSConfig: opt.TLSConfig,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// RedisClusterClientOpt is used to creates a redis client that connects to
|
|
||||||
// redis cluster.
|
|
||||||
type RedisClusterClientOpt struct {
|
|
||||||
// A seed list of host:port addresses of cluster nodes.
|
|
||||||
Addrs []string
|
|
||||||
|
|
||||||
// The maximum number of retries before giving up.
|
|
||||||
// Command is retried on network errors and MOVED/ASK redirects.
|
|
||||||
// Default is 8 retries.
|
|
||||||
MaxRedirects int
|
|
||||||
|
|
||||||
// Username to authenticate the current connection when Redis ACLs are used.
|
|
||||||
// See: https://redis.io/commands/auth.
|
|
||||||
Username string
|
|
||||||
|
|
||||||
// Password to authenticate the current connection.
|
|
||||||
// See: https://redis.io/commands/auth.
|
|
||||||
Password string
|
|
||||||
|
|
||||||
// Dial timeout for establishing new connections.
|
|
||||||
// Default is 5 seconds.
|
|
||||||
DialTimeout time.Duration
|
|
||||||
|
|
||||||
// Timeout for socket reads.
|
|
||||||
// If timeout is reached, read commands will fail with a timeout error
|
|
||||||
// instead of blocking.
|
|
||||||
//
|
|
||||||
// Use value -1 for no timeout and 0 for default.
|
|
||||||
// Default is 3 seconds.
|
|
||||||
ReadTimeout time.Duration
|
|
||||||
|
|
||||||
// Timeout for socket writes.
|
|
||||||
// If timeout is reached, write commands will fail with a timeout error
|
|
||||||
// instead of blocking.
|
|
||||||
//
|
|
||||||
// Use value -1 for no timeout and 0 for default.
|
|
||||||
// Default is ReadTimeout.
|
|
||||||
WriteTimeout time.Duration
|
|
||||||
|
|
||||||
// TLS Config used to connect to a server.
|
|
||||||
// TLS will be negotiated only if this field is set.
|
|
||||||
TLSConfig *tls.Config
|
|
||||||
}
|
|
||||||
|
|
||||||
func (opt RedisClusterClientOpt) MakeRedisClient() interface{} {
|
|
||||||
return redis.NewClusterClient(&redis.ClusterOptions{
|
|
||||||
Addrs: opt.Addrs,
|
|
||||||
MaxRedirects: opt.MaxRedirects,
|
|
||||||
Username: opt.Username,
|
|
||||||
Password: opt.Password,
|
|
||||||
DialTimeout: opt.DialTimeout,
|
|
||||||
ReadTimeout: opt.ReadTimeout,
|
|
||||||
WriteTimeout: opt.WriteTimeout,
|
|
||||||
TLSConfig: opt.TLSConfig,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParseRedisURI parses redis uri string and returns RedisConnOpt if uri is valid.
|
// ParseRedisURI parses redis uri string and returns RedisConnOpt if uri is valid.
|
||||||
// It returns a non-nil error if uri cannot be parsed.
|
// It returns a non-nil error if uri cannot be parsed.
|
||||||
//
|
//
|
||||||
// Three URI schemes are supported, which are redis:, rediss:, redis-socket:, and redis-sentinel:.
|
// Three URI schemes are supported, which are redis:, redis-socket:, and redis-sentinel:.
|
||||||
// Supported formats are:
|
// Supported formats are:
|
||||||
// redis://[:password@]host[:port][/dbnumber]
|
// redis://[:password@]host[:port][/dbnumber]
|
||||||
// rediss://[:password@]host[:port][/dbnumber]
|
|
||||||
// redis-socket://[:password@]path[?db=dbnumber]
|
// redis-socket://[:password@]path[?db=dbnumber]
|
||||||
// redis-sentinel://[:password@]host1[:port][,host2:[:port]][,hostN:[:port]][?master=masterName]
|
// redis-sentinel://[:password@]host1[:port][,host2:[:port]][,hostN:[:port]][?master=masterName]
|
||||||
func ParseRedisURI(uri string) (RedisConnOpt, error) {
|
func ParseRedisURI(uri string) (RedisConnOpt, error) {
|
||||||
@ -452,7 +111,7 @@ func ParseRedisURI(uri string) (RedisConnOpt, error) {
|
|||||||
return nil, fmt.Errorf("asynq: could not parse redis uri: %v", err)
|
return nil, fmt.Errorf("asynq: could not parse redis uri: %v", err)
|
||||||
}
|
}
|
||||||
switch u.Scheme {
|
switch u.Scheme {
|
||||||
case "redis", "rediss":
|
case "redis":
|
||||||
return parseRedisURI(u)
|
return parseRedisURI(u)
|
||||||
case "redis-socket":
|
case "redis-socket":
|
||||||
return parseRedisSocketURI(u)
|
return parseRedisSocketURI(u)
|
||||||
@ -466,8 +125,6 @@ func ParseRedisURI(uri string) (RedisConnOpt, error) {
|
|||||||
func parseRedisURI(u *url.URL) (RedisConnOpt, error) {
|
func parseRedisURI(u *url.URL) (RedisConnOpt, error) {
|
||||||
var db int
|
var db int
|
||||||
var err error
|
var err error
|
||||||
var redisConnOpt RedisClientOpt
|
|
||||||
|
|
||||||
if len(u.Path) > 0 {
|
if len(u.Path) > 0 {
|
||||||
xs := strings.Split(strings.Trim(u.Path, "/"), "/")
|
xs := strings.Split(strings.Trim(u.Path, "/"), "/")
|
||||||
db, err = strconv.Atoi(xs[0])
|
db, err = strconv.Atoi(xs[0])
|
||||||
@ -479,20 +136,7 @@ func parseRedisURI(u *url.URL) (RedisConnOpt, error) {
|
|||||||
if v, ok := u.User.Password(); ok {
|
if v, ok := u.User.Password(); ok {
|
||||||
password = v
|
password = v
|
||||||
}
|
}
|
||||||
|
return RedisClientOpt{Addr: u.Host, DB: db, Password: password}, nil
|
||||||
if u.Scheme == "rediss" {
|
|
||||||
h, _, err := net.SplitHostPort(u.Host)
|
|
||||||
if err != nil {
|
|
||||||
h = u.Host
|
|
||||||
}
|
|
||||||
redisConnOpt.TLSConfig = &tls.Config{ServerName: h}
|
|
||||||
}
|
|
||||||
|
|
||||||
redisConnOpt.Addr = u.Host
|
|
||||||
redisConnOpt.Password = password
|
|
||||||
redisConnOpt.DB = db
|
|
||||||
|
|
||||||
return redisConnOpt, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseRedisSocketURI(u *url.URL) (RedisConnOpt, error) {
|
func parseRedisSocketURI(u *url.URL) (RedisConnOpt, error) {
|
||||||
@ -523,29 +167,53 @@ func parseRedisSentinelURI(u *url.URL) (RedisConnOpt, error) {
|
|||||||
if v, ok := u.User.Password(); ok {
|
if v, ok := u.User.Password(); ok {
|
||||||
password = v
|
password = v
|
||||||
}
|
}
|
||||||
return RedisFailoverClientOpt{MasterName: master, SentinelAddrs: addrs, SentinelPassword: password}, nil
|
return RedisFailoverClientOpt{MasterName: master, SentinelAddrs: addrs, Password: password}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ResultWriter is a client interface to write result data for a task.
|
// createRedisClient returns a redis client given a redis connection configuration.
|
||||||
// It writes the data to the redis instance the server is connected to.
|
//
|
||||||
type ResultWriter struct {
|
// Passing an unexpected type as a RedisConnOpt argument will cause panic.
|
||||||
id string // task ID this writer is responsible for
|
func createRedisClient(r RedisConnOpt) *redis.Client {
|
||||||
qname string // queue name the task belongs to
|
switch r := r.(type) {
|
||||||
broker base.Broker
|
case *RedisClientOpt:
|
||||||
ctx context.Context // context associated with the task
|
return redis.NewClient(&redis.Options{
|
||||||
}
|
Network: r.Network,
|
||||||
|
Addr: r.Addr,
|
||||||
// Write writes the given data as a result of the task the ResultWriter is associated with.
|
Password: r.Password,
|
||||||
func (w *ResultWriter) Write(data []byte) (n int, err error) {
|
DB: r.DB,
|
||||||
select {
|
PoolSize: r.PoolSize,
|
||||||
case <-w.ctx.Done():
|
TLSConfig: r.TLSConfig,
|
||||||
return 0, fmt.Errorf("failed to result task result: %v", w.ctx.Err())
|
})
|
||||||
|
case RedisClientOpt:
|
||||||
|
return redis.NewClient(&redis.Options{
|
||||||
|
Network: r.Network,
|
||||||
|
Addr: r.Addr,
|
||||||
|
Password: r.Password,
|
||||||
|
DB: r.DB,
|
||||||
|
PoolSize: r.PoolSize,
|
||||||
|
TLSConfig: r.TLSConfig,
|
||||||
|
})
|
||||||
|
case *RedisFailoverClientOpt:
|
||||||
|
return redis.NewFailoverClient(&redis.FailoverOptions{
|
||||||
|
MasterName: r.MasterName,
|
||||||
|
SentinelAddrs: r.SentinelAddrs,
|
||||||
|
SentinelPassword: r.SentinelPassword,
|
||||||
|
Password: r.Password,
|
||||||
|
DB: r.DB,
|
||||||
|
PoolSize: r.PoolSize,
|
||||||
|
TLSConfig: r.TLSConfig,
|
||||||
|
})
|
||||||
|
case RedisFailoverClientOpt:
|
||||||
|
return redis.NewFailoverClient(&redis.FailoverOptions{
|
||||||
|
MasterName: r.MasterName,
|
||||||
|
SentinelAddrs: r.SentinelAddrs,
|
||||||
|
SentinelPassword: r.SentinelPassword,
|
||||||
|
Password: r.Password,
|
||||||
|
DB: r.DB,
|
||||||
|
PoolSize: r.PoolSize,
|
||||||
|
TLSConfig: r.TLSConfig,
|
||||||
|
})
|
||||||
default:
|
default:
|
||||||
|
panic(fmt.Sprintf("asynq: unexpected type %T for RedisConnOpt", r))
|
||||||
}
|
}
|
||||||
return w.broker.WriteResult(w.qname, w.id, data)
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskID returns the ID of the task the ResultWriter is associated with.
|
|
||||||
func (w *ResultWriter) TaskID() string {
|
|
||||||
return w.id
|
|
||||||
}
|
}
|
||||||
|
@ -5,89 +5,42 @@
|
|||||||
package asynq
|
package asynq
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/tls"
|
"os"
|
||||||
"flag"
|
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/redis/go-redis/v9"
|
"github.com/go-redis/redis/v7"
|
||||||
"github.com/google/go-cmp/cmp"
|
"github.com/google/go-cmp/cmp"
|
||||||
"github.com/google/go-cmp/cmp/cmpopts"
|
h "github.com/hibiken/asynq/internal/asynqtest"
|
||||||
"github.com/hibiken/asynq/internal/log"
|
"github.com/hibiken/asynq/internal/log"
|
||||||
h "github.com/hibiken/asynq/internal/testutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
//============================================================================
|
// This file defines test helper functions used by
|
||||||
// This file defines helper functions and variables used in other test files.
|
// other test files.
|
||||||
//============================================================================
|
|
||||||
|
|
||||||
// variables used for package testing.
|
// redis used for package testing.
|
||||||
var (
|
const (
|
||||||
redisAddr string
|
redisAddr = "localhost:6379"
|
||||||
redisDB int
|
redisDB = 14
|
||||||
|
|
||||||
useRedisCluster bool
|
|
||||||
redisClusterAddrs string // comma-separated list of host:port
|
|
||||||
|
|
||||||
testLogLevel = FatalLevel
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var testLogger *log.Logger
|
var testLogger = log.NewLogger(os.Stderr)
|
||||||
|
|
||||||
func init() {
|
func setup(tb testing.TB) *redis.Client {
|
||||||
flag.StringVar(&redisAddr, "redis_addr", "localhost:6379", "redis address to use in testing")
|
|
||||||
flag.IntVar(&redisDB, "redis_db", 14, "redis db number to use in testing")
|
|
||||||
flag.BoolVar(&useRedisCluster, "redis_cluster", false, "use redis cluster as a broker in testing")
|
|
||||||
flag.StringVar(&redisClusterAddrs, "redis_cluster_addrs", "localhost:7000,localhost:7001,localhost:7002", "comma separated list of redis server addresses")
|
|
||||||
flag.Var(&testLogLevel, "loglevel", "log level to use in testing")
|
|
||||||
|
|
||||||
testLogger = log.NewLogger(nil)
|
|
||||||
testLogger.SetLevel(toInternalLogLevel(testLogLevel))
|
|
||||||
}
|
|
||||||
|
|
||||||
func setup(tb testing.TB) (r redis.UniversalClient) {
|
|
||||||
tb.Helper()
|
tb.Helper()
|
||||||
if useRedisCluster {
|
r := redis.NewClient(&redis.Options{
|
||||||
addrs := strings.Split(redisClusterAddrs, ",")
|
Addr: redisAddr,
|
||||||
if len(addrs) == 0 {
|
DB: redisDB,
|
||||||
tb.Fatal("No redis cluster addresses provided. Please set addresses using --redis_cluster_addrs flag.")
|
})
|
||||||
}
|
|
||||||
r = redis.NewClusterClient(&redis.ClusterOptions{
|
|
||||||
Addrs: addrs,
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
r = redis.NewClient(&redis.Options{
|
|
||||||
Addr: redisAddr,
|
|
||||||
DB: redisDB,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
// Start each test with a clean slate.
|
// Start each test with a clean slate.
|
||||||
h.FlushDB(tb, r)
|
h.FlushDB(tb, r)
|
||||||
return r
|
return r
|
||||||
}
|
}
|
||||||
|
|
||||||
func getRedisConnOpt(tb testing.TB) RedisConnOpt {
|
|
||||||
tb.Helper()
|
|
||||||
if useRedisCluster {
|
|
||||||
addrs := strings.Split(redisClusterAddrs, ",")
|
|
||||||
if len(addrs) == 0 {
|
|
||||||
tb.Fatal("No redis cluster addresses provided. Please set addresses using --redis_cluster_addrs flag.")
|
|
||||||
}
|
|
||||||
return RedisClusterClientOpt{
|
|
||||||
Addrs: addrs,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return RedisClientOpt{
|
|
||||||
Addr: redisAddr,
|
|
||||||
DB: redisDB,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var sortTaskOpt = cmp.Transformer("SortMsg", func(in []*Task) []*Task {
|
var sortTaskOpt = cmp.Transformer("SortMsg", func(in []*Task) []*Task {
|
||||||
out := append([]*Task(nil), in...) // Copy input to avoid mutating it
|
out := append([]*Task(nil), in...) // Copy input to avoid mutating it
|
||||||
sort.Slice(out, func(i, j int) bool {
|
sort.Slice(out, func(i, j int) bool {
|
||||||
return out[i].Type() < out[j].Type()
|
return out[i].Type < out[j].Type
|
||||||
})
|
})
|
||||||
return out
|
return out
|
||||||
})
|
})
|
||||||
@ -101,10 +54,6 @@ func TestParseRedisURI(t *testing.T) {
|
|||||||
"redis://localhost:6379",
|
"redis://localhost:6379",
|
||||||
RedisClientOpt{Addr: "localhost:6379"},
|
RedisClientOpt{Addr: "localhost:6379"},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"rediss://localhost:6379",
|
|
||||||
RedisClientOpt{Addr: "localhost:6379", TLSConfig: &tls.Config{ServerName: "localhost"}},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"redis://localhost:6379/3",
|
"redis://localhost:6379/3",
|
||||||
RedisClientOpt{Addr: "localhost:6379", DB: 3},
|
RedisClientOpt{Addr: "localhost:6379", DB: 3},
|
||||||
@ -143,9 +92,9 @@ func TestParseRedisURI(t *testing.T) {
|
|||||||
{
|
{
|
||||||
"redis-sentinel://:mypassword@localhost:5000,localhost:5001,localhost:5002?master=mymaster",
|
"redis-sentinel://:mypassword@localhost:5000,localhost:5001,localhost:5002?master=mymaster",
|
||||||
RedisFailoverClientOpt{
|
RedisFailoverClientOpt{
|
||||||
MasterName: "mymaster",
|
MasterName: "mymaster",
|
||||||
SentinelAddrs: []string{"localhost:5000", "localhost:5001", "localhost:5002"},
|
SentinelAddrs: []string{"localhost:5000", "localhost:5001", "localhost:5002"},
|
||||||
SentinelPassword: "mypassword",
|
Password: "mypassword",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -157,7 +106,7 @@ func TestParseRedisURI(t *testing.T) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreUnexported(tls.Config{})); diff != "" {
|
if diff := cmp.Diff(tc.want, got); diff != "" {
|
||||||
t.Errorf("ParseRedisURI(%q) = %+v, want %+v\n(-want,+got)\n%s", tc.uri, got, tc.want, diff)
|
t.Errorf("ParseRedisURI(%q) = %+v, want %+v\n(-want,+got)\n%s", tc.uri, got, tc.want, diff)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,46 +6,37 @@ package asynq
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math/rand"
|
||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
h "github.com/hibiken/asynq/internal/testutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Creates a new task of type "task<n>" with payload {"data": n}.
|
|
||||||
func makeTask(n int) *Task {
|
|
||||||
b, err := json.Marshal(map[string]int{"data": n})
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
return NewTask(fmt.Sprintf("task%d", n), b)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Simple E2E Benchmark testing with no scheduled tasks and retries.
|
// Simple E2E Benchmark testing with no scheduled tasks and retries.
|
||||||
func BenchmarkEndToEndSimple(b *testing.B) {
|
func BenchmarkEndToEndSimple(b *testing.B) {
|
||||||
const count = 100000
|
const count = 100000
|
||||||
for n := 0; n < b.N; n++ {
|
for n := 0; n < b.N; n++ {
|
||||||
b.StopTimer() // begin setup
|
b.StopTimer() // begin setup
|
||||||
setup(b)
|
setup(b)
|
||||||
redis := getRedisConnOpt(b)
|
redis := &RedisClientOpt{
|
||||||
|
Addr: redisAddr,
|
||||||
|
DB: redisDB,
|
||||||
|
}
|
||||||
client := NewClient(redis)
|
client := NewClient(redis)
|
||||||
srv := NewServer(redis, Config{
|
srv := NewServer(redis, Config{
|
||||||
Concurrency: 10,
|
Concurrency: 10,
|
||||||
RetryDelayFunc: func(n int, err error, t *Task) time.Duration {
|
RetryDelayFunc: func(n int, err error, t *Task) time.Duration {
|
||||||
return time.Second
|
return time.Second
|
||||||
},
|
},
|
||||||
LogLevel: testLogLevel,
|
|
||||||
})
|
})
|
||||||
// Create a bunch of tasks
|
// Create a bunch of tasks
|
||||||
for i := 0; i < count; i++ {
|
for i := 0; i < count; i++ {
|
||||||
if _, err := client.Enqueue(makeTask(i)); err != nil {
|
t := NewTask(fmt.Sprintf("task%d", i), map[string]interface{}{"data": i})
|
||||||
|
if err := client.Enqueue(t); err != nil {
|
||||||
b.Fatalf("could not enqueue a task: %v", err)
|
b.Fatalf("could not enqueue a task: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
client.Close()
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(count)
|
wg.Add(count)
|
||||||
@ -55,7 +46,7 @@ func BenchmarkEndToEndSimple(b *testing.B) {
|
|||||||
}
|
}
|
||||||
b.StartTimer() // end setup
|
b.StartTimer() // end setup
|
||||||
|
|
||||||
_ = srv.Start(HandlerFunc(handler))
|
srv.Start(HandlerFunc(handler))
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
b.StopTimer() // begin teardown
|
b.StopTimer() // begin teardown
|
||||||
@ -69,47 +60,38 @@ func BenchmarkEndToEnd(b *testing.B) {
|
|||||||
const count = 100000
|
const count = 100000
|
||||||
for n := 0; n < b.N; n++ {
|
for n := 0; n < b.N; n++ {
|
||||||
b.StopTimer() // begin setup
|
b.StopTimer() // begin setup
|
||||||
|
rand.Seed(time.Now().UnixNano())
|
||||||
setup(b)
|
setup(b)
|
||||||
redis := getRedisConnOpt(b)
|
redis := &RedisClientOpt{
|
||||||
|
Addr: redisAddr,
|
||||||
|
DB: redisDB,
|
||||||
|
}
|
||||||
client := NewClient(redis)
|
client := NewClient(redis)
|
||||||
srv := NewServer(redis, Config{
|
srv := NewServer(redis, Config{
|
||||||
Concurrency: 10,
|
Concurrency: 10,
|
||||||
RetryDelayFunc: func(n int, err error, t *Task) time.Duration {
|
RetryDelayFunc: func(n int, err error, t *Task) time.Duration {
|
||||||
return time.Second
|
return time.Second
|
||||||
},
|
},
|
||||||
LogLevel: testLogLevel,
|
|
||||||
})
|
})
|
||||||
// Create a bunch of tasks
|
// Create a bunch of tasks
|
||||||
for i := 0; i < count; i++ {
|
for i := 0; i < count; i++ {
|
||||||
if _, err := client.Enqueue(makeTask(i)); err != nil {
|
t := NewTask(fmt.Sprintf("task%d", i), map[string]interface{}{"data": i})
|
||||||
|
if err := client.Enqueue(t); err != nil {
|
||||||
b.Fatalf("could not enqueue a task: %v", err)
|
b.Fatalf("could not enqueue a task: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for i := 0; i < count; i++ {
|
for i := 0; i < count; i++ {
|
||||||
if _, err := client.Enqueue(makeTask(i), ProcessIn(1*time.Second)); err != nil {
|
t := NewTask(fmt.Sprintf("scheduled%d", i), map[string]interface{}{"data": i})
|
||||||
|
if err := client.EnqueueAt(time.Now().Add(time.Second), t); err != nil {
|
||||||
b.Fatalf("could not enqueue a task: %v", err)
|
b.Fatalf("could not enqueue a task: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
client.Close()
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(count * 2)
|
wg.Add(count * 2)
|
||||||
handler := func(ctx context.Context, t *Task) error {
|
handler := func(ctx context.Context, t *Task) error {
|
||||||
var p map[string]int
|
// randomly fail 1% of tasks
|
||||||
if err := json.Unmarshal(t.Payload(), &p); err != nil {
|
if rand.Intn(100) == 1 {
|
||||||
b.Logf("internal error: %v", err)
|
|
||||||
}
|
|
||||||
n, ok := p["data"]
|
|
||||||
if !ok {
|
|
||||||
n = 1
|
|
||||||
b.Logf("internal error: could not get data from payload")
|
|
||||||
}
|
|
||||||
retried, ok := GetRetryCount(ctx)
|
|
||||||
if !ok {
|
|
||||||
b.Logf("internal error: could not get retry count from context")
|
|
||||||
}
|
|
||||||
// Fail 1% of tasks for the first attempt.
|
|
||||||
if retried == 0 && n%100 == 0 {
|
|
||||||
return fmt.Errorf(":(")
|
return fmt.Errorf(":(")
|
||||||
}
|
}
|
||||||
wg.Done()
|
wg.Done()
|
||||||
@ -117,7 +99,7 @@ func BenchmarkEndToEnd(b *testing.B) {
|
|||||||
}
|
}
|
||||||
b.StartTimer() // end setup
|
b.StartTimer() // end setup
|
||||||
|
|
||||||
_ = srv.Start(HandlerFunc(handler))
|
srv.Start(HandlerFunc(handler))
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
b.StopTimer() // begin teardown
|
b.StopTimer() // begin teardown
|
||||||
@ -137,7 +119,10 @@ func BenchmarkEndToEndMultipleQueues(b *testing.B) {
|
|||||||
for n := 0; n < b.N; n++ {
|
for n := 0; n < b.N; n++ {
|
||||||
b.StopTimer() // begin setup
|
b.StopTimer() // begin setup
|
||||||
setup(b)
|
setup(b)
|
||||||
redis := getRedisConnOpt(b)
|
redis := &RedisClientOpt{
|
||||||
|
Addr: redisAddr,
|
||||||
|
DB: redisDB,
|
||||||
|
}
|
||||||
client := NewClient(redis)
|
client := NewClient(redis)
|
||||||
srv := NewServer(redis, Config{
|
srv := NewServer(redis, Config{
|
||||||
Concurrency: 10,
|
Concurrency: 10,
|
||||||
@ -146,25 +131,26 @@ func BenchmarkEndToEndMultipleQueues(b *testing.B) {
|
|||||||
"default": 3,
|
"default": 3,
|
||||||
"low": 1,
|
"low": 1,
|
||||||
},
|
},
|
||||||
LogLevel: testLogLevel,
|
|
||||||
})
|
})
|
||||||
// Create a bunch of tasks
|
// Create a bunch of tasks
|
||||||
for i := 0; i < highCount; i++ {
|
for i := 0; i < highCount; i++ {
|
||||||
if _, err := client.Enqueue(makeTask(i), Queue("high")); err != nil {
|
t := NewTask(fmt.Sprintf("task%d", i), map[string]interface{}{"data": i})
|
||||||
|
if err := client.Enqueue(t, Queue("high")); err != nil {
|
||||||
b.Fatalf("could not enqueue a task: %v", err)
|
b.Fatalf("could not enqueue a task: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for i := 0; i < defaultCount; i++ {
|
for i := 0; i < defaultCount; i++ {
|
||||||
if _, err := client.Enqueue(makeTask(i)); err != nil {
|
t := NewTask(fmt.Sprintf("task%d", i), map[string]interface{}{"data": i})
|
||||||
|
if err := client.Enqueue(t); err != nil {
|
||||||
b.Fatalf("could not enqueue a task: %v", err)
|
b.Fatalf("could not enqueue a task: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for i := 0; i < lowCount; i++ {
|
for i := 0; i < lowCount; i++ {
|
||||||
if _, err := client.Enqueue(makeTask(i), Queue("low")); err != nil {
|
t := NewTask(fmt.Sprintf("task%d", i), map[string]interface{}{"data": i})
|
||||||
|
if err := client.Enqueue(t, Queue("low")); err != nil {
|
||||||
b.Fatalf("could not enqueue a task: %v", err)
|
b.Fatalf("could not enqueue a task: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
client.Close()
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(highCount + defaultCount + lowCount)
|
wg.Add(highCount + defaultCount + lowCount)
|
||||||
@ -174,7 +160,7 @@ func BenchmarkEndToEndMultipleQueues(b *testing.B) {
|
|||||||
}
|
}
|
||||||
b.StartTimer() // end setup
|
b.StartTimer() // end setup
|
||||||
|
|
||||||
_ = srv.Start(HandlerFunc(handler))
|
srv.Start(HandlerFunc(handler))
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
b.StopTimer() // begin teardown
|
b.StopTimer() // begin teardown
|
||||||
@ -182,58 +168,3 @@ func BenchmarkEndToEndMultipleQueues(b *testing.B) {
|
|||||||
b.StartTimer() // end teardown
|
b.StartTimer() // end teardown
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// E2E benchmark to check client enqueue operation performs correctly,
|
|
||||||
// while server is busy processing tasks.
|
|
||||||
func BenchmarkClientWhileServerRunning(b *testing.B) {
|
|
||||||
const count = 10000
|
|
||||||
for n := 0; n < b.N; n++ {
|
|
||||||
b.StopTimer() // begin setup
|
|
||||||
setup(b)
|
|
||||||
redis := getRedisConnOpt(b)
|
|
||||||
client := NewClient(redis)
|
|
||||||
srv := NewServer(redis, Config{
|
|
||||||
Concurrency: 10,
|
|
||||||
RetryDelayFunc: func(n int, err error, t *Task) time.Duration {
|
|
||||||
return time.Second
|
|
||||||
},
|
|
||||||
LogLevel: testLogLevel,
|
|
||||||
})
|
|
||||||
// Enqueue 10,000 tasks.
|
|
||||||
for i := 0; i < count; i++ {
|
|
||||||
if _, err := client.Enqueue(makeTask(i)); err != nil {
|
|
||||||
b.Fatalf("could not enqueue a task: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Schedule 10,000 tasks.
|
|
||||||
for i := 0; i < count; i++ {
|
|
||||||
if _, err := client.Enqueue(makeTask(i), ProcessIn(1*time.Second)); err != nil {
|
|
||||||
b.Fatalf("could not enqueue a task: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
handler := func(ctx context.Context, t *Task) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
_ = srv.Start(HandlerFunc(handler))
|
|
||||||
|
|
||||||
b.StartTimer() // end setup
|
|
||||||
|
|
||||||
b.Log("Starting enqueueing")
|
|
||||||
enqueued := 0
|
|
||||||
for enqueued < 100000 {
|
|
||||||
t := NewTask(fmt.Sprintf("enqueued%d", enqueued), h.JSON(map[string]interface{}{"data": enqueued}))
|
|
||||||
if _, err := client.Enqueue(t); err != nil {
|
|
||||||
b.Logf("could not enqueue task %d: %v", enqueued, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
enqueued++
|
|
||||||
}
|
|
||||||
b.Logf("Finished enqueueing %d tasks", enqueued)
|
|
||||||
|
|
||||||
b.StopTimer() // begin teardown
|
|
||||||
srv.Stop()
|
|
||||||
client.Close()
|
|
||||||
b.StartTimer() // end teardown
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
435
client.go
435
client.go
@ -5,16 +5,16 @@
|
|||||||
package asynq
|
package asynq
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/hibiken/asynq/internal/errors"
|
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
"github.com/redis/go-redis/v9"
|
"github.com/rs/xid"
|
||||||
)
|
)
|
||||||
|
|
||||||
// A Client is responsible for scheduling tasks.
|
// A Client is responsible for scheduling tasks.
|
||||||
@ -24,68 +24,30 @@ import (
|
|||||||
//
|
//
|
||||||
// Clients are safe for concurrent use by multiple goroutines.
|
// Clients are safe for concurrent use by multiple goroutines.
|
||||||
type Client struct {
|
type Client struct {
|
||||||
broker base.Broker
|
mu sync.Mutex
|
||||||
// When a Client has been created with an existing Redis connection, we do
|
opts map[string][]Option
|
||||||
// not want to close it.
|
rdb *rdb.RDB
|
||||||
sharedConnection bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewClient returns a new Client instance given a redis connection option.
|
// NewClient and returns a new Client given a redis connection option.
|
||||||
func NewClient(r RedisConnOpt) *Client {
|
func NewClient(r RedisConnOpt) *Client {
|
||||||
redisClient, ok := r.MakeRedisClient().(redis.UniversalClient)
|
rdb := rdb.NewRDB(createRedisClient(r))
|
||||||
if !ok {
|
return &Client{
|
||||||
panic(fmt.Sprintf("asynq: unsupported RedisConnOpt type %T", r))
|
opts: make(map[string][]Option),
|
||||||
|
rdb: rdb,
|
||||||
}
|
}
|
||||||
client := NewClientFromRedisClient(redisClient)
|
|
||||||
client.sharedConnection = false
|
|
||||||
return client
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewClientFromRedisClient returns a new instance of Client given a redis.UniversalClient
|
|
||||||
// Warning: The underlying redis connection pool will not be closed by Asynq, you are responsible for closing it.
|
|
||||||
func NewClientFromRedisClient(c redis.UniversalClient) *Client {
|
|
||||||
return &Client{broker: rdb.NewRDB(c), sharedConnection: true}
|
|
||||||
}
|
|
||||||
|
|
||||||
type OptionType int
|
|
||||||
|
|
||||||
const (
|
|
||||||
MaxRetryOpt OptionType = iota
|
|
||||||
QueueOpt
|
|
||||||
TimeoutOpt
|
|
||||||
DeadlineOpt
|
|
||||||
UniqueOpt
|
|
||||||
ProcessAtOpt
|
|
||||||
ProcessInOpt
|
|
||||||
TaskIDOpt
|
|
||||||
RetentionOpt
|
|
||||||
GroupOpt
|
|
||||||
)
|
|
||||||
|
|
||||||
// Option specifies the task processing behavior.
|
// Option specifies the task processing behavior.
|
||||||
type Option interface {
|
type Option interface{}
|
||||||
// String returns a string representation of the option.
|
|
||||||
String() string
|
|
||||||
|
|
||||||
// Type describes the type of the option.
|
|
||||||
Type() OptionType
|
|
||||||
|
|
||||||
// Value returns a value used to create this option.
|
|
||||||
Value() interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Internal option representations.
|
// Internal option representations.
|
||||||
type (
|
type (
|
||||||
retryOption int
|
retryOption int
|
||||||
queueOption string
|
queueOption string
|
||||||
taskIDOption string
|
timeoutOption time.Duration
|
||||||
timeoutOption time.Duration
|
deadlineOption time.Time
|
||||||
deadlineOption time.Time
|
uniqueOption time.Duration
|
||||||
uniqueOption time.Duration
|
|
||||||
processAtOption time.Time
|
|
||||||
processInOption time.Duration
|
|
||||||
retentionOption time.Duration
|
|
||||||
groupOption string
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// MaxRetry returns an option to specify the max number of times
|
// MaxRetry returns an option to specify the max number of times
|
||||||
@ -99,349 +61,194 @@ func MaxRetry(n int) Option {
|
|||||||
return retryOption(n)
|
return retryOption(n)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n retryOption) String() string { return fmt.Sprintf("MaxRetry(%d)", int(n)) }
|
|
||||||
func (n retryOption) Type() OptionType { return MaxRetryOpt }
|
|
||||||
func (n retryOption) Value() interface{} { return int(n) }
|
|
||||||
|
|
||||||
// Queue returns an option to specify the queue to enqueue the task into.
|
// Queue returns an option to specify the queue to enqueue the task into.
|
||||||
|
//
|
||||||
|
// Queue name is case-insensitive and the lowercased version is used.
|
||||||
func Queue(name string) Option {
|
func Queue(name string) Option {
|
||||||
return queueOption(name)
|
return queueOption(strings.ToLower(name))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (name queueOption) String() string { return fmt.Sprintf("Queue(%q)", string(name)) }
|
|
||||||
func (name queueOption) Type() OptionType { return QueueOpt }
|
|
||||||
func (name queueOption) Value() interface{} { return string(name) }
|
|
||||||
|
|
||||||
// TaskID returns an option to specify the task ID.
|
|
||||||
func TaskID(id string) Option {
|
|
||||||
return taskIDOption(id)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (id taskIDOption) String() string { return fmt.Sprintf("TaskID(%q)", string(id)) }
|
|
||||||
func (id taskIDOption) Type() OptionType { return TaskIDOpt }
|
|
||||||
func (id taskIDOption) Value() interface{} { return string(id) }
|
|
||||||
|
|
||||||
// Timeout returns an option to specify how long a task may run.
|
// Timeout returns an option to specify how long a task may run.
|
||||||
// If the timeout elapses before the Handler returns, then the task
|
|
||||||
// will be retried.
|
|
||||||
//
|
//
|
||||||
// Zero duration means no limit.
|
// Zero duration means no limit.
|
||||||
//
|
|
||||||
// If there's a conflicting Deadline option, whichever comes earliest
|
|
||||||
// will be used.
|
|
||||||
func Timeout(d time.Duration) Option {
|
func Timeout(d time.Duration) Option {
|
||||||
return timeoutOption(d)
|
return timeoutOption(d)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d timeoutOption) String() string { return fmt.Sprintf("Timeout(%v)", time.Duration(d)) }
|
|
||||||
func (d timeoutOption) Type() OptionType { return TimeoutOpt }
|
|
||||||
func (d timeoutOption) Value() interface{} { return time.Duration(d) }
|
|
||||||
|
|
||||||
// Deadline returns an option to specify the deadline for the given task.
|
// Deadline returns an option to specify the deadline for the given task.
|
||||||
// If it reaches the deadline before the Handler returns, then the task
|
|
||||||
// will be retried.
|
|
||||||
//
|
|
||||||
// If there's a conflicting Timeout option, whichever comes earliest
|
|
||||||
// will be used.
|
|
||||||
func Deadline(t time.Time) Option {
|
func Deadline(t time.Time) Option {
|
||||||
return deadlineOption(t)
|
return deadlineOption(t)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t deadlineOption) String() string {
|
|
||||||
return fmt.Sprintf("Deadline(%v)", time.Time(t).Format(time.UnixDate))
|
|
||||||
}
|
|
||||||
func (t deadlineOption) Type() OptionType { return DeadlineOpt }
|
|
||||||
func (t deadlineOption) Value() interface{} { return time.Time(t) }
|
|
||||||
|
|
||||||
// Unique returns an option to enqueue a task only if the given task is unique.
|
// Unique returns an option to enqueue a task only if the given task is unique.
|
||||||
// Task enqueued with this option is guaranteed to be unique within the given ttl.
|
// Task enqueued with this option is guaranteed to be unique within the given ttl.
|
||||||
// Once the task gets processed successfully or once the TTL has expired,
|
// Once the task gets processed successfully or once the TTL has expired, another task with the same uniqueness may be enqueued.
|
||||||
// another task with the same uniqueness may be enqueued.
|
|
||||||
// ErrDuplicateTask error is returned when enqueueing a duplicate task.
|
// ErrDuplicateTask error is returned when enqueueing a duplicate task.
|
||||||
// TTL duration must be greater than or equal to 1 second.
|
|
||||||
//
|
//
|
||||||
// Uniqueness of a task is based on the following properties:
|
// Uniqueness of a task is based on the following properties:
|
||||||
// - Task Type
|
// - Task Type
|
||||||
// - Task Payload
|
// - Task Payload
|
||||||
// - Queue Name
|
// - Queue Name
|
||||||
func Unique(ttl time.Duration) Option {
|
func Unique(ttl time.Duration) Option {
|
||||||
return uniqueOption(ttl)
|
return uniqueOption(ttl)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ttl uniqueOption) String() string { return fmt.Sprintf("Unique(%v)", time.Duration(ttl)) }
|
|
||||||
func (ttl uniqueOption) Type() OptionType { return UniqueOpt }
|
|
||||||
func (ttl uniqueOption) Value() interface{} { return time.Duration(ttl) }
|
|
||||||
|
|
||||||
// ProcessAt returns an option to specify when to process the given task.
|
|
||||||
//
|
|
||||||
// If there's a conflicting ProcessIn option, the last option passed to Enqueue overrides the others.
|
|
||||||
func ProcessAt(t time.Time) Option {
|
|
||||||
return processAtOption(t)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t processAtOption) String() string {
|
|
||||||
return fmt.Sprintf("ProcessAt(%v)", time.Time(t).Format(time.UnixDate))
|
|
||||||
}
|
|
||||||
func (t processAtOption) Type() OptionType { return ProcessAtOpt }
|
|
||||||
func (t processAtOption) Value() interface{} { return time.Time(t) }
|
|
||||||
|
|
||||||
// ProcessIn returns an option to specify when to process the given task relative to the current time.
|
|
||||||
//
|
|
||||||
// If there's a conflicting ProcessAt option, the last option passed to Enqueue overrides the others.
|
|
||||||
func ProcessIn(d time.Duration) Option {
|
|
||||||
return processInOption(d)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d processInOption) String() string { return fmt.Sprintf("ProcessIn(%v)", time.Duration(d)) }
|
|
||||||
func (d processInOption) Type() OptionType { return ProcessInOpt }
|
|
||||||
func (d processInOption) Value() interface{} { return time.Duration(d) }
|
|
||||||
|
|
||||||
// Retention returns an option to specify the duration of retention period for the task.
|
|
||||||
// If this option is provided, the task will be stored as a completed task after successful processing.
|
|
||||||
// A completed task will be deleted after the specified duration elapses.
|
|
||||||
func Retention(d time.Duration) Option {
|
|
||||||
return retentionOption(d)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ttl retentionOption) String() string { return fmt.Sprintf("Retention(%v)", time.Duration(ttl)) }
|
|
||||||
func (ttl retentionOption) Type() OptionType { return RetentionOpt }
|
|
||||||
func (ttl retentionOption) Value() interface{} { return time.Duration(ttl) }
|
|
||||||
|
|
||||||
// Group returns an option to specify the group used for the task.
|
|
||||||
// Tasks in a given queue with the same group will be aggregated into one task before passed to Handler.
|
|
||||||
func Group(name string) Option {
|
|
||||||
return groupOption(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (name groupOption) String() string { return fmt.Sprintf("Group(%q)", string(name)) }
|
|
||||||
func (name groupOption) Type() OptionType { return GroupOpt }
|
|
||||||
func (name groupOption) Value() interface{} { return string(name) }
|
|
||||||
|
|
||||||
// ErrDuplicateTask indicates that the given task could not be enqueued since it's a duplicate of another task.
|
// ErrDuplicateTask indicates that the given task could not be enqueued since it's a duplicate of another task.
|
||||||
//
|
//
|
||||||
// ErrDuplicateTask error only applies to tasks enqueued with a Unique option.
|
// ErrDuplicateTask error only applies to tasks enqueued with a Unique option.
|
||||||
var ErrDuplicateTask = errors.New("task already exists")
|
var ErrDuplicateTask = errors.New("task already exists")
|
||||||
|
|
||||||
// ErrTaskIDConflict indicates that the given task could not be enqueued since its task ID already exists.
|
|
||||||
//
|
|
||||||
// ErrTaskIDConflict error only applies to tasks enqueued with a TaskID option.
|
|
||||||
var ErrTaskIDConflict = errors.New("task ID conflicts with another task")
|
|
||||||
|
|
||||||
type option struct {
|
type option struct {
|
||||||
retry int
|
retry int
|
||||||
queue string
|
queue string
|
||||||
taskID string
|
|
||||||
timeout time.Duration
|
timeout time.Duration
|
||||||
deadline time.Time
|
deadline time.Time
|
||||||
uniqueTTL time.Duration
|
uniqueTTL time.Duration
|
||||||
processAt time.Time
|
|
||||||
retention time.Duration
|
|
||||||
group string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// composeOptions merges user provided options into the default options
|
func composeOptions(opts ...Option) option {
|
||||||
// and returns the composed option.
|
|
||||||
// It also validates the user provided options and returns an error if any of
|
|
||||||
// the user provided options fail the validations.
|
|
||||||
func composeOptions(opts ...Option) (option, error) {
|
|
||||||
res := option{
|
res := option{
|
||||||
retry: defaultMaxRetry,
|
retry: defaultMaxRetry,
|
||||||
queue: base.DefaultQueueName,
|
queue: base.DefaultQueueName,
|
||||||
taskID: uuid.NewString(),
|
timeout: 0,
|
||||||
timeout: 0, // do not set to defaultTimeout here
|
deadline: time.Time{},
|
||||||
deadline: time.Time{},
|
|
||||||
processAt: time.Now(),
|
|
||||||
}
|
}
|
||||||
for _, opt := range opts {
|
for _, opt := range opts {
|
||||||
switch opt := opt.(type) {
|
switch opt := opt.(type) {
|
||||||
case retryOption:
|
case retryOption:
|
||||||
res.retry = int(opt)
|
res.retry = int(opt)
|
||||||
case queueOption:
|
case queueOption:
|
||||||
qname := string(opt)
|
res.queue = string(opt)
|
||||||
if err := base.ValidateQueueName(qname); err != nil {
|
|
||||||
return option{}, err
|
|
||||||
}
|
|
||||||
res.queue = qname
|
|
||||||
case taskIDOption:
|
|
||||||
id := string(opt)
|
|
||||||
if isBlank(id) {
|
|
||||||
return option{}, errors.New("task ID cannot be empty")
|
|
||||||
}
|
|
||||||
res.taskID = id
|
|
||||||
case timeoutOption:
|
case timeoutOption:
|
||||||
res.timeout = time.Duration(opt)
|
res.timeout = time.Duration(opt)
|
||||||
case deadlineOption:
|
case deadlineOption:
|
||||||
res.deadline = time.Time(opt)
|
res.deadline = time.Time(opt)
|
||||||
case uniqueOption:
|
case uniqueOption:
|
||||||
ttl := time.Duration(opt)
|
res.uniqueTTL = time.Duration(opt)
|
||||||
if ttl < 1*time.Second {
|
|
||||||
return option{}, errors.New("Unique TTL cannot be less than 1s")
|
|
||||||
}
|
|
||||||
res.uniqueTTL = ttl
|
|
||||||
case processAtOption:
|
|
||||||
res.processAt = time.Time(opt)
|
|
||||||
case processInOption:
|
|
||||||
res.processAt = time.Now().Add(time.Duration(opt))
|
|
||||||
case retentionOption:
|
|
||||||
res.retention = time.Duration(opt)
|
|
||||||
case groupOption:
|
|
||||||
key := string(opt)
|
|
||||||
if isBlank(key) {
|
|
||||||
return option{}, errors.New("group key cannot be empty")
|
|
||||||
}
|
|
||||||
res.group = key
|
|
||||||
default:
|
default:
|
||||||
// ignore unexpected option
|
// ignore unexpected option
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res, nil
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
// isBlank returns true if the given s is empty or consist of all whitespaces.
|
// uniqueKey computes the redis key used for the given task.
|
||||||
func isBlank(s string) bool {
|
// It returns an empty string if ttl is zero.
|
||||||
return strings.TrimSpace(s) == ""
|
func uniqueKey(t *Task, ttl time.Duration, qname string) string {
|
||||||
}
|
if ttl == 0 {
|
||||||
|
return ""
|
||||||
const (
|
|
||||||
// Default max retry count used if nothing is specified.
|
|
||||||
defaultMaxRetry = 25
|
|
||||||
|
|
||||||
// Default timeout used if both timeout and deadline are not specified.
|
|
||||||
defaultTimeout = 30 * time.Minute
|
|
||||||
)
|
|
||||||
|
|
||||||
// Value zero indicates no timeout and no deadline.
|
|
||||||
var (
|
|
||||||
noTimeout time.Duration = 0
|
|
||||||
noDeadline time.Time = time.Unix(0, 0)
|
|
||||||
)
|
|
||||||
|
|
||||||
// Close closes the connection with redis.
|
|
||||||
func (c *Client) Close() error {
|
|
||||||
if c.sharedConnection {
|
|
||||||
return fmt.Errorf("redis connection is shared so the Client can't be closed through asynq")
|
|
||||||
}
|
}
|
||||||
return c.broker.Close()
|
return fmt.Sprintf("%s:%s:%s", t.Type, serializePayload(t.Payload.data), qname)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enqueue enqueues the given task to a queue.
|
func serializePayload(payload map[string]interface{}) string {
|
||||||
|
if payload == nil {
|
||||||
|
return "nil"
|
||||||
|
}
|
||||||
|
type entry struct {
|
||||||
|
k string
|
||||||
|
v interface{}
|
||||||
|
}
|
||||||
|
var es []entry
|
||||||
|
for k, v := range payload {
|
||||||
|
es = append(es, entry{k, v})
|
||||||
|
}
|
||||||
|
// sort entries by key
|
||||||
|
sort.Slice(es, func(i, j int) bool { return es[i].k < es[j].k })
|
||||||
|
var b strings.Builder
|
||||||
|
for _, e := range es {
|
||||||
|
if b.Len() > 0 {
|
||||||
|
b.WriteString(",")
|
||||||
|
}
|
||||||
|
b.WriteString(fmt.Sprintf("%s=%v", e.k, e.v))
|
||||||
|
}
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default max retry count used if nothing is specified.
|
||||||
|
const defaultMaxRetry = 25
|
||||||
|
|
||||||
|
// SetDefaultOptions sets options to be used for a given task type.
|
||||||
|
// The argument opts specifies the behavior of task processing.
|
||||||
|
// If there are conflicting Option values the last one overrides others.
|
||||||
//
|
//
|
||||||
// Enqueue returns TaskInfo and nil error if the task is enqueued successfully, otherwise returns a non-nil error.
|
// Default options can be overridden by options passed at enqueue time.
|
||||||
|
func (c *Client) SetDefaultOptions(taskType string, opts ...Option) {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
c.opts[taskType] = opts
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnqueueAt schedules task to be enqueued at the specified time.
|
||||||
|
//
|
||||||
|
// EnqueueAt returns nil if the task is scheduled successfully, otherwise returns a non-nil error.
|
||||||
//
|
//
|
||||||
// The argument opts specifies the behavior of task processing.
|
// The argument opts specifies the behavior of task processing.
|
||||||
// If there are conflicting Option values the last one overrides others.
|
// If there are conflicting Option values the last one overrides others.
|
||||||
// Any options provided to NewTask can be overridden by options passed to Enqueue.
|
func (c *Client) EnqueueAt(t time.Time, task *Task, opts ...Option) error {
|
||||||
// By default, max retry is set to 25 and timeout is set to 30 minutes.
|
return c.enqueueAt(t, task, opts...)
|
||||||
//
|
|
||||||
// If no ProcessAt or ProcessIn options are provided, the task will be pending immediately.
|
|
||||||
//
|
|
||||||
// Enqueue uses context.Background internally; to specify the context, use EnqueueContext.
|
|
||||||
func (c *Client) Enqueue(task *Task, opts ...Option) (*TaskInfo, error) {
|
|
||||||
return c.EnqueueContext(context.Background(), task, opts...)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EnqueueContext enqueues the given task to a queue.
|
// Enqueue enqueues task to be processed immediately.
|
||||||
//
|
//
|
||||||
// EnqueueContext returns TaskInfo and nil error if the task is enqueued successfully, otherwise returns a non-nil error.
|
// Enqueue returns nil if the task is enqueued successfully, otherwise returns a non-nil error.
|
||||||
//
|
//
|
||||||
// The argument opts specifies the behavior of task processing.
|
// The argument opts specifies the behavior of task processing.
|
||||||
// If there are conflicting Option values the last one overrides others.
|
// If there are conflicting Option values the last one overrides others.
|
||||||
// Any options provided to NewTask can be overridden by options passed to Enqueue.
|
func (c *Client) Enqueue(task *Task, opts ...Option) error {
|
||||||
// By default, max retry is set to 25 and timeout is set to 30 minutes.
|
return c.enqueueAt(time.Now(), task, opts...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnqueueIn schedules task to be enqueued after the specified delay.
|
||||||
//
|
//
|
||||||
// If no ProcessAt or ProcessIn options are provided, the task will be pending immediately.
|
// EnqueueIn returns nil if the task is scheduled successfully, otherwise returns a non-nil error.
|
||||||
//
|
//
|
||||||
// The first argument context applies to the enqueue operation. To specify task timeout and deadline, use Timeout and Deadline option instead.
|
// The argument opts specifies the behavior of task processing.
|
||||||
func (c *Client) EnqueueContext(ctx context.Context, task *Task, opts ...Option) (*TaskInfo, error) {
|
// If there are conflicting Option values the last one overrides others.
|
||||||
if task == nil {
|
func (c *Client) EnqueueIn(d time.Duration, task *Task, opts ...Option) error {
|
||||||
return nil, fmt.Errorf("task cannot be nil")
|
return c.enqueueAt(time.Now().Add(d), task, opts...)
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(task.Type()) == "" {
|
|
||||||
return nil, fmt.Errorf("task typename cannot be empty")
|
func (c *Client) enqueueAt(t time.Time, task *Task, opts ...Option) error {
|
||||||
}
|
c.mu.Lock()
|
||||||
// merge task options with the options provided at enqueue time.
|
defer c.mu.Unlock()
|
||||||
opts = append(task.opts, opts...)
|
if defaults, ok := c.opts[task.Type]; ok {
|
||||||
opt, err := composeOptions(opts...)
|
opts = append(defaults, opts...)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
deadline := noDeadline
|
|
||||||
if !opt.deadline.IsZero() {
|
|
||||||
deadline = opt.deadline
|
|
||||||
}
|
|
||||||
timeout := noTimeout
|
|
||||||
if opt.timeout != 0 {
|
|
||||||
timeout = opt.timeout
|
|
||||||
}
|
|
||||||
if deadline.Equal(noDeadline) && timeout == noTimeout {
|
|
||||||
// If neither deadline nor timeout are set, use default timeout.
|
|
||||||
timeout = defaultTimeout
|
|
||||||
}
|
|
||||||
var uniqueKey string
|
|
||||||
if opt.uniqueTTL > 0 {
|
|
||||||
uniqueKey = base.UniqueKey(opt.queue, task.Type(), task.Payload())
|
|
||||||
}
|
}
|
||||||
|
opt := composeOptions(opts...)
|
||||||
msg := &base.TaskMessage{
|
msg := &base.TaskMessage{
|
||||||
ID: opt.taskID,
|
ID: xid.New(),
|
||||||
Type: task.Type(),
|
Type: task.Type,
|
||||||
Payload: task.Payload(),
|
Payload: task.Payload.data,
|
||||||
Queue: opt.queue,
|
Queue: opt.queue,
|
||||||
Retry: opt.retry,
|
Retry: opt.retry,
|
||||||
Deadline: deadline.Unix(),
|
Timeout: opt.timeout.String(),
|
||||||
Timeout: int64(timeout.Seconds()),
|
Deadline: opt.deadline.Format(time.RFC3339),
|
||||||
UniqueKey: uniqueKey,
|
UniqueKey: uniqueKey(task, opt.uniqueTTL, opt.queue),
|
||||||
GroupKey: opt.group,
|
|
||||||
Retention: int64(opt.retention.Seconds()),
|
|
||||||
}
|
}
|
||||||
now := time.Now()
|
var err error
|
||||||
var state base.TaskState
|
if time.Now().After(t) {
|
||||||
if opt.processAt.After(now) {
|
err = c.enqueue(msg, opt.uniqueTTL)
|
||||||
err = c.schedule(ctx, msg, opt.processAt, opt.uniqueTTL)
|
|
||||||
state = base.TaskStateScheduled
|
|
||||||
} else if opt.group != "" {
|
|
||||||
// Use zero value for processAt since we don't know when the task will be aggregated and processed.
|
|
||||||
opt.processAt = time.Time{}
|
|
||||||
err = c.addToGroup(ctx, msg, opt.group, opt.uniqueTTL)
|
|
||||||
state = base.TaskStateAggregating
|
|
||||||
} else {
|
} else {
|
||||||
opt.processAt = now
|
err = c.schedule(msg, t, opt.uniqueTTL)
|
||||||
err = c.enqueue(ctx, msg, opt.uniqueTTL)
|
|
||||||
state = base.TaskStatePending
|
|
||||||
}
|
}
|
||||||
switch {
|
if err == rdb.ErrDuplicateTask {
|
||||||
case errors.Is(err, errors.ErrDuplicateTask):
|
return fmt.Errorf("%w", ErrDuplicateTask)
|
||||||
return nil, fmt.Errorf("%w", ErrDuplicateTask)
|
|
||||||
case errors.Is(err, errors.ErrTaskIdConflict):
|
|
||||||
return nil, fmt.Errorf("%w", ErrTaskIDConflict)
|
|
||||||
case err != nil:
|
|
||||||
return nil, err
|
|
||||||
}
|
}
|
||||||
return newTaskInfo(msg, state, opt.processAt, nil), nil
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ping performs a ping against the redis connection.
|
func (c *Client) enqueue(msg *base.TaskMessage, uniqueTTL time.Duration) error {
|
||||||
func (c *Client) Ping() error {
|
|
||||||
return c.broker.Ping()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) enqueue(ctx context.Context, msg *base.TaskMessage, uniqueTTL time.Duration) error {
|
|
||||||
if uniqueTTL > 0 {
|
if uniqueTTL > 0 {
|
||||||
return c.broker.EnqueueUnique(ctx, msg, uniqueTTL)
|
return c.rdb.EnqueueUnique(msg, uniqueTTL)
|
||||||
}
|
}
|
||||||
return c.broker.Enqueue(ctx, msg)
|
return c.rdb.Enqueue(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) schedule(ctx context.Context, msg *base.TaskMessage, t time.Time, uniqueTTL time.Duration) error {
|
func (c *Client) schedule(msg *base.TaskMessage, t time.Time, uniqueTTL time.Duration) error {
|
||||||
if uniqueTTL > 0 {
|
if uniqueTTL > 0 {
|
||||||
ttl := time.Until(t.Add(uniqueTTL))
|
ttl := t.Add(uniqueTTL).Sub(time.Now())
|
||||||
return c.broker.ScheduleUnique(ctx, msg, t, ttl)
|
return c.rdb.ScheduleUnique(msg, t, ttl)
|
||||||
}
|
}
|
||||||
return c.broker.Schedule(ctx, msg, t)
|
return c.rdb.Schedule(msg, t)
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) addToGroup(ctx context.Context, msg *base.TaskMessage, group string, uniqueTTL time.Duration) error {
|
|
||||||
if uniqueTTL > 0 {
|
|
||||||
return c.broker.AddToGroupUnique(ctx, msg, group, uniqueTTL)
|
|
||||||
}
|
|
||||||
return c.broker.AddToGroup(ctx, msg, group)
|
|
||||||
}
|
}
|
||||||
|
1061
client_test.go
1061
client_test.go
File diff suppressed because it is too large
Load Diff
42
context.go
42
context.go
@ -1,42 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
asynqcontext "github.com/hibiken/asynq/internal/context"
|
|
||||||
)
|
|
||||||
|
|
||||||
// GetTaskID extracts a task ID from a context, if any.
|
|
||||||
//
|
|
||||||
// ID of a task is guaranteed to be unique.
|
|
||||||
// ID of a task doesn't change if the task is being retried.
|
|
||||||
func GetTaskID(ctx context.Context) (id string, ok bool) {
|
|
||||||
return asynqcontext.GetTaskID(ctx)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetRetryCount extracts retry count from a context, if any.
|
|
||||||
//
|
|
||||||
// Return value n indicates the number of times associated task has been
|
|
||||||
// retried so far.
|
|
||||||
func GetRetryCount(ctx context.Context) (n int, ok bool) {
|
|
||||||
return asynqcontext.GetRetryCount(ctx)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetMaxRetry extracts maximum retry from a context, if any.
|
|
||||||
//
|
|
||||||
// Return value n indicates the maximum number of times the associated task
|
|
||||||
// can be retried if ProcessTask returns a non-nil error.
|
|
||||||
func GetMaxRetry(ctx context.Context) (n int, ok bool) {
|
|
||||||
return asynqcontext.GetMaxRetry(ctx)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetQueueName extracts queue name from a context, if any.
|
|
||||||
//
|
|
||||||
// Return value queue indicates which queue the task was pulled from.
|
|
||||||
func GetQueueName(ctx context.Context) (queue string, ok bool) {
|
|
||||||
return asynqcontext.GetQueueName(ctx)
|
|
||||||
}
|
|
49
doc.go
49
doc.go
@ -3,46 +3,40 @@
|
|||||||
// that can be found in the LICENSE file.
|
// that can be found in the LICENSE file.
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Package asynq provides a framework for Redis based distrubted task queue.
|
Package asynq provides a framework for asynchronous task processing.
|
||||||
|
|
||||||
Asynq uses Redis as a message broker. To connect to redis,
|
Asynq uses Redis as a message broker. To connect to redis server,
|
||||||
specify the connection using one of RedisConnOpt types.
|
specify the options using one of RedisConnOpt types.
|
||||||
|
|
||||||
redisConnOpt = asynq.RedisClientOpt{
|
redis = &asynq.RedisClientOpt{
|
||||||
Addr: "127.0.0.1:6379",
|
Addr: "127.0.0.1:6379",
|
||||||
Password: "xxxxx",
|
Password: "xxxxx",
|
||||||
DB: 2,
|
DB: 3,
|
||||||
}
|
}
|
||||||
|
|
||||||
The Client is used to enqueue a task.
|
The Client is used to enqueue a task to be processed at the specified time.
|
||||||
|
|
||||||
|
Task is created with two parameters: its type and payload.
|
||||||
|
|
||||||
client := asynq.NewClient(redisConnOpt)
|
client := asynq.NewClient(redis)
|
||||||
|
|
||||||
// Task is created with two parameters: its type and payload.
|
t := asynq.NewTask(
|
||||||
// Payload data is simply an array of bytes. It can be encoded in JSON, Protocol Buffer, Gob, etc.
|
"send_email",
|
||||||
b, err := json.Marshal(ExamplePayload{UserID: 42})
|
map[string]interface{}{"user_id": 42})
|
||||||
if err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
task := asynq.NewTask("example", b)
|
|
||||||
|
|
||||||
// Enqueue the task to be processed immediately.
|
// Enqueue the task to be processed immediately.
|
||||||
info, err := client.Enqueue(task)
|
err := client.Enqueue(t)
|
||||||
|
|
||||||
// Schedule the task to be processed after one minute.
|
// Schedule the task to be processed after one minute.
|
||||||
info, err = client.Enqueue(t, asynq.ProcessIn(1*time.Minute))
|
err = client.EnqueueIn(time.Minute, t)
|
||||||
|
|
||||||
The Server is used to run the task processing workers with a given
|
The Server is used to run the background task processing with a given
|
||||||
handler.
|
handler.
|
||||||
srv := asynq.NewServer(redisConnOpt, asynq.Config{
|
srv := asynq.NewServer(redis, asynq.Config{
|
||||||
Concurrency: 10,
|
Concurrency: 10,
|
||||||
})
|
})
|
||||||
|
|
||||||
if err := srv.Run(handler); err != nil {
|
srv.Run(handler)
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
Handler is an interface type with a method which
|
Handler is an interface type with a method which
|
||||||
takes a task and returns an error. Handler should return nil if
|
takes a task and returns an error. Handler should return nil if
|
||||||
@ -56,13 +50,10 @@ Example of a type that implements the Handler interface.
|
|||||||
|
|
||||||
func (h *TaskHandler) ProcessTask(ctx context.Context, task *asynq.Task) error {
|
func (h *TaskHandler) ProcessTask(ctx context.Context, task *asynq.Task) error {
|
||||||
switch task.Type {
|
switch task.Type {
|
||||||
case "example":
|
case "send_email":
|
||||||
var data ExamplePayload
|
id, err := task.Payload.GetInt("user_id")
|
||||||
if err := json.Unmarshal(task.Payload(), &data); err != nil {
|
// send email
|
||||||
return err
|
//...
|
||||||
}
|
|
||||||
// perform task with the data
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return fmt.Errorf("unexpected task type %q", task.Type)
|
return fmt.Errorf("unexpected task type %q", task.Type)
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 279 KiB |
Binary file not shown.
Before Width: | Height: | Size: 347 KiB |
Binary file not shown.
Before Width: | Height: | Size: 60 KiB |
Binary file not shown.
Before Width: | Height: | Size: 809 KiB |
Binary file not shown.
Before Width: | Height: | Size: 329 KiB After Width: | Height: | Size: 983 KiB |
@ -5,12 +5,10 @@
|
|||||||
package asynq_test
|
package asynq_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/hibiken/asynq"
|
"github.com/hibiken/asynq"
|
||||||
"golang.org/x/sys/unix"
|
"golang.org/x/sys/unix"
|
||||||
@ -31,7 +29,7 @@ func ExampleServer_Run() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleServer_Shutdown() {
|
func ExampleServer_Stop() {
|
||||||
srv := asynq.NewServer(
|
srv := asynq.NewServer(
|
||||||
asynq.RedisClientOpt{Addr: ":6379"},
|
asynq.RedisClientOpt{Addr: ":6379"},
|
||||||
asynq.Config{Concurrency: 20},
|
asynq.Config{Concurrency: 20},
|
||||||
@ -48,10 +46,10 @@ func ExampleServer_Shutdown() {
|
|||||||
signal.Notify(sigs, unix.SIGTERM, unix.SIGINT)
|
signal.Notify(sigs, unix.SIGTERM, unix.SIGINT)
|
||||||
<-sigs // wait for termination signal
|
<-sigs // wait for termination signal
|
||||||
|
|
||||||
srv.Shutdown()
|
srv.Stop()
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleServer_Stop() {
|
func ExampleServer_Quiet() {
|
||||||
srv := asynq.NewServer(
|
srv := asynq.NewServer(
|
||||||
asynq.RedisClientOpt{Addr: ":6379"},
|
asynq.RedisClientOpt{Addr: ":6379"},
|
||||||
asynq.Config{Concurrency: 20},
|
asynq.Config{Concurrency: 20},
|
||||||
@ -71,32 +69,13 @@ func ExampleServer_Stop() {
|
|||||||
for {
|
for {
|
||||||
s := <-sigs
|
s := <-sigs
|
||||||
if s == unix.SIGTSTP {
|
if s == unix.SIGTSTP {
|
||||||
srv.Stop() // stop processing new tasks
|
srv.Quiet() // stop processing new tasks
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
break // received SIGTERM or SIGINT signal
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
srv.Shutdown()
|
srv.Stop()
|
||||||
}
|
|
||||||
|
|
||||||
func ExampleScheduler() {
|
|
||||||
scheduler := asynq.NewScheduler(
|
|
||||||
asynq.RedisClientOpt{Addr: ":6379"},
|
|
||||||
&asynq.SchedulerOpts{Location: time.Local},
|
|
||||||
)
|
|
||||||
|
|
||||||
if _, err := scheduler.Register("* * * * *", asynq.NewTask("task1", nil)); err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
if _, err := scheduler.Register("@every 30s", asynq.NewTask("task2", nil)); err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Run blocks and waits for os signal to terminate the program.
|
|
||||||
if err := scheduler.Run(); err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleParseRedisURI() {
|
func ExampleParseRedisURI() {
|
||||||
@ -114,20 +93,3 @@ func ExampleParseRedisURI() {
|
|||||||
// localhost:6379
|
// localhost:6379
|
||||||
// 10
|
// 10
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleResultWriter() {
|
|
||||||
// ResultWriter is only accessible in Handler.
|
|
||||||
h := func(ctx context.Context, task *asynq.Task) error {
|
|
||||||
// .. do task processing work
|
|
||||||
|
|
||||||
res := []byte("task result data")
|
|
||||||
n, err := task.ResultWriter().Write(res) // implements io.Writer
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to write task result: %v", err)
|
|
||||||
}
|
|
||||||
log.Printf(" %d bytes written", n)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
_ = h
|
|
||||||
}
|
|
||||||
|
77
forwarder.go
77
forwarder.go
@ -1,77 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
)
|
|
||||||
|
|
||||||
// A forwarder is responsible for moving scheduled and retry tasks to pending state
|
|
||||||
// so that the tasks get processed by the workers.
|
|
||||||
type forwarder struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
|
|
||||||
// channel to communicate back to the long running "forwarder" goroutine.
|
|
||||||
done chan struct{}
|
|
||||||
|
|
||||||
// list of queue names to check and enqueue.
|
|
||||||
queues []string
|
|
||||||
|
|
||||||
// poll interval on average
|
|
||||||
avgInterval time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
type forwarderParams struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
queues []string
|
|
||||||
interval time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
func newForwarder(params forwarderParams) *forwarder {
|
|
||||||
return &forwarder{
|
|
||||||
logger: params.logger,
|
|
||||||
broker: params.broker,
|
|
||||||
done: make(chan struct{}),
|
|
||||||
queues: params.queues,
|
|
||||||
avgInterval: params.interval,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *forwarder) shutdown() {
|
|
||||||
f.logger.Debug("Forwarder shutting down...")
|
|
||||||
// Signal the forwarder goroutine to stop polling.
|
|
||||||
f.done <- struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// start starts the "forwarder" goroutine.
|
|
||||||
func (f *forwarder) start(wg *sync.WaitGroup) {
|
|
||||||
wg.Add(1)
|
|
||||||
go func() {
|
|
||||||
defer wg.Done()
|
|
||||||
timer := time.NewTimer(f.avgInterval)
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-f.done:
|
|
||||||
f.logger.Debug("Forwarder done")
|
|
||||||
return
|
|
||||||
case <-timer.C:
|
|
||||||
f.exec()
|
|
||||||
timer.Reset(f.avgInterval)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *forwarder) exec() {
|
|
||||||
if err := f.broker.ForwardIfReady(f.queues...); err != nil {
|
|
||||||
f.logger.Errorf("Failed to forward scheduled tasks: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,137 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
|
||||||
h "github.com/hibiken/asynq/internal/testutil"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestForwarder(t *testing.T) {
|
|
||||||
r := setup(t)
|
|
||||||
defer r.Close()
|
|
||||||
rdbClient := rdb.NewRDB(r)
|
|
||||||
const pollInterval = time.Second
|
|
||||||
s := newForwarder(forwarderParams{
|
|
||||||
logger: testLogger,
|
|
||||||
broker: rdbClient,
|
|
||||||
queues: []string{"default", "critical"},
|
|
||||||
interval: pollInterval,
|
|
||||||
})
|
|
||||||
t1 := h.NewTaskMessageWithQueue("gen_thumbnail", nil, "default")
|
|
||||||
t2 := h.NewTaskMessageWithQueue("send_email", nil, "critical")
|
|
||||||
t3 := h.NewTaskMessageWithQueue("reindex", nil, "default")
|
|
||||||
t4 := h.NewTaskMessageWithQueue("sync", nil, "critical")
|
|
||||||
now := time.Now()
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
initScheduled map[string][]base.Z // scheduled queue initial state
|
|
||||||
initRetry map[string][]base.Z // retry queue initial state
|
|
||||||
initPending map[string][]*base.TaskMessage // default queue initial state
|
|
||||||
wait time.Duration // wait duration before checking for final state
|
|
||||||
wantScheduled map[string][]*base.TaskMessage // schedule queue final state
|
|
||||||
wantRetry map[string][]*base.TaskMessage // retry queue final state
|
|
||||||
wantPending map[string][]*base.TaskMessage // default queue final state
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
initScheduled: map[string][]base.Z{
|
|
||||||
"default": {{Message: t1, Score: now.Add(time.Hour).Unix()}},
|
|
||||||
"critical": {{Message: t2, Score: now.Add(-2 * time.Second).Unix()}},
|
|
||||||
},
|
|
||||||
initRetry: map[string][]base.Z{
|
|
||||||
"default": {{Message: t3, Score: time.Now().Add(-500 * time.Millisecond).Unix()}},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
initPending: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {t4},
|
|
||||||
},
|
|
||||||
wait: pollInterval * 2,
|
|
||||||
wantScheduled: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t1},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantRetry: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantPending: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t3},
|
|
||||||
"critical": {t2, t4},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
initScheduled: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: t1, Score: now.Unix()},
|
|
||||||
{Message: t3, Score: now.Add(-500 * time.Millisecond).Unix()},
|
|
||||||
},
|
|
||||||
"critical": {
|
|
||||||
{Message: t2, Score: now.Add(-2 * time.Second).Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
initRetry: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
initPending: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {t4},
|
|
||||||
},
|
|
||||||
wait: pollInterval * 2,
|
|
||||||
wantScheduled: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantRetry: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantPending: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t1, t3},
|
|
||||||
"critical": {t2, t4},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
h.FlushDB(t, r) // clean up db before each test case.
|
|
||||||
h.SeedAllScheduledQueues(t, r, tc.initScheduled) // initialize scheduled queue
|
|
||||||
h.SeedAllRetryQueues(t, r, tc.initRetry) // initialize retry queue
|
|
||||||
h.SeedAllPendingQueues(t, r, tc.initPending) // initialize default queue
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
s.start(&wg)
|
|
||||||
time.Sleep(tc.wait)
|
|
||||||
s.shutdown()
|
|
||||||
|
|
||||||
for qname, want := range tc.wantScheduled {
|
|
||||||
gotScheduled := h.GetScheduledMessages(t, r, qname)
|
|
||||||
if diff := cmp.Diff(want, gotScheduled, h.SortMsgOpt); diff != "" {
|
|
||||||
t.Errorf("mismatch found in %q after running forwarder: (-want, +got)\n%s", base.ScheduledKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for qname, want := range tc.wantRetry {
|
|
||||||
gotRetry := h.GetRetryMessages(t, r, qname)
|
|
||||||
if diff := cmp.Diff(want, gotRetry, h.SortMsgOpt); diff != "" {
|
|
||||||
t.Errorf("mismatch found in %q after running forwarder: (-want, +got)\n%s", base.RetryKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for qname, want := range tc.wantPending {
|
|
||||||
gotPending := h.GetPendingMessages(t, r, qname)
|
|
||||||
if diff := cmp.Diff(want, gotPending, h.SortMsgOpt); diff != "" {
|
|
||||||
t.Errorf("mismatch found in %q after running forwarder: (-want, +got)\n%s", base.PendingKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
24
go.mod
24
go.mod
@ -1,20 +1,14 @@
|
|||||||
module github.com/hibiken/asynq
|
module github.com/hibiken/asynq
|
||||||
|
|
||||||
go 1.22
|
go 1.13
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/google/go-cmp v0.6.0
|
github.com/go-redis/redis/v7 v7.2.0
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/go-cmp v0.4.0
|
||||||
github.com/redis/go-redis/v9 v9.7.0
|
github.com/rs/xid v1.2.1
|
||||||
github.com/robfig/cron/v3 v3.0.1
|
github.com/spf13/cast v1.3.1
|
||||||
github.com/spf13/cast v1.7.0
|
go.uber.org/goleak v0.10.0
|
||||||
go.uber.org/goleak v1.3.0
|
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e
|
||||||
golang.org/x/sys v0.27.0
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
|
||||||
golang.org/x/time v0.8.0
|
gopkg.in/yaml.v2 v2.2.7 // indirect
|
||||||
google.golang.org/protobuf v1.35.2
|
|
||||||
)
|
|
||||||
|
|
||||||
require (
|
|
||||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
|
||||||
)
|
)
|
||||||
|
108
go.sum
108
go.sum
@ -1,42 +1,74 @@
|
|||||||
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
|
||||||
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
|
||||||
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
|
||||||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
|
||||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
|
||||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||||
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
|
github.com/go-redis/redis/v7 v7.0.0-beta.4 h1:p6z7Pde69EGRWvlC++y8aFcaWegyrKHzOBGo0zUACTQ=
|
||||||
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
github.com/go-redis/redis/v7 v7.0.0-beta.4/go.mod h1:xhhSbUMTsleRPur+Vgx9sUHtyN33bdjxY+9/0n9Ig8s=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/go-redis/redis/v7 v7.2.0 h1:CrCexy/jYWZjW0AyVoHlcJUeZN19VWlbepTh1Vq6dJs=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/go-redis/redis/v7 v7.2.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
|
||||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
||||||
|
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||||
|
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
|
||||||
|
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||||
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
|
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||||
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
|
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||||
|
github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
|
||||||
|
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||||
|
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||||
|
github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
|
||||||
|
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||||
|
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
|
github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
|
||||||
github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
|
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
|
||||||
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
|
github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
|
||||||
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
|
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
||||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
|
||||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||||
github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
|
go.uber.org/goleak v0.10.0 h1:G3eWbSNIskeRqtsN/1uI5B+eP73y3JUuBsv9AZjehb4=
|
||||||
github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
|
go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
|
||||||
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
|
||||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco=
|
||||||
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
|
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
||||||
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
|
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
|
||||||
golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
|
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
|
||||||
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
|
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e h1:9vRrk9YW2BTzLP0VCB9ZDjU4cPqkg+IDWL7XgxA1yxQ=
|
||||||
|
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
|
||||||
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
|
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
|
||||||
|
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||||
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
|
||||||
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
|
||||||
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
|
||||||
|
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
||||||
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
|
||||||
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||||
|
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
|
||||||
|
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
|
||||||
|
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
@ -1,80 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
)
|
|
||||||
|
|
||||||
// healthchecker is responsible for pinging broker periodically
|
|
||||||
// and call user provided HeathCheckFunc with the ping result.
|
|
||||||
type healthchecker struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
|
|
||||||
// channel to communicate back to the long running "healthchecker" goroutine.
|
|
||||||
done chan struct{}
|
|
||||||
|
|
||||||
// interval between healthchecks.
|
|
||||||
interval time.Duration
|
|
||||||
|
|
||||||
// function to call periodically.
|
|
||||||
healthcheckFunc func(error)
|
|
||||||
}
|
|
||||||
|
|
||||||
type healthcheckerParams struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
interval time.Duration
|
|
||||||
healthcheckFunc func(error)
|
|
||||||
}
|
|
||||||
|
|
||||||
func newHealthChecker(params healthcheckerParams) *healthchecker {
|
|
||||||
return &healthchecker{
|
|
||||||
logger: params.logger,
|
|
||||||
broker: params.broker,
|
|
||||||
done: make(chan struct{}),
|
|
||||||
interval: params.interval,
|
|
||||||
healthcheckFunc: params.healthcheckFunc,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (hc *healthchecker) shutdown() {
|
|
||||||
if hc.healthcheckFunc == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
hc.logger.Debug("Healthchecker shutting down...")
|
|
||||||
// Signal the healthchecker goroutine to stop.
|
|
||||||
hc.done <- struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (hc *healthchecker) start(wg *sync.WaitGroup) {
|
|
||||||
if hc.healthcheckFunc == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
wg.Add(1)
|
|
||||||
go func() {
|
|
||||||
defer wg.Done()
|
|
||||||
timer := time.NewTimer(hc.interval)
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-hc.done:
|
|
||||||
hc.logger.Debug("Healthchecker done")
|
|
||||||
timer.Stop()
|
|
||||||
return
|
|
||||||
case <-timer.C:
|
|
||||||
err := hc.broker.Ping()
|
|
||||||
hc.healthcheckFunc(err)
|
|
||||||
timer.Reset(hc.interval)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
@ -1,103 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
|
||||||
"github.com/hibiken/asynq/internal/testbroker"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestHealthChecker(t *testing.T) {
|
|
||||||
r := setup(t)
|
|
||||||
defer r.Close()
|
|
||||||
rdbClient := rdb.NewRDB(r)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// mu guards called and e variables.
|
|
||||||
mu sync.Mutex
|
|
||||||
called int
|
|
||||||
e error
|
|
||||||
)
|
|
||||||
checkFn := func(err error) {
|
|
||||||
mu.Lock()
|
|
||||||
defer mu.Unlock()
|
|
||||||
called++
|
|
||||||
e = err
|
|
||||||
}
|
|
||||||
|
|
||||||
hc := newHealthChecker(healthcheckerParams{
|
|
||||||
logger: testLogger,
|
|
||||||
broker: rdbClient,
|
|
||||||
interval: 1 * time.Second,
|
|
||||||
healthcheckFunc: checkFn,
|
|
||||||
})
|
|
||||||
|
|
||||||
hc.start(&sync.WaitGroup{})
|
|
||||||
|
|
||||||
time.Sleep(2 * time.Second)
|
|
||||||
|
|
||||||
mu.Lock()
|
|
||||||
if called == 0 {
|
|
||||||
t.Errorf("Healthchecker did not call the provided HealthCheckFunc")
|
|
||||||
}
|
|
||||||
if e != nil {
|
|
||||||
t.Errorf("HealthCheckFunc was called with non-nil error: %v", e)
|
|
||||||
}
|
|
||||||
mu.Unlock()
|
|
||||||
|
|
||||||
hc.shutdown()
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHealthCheckerWhenRedisDown(t *testing.T) {
|
|
||||||
// Make sure that healthchecker goroutine doesn't panic
|
|
||||||
// if it cannot connect to redis.
|
|
||||||
defer func() {
|
|
||||||
if r := recover(); r != nil {
|
|
||||||
t.Errorf("panic occurred: %v", r)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
r := rdb.NewRDB(setup(t))
|
|
||||||
defer r.Close()
|
|
||||||
testBroker := testbroker.NewTestBroker(r)
|
|
||||||
var (
|
|
||||||
// mu guards called and e variables.
|
|
||||||
mu sync.Mutex
|
|
||||||
called int
|
|
||||||
e error
|
|
||||||
)
|
|
||||||
checkFn := func(err error) {
|
|
||||||
mu.Lock()
|
|
||||||
defer mu.Unlock()
|
|
||||||
called++
|
|
||||||
e = err
|
|
||||||
}
|
|
||||||
|
|
||||||
hc := newHealthChecker(healthcheckerParams{
|
|
||||||
logger: testLogger,
|
|
||||||
broker: testBroker,
|
|
||||||
interval: 1 * time.Second,
|
|
||||||
healthcheckFunc: checkFn,
|
|
||||||
})
|
|
||||||
|
|
||||||
testBroker.Sleep()
|
|
||||||
hc.start(&sync.WaitGroup{})
|
|
||||||
|
|
||||||
time.Sleep(2 * time.Second)
|
|
||||||
|
|
||||||
mu.Lock()
|
|
||||||
if called == 0 {
|
|
||||||
t.Errorf("Healthchecker did not call the provided HealthCheckFunc")
|
|
||||||
}
|
|
||||||
if e == nil {
|
|
||||||
t.Errorf("HealthCheckFunc was called with nil; want non-nil error")
|
|
||||||
}
|
|
||||||
mu.Unlock()
|
|
||||||
|
|
||||||
hc.shutdown()
|
|
||||||
}
|
|
166
heartbeat.go
166
heartbeat.go
@ -5,198 +5,68 @@
|
|||||||
package asynq
|
package asynq
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
"github.com/hibiken/asynq/internal/timeutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// heartbeater is responsible for writing process info to redis periodically to
|
// heartbeater is responsible for writing process info to redis periodically to
|
||||||
// indicate that the background worker process is up.
|
// indicate that the background worker process is up.
|
||||||
type heartbeater struct {
|
type heartbeater struct {
|
||||||
logger *log.Logger
|
logger Logger
|
||||||
broker base.Broker
|
broker base.Broker
|
||||||
clock timeutil.Clock
|
|
||||||
|
ss *base.ServerState
|
||||||
|
|
||||||
// channel to communicate back to the long running "heartbeater" goroutine.
|
// channel to communicate back to the long running "heartbeater" goroutine.
|
||||||
done chan struct{}
|
done chan struct{}
|
||||||
|
|
||||||
// interval between heartbeats.
|
// interval between heartbeats.
|
||||||
interval time.Duration
|
interval time.Duration
|
||||||
|
|
||||||
// following fields are initialized at construction time and are immutable.
|
|
||||||
host string
|
|
||||||
pid int
|
|
||||||
serverID string
|
|
||||||
concurrency int
|
|
||||||
queues map[string]int
|
|
||||||
strictPriority bool
|
|
||||||
|
|
||||||
// following fields are mutable and should be accessed only by the
|
|
||||||
// heartbeater goroutine. In other words, confine these variables
|
|
||||||
// to this goroutine only.
|
|
||||||
started time.Time
|
|
||||||
workers map[string]*workerInfo
|
|
||||||
|
|
||||||
// state is shared with other goroutine but is concurrency safe.
|
|
||||||
state *serverState
|
|
||||||
|
|
||||||
// channels to receive updates on active workers.
|
|
||||||
starting <-chan *workerInfo
|
|
||||||
finished <-chan *base.TaskMessage
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type heartbeaterParams struct {
|
func newHeartbeater(l Logger, b base.Broker, ss *base.ServerState, interval time.Duration) *heartbeater {
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
interval time.Duration
|
|
||||||
concurrency int
|
|
||||||
queues map[string]int
|
|
||||||
strictPriority bool
|
|
||||||
state *serverState
|
|
||||||
starting <-chan *workerInfo
|
|
||||||
finished <-chan *base.TaskMessage
|
|
||||||
}
|
|
||||||
|
|
||||||
func newHeartbeater(params heartbeaterParams) *heartbeater {
|
|
||||||
host, err := os.Hostname()
|
|
||||||
if err != nil {
|
|
||||||
host = "unknown-host"
|
|
||||||
}
|
|
||||||
|
|
||||||
return &heartbeater{
|
return &heartbeater{
|
||||||
logger: params.logger,
|
logger: l,
|
||||||
broker: params.broker,
|
broker: b,
|
||||||
clock: timeutil.NewRealClock(),
|
ss: ss,
|
||||||
done: make(chan struct{}),
|
done: make(chan struct{}),
|
||||||
interval: params.interval,
|
interval: interval,
|
||||||
|
|
||||||
host: host,
|
|
||||||
pid: os.Getpid(),
|
|
||||||
serverID: uuid.New().String(),
|
|
||||||
concurrency: params.concurrency,
|
|
||||||
queues: params.queues,
|
|
||||||
strictPriority: params.strictPriority,
|
|
||||||
|
|
||||||
state: params.state,
|
|
||||||
workers: make(map[string]*workerInfo),
|
|
||||||
starting: params.starting,
|
|
||||||
finished: params.finished,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *heartbeater) shutdown() {
|
func (h *heartbeater) terminate() {
|
||||||
h.logger.Debug("Heartbeater shutting down...")
|
h.logger.Info("Heartbeater shutting down...")
|
||||||
// Signal the heartbeater goroutine to stop.
|
// Signal the heartbeater goroutine to stop.
|
||||||
h.done <- struct{}{}
|
h.done <- struct{}{}
|
||||||
}
|
}
|
||||||
|
|
||||||
// A workerInfo holds an active worker information.
|
|
||||||
type workerInfo struct {
|
|
||||||
// the task message the worker is processing.
|
|
||||||
msg *base.TaskMessage
|
|
||||||
// the time the worker has started processing the message.
|
|
||||||
started time.Time
|
|
||||||
// deadline the worker has to finish processing the task by.
|
|
||||||
deadline time.Time
|
|
||||||
// lease the worker holds for the task.
|
|
||||||
lease *base.Lease
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *heartbeater) start(wg *sync.WaitGroup) {
|
func (h *heartbeater) start(wg *sync.WaitGroup) {
|
||||||
|
h.ss.SetStarted(time.Now())
|
||||||
|
h.ss.SetStatus(base.StatusRunning)
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
go func() {
|
go func() {
|
||||||
defer wg.Done()
|
defer wg.Done()
|
||||||
|
|
||||||
h.started = h.clock.Now()
|
|
||||||
|
|
||||||
h.beat()
|
h.beat()
|
||||||
|
|
||||||
timer := time.NewTimer(h.interval)
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-h.done:
|
case <-h.done:
|
||||||
if err := h.broker.ClearServerState(h.host, h.pid, h.serverID); err != nil {
|
h.broker.ClearServerState(h.ss)
|
||||||
h.logger.Errorf("Failed to clear server state: %v", err)
|
h.logger.Info("Heartbeater done")
|
||||||
}
|
|
||||||
h.logger.Debug("Heartbeater done")
|
|
||||||
timer.Stop()
|
|
||||||
return
|
return
|
||||||
|
case <-time.After(h.interval):
|
||||||
case <-timer.C:
|
|
||||||
h.beat()
|
h.beat()
|
||||||
timer.Reset(h.interval)
|
|
||||||
|
|
||||||
case w := <-h.starting:
|
|
||||||
h.workers[w.msg.ID] = w
|
|
||||||
|
|
||||||
case msg := <-h.finished:
|
|
||||||
delete(h.workers, msg.ID)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
// beat extends lease for workers and writes server/worker info to redis.
|
|
||||||
func (h *heartbeater) beat() {
|
func (h *heartbeater) beat() {
|
||||||
h.state.mu.Lock()
|
|
||||||
srvStatus := h.state.value.String()
|
|
||||||
h.state.mu.Unlock()
|
|
||||||
|
|
||||||
info := base.ServerInfo{
|
|
||||||
Host: h.host,
|
|
||||||
PID: h.pid,
|
|
||||||
ServerID: h.serverID,
|
|
||||||
Concurrency: h.concurrency,
|
|
||||||
Queues: h.queues,
|
|
||||||
StrictPriority: h.strictPriority,
|
|
||||||
Status: srvStatus,
|
|
||||||
Started: h.started,
|
|
||||||
ActiveWorkerCount: len(h.workers),
|
|
||||||
}
|
|
||||||
|
|
||||||
var ws []*base.WorkerInfo
|
|
||||||
idsByQueue := make(map[string][]string)
|
|
||||||
for id, w := range h.workers {
|
|
||||||
ws = append(ws, &base.WorkerInfo{
|
|
||||||
Host: h.host,
|
|
||||||
PID: h.pid,
|
|
||||||
ServerID: h.serverID,
|
|
||||||
ID: id,
|
|
||||||
Type: w.msg.Type,
|
|
||||||
Queue: w.msg.Queue,
|
|
||||||
Payload: w.msg.Payload,
|
|
||||||
Started: w.started,
|
|
||||||
Deadline: w.deadline,
|
|
||||||
})
|
|
||||||
// Check lease before adding to the set to make sure not to extend the lease if the lease is already expired.
|
|
||||||
if w.lease.IsValid() {
|
|
||||||
idsByQueue[w.msg.Queue] = append(idsByQueue[w.msg.Queue], id)
|
|
||||||
} else {
|
|
||||||
w.lease.NotifyExpiration() // notify processor if the lease is expired
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Note: Set TTL to be long enough so that it won't expire before we write again
|
// Note: Set TTL to be long enough so that it won't expire before we write again
|
||||||
// and short enough to expire quickly once the process is shut down or killed.
|
// and short enough to expire quickly once the process is shut down or killed.
|
||||||
if err := h.broker.WriteServerState(&info, ws, h.interval*2); err != nil {
|
err := h.broker.WriteServerState(h.ss, h.interval*2)
|
||||||
h.logger.Errorf("Failed to write server state data: %v", err)
|
if err != nil {
|
||||||
}
|
h.logger.Error("could not write heartbeat data: %v", err)
|
||||||
|
|
||||||
for qname, ids := range idsByQueue {
|
|
||||||
expirationTime, err := h.broker.ExtendLease(qname, ids...)
|
|
||||||
if err != nil {
|
|
||||||
h.logger.Errorf("Failed to extend lease for tasks %v: %v", ids, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
for _, id := range ids {
|
|
||||||
if l := h.workers[id].lease; !l.Reset(expirationTime) {
|
|
||||||
h.logger.Warnf("Lease reset failed for %s; lease deadline: %v", id, l.Deadline())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,154 +5,30 @@
|
|||||||
package asynq
|
package asynq
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
"github.com/google/go-cmp/cmp"
|
||||||
"github.com/google/go-cmp/cmp/cmpopts"
|
"github.com/google/go-cmp/cmp/cmpopts"
|
||||||
|
h "github.com/hibiken/asynq/internal/asynqtest"
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
"github.com/hibiken/asynq/internal/testbroker"
|
"github.com/hibiken/asynq/internal/testbroker"
|
||||||
h "github.com/hibiken/asynq/internal/testutil"
|
|
||||||
"github.com/hibiken/asynq/internal/timeutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Test goes through a few phases.
|
|
||||||
//
|
|
||||||
// Phase1: Simulate Server startup; Simulate starting tasks listed in startedWorkers
|
|
||||||
// Phase2: Simulate finishing tasks listed in finishedTasks
|
|
||||||
// Phase3: Simulate Server shutdown;
|
|
||||||
func TestHeartbeater(t *testing.T) {
|
func TestHeartbeater(t *testing.T) {
|
||||||
r := setup(t)
|
r := setup(t)
|
||||||
defer r.Close()
|
|
||||||
rdbClient := rdb.NewRDB(r)
|
rdbClient := rdb.NewRDB(r)
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
const elapsedTime = 10 * time.Second // simulated time elapsed between phase1 and phase2
|
|
||||||
|
|
||||||
clock := timeutil.NewSimulatedClock(time.Time{}) // time will be set in each test
|
|
||||||
|
|
||||||
t1 := h.NewTaskMessageWithQueue("task1", nil, "default")
|
|
||||||
t2 := h.NewTaskMessageWithQueue("task2", nil, "default")
|
|
||||||
t3 := h.NewTaskMessageWithQueue("task3", nil, "default")
|
|
||||||
t4 := h.NewTaskMessageWithQueue("task4", nil, "custom")
|
|
||||||
t5 := h.NewTaskMessageWithQueue("task5", nil, "custom")
|
|
||||||
t6 := h.NewTaskMessageWithQueue("task6", nil, "default")
|
|
||||||
|
|
||||||
// Note: intentionally set to time less than now.Add(rdb.LeaseDuration) to test lease extension is working.
|
|
||||||
lease1 := h.NewLeaseWithClock(now.Add(10*time.Second), clock)
|
|
||||||
lease2 := h.NewLeaseWithClock(now.Add(10*time.Second), clock)
|
|
||||||
lease3 := h.NewLeaseWithClock(now.Add(10*time.Second), clock)
|
|
||||||
lease4 := h.NewLeaseWithClock(now.Add(10*time.Second), clock)
|
|
||||||
lease5 := h.NewLeaseWithClock(now.Add(10*time.Second), clock)
|
|
||||||
lease6 := h.NewLeaseWithClock(now.Add(10*time.Second), clock)
|
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
desc string
|
interval time.Duration
|
||||||
|
|
||||||
// Interval between heartbeats.
|
|
||||||
interval time.Duration
|
|
||||||
|
|
||||||
// Server info.
|
|
||||||
host string
|
host string
|
||||||
pid int
|
pid int
|
||||||
queues map[string]int
|
queues map[string]int
|
||||||
concurrency int
|
concurrency int
|
||||||
|
|
||||||
active map[string][]*base.TaskMessage // initial active set state
|
|
||||||
lease map[string][]base.Z // initial lease set state
|
|
||||||
wantLease1 map[string][]base.Z // expected lease set state after starting all startedWorkers
|
|
||||||
wantLease2 map[string][]base.Z // expected lease set state after finishing all finishedTasks
|
|
||||||
startedWorkers []*workerInfo // workerInfo to send via the started channel
|
|
||||||
finishedTasks []*base.TaskMessage // tasks to send via the finished channel
|
|
||||||
|
|
||||||
startTime time.Time // simulated start time
|
|
||||||
elapsedTime time.Duration // simulated time elapsed between starting and finishing processing tasks
|
|
||||||
}{
|
}{
|
||||||
{
|
{time.Second, "localhost", 45678, map[string]int{"default": 1}, 10},
|
||||||
desc: "With single queue",
|
|
||||||
interval: 2 * time.Second,
|
|
||||||
host: "localhost",
|
|
||||||
pid: 45678,
|
|
||||||
queues: map[string]int{"default": 1},
|
|
||||||
concurrency: 10,
|
|
||||||
active: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t1, t2, t3},
|
|
||||||
},
|
|
||||||
lease: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: t1, Score: now.Add(10 * time.Second).Unix()},
|
|
||||||
{Message: t2, Score: now.Add(10 * time.Second).Unix()},
|
|
||||||
{Message: t3, Score: now.Add(10 * time.Second).Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
startedWorkers: []*workerInfo{
|
|
||||||
{msg: t1, started: now, deadline: now.Add(2 * time.Minute), lease: lease1},
|
|
||||||
{msg: t2, started: now, deadline: now.Add(2 * time.Minute), lease: lease2},
|
|
||||||
{msg: t3, started: now, deadline: now.Add(2 * time.Minute), lease: lease3},
|
|
||||||
},
|
|
||||||
finishedTasks: []*base.TaskMessage{t1, t2},
|
|
||||||
wantLease1: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: t1, Score: now.Add(rdb.LeaseDuration).Unix()},
|
|
||||||
{Message: t2, Score: now.Add(rdb.LeaseDuration).Unix()},
|
|
||||||
{Message: t3, Score: now.Add(rdb.LeaseDuration).Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
wantLease2: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: t3, Score: now.Add(elapsedTime).Add(rdb.LeaseDuration).Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
startTime: now,
|
|
||||||
elapsedTime: elapsedTime,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "With multiple queue",
|
|
||||||
interval: 2 * time.Second,
|
|
||||||
host: "localhost",
|
|
||||||
pid: 45678,
|
|
||||||
queues: map[string]int{"default": 1, "custom": 2},
|
|
||||||
concurrency: 10,
|
|
||||||
active: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t6},
|
|
||||||
"custom": {t4, t5},
|
|
||||||
},
|
|
||||||
lease: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: t6, Score: now.Add(10 * time.Second).Unix()},
|
|
||||||
},
|
|
||||||
"custom": {
|
|
||||||
{Message: t4, Score: now.Add(10 * time.Second).Unix()},
|
|
||||||
{Message: t5, Score: now.Add(10 * time.Second).Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
startedWorkers: []*workerInfo{
|
|
||||||
{msg: t6, started: now, deadline: now.Add(2 * time.Minute), lease: lease6},
|
|
||||||
{msg: t4, started: now, deadline: now.Add(2 * time.Minute), lease: lease4},
|
|
||||||
{msg: t5, started: now, deadline: now.Add(2 * time.Minute), lease: lease5},
|
|
||||||
},
|
|
||||||
finishedTasks: []*base.TaskMessage{t6, t5},
|
|
||||||
wantLease1: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: t6, Score: now.Add(rdb.LeaseDuration).Unix()},
|
|
||||||
},
|
|
||||||
"custom": {
|
|
||||||
{Message: t4, Score: now.Add(rdb.LeaseDuration).Unix()},
|
|
||||||
{Message: t5, Score: now.Add(rdb.LeaseDuration).Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
wantLease2: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"custom": {
|
|
||||||
{Message: t4, Score: now.Add(elapsedTime).Add(rdb.LeaseDuration).Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
startTime: now,
|
|
||||||
elapsedTime: elapsedTime,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
timeCmpOpt := cmpopts.EquateApproxTime(10 * time.Millisecond)
|
timeCmpOpt := cmpopts.EquateApproxTime(10 * time.Millisecond)
|
||||||
@ -160,155 +36,71 @@ func TestHeartbeater(t *testing.T) {
|
|||||||
ignoreFieldOpt := cmpopts.IgnoreFields(base.ServerInfo{}, "ServerID")
|
ignoreFieldOpt := cmpopts.IgnoreFields(base.ServerInfo{}, "ServerID")
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
h.FlushDB(t, r)
|
h.FlushDB(t, r)
|
||||||
h.SeedAllActiveQueues(t, r, tc.active)
|
|
||||||
h.SeedAllLease(t, r, tc.lease)
|
|
||||||
|
|
||||||
clock.SetTime(tc.startTime)
|
state := base.NewServerState(tc.host, tc.pid, tc.concurrency, tc.queues, false)
|
||||||
rdbClient.SetClock(clock)
|
hb := newHeartbeater(testLogger, rdbClient, state, tc.interval)
|
||||||
|
|
||||||
srvState := &serverState{}
|
|
||||||
startingCh := make(chan *workerInfo)
|
|
||||||
finishedCh := make(chan *base.TaskMessage)
|
|
||||||
hb := newHeartbeater(heartbeaterParams{
|
|
||||||
logger: testLogger,
|
|
||||||
broker: rdbClient,
|
|
||||||
interval: tc.interval,
|
|
||||||
concurrency: tc.concurrency,
|
|
||||||
queues: tc.queues,
|
|
||||||
strictPriority: false,
|
|
||||||
state: srvState,
|
|
||||||
starting: startingCh,
|
|
||||||
finished: finishedCh,
|
|
||||||
})
|
|
||||||
hb.clock = clock
|
|
||||||
|
|
||||||
// Change host and pid fields for testing purpose.
|
|
||||||
hb.host = tc.host
|
|
||||||
hb.pid = tc.pid
|
|
||||||
|
|
||||||
//===================
|
|
||||||
// Start Phase1
|
|
||||||
//===================
|
|
||||||
|
|
||||||
srvState.mu.Lock()
|
|
||||||
srvState.value = srvStateActive // simulating Server.Start
|
|
||||||
srvState.mu.Unlock()
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
hb.start(&wg)
|
hb.start(&wg)
|
||||||
|
|
||||||
// Simulate processor starting to work on tasks.
|
want := &base.ServerInfo{
|
||||||
for _, w := range tc.startedWorkers {
|
Host: tc.host,
|
||||||
startingCh <- w
|
PID: tc.pid,
|
||||||
|
Queues: tc.queues,
|
||||||
|
Concurrency: tc.concurrency,
|
||||||
|
Started: time.Now(),
|
||||||
|
Status: "running",
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait for heartbeater to write to redis
|
// allow for heartbeater to write to redis
|
||||||
time.Sleep(tc.interval * 2)
|
time.Sleep(tc.interval * 2)
|
||||||
|
|
||||||
ss, err := rdbClient.ListServers()
|
ss, err := rdbClient.ListServers()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("%s: could not read server info from redis: %v", tc.desc, err)
|
t.Errorf("could not read server info from redis: %v", err)
|
||||||
hb.shutdown()
|
hb.terminate()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(ss) != 1 {
|
if len(ss) != 1 {
|
||||||
t.Errorf("%s: (*RDB).ListServers returned %d server info, want 1", tc.desc, len(ss))
|
t.Errorf("(*RDB).ListServers returned %d process info, want 1", len(ss))
|
||||||
hb.shutdown()
|
hb.terminate()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
wantInfo := &base.ServerInfo{
|
if diff := cmp.Diff(want, ss[0], timeCmpOpt, ignoreOpt, ignoreFieldOpt); diff != "" {
|
||||||
Host: tc.host,
|
t.Errorf("redis stored process status %+v, want %+v; (-want, +got)\n%s", ss[0], want, diff)
|
||||||
PID: tc.pid,
|
hb.terminate()
|
||||||
Queues: tc.queues,
|
|
||||||
Concurrency: tc.concurrency,
|
|
||||||
Started: now,
|
|
||||||
Status: "active",
|
|
||||||
ActiveWorkerCount: len(tc.startedWorkers),
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(wantInfo, ss[0], timeCmpOpt, ignoreOpt, ignoreFieldOpt); diff != "" {
|
|
||||||
t.Errorf("%s: redis stored server status %+v, want %+v; (-want, +got)\n%s", tc.desc, ss[0], wantInfo, diff)
|
|
||||||
hb.shutdown()
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
for qname, wantLease := range tc.wantLease1 {
|
// status change
|
||||||
gotLease := h.GetLeaseEntries(t, r, qname)
|
state.SetStatus(base.StatusStopped)
|
||||||
if diff := cmp.Diff(wantLease, gotLease, h.SortZSetEntryOpt); diff != "" {
|
|
||||||
t.Errorf("%s: mismatch found in %q: (-want,+got):\n%s", tc.desc, base.LeaseKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, w := range tc.startedWorkers {
|
// allow for heartbeater to write to redis
|
||||||
if want := now.Add(rdb.LeaseDuration); w.lease.Deadline() != want {
|
|
||||||
t.Errorf("%s: lease deadline for %v is set to %v, want %v", tc.desc, w.msg, w.lease.Deadline(), want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//===================
|
|
||||||
// Start Phase2
|
|
||||||
//===================
|
|
||||||
|
|
||||||
clock.AdvanceTime(tc.elapsedTime)
|
|
||||||
// Simulate processor finished processing tasks.
|
|
||||||
for _, msg := range tc.finishedTasks {
|
|
||||||
if err := rdbClient.Done(context.Background(), msg); err != nil {
|
|
||||||
t.Fatalf("RDB.Done failed: %v", err)
|
|
||||||
}
|
|
||||||
finishedCh <- msg
|
|
||||||
}
|
|
||||||
// Wait for heartbeater to write to redis
|
|
||||||
time.Sleep(tc.interval * 2)
|
time.Sleep(tc.interval * 2)
|
||||||
|
|
||||||
for qname, wantLease := range tc.wantLease2 {
|
want.Status = "stopped"
|
||||||
gotLease := h.GetLeaseEntries(t, r, qname)
|
|
||||||
if diff := cmp.Diff(wantLease, gotLease, h.SortZSetEntryOpt); diff != "" {
|
|
||||||
t.Errorf("%s: mismatch found in %q: (-want,+got):\n%s", tc.desc, base.LeaseKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//===================
|
|
||||||
// Start Phase3
|
|
||||||
//===================
|
|
||||||
|
|
||||||
// Server state change; simulating Server.Shutdown
|
|
||||||
srvState.mu.Lock()
|
|
||||||
srvState.value = srvStateClosed
|
|
||||||
srvState.mu.Unlock()
|
|
||||||
|
|
||||||
// Wait for heartbeater to write to redis
|
|
||||||
time.Sleep(tc.interval * 2)
|
|
||||||
|
|
||||||
wantInfo = &base.ServerInfo{
|
|
||||||
Host: tc.host,
|
|
||||||
PID: tc.pid,
|
|
||||||
Queues: tc.queues,
|
|
||||||
Concurrency: tc.concurrency,
|
|
||||||
Started: now,
|
|
||||||
Status: "closed",
|
|
||||||
ActiveWorkerCount: len(tc.startedWorkers) - len(tc.finishedTasks),
|
|
||||||
}
|
|
||||||
ss, err = rdbClient.ListServers()
|
ss, err = rdbClient.ListServers()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("%s: could not read server status from redis: %v", tc.desc, err)
|
t.Errorf("could not read process status from redis: %v", err)
|
||||||
hb.shutdown()
|
hb.terminate()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(ss) != 1 {
|
if len(ss) != 1 {
|
||||||
t.Errorf("%s: (*RDB).ListServers returned %d server info, want 1", tc.desc, len(ss))
|
t.Errorf("(*RDB).ListProcesses returned %d process info, want 1", len(ss))
|
||||||
hb.shutdown()
|
hb.terminate()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if diff := cmp.Diff(wantInfo, ss[0], timeCmpOpt, ignoreOpt, ignoreFieldOpt); diff != "" {
|
if diff := cmp.Diff(want, ss[0], timeCmpOpt, ignoreOpt, ignoreFieldOpt); diff != "" {
|
||||||
t.Errorf("%s: redis stored process status %+v, want %+v; (-want, +got)\n%s", tc.desc, ss[0], wantInfo, diff)
|
t.Errorf("redis stored process status %+v, want %+v; (-want, +got)\n%s", ss[0], want, diff)
|
||||||
hb.shutdown()
|
hb.terminate()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
hb.shutdown()
|
hb.terminate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -321,20 +113,9 @@ func TestHeartbeaterWithRedisDown(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
r := rdb.NewRDB(setup(t))
|
r := rdb.NewRDB(setup(t))
|
||||||
defer r.Close()
|
|
||||||
testBroker := testbroker.NewTestBroker(r)
|
testBroker := testbroker.NewTestBroker(r)
|
||||||
state := &serverState{value: srvStateActive}
|
ss := base.NewServerState("localhost", 1234, 10, map[string]int{"default": 1}, false)
|
||||||
hb := newHeartbeater(heartbeaterParams{
|
hb := newHeartbeater(testLogger, testBroker, ss, time.Second)
|
||||||
logger: testLogger,
|
|
||||||
broker: testBroker,
|
|
||||||
interval: time.Second,
|
|
||||||
concurrency: 10,
|
|
||||||
queues: map[string]int{"default": 1},
|
|
||||||
strictPriority: false,
|
|
||||||
state: state,
|
|
||||||
starting: make(chan *workerInfo),
|
|
||||||
finished: make(chan *base.TaskMessage),
|
|
||||||
})
|
|
||||||
|
|
||||||
testBroker.Sleep()
|
testBroker.Sleep()
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
@ -343,5 +124,5 @@ func TestHeartbeaterWithRedisDown(t *testing.T) {
|
|||||||
// wait for heartbeater to try writing data to redis
|
// wait for heartbeater to try writing data to redis
|
||||||
time.Sleep(2 * time.Second)
|
time.Sleep(2 * time.Second)
|
||||||
|
|
||||||
hb.shutdown()
|
hb.terminate()
|
||||||
}
|
}
|
||||||
|
1026
inspector.go
1026
inspector.go
File diff suppressed because it is too large
Load Diff
3535
inspector_test.go
3535
inspector_test.go
File diff suppressed because it is too large
Load Diff
280
internal/asynqtest/asynqtest.go
Normal file
280
internal/asynqtest/asynqtest.go
Normal file
@ -0,0 +1,280 @@
|
|||||||
|
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT license
|
||||||
|
// that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
// Package asynqtest defines test helpers for asynq and its internal packages.
|
||||||
|
package asynqtest
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"sort"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v7"
|
||||||
|
"github.com/google/go-cmp/cmp"
|
||||||
|
"github.com/google/go-cmp/cmp/cmpopts"
|
||||||
|
"github.com/hibiken/asynq/internal/base"
|
||||||
|
"github.com/rs/xid"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ZSetEntry is an entry in redis sorted set.
|
||||||
|
type ZSetEntry struct {
|
||||||
|
Msg *base.TaskMessage
|
||||||
|
Score float64
|
||||||
|
}
|
||||||
|
|
||||||
|
// SortMsgOpt is a cmp.Option to sort base.TaskMessage for comparing slice of task messages.
|
||||||
|
var SortMsgOpt = cmp.Transformer("SortTaskMessages", func(in []*base.TaskMessage) []*base.TaskMessage {
|
||||||
|
out := append([]*base.TaskMessage(nil), in...) // Copy input to avoid mutating it
|
||||||
|
sort.Slice(out, func(i, j int) bool {
|
||||||
|
return out[i].ID.String() < out[j].ID.String()
|
||||||
|
})
|
||||||
|
return out
|
||||||
|
})
|
||||||
|
|
||||||
|
// SortZSetEntryOpt is an cmp.Option to sort ZSetEntry for comparing slice of zset entries.
|
||||||
|
var SortZSetEntryOpt = cmp.Transformer("SortZSetEntries", func(in []ZSetEntry) []ZSetEntry {
|
||||||
|
out := append([]ZSetEntry(nil), in...) // Copy input to avoid mutating it
|
||||||
|
sort.Slice(out, func(i, j int) bool {
|
||||||
|
return out[i].Msg.ID.String() < out[j].Msg.ID.String()
|
||||||
|
})
|
||||||
|
return out
|
||||||
|
})
|
||||||
|
|
||||||
|
// SortServerInfoOpt is a cmp.Option to sort base.ServerInfo for comparing slice of process info.
|
||||||
|
var SortServerInfoOpt = cmp.Transformer("SortServerInfo", func(in []*base.ServerInfo) []*base.ServerInfo {
|
||||||
|
out := append([]*base.ServerInfo(nil), in...) // Copy input to avoid mutating it
|
||||||
|
sort.Slice(out, func(i, j int) bool {
|
||||||
|
if out[i].Host != out[j].Host {
|
||||||
|
return out[i].Host < out[j].Host
|
||||||
|
}
|
||||||
|
return out[i].PID < out[j].PID
|
||||||
|
})
|
||||||
|
return out
|
||||||
|
})
|
||||||
|
|
||||||
|
// SortWorkerInfoOpt is a cmp.Option to sort base.WorkerInfo for comparing slice of worker info.
|
||||||
|
var SortWorkerInfoOpt = cmp.Transformer("SortWorkerInfo", func(in []*base.WorkerInfo) []*base.WorkerInfo {
|
||||||
|
out := append([]*base.WorkerInfo(nil), in...) // Copy input to avoid mutating it
|
||||||
|
sort.Slice(out, func(i, j int) bool {
|
||||||
|
return out[i].ID.String() < out[j].ID.String()
|
||||||
|
})
|
||||||
|
return out
|
||||||
|
})
|
||||||
|
|
||||||
|
// SortStringSliceOpt is a cmp.Option to sort string slice.
|
||||||
|
var SortStringSliceOpt = cmp.Transformer("SortStringSlice", func(in []string) []string {
|
||||||
|
out := append([]string(nil), in...)
|
||||||
|
sort.Strings(out)
|
||||||
|
return out
|
||||||
|
})
|
||||||
|
|
||||||
|
// IgnoreIDOpt is an cmp.Option to ignore ID field in task messages when comparing.
|
||||||
|
var IgnoreIDOpt = cmpopts.IgnoreFields(base.TaskMessage{}, "ID")
|
||||||
|
|
||||||
|
// NewTaskMessage returns a new instance of TaskMessage given a task type and payload.
|
||||||
|
func NewTaskMessage(taskType string, payload map[string]interface{}) *base.TaskMessage {
|
||||||
|
return &base.TaskMessage{
|
||||||
|
ID: xid.New(),
|
||||||
|
Type: taskType,
|
||||||
|
Queue: base.DefaultQueueName,
|
||||||
|
Retry: 25,
|
||||||
|
Payload: payload,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewTaskMessageWithQueue returns a new instance of TaskMessage given a
|
||||||
|
// task type, payload and queue name.
|
||||||
|
func NewTaskMessageWithQueue(taskType string, payload map[string]interface{}, qname string) *base.TaskMessage {
|
||||||
|
return &base.TaskMessage{
|
||||||
|
ID: xid.New(),
|
||||||
|
Type: taskType,
|
||||||
|
Queue: qname,
|
||||||
|
Retry: 25,
|
||||||
|
Payload: payload,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustMarshal marshals given task message and returns a json string.
|
||||||
|
// Calling test will fail if marshaling errors out.
|
||||||
|
func MustMarshal(tb testing.TB, msg *base.TaskMessage) string {
|
||||||
|
tb.Helper()
|
||||||
|
data, err := json.Marshal(msg)
|
||||||
|
if err != nil {
|
||||||
|
tb.Fatal(err)
|
||||||
|
}
|
||||||
|
return string(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustUnmarshal unmarshals given string into task message struct.
|
||||||
|
// Calling test will fail if unmarshaling errors out.
|
||||||
|
func MustUnmarshal(tb testing.TB, data string) *base.TaskMessage {
|
||||||
|
tb.Helper()
|
||||||
|
var msg base.TaskMessage
|
||||||
|
err := json.Unmarshal([]byte(data), &msg)
|
||||||
|
if err != nil {
|
||||||
|
tb.Fatal(err)
|
||||||
|
}
|
||||||
|
return &msg
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustMarshalSlice marshals a slice of task messages and return a slice of
|
||||||
|
// json strings. Calling test will fail if marshaling errors out.
|
||||||
|
func MustMarshalSlice(tb testing.TB, msgs []*base.TaskMessage) []string {
|
||||||
|
tb.Helper()
|
||||||
|
var data []string
|
||||||
|
for _, m := range msgs {
|
||||||
|
data = append(data, MustMarshal(tb, m))
|
||||||
|
}
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustUnmarshalSlice unmarshals a slice of strings into a slice of task message structs.
|
||||||
|
// Calling test will fail if marshaling errors out.
|
||||||
|
func MustUnmarshalSlice(tb testing.TB, data []string) []*base.TaskMessage {
|
||||||
|
tb.Helper()
|
||||||
|
var msgs []*base.TaskMessage
|
||||||
|
for _, s := range data {
|
||||||
|
msgs = append(msgs, MustUnmarshal(tb, s))
|
||||||
|
}
|
||||||
|
return msgs
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlushDB deletes all the keys of the currently selected DB.
|
||||||
|
func FlushDB(tb testing.TB, r *redis.Client) {
|
||||||
|
tb.Helper()
|
||||||
|
if err := r.FlushDB().Err(); err != nil {
|
||||||
|
tb.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SeedEnqueuedQueue initializes the specified queue with the given messages.
|
||||||
|
//
|
||||||
|
// If queue name option is not passed, it defaults to the default queue.
|
||||||
|
func SeedEnqueuedQueue(tb testing.TB, r *redis.Client, msgs []*base.TaskMessage, queueOpt ...string) {
|
||||||
|
tb.Helper()
|
||||||
|
queue := base.DefaultQueue
|
||||||
|
if len(queueOpt) > 0 {
|
||||||
|
queue = base.QueueKey(queueOpt[0])
|
||||||
|
}
|
||||||
|
r.SAdd(base.AllQueues, queue)
|
||||||
|
seedRedisList(tb, r, queue, msgs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SeedInProgressQueue initializes the in-progress queue with the given messages.
|
||||||
|
func SeedInProgressQueue(tb testing.TB, r *redis.Client, msgs []*base.TaskMessage) {
|
||||||
|
tb.Helper()
|
||||||
|
seedRedisList(tb, r, base.InProgressQueue, msgs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SeedScheduledQueue initializes the scheduled queue with the given messages.
|
||||||
|
func SeedScheduledQueue(tb testing.TB, r *redis.Client, entries []ZSetEntry) {
|
||||||
|
tb.Helper()
|
||||||
|
seedRedisZSet(tb, r, base.ScheduledQueue, entries)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SeedRetryQueue initializes the retry queue with the given messages.
|
||||||
|
func SeedRetryQueue(tb testing.TB, r *redis.Client, entries []ZSetEntry) {
|
||||||
|
tb.Helper()
|
||||||
|
seedRedisZSet(tb, r, base.RetryQueue, entries)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SeedDeadQueue initializes the dead queue with the given messages.
|
||||||
|
func SeedDeadQueue(tb testing.TB, r *redis.Client, entries []ZSetEntry) {
|
||||||
|
tb.Helper()
|
||||||
|
seedRedisZSet(tb, r, base.DeadQueue, entries)
|
||||||
|
}
|
||||||
|
|
||||||
|
func seedRedisList(tb testing.TB, c *redis.Client, key string, msgs []*base.TaskMessage) {
|
||||||
|
data := MustMarshalSlice(tb, msgs)
|
||||||
|
for _, s := range data {
|
||||||
|
if err := c.LPush(key, s).Err(); err != nil {
|
||||||
|
tb.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func seedRedisZSet(tb testing.TB, c *redis.Client, key string, items []ZSetEntry) {
|
||||||
|
for _, item := range items {
|
||||||
|
z := &redis.Z{Member: MustMarshal(tb, item.Msg), Score: float64(item.Score)}
|
||||||
|
if err := c.ZAdd(key, z).Err(); err != nil {
|
||||||
|
tb.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetEnqueuedMessages returns all task messages in the specified queue.
|
||||||
|
//
|
||||||
|
// If queue name option is not passed, it defaults to the default queue.
|
||||||
|
func GetEnqueuedMessages(tb testing.TB, r *redis.Client, queueOpt ...string) []*base.TaskMessage {
|
||||||
|
tb.Helper()
|
||||||
|
queue := base.DefaultQueue
|
||||||
|
if len(queueOpt) > 0 {
|
||||||
|
queue = base.QueueKey(queueOpt[0])
|
||||||
|
}
|
||||||
|
return getListMessages(tb, r, queue)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetInProgressMessages returns all task messages in the in-progress queue.
|
||||||
|
func GetInProgressMessages(tb testing.TB, r *redis.Client) []*base.TaskMessage {
|
||||||
|
tb.Helper()
|
||||||
|
return getListMessages(tb, r, base.InProgressQueue)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetScheduledMessages returns all task messages in the scheduled queue.
|
||||||
|
func GetScheduledMessages(tb testing.TB, r *redis.Client) []*base.TaskMessage {
|
||||||
|
tb.Helper()
|
||||||
|
return getZSetMessages(tb, r, base.ScheduledQueue)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRetryMessages returns all task messages in the retry queue.
|
||||||
|
func GetRetryMessages(tb testing.TB, r *redis.Client) []*base.TaskMessage {
|
||||||
|
tb.Helper()
|
||||||
|
return getZSetMessages(tb, r, base.RetryQueue)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDeadMessages returns all task messages in the dead queue.
|
||||||
|
func GetDeadMessages(tb testing.TB, r *redis.Client) []*base.TaskMessage {
|
||||||
|
tb.Helper()
|
||||||
|
return getZSetMessages(tb, r, base.DeadQueue)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetScheduledEntries returns all task messages and its score in the scheduled queue.
|
||||||
|
func GetScheduledEntries(tb testing.TB, r *redis.Client) []ZSetEntry {
|
||||||
|
tb.Helper()
|
||||||
|
return getZSetEntries(tb, r, base.ScheduledQueue)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRetryEntries returns all task messages and its score in the retry queue.
|
||||||
|
func GetRetryEntries(tb testing.TB, r *redis.Client) []ZSetEntry {
|
||||||
|
tb.Helper()
|
||||||
|
return getZSetEntries(tb, r, base.RetryQueue)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDeadEntries returns all task messages and its score in the dead queue.
|
||||||
|
func GetDeadEntries(tb testing.TB, r *redis.Client) []ZSetEntry {
|
||||||
|
tb.Helper()
|
||||||
|
return getZSetEntries(tb, r, base.DeadQueue)
|
||||||
|
}
|
||||||
|
|
||||||
|
func getListMessages(tb testing.TB, r *redis.Client, list string) []*base.TaskMessage {
|
||||||
|
data := r.LRange(list, 0, -1).Val()
|
||||||
|
return MustUnmarshalSlice(tb, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func getZSetMessages(tb testing.TB, r *redis.Client, zset string) []*base.TaskMessage {
|
||||||
|
data := r.ZRange(zset, 0, -1).Val()
|
||||||
|
return MustUnmarshalSlice(tb, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func getZSetEntries(tb testing.TB, r *redis.Client, zset string) []ZSetEntry {
|
||||||
|
data := r.ZRangeWithScores(zset, 0, -1).Val()
|
||||||
|
var entries []ZSetEntry
|
||||||
|
for _, z := range data {
|
||||||
|
entries = append(entries, ZSetEntry{
|
||||||
|
Msg: MustUnmarshal(tb, z.Member.(string)),
|
||||||
|
Score: z.Score,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return entries
|
||||||
|
}
|
@ -7,228 +7,59 @@ package base
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/md5"
|
|
||||||
"encoding/hex"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/errors"
|
"github.com/go-redis/redis/v7"
|
||||||
pb "github.com/hibiken/asynq/internal/proto"
|
"github.com/rs/xid"
|
||||||
"github.com/hibiken/asynq/internal/timeutil"
|
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
"google.golang.org/protobuf/proto"
|
|
||||||
"google.golang.org/protobuf/types/known/timestamppb"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Version of asynq library and CLI.
|
|
||||||
const Version = "0.25.1"
|
|
||||||
|
|
||||||
// DefaultQueueName is the queue name used if none are specified by user.
|
// DefaultQueueName is the queue name used if none are specified by user.
|
||||||
const DefaultQueueName = "default"
|
const DefaultQueueName = "default"
|
||||||
|
|
||||||
// DefaultQueue is the redis key for the default queue.
|
// Redis keys
|
||||||
var DefaultQueue = PendingKey(DefaultQueueName)
|
|
||||||
|
|
||||||
// Global Redis keys.
|
|
||||||
const (
|
const (
|
||||||
AllServers = "asynq:servers" // ZSET
|
AllServers = "asynq:servers" // ZSET
|
||||||
AllWorkers = "asynq:workers" // ZSET
|
serversPrefix = "asynq:servers:" // STRING - asynq:ps:<host>:<pid>:<serverid>
|
||||||
AllSchedulers = "asynq:schedulers" // ZSET
|
AllWorkers = "asynq:workers" // ZSET
|
||||||
AllQueues = "asynq:queues" // SET
|
workersPrefix = "asynq:workers:" // HASH - asynq:workers:<host:<pid>:<serverid>
|
||||||
CancelChannel = "asynq:cancel" // PubSub channel
|
processedPrefix = "asynq:processed:" // STRING - asynq:processed:<yyyy-mm-dd>
|
||||||
|
failurePrefix = "asynq:failure:" // STRING - asynq:failure:<yyyy-mm-dd>
|
||||||
|
QueuePrefix = "asynq:queues:" // LIST - asynq:queues:<qname>
|
||||||
|
AllQueues = "asynq:queues" // SET
|
||||||
|
DefaultQueue = QueuePrefix + DefaultQueueName // LIST
|
||||||
|
ScheduledQueue = "asynq:scheduled" // ZSET
|
||||||
|
RetryQueue = "asynq:retry" // ZSET
|
||||||
|
DeadQueue = "asynq:dead" // ZSET
|
||||||
|
InProgressQueue = "asynq:in_progress" // LIST
|
||||||
|
CancelChannel = "asynq:cancel" // PubSub channel
|
||||||
)
|
)
|
||||||
|
|
||||||
// TaskState denotes the state of a task.
|
// QueueKey returns a redis key for the given queue name.
|
||||||
type TaskState int
|
func QueueKey(qname string) string {
|
||||||
|
return QueuePrefix + strings.ToLower(qname)
|
||||||
const (
|
|
||||||
TaskStateActive TaskState = iota + 1
|
|
||||||
TaskStatePending
|
|
||||||
TaskStateScheduled
|
|
||||||
TaskStateRetry
|
|
||||||
TaskStateArchived
|
|
||||||
TaskStateCompleted
|
|
||||||
TaskStateAggregating // describes a state where task is waiting in a group to be aggregated
|
|
||||||
)
|
|
||||||
|
|
||||||
func (s TaskState) String() string {
|
|
||||||
switch s {
|
|
||||||
case TaskStateActive:
|
|
||||||
return "active"
|
|
||||||
case TaskStatePending:
|
|
||||||
return "pending"
|
|
||||||
case TaskStateScheduled:
|
|
||||||
return "scheduled"
|
|
||||||
case TaskStateRetry:
|
|
||||||
return "retry"
|
|
||||||
case TaskStateArchived:
|
|
||||||
return "archived"
|
|
||||||
case TaskStateCompleted:
|
|
||||||
return "completed"
|
|
||||||
case TaskStateAggregating:
|
|
||||||
return "aggregating"
|
|
||||||
}
|
|
||||||
panic(fmt.Sprintf("internal error: unknown task state %d", s))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TaskStateFromString(s string) (TaskState, error) {
|
// ProcessedKey returns a redis key for processed count for the given day.
|
||||||
switch s {
|
func ProcessedKey(t time.Time) string {
|
||||||
case "active":
|
return processedPrefix + t.UTC().Format("2006-01-02")
|
||||||
return TaskStateActive, nil
|
|
||||||
case "pending":
|
|
||||||
return TaskStatePending, nil
|
|
||||||
case "scheduled":
|
|
||||||
return TaskStateScheduled, nil
|
|
||||||
case "retry":
|
|
||||||
return TaskStateRetry, nil
|
|
||||||
case "archived":
|
|
||||||
return TaskStateArchived, nil
|
|
||||||
case "completed":
|
|
||||||
return TaskStateCompleted, nil
|
|
||||||
case "aggregating":
|
|
||||||
return TaskStateAggregating, nil
|
|
||||||
}
|
|
||||||
return 0, errors.E(errors.FailedPrecondition, fmt.Sprintf("%q is not supported task state", s))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateQueueName validates a given qname to be used as a queue name.
|
// FailureKey returns a redis key for failure count for the given day.
|
||||||
// Returns nil if valid, otherwise returns non-nil error.
|
func FailureKey(t time.Time) string {
|
||||||
func ValidateQueueName(qname string) error {
|
return failurePrefix + t.UTC().Format("2006-01-02")
|
||||||
if len(strings.TrimSpace(qname)) == 0 {
|
|
||||||
return fmt.Errorf("queue name must contain one or more characters")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// QueueKeyPrefix returns a prefix for all keys in the given queue.
|
|
||||||
func QueueKeyPrefix(qname string) string {
|
|
||||||
return "asynq:{" + qname + "}:"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskKeyPrefix returns a prefix for task key.
|
|
||||||
func TaskKeyPrefix(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "t:"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskKey returns a redis key for the given task message.
|
|
||||||
func TaskKey(qname, id string) string {
|
|
||||||
return TaskKeyPrefix(qname) + id
|
|
||||||
}
|
|
||||||
|
|
||||||
// PendingKey returns a redis key for the given queue name.
|
|
||||||
func PendingKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "pending"
|
|
||||||
}
|
|
||||||
|
|
||||||
// ActiveKey returns a redis key for the active tasks.
|
|
||||||
func ActiveKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "active"
|
|
||||||
}
|
|
||||||
|
|
||||||
// ScheduledKey returns a redis key for the scheduled tasks.
|
|
||||||
func ScheduledKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "scheduled"
|
|
||||||
}
|
|
||||||
|
|
||||||
// RetryKey returns a redis key for the retry tasks.
|
|
||||||
func RetryKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "retry"
|
|
||||||
}
|
|
||||||
|
|
||||||
// ArchivedKey returns a redis key for the archived tasks.
|
|
||||||
func ArchivedKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "archived"
|
|
||||||
}
|
|
||||||
|
|
||||||
// LeaseKey returns a redis key for the lease.
|
|
||||||
func LeaseKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "lease"
|
|
||||||
}
|
|
||||||
|
|
||||||
func CompletedKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "completed"
|
|
||||||
}
|
|
||||||
|
|
||||||
// PausedKey returns a redis key to indicate that the given queue is paused.
|
|
||||||
func PausedKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "paused"
|
|
||||||
}
|
|
||||||
|
|
||||||
// ProcessedTotalKey returns a redis key for total processed count for the given queue.
|
|
||||||
func ProcessedTotalKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "processed"
|
|
||||||
}
|
|
||||||
|
|
||||||
// FailedTotalKey returns a redis key for total failure count for the given queue.
|
|
||||||
func FailedTotalKey(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "failed"
|
|
||||||
}
|
|
||||||
|
|
||||||
// ProcessedKey returns a redis key for processed count for the given day for the queue.
|
|
||||||
func ProcessedKey(qname string, t time.Time) string {
|
|
||||||
return QueueKeyPrefix(qname) + "processed:" + t.UTC().Format("2006-01-02")
|
|
||||||
}
|
|
||||||
|
|
||||||
// FailedKey returns a redis key for failure count for the given day for the queue.
|
|
||||||
func FailedKey(qname string, t time.Time) string {
|
|
||||||
return QueueKeyPrefix(qname) + "failed:" + t.UTC().Format("2006-01-02")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ServerInfoKey returns a redis key for process info.
|
// ServerInfoKey returns a redis key for process info.
|
||||||
func ServerInfoKey(hostname string, pid int, serverID string) string {
|
func ServerInfoKey(hostname string, pid int, sid string) string {
|
||||||
return fmt.Sprintf("asynq:servers:{%s:%d:%s}", hostname, pid, serverID)
|
return fmt.Sprintf("%s%s:%d:%s", serversPrefix, hostname, pid, sid)
|
||||||
}
|
}
|
||||||
|
|
||||||
// WorkersKey returns a redis key for the workers given hostname, pid, and server ID.
|
// WorkersKey returns a redis key for the workers given hostname, pid, and server ID.
|
||||||
func WorkersKey(hostname string, pid int, serverID string) string {
|
func WorkersKey(hostname string, pid int, sid string) string {
|
||||||
return fmt.Sprintf("asynq:workers:{%s:%d:%s}", hostname, pid, serverID)
|
return fmt.Sprintf("%s%s:%d:%s", workersPrefix, hostname, pid, sid)
|
||||||
}
|
|
||||||
|
|
||||||
// SchedulerEntriesKey returns a redis key for the scheduler entries given scheduler ID.
|
|
||||||
func SchedulerEntriesKey(schedulerID string) string {
|
|
||||||
return "asynq:schedulers:{" + schedulerID + "}"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchedulerHistoryKey returns a redis key for the scheduler's history for the given entry.
|
|
||||||
func SchedulerHistoryKey(entryID string) string {
|
|
||||||
return "asynq:scheduler_history:" + entryID
|
|
||||||
}
|
|
||||||
|
|
||||||
// UniqueKey returns a redis key with the given type, payload, and queue name.
|
|
||||||
func UniqueKey(qname, tasktype string, payload []byte) string {
|
|
||||||
if payload == nil {
|
|
||||||
return QueueKeyPrefix(qname) + "unique:" + tasktype + ":"
|
|
||||||
}
|
|
||||||
checksum := md5.Sum(payload)
|
|
||||||
return QueueKeyPrefix(qname) + "unique:" + tasktype + ":" + hex.EncodeToString(checksum[:])
|
|
||||||
}
|
|
||||||
|
|
||||||
// GroupKeyPrefix returns a prefix for group key.
|
|
||||||
func GroupKeyPrefix(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "g:"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GroupKey returns a redis key used to group tasks belong in the same group.
|
|
||||||
func GroupKey(qname, gkey string) string {
|
|
||||||
return GroupKeyPrefix(qname) + gkey
|
|
||||||
}
|
|
||||||
|
|
||||||
// AggregationSetKey returns a redis key used for an aggregation set.
|
|
||||||
func AggregationSetKey(qname, gname, setID string) string {
|
|
||||||
return GroupKey(qname, gname) + ":" + setID
|
|
||||||
}
|
|
||||||
|
|
||||||
// AllGroups return a redis key used to store all group keys used in a given queue.
|
|
||||||
func AllGroups(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "groups"
|
|
||||||
}
|
|
||||||
|
|
||||||
// AllAggregationSets returns a redis key used to store all aggregation sets (set of tasks staged to be aggregated)
|
|
||||||
// in a given queue.
|
|
||||||
func AllAggregationSets(qname string) string {
|
|
||||||
return QueueKeyPrefix(qname) + "aggregation_sets"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TaskMessage is the internal representation of a task with additional metadata fields.
|
// TaskMessage is the internal representation of a task with additional metadata fields.
|
||||||
@ -238,10 +69,10 @@ type TaskMessage struct {
|
|||||||
Type string
|
Type string
|
||||||
|
|
||||||
// Payload holds data needed to process the task.
|
// Payload holds data needed to process the task.
|
||||||
Payload []byte
|
Payload map[string]interface{}
|
||||||
|
|
||||||
// ID is a unique identifier for each task.
|
// ID is a unique identifier for each task.
|
||||||
ID string
|
ID xid.ID
|
||||||
|
|
||||||
// Queue is a name this message should be enqueued to.
|
// Queue is a name this message should be enqueued to.
|
||||||
Queue string
|
Queue string
|
||||||
@ -255,106 +86,176 @@ type TaskMessage struct {
|
|||||||
// ErrorMsg holds the error message from the last failure.
|
// ErrorMsg holds the error message from the last failure.
|
||||||
ErrorMsg string
|
ErrorMsg string
|
||||||
|
|
||||||
// Time of last failure in Unix time,
|
// Timeout specifies how long a task may run.
|
||||||
// the number of seconds elapsed since January 1, 1970 UTC.
|
// The string value should be compatible with time.Duration.ParseDuration.
|
||||||
//
|
//
|
||||||
// Use zero to indicate no last failure
|
// Zero means no limit.
|
||||||
LastFailedAt int64
|
Timeout string
|
||||||
|
|
||||||
// Timeout specifies timeout in seconds.
|
// Deadline specifies the deadline for the task.
|
||||||
// If task processing doesn't complete within the timeout, the task will be retried
|
// Task won't be processed if it exceeded its deadline.
|
||||||
// if retry count is remaining. Otherwise it will be moved to the archive.
|
// The string shoulbe be in RFC3339 format.
|
||||||
//
|
//
|
||||||
// Use zero to indicate no timeout.
|
// time.Time's zero value means no deadline.
|
||||||
Timeout int64
|
Deadline string
|
||||||
|
|
||||||
// Deadline specifies the deadline for the task in Unix time,
|
|
||||||
// the number of seconds elapsed since January 1, 1970 UTC.
|
|
||||||
// If task processing doesn't complete before the deadline, the task will be retried
|
|
||||||
// if retry count is remaining. Otherwise it will be moved to the archive.
|
|
||||||
//
|
|
||||||
// Use zero to indicate no deadline.
|
|
||||||
Deadline int64
|
|
||||||
|
|
||||||
// UniqueKey holds the redis key used for uniqueness lock for this task.
|
// UniqueKey holds the redis key used for uniqueness lock for this task.
|
||||||
//
|
//
|
||||||
// Empty string indicates that no uniqueness lock was used.
|
// Empty string indicates that no uniqueness lock was used.
|
||||||
UniqueKey string
|
UniqueKey string
|
||||||
|
|
||||||
// GroupKey holds the group key used for task aggregation.
|
|
||||||
//
|
|
||||||
// Empty string indicates no aggregation is used for this task.
|
|
||||||
GroupKey string
|
|
||||||
|
|
||||||
// Retention specifies the number of seconds the task should be retained after completion.
|
|
||||||
Retention int64
|
|
||||||
|
|
||||||
// CompletedAt is the time the task was processed successfully in Unix time,
|
|
||||||
// the number of seconds elapsed since January 1, 1970 UTC.
|
|
||||||
//
|
|
||||||
// Use zero to indicate no value.
|
|
||||||
CompletedAt int64
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EncodeMessage marshals the given task message and returns an encoded bytes.
|
// ServerState holds process level information.
|
||||||
func EncodeMessage(msg *TaskMessage) ([]byte, error) {
|
//
|
||||||
if msg == nil {
|
// ServerStates are safe for concurrent use by multiple goroutines.
|
||||||
return nil, fmt.Errorf("cannot encode nil message")
|
type ServerState struct {
|
||||||
|
mu sync.Mutex // guards all data fields
|
||||||
|
id xid.ID
|
||||||
|
concurrency int
|
||||||
|
queues map[string]int
|
||||||
|
strictPriority bool
|
||||||
|
pid int
|
||||||
|
host string
|
||||||
|
status ServerStatus
|
||||||
|
started time.Time
|
||||||
|
workers map[string]*workerStats
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServerStatus represents status of a server.
|
||||||
|
type ServerStatus int
|
||||||
|
|
||||||
|
const (
|
||||||
|
// StatusIdle indicates the server is in idle state.
|
||||||
|
StatusIdle ServerStatus = iota
|
||||||
|
|
||||||
|
// StatusRunning indicates the servier is up and processing tasks.
|
||||||
|
StatusRunning
|
||||||
|
|
||||||
|
// StatusQuiet indicates the server is up but not processing new tasks.
|
||||||
|
StatusQuiet
|
||||||
|
|
||||||
|
// StatusStopped indicates the server server has been stopped.
|
||||||
|
StatusStopped
|
||||||
|
)
|
||||||
|
|
||||||
|
var statuses = []string{
|
||||||
|
"idle",
|
||||||
|
"running",
|
||||||
|
"quiet",
|
||||||
|
"stopped",
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s ServerStatus) String() string {
|
||||||
|
if StatusIdle <= s && s <= StatusStopped {
|
||||||
|
return statuses[s]
|
||||||
}
|
}
|
||||||
return proto.Marshal(&pb.TaskMessage{
|
return "unknown status"
|
||||||
Type: msg.Type,
|
|
||||||
Payload: msg.Payload,
|
|
||||||
Id: msg.ID,
|
|
||||||
Queue: msg.Queue,
|
|
||||||
Retry: int32(msg.Retry),
|
|
||||||
Retried: int32(msg.Retried),
|
|
||||||
ErrorMsg: msg.ErrorMsg,
|
|
||||||
LastFailedAt: msg.LastFailedAt,
|
|
||||||
Timeout: msg.Timeout,
|
|
||||||
Deadline: msg.Deadline,
|
|
||||||
UniqueKey: msg.UniqueKey,
|
|
||||||
GroupKey: msg.GroupKey,
|
|
||||||
Retention: msg.Retention,
|
|
||||||
CompletedAt: msg.CompletedAt,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DecodeMessage unmarshals the given bytes and returns a decoded task message.
|
type workerStats struct {
|
||||||
func DecodeMessage(data []byte) (*TaskMessage, error) {
|
msg *TaskMessage
|
||||||
var pbmsg pb.TaskMessage
|
started time.Time
|
||||||
if err := proto.Unmarshal(data, &pbmsg); err != nil {
|
}
|
||||||
return nil, err
|
|
||||||
|
// NewServerState returns a new instance of ServerState.
|
||||||
|
func NewServerState(host string, pid, concurrency int, queues map[string]int, strict bool) *ServerState {
|
||||||
|
return &ServerState{
|
||||||
|
host: host,
|
||||||
|
pid: pid,
|
||||||
|
id: xid.New(),
|
||||||
|
concurrency: concurrency,
|
||||||
|
queues: cloneQueueConfig(queues),
|
||||||
|
strictPriority: strict,
|
||||||
|
status: StatusIdle,
|
||||||
|
workers: make(map[string]*workerStats),
|
||||||
}
|
}
|
||||||
return &TaskMessage{
|
|
||||||
Type: pbmsg.GetType(),
|
|
||||||
Payload: pbmsg.GetPayload(),
|
|
||||||
ID: pbmsg.GetId(),
|
|
||||||
Queue: pbmsg.GetQueue(),
|
|
||||||
Retry: int(pbmsg.GetRetry()),
|
|
||||||
Retried: int(pbmsg.GetRetried()),
|
|
||||||
ErrorMsg: pbmsg.GetErrorMsg(),
|
|
||||||
LastFailedAt: pbmsg.GetLastFailedAt(),
|
|
||||||
Timeout: pbmsg.GetTimeout(),
|
|
||||||
Deadline: pbmsg.GetDeadline(),
|
|
||||||
UniqueKey: pbmsg.GetUniqueKey(),
|
|
||||||
GroupKey: pbmsg.GetGroupKey(),
|
|
||||||
Retention: pbmsg.GetRetention(),
|
|
||||||
CompletedAt: pbmsg.GetCompletedAt(),
|
|
||||||
}, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TaskInfo describes a task message and its metadata.
|
// SetStatus updates the status of server.
|
||||||
type TaskInfo struct {
|
func (ss *ServerState) SetStatus(status ServerStatus) {
|
||||||
Message *TaskMessage
|
ss.mu.Lock()
|
||||||
State TaskState
|
defer ss.mu.Unlock()
|
||||||
NextProcessAt time.Time
|
ss.status = status
|
||||||
Result []byte
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Z represents sorted set member.
|
// Status returns the status of server.
|
||||||
type Z struct {
|
func (ss *ServerState) Status() ServerStatus {
|
||||||
Message *TaskMessage
|
ss.mu.Lock()
|
||||||
Score int64
|
defer ss.mu.Unlock()
|
||||||
|
return ss.status
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetStarted records when the process started processing.
|
||||||
|
func (ss *ServerState) SetStarted(t time.Time) {
|
||||||
|
ss.mu.Lock()
|
||||||
|
defer ss.mu.Unlock()
|
||||||
|
ss.started = t
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddWorkerStats records when a worker started and which task it's processing.
|
||||||
|
func (ss *ServerState) AddWorkerStats(msg *TaskMessage, started time.Time) {
|
||||||
|
ss.mu.Lock()
|
||||||
|
defer ss.mu.Unlock()
|
||||||
|
ss.workers[msg.ID.String()] = &workerStats{msg, started}
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteWorkerStats removes a worker's entry from the process state.
|
||||||
|
func (ss *ServerState) DeleteWorkerStats(msg *TaskMessage) {
|
||||||
|
ss.mu.Lock()
|
||||||
|
defer ss.mu.Unlock()
|
||||||
|
delete(ss.workers, msg.ID.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetInfo returns current state of server as a ServerInfo.
|
||||||
|
func (ss *ServerState) GetInfo() *ServerInfo {
|
||||||
|
ss.mu.Lock()
|
||||||
|
defer ss.mu.Unlock()
|
||||||
|
return &ServerInfo{
|
||||||
|
Host: ss.host,
|
||||||
|
PID: ss.pid,
|
||||||
|
ServerID: ss.id.String(),
|
||||||
|
Concurrency: ss.concurrency,
|
||||||
|
Queues: cloneQueueConfig(ss.queues),
|
||||||
|
StrictPriority: ss.strictPriority,
|
||||||
|
Status: ss.status.String(),
|
||||||
|
Started: ss.started,
|
||||||
|
ActiveWorkerCount: len(ss.workers),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetWorkers returns a list of currently running workers' info.
|
||||||
|
func (ss *ServerState) GetWorkers() []*WorkerInfo {
|
||||||
|
ss.mu.Lock()
|
||||||
|
defer ss.mu.Unlock()
|
||||||
|
var res []*WorkerInfo
|
||||||
|
for _, w := range ss.workers {
|
||||||
|
res = append(res, &WorkerInfo{
|
||||||
|
Host: ss.host,
|
||||||
|
PID: ss.pid,
|
||||||
|
ID: w.msg.ID,
|
||||||
|
Type: w.msg.Type,
|
||||||
|
Queue: w.msg.Queue,
|
||||||
|
Payload: clonePayload(w.msg.Payload),
|
||||||
|
Started: w.started,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
func cloneQueueConfig(qcfg map[string]int) map[string]int {
|
||||||
|
res := make(map[string]int)
|
||||||
|
for qname, n := range qcfg {
|
||||||
|
res[qname] = n
|
||||||
|
}
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
func clonePayload(payload map[string]interface{}) map[string]interface{} {
|
||||||
|
res := make(map[string]interface{})
|
||||||
|
for k, v := range payload {
|
||||||
|
res[k] = v
|
||||||
|
}
|
||||||
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
// ServerInfo holds information about a running server.
|
// ServerInfo holds information about a running server.
|
||||||
@ -370,214 +271,20 @@ type ServerInfo struct {
|
|||||||
ActiveWorkerCount int
|
ActiveWorkerCount int
|
||||||
}
|
}
|
||||||
|
|
||||||
// EncodeServerInfo marshals the given ServerInfo and returns the encoded bytes.
|
|
||||||
func EncodeServerInfo(info *ServerInfo) ([]byte, error) {
|
|
||||||
if info == nil {
|
|
||||||
return nil, fmt.Errorf("cannot encode nil server info")
|
|
||||||
}
|
|
||||||
queues := make(map[string]int32, len(info.Queues))
|
|
||||||
for q, p := range info.Queues {
|
|
||||||
queues[q] = int32(p)
|
|
||||||
}
|
|
||||||
started := timestamppb.New(info.Started)
|
|
||||||
|
|
||||||
return proto.Marshal(&pb.ServerInfo{
|
|
||||||
Host: info.Host,
|
|
||||||
Pid: int32(info.PID),
|
|
||||||
ServerId: info.ServerID,
|
|
||||||
Concurrency: int32(info.Concurrency),
|
|
||||||
Queues: queues,
|
|
||||||
StrictPriority: info.StrictPriority,
|
|
||||||
Status: info.Status,
|
|
||||||
StartTime: started,
|
|
||||||
ActiveWorkerCount: int32(info.ActiveWorkerCount),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// DecodeServerInfo decodes the given bytes into ServerInfo.
|
|
||||||
func DecodeServerInfo(b []byte) (*ServerInfo, error) {
|
|
||||||
var pbmsg pb.ServerInfo
|
|
||||||
if err := proto.Unmarshal(b, &pbmsg); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
queues := make(map[string]int, len(pbmsg.GetQueues()))
|
|
||||||
for q, p := range pbmsg.GetQueues() {
|
|
||||||
queues[q] = int(p)
|
|
||||||
}
|
|
||||||
startTime := pbmsg.GetStartTime()
|
|
||||||
|
|
||||||
return &ServerInfo{
|
|
||||||
Host: pbmsg.GetHost(),
|
|
||||||
PID: int(pbmsg.GetPid()),
|
|
||||||
ServerID: pbmsg.GetServerId(),
|
|
||||||
Concurrency: int(pbmsg.GetConcurrency()),
|
|
||||||
Queues: queues,
|
|
||||||
StrictPriority: pbmsg.GetStrictPriority(),
|
|
||||||
Status: pbmsg.GetStatus(),
|
|
||||||
Started: startTime.AsTime(),
|
|
||||||
ActiveWorkerCount: int(pbmsg.GetActiveWorkerCount()),
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// WorkerInfo holds information about a running worker.
|
// WorkerInfo holds information about a running worker.
|
||||||
type WorkerInfo struct {
|
type WorkerInfo struct {
|
||||||
Host string
|
Host string
|
||||||
PID int
|
PID int
|
||||||
ServerID string
|
ID xid.ID
|
||||||
ID string
|
Type string
|
||||||
Type string
|
Queue string
|
||||||
Payload []byte
|
Payload map[string]interface{}
|
||||||
Queue string
|
Started time.Time
|
||||||
Started time.Time
|
|
||||||
Deadline time.Time
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EncodeWorkerInfo marshals the given WorkerInfo and returns the encoded bytes.
|
// Cancelations is a collection that holds cancel functions for all in-progress tasks.
|
||||||
func EncodeWorkerInfo(info *WorkerInfo) ([]byte, error) {
|
|
||||||
if info == nil {
|
|
||||||
return nil, fmt.Errorf("cannot encode nil worker info")
|
|
||||||
}
|
|
||||||
startTime := timestamppb.New(info.Started)
|
|
||||||
deadline := timestamppb.New(info.Deadline)
|
|
||||||
|
|
||||||
return proto.Marshal(&pb.WorkerInfo{
|
|
||||||
Host: info.Host,
|
|
||||||
Pid: int32(info.PID),
|
|
||||||
ServerId: info.ServerID,
|
|
||||||
TaskId: info.ID,
|
|
||||||
TaskType: info.Type,
|
|
||||||
TaskPayload: info.Payload,
|
|
||||||
Queue: info.Queue,
|
|
||||||
StartTime: startTime,
|
|
||||||
Deadline: deadline,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// DecodeWorkerInfo decodes the given bytes into WorkerInfo.
|
|
||||||
func DecodeWorkerInfo(b []byte) (*WorkerInfo, error) {
|
|
||||||
var pbmsg pb.WorkerInfo
|
|
||||||
if err := proto.Unmarshal(b, &pbmsg); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
startTime := pbmsg.GetStartTime()
|
|
||||||
deadline := pbmsg.GetDeadline()
|
|
||||||
|
|
||||||
return &WorkerInfo{
|
|
||||||
Host: pbmsg.GetHost(),
|
|
||||||
PID: int(pbmsg.GetPid()),
|
|
||||||
ServerID: pbmsg.GetServerId(),
|
|
||||||
ID: pbmsg.GetTaskId(),
|
|
||||||
Type: pbmsg.GetTaskType(),
|
|
||||||
Payload: pbmsg.GetTaskPayload(),
|
|
||||||
Queue: pbmsg.GetQueue(),
|
|
||||||
Started: startTime.AsTime(),
|
|
||||||
Deadline: deadline.AsTime(),
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchedulerEntry holds information about a periodic task registered with a scheduler.
|
|
||||||
type SchedulerEntry struct {
|
|
||||||
// Identifier of this entry.
|
|
||||||
ID string
|
|
||||||
|
|
||||||
// Spec describes the schedule of this entry.
|
|
||||||
Spec string
|
|
||||||
|
|
||||||
// Type is the task type of the periodic task.
|
|
||||||
Type string
|
|
||||||
|
|
||||||
// Payload is the payload of the periodic task.
|
|
||||||
Payload []byte
|
|
||||||
|
|
||||||
// Opts is the options for the periodic task.
|
|
||||||
Opts []string
|
|
||||||
|
|
||||||
// Next shows the next time the task will be enqueued.
|
|
||||||
Next time.Time
|
|
||||||
|
|
||||||
// Prev shows the last time the task was enqueued.
|
|
||||||
// Zero time if task was never enqueued.
|
|
||||||
Prev time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
// EncodeSchedulerEntry marshals the given entry and returns an encoded bytes.
|
|
||||||
func EncodeSchedulerEntry(entry *SchedulerEntry) ([]byte, error) {
|
|
||||||
if entry == nil {
|
|
||||||
return nil, fmt.Errorf("cannot encode nil scheduler entry")
|
|
||||||
}
|
|
||||||
next := timestamppb.New(entry.Next)
|
|
||||||
prev := timestamppb.New(entry.Prev)
|
|
||||||
|
|
||||||
return proto.Marshal(&pb.SchedulerEntry{
|
|
||||||
Id: entry.ID,
|
|
||||||
Spec: entry.Spec,
|
|
||||||
TaskType: entry.Type,
|
|
||||||
TaskPayload: entry.Payload,
|
|
||||||
EnqueueOptions: entry.Opts,
|
|
||||||
NextEnqueueTime: next,
|
|
||||||
PrevEnqueueTime: prev,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// DecodeSchedulerEntry unmarshals the given bytes and returns a decoded SchedulerEntry.
|
|
||||||
func DecodeSchedulerEntry(b []byte) (*SchedulerEntry, error) {
|
|
||||||
var pbmsg pb.SchedulerEntry
|
|
||||||
if err := proto.Unmarshal(b, &pbmsg); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
next := pbmsg.GetNextEnqueueTime()
|
|
||||||
prev := pbmsg.GetPrevEnqueueTime()
|
|
||||||
|
|
||||||
return &SchedulerEntry{
|
|
||||||
ID: pbmsg.GetId(),
|
|
||||||
Spec: pbmsg.GetSpec(),
|
|
||||||
Type: pbmsg.GetTaskType(),
|
|
||||||
Payload: pbmsg.GetTaskPayload(),
|
|
||||||
Opts: pbmsg.GetEnqueueOptions(),
|
|
||||||
Next: next.AsTime(),
|
|
||||||
Prev: prev.AsTime(),
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchedulerEnqueueEvent holds information about an enqueue event by a scheduler.
|
|
||||||
type SchedulerEnqueueEvent struct {
|
|
||||||
// ID of the task that was enqueued.
|
|
||||||
TaskID string
|
|
||||||
|
|
||||||
// Time the task was enqueued.
|
|
||||||
EnqueuedAt time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
// EncodeSchedulerEnqueueEvent marshals the given event
|
|
||||||
// and returns an encoded bytes.
|
|
||||||
func EncodeSchedulerEnqueueEvent(event *SchedulerEnqueueEvent) ([]byte, error) {
|
|
||||||
if event == nil {
|
|
||||||
return nil, fmt.Errorf("cannot encode nil enqueue event")
|
|
||||||
}
|
|
||||||
enqueuedAt := timestamppb.New(event.EnqueuedAt)
|
|
||||||
return proto.Marshal(&pb.SchedulerEnqueueEvent{
|
|
||||||
TaskId: event.TaskID,
|
|
||||||
EnqueueTime: enqueuedAt,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// DecodeSchedulerEnqueueEvent unmarshals the given bytes
|
|
||||||
// and returns a decoded SchedulerEnqueueEvent.
|
|
||||||
func DecodeSchedulerEnqueueEvent(b []byte) (*SchedulerEnqueueEvent, error) {
|
|
||||||
var pbmsg pb.SchedulerEnqueueEvent
|
|
||||||
if err := proto.Unmarshal(b, &pbmsg); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
enqueuedAt := pbmsg.GetEnqueueTime()
|
|
||||||
return &SchedulerEnqueueEvent{
|
|
||||||
TaskID: pbmsg.GetTaskId(),
|
|
||||||
EnqueuedAt: enqueuedAt.AsTime(),
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cancelations is a collection that holds cancel functions for all active tasks.
|
|
||||||
//
|
//
|
||||||
// Cancelations are safe for concurrent use by multiple goroutines.
|
// Cancelations are safe for concurrent use by multipel goroutines.
|
||||||
type Cancelations struct {
|
type Cancelations struct {
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
cancelFuncs map[string]context.CancelFunc
|
cancelFuncs map[string]context.CancelFunc
|
||||||
@ -612,114 +319,35 @@ func (c *Cancelations) Get(id string) (fn context.CancelFunc, ok bool) {
|
|||||||
return fn, ok
|
return fn, ok
|
||||||
}
|
}
|
||||||
|
|
||||||
// Lease is a time bound lease for worker to process task.
|
// GetAll returns all cancel funcs.
|
||||||
// It provides a communication channel between lessor and lessee about lease expiration.
|
func (c *Cancelations) GetAll() []context.CancelFunc {
|
||||||
type Lease struct {
|
c.mu.Lock()
|
||||||
once sync.Once
|
defer c.mu.Unlock()
|
||||||
ch chan struct{}
|
var res []context.CancelFunc
|
||||||
|
for _, fn := range c.cancelFuncs {
|
||||||
Clock timeutil.Clock
|
res = append(res, fn)
|
||||||
|
|
||||||
mu sync.Mutex
|
|
||||||
expireAt time.Time // guarded by mu
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewLease(expirationTime time.Time) *Lease {
|
|
||||||
return &Lease{
|
|
||||||
ch: make(chan struct{}),
|
|
||||||
expireAt: expirationTime,
|
|
||||||
Clock: timeutil.NewRealClock(),
|
|
||||||
}
|
}
|
||||||
}
|
return res
|
||||||
|
|
||||||
// Reset changes the lease to expire at the given time.
|
|
||||||
// It returns true if the lease is still valid and reset operation was successful, false if the lease had been expired.
|
|
||||||
func (l *Lease) Reset(expirationTime time.Time) bool {
|
|
||||||
if !l.IsValid() {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
l.mu.Lock()
|
|
||||||
defer l.mu.Unlock()
|
|
||||||
l.expireAt = expirationTime
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sends a notification to lessee about expired lease
|
|
||||||
// Returns true if notification was sent, returns false if the lease is still valid and notification was not sent.
|
|
||||||
func (l *Lease) NotifyExpiration() bool {
|
|
||||||
if l.IsValid() {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
l.once.Do(l.closeCh)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Lease) closeCh() {
|
|
||||||
close(l.ch)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Done returns a communication channel from which the lessee can read to get notified when lessor notifies about lease expiration.
|
|
||||||
func (l *Lease) Done() <-chan struct{} {
|
|
||||||
return l.ch
|
|
||||||
}
|
|
||||||
|
|
||||||
// Deadline returns the expiration time of the lease.
|
|
||||||
func (l *Lease) Deadline() time.Time {
|
|
||||||
l.mu.Lock()
|
|
||||||
defer l.mu.Unlock()
|
|
||||||
return l.expireAt
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsValid returns true if the lease's expiration time is in the future or equals to the current time,
|
|
||||||
// returns false otherwise.
|
|
||||||
func (l *Lease) IsValid() bool {
|
|
||||||
now := l.Clock.Now()
|
|
||||||
l.mu.Lock()
|
|
||||||
defer l.mu.Unlock()
|
|
||||||
return l.expireAt.After(now) || l.expireAt.Equal(now)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Broker is a message broker that supports operations to manage task queues.
|
// Broker is a message broker that supports operations to manage task queues.
|
||||||
//
|
//
|
||||||
// See rdb.RDB as a reference implementation.
|
// See rdb.RDB as a reference implementation.
|
||||||
type Broker interface {
|
type Broker interface {
|
||||||
Ping() error
|
Enqueue(msg *TaskMessage) error
|
||||||
Close() error
|
EnqueueUnique(msg *TaskMessage, ttl time.Duration) error
|
||||||
Enqueue(ctx context.Context, msg *TaskMessage) error
|
Dequeue(qnames ...string) (*TaskMessage, error)
|
||||||
EnqueueUnique(ctx context.Context, msg *TaskMessage, ttl time.Duration) error
|
Done(msg *TaskMessage) error
|
||||||
Dequeue(qnames ...string) (*TaskMessage, time.Time, error)
|
Requeue(msg *TaskMessage) error
|
||||||
Done(ctx context.Context, msg *TaskMessage) error
|
Schedule(msg *TaskMessage, processAt time.Time) error
|
||||||
MarkAsComplete(ctx context.Context, msg *TaskMessage) error
|
ScheduleUnique(msg *TaskMessage, processAt time.Time, ttl time.Duration) error
|
||||||
Requeue(ctx context.Context, msg *TaskMessage) error
|
Retry(msg *TaskMessage, processAt time.Time, errMsg string) error
|
||||||
Schedule(ctx context.Context, msg *TaskMessage, processAt time.Time) error
|
Kill(msg *TaskMessage, errMsg string) error
|
||||||
ScheduleUnique(ctx context.Context, msg *TaskMessage, processAt time.Time, ttl time.Duration) error
|
RequeueAll() (int64, error)
|
||||||
Retry(ctx context.Context, msg *TaskMessage, processAt time.Time, errMsg string, isFailure bool) error
|
CheckAndEnqueue(qnames ...string) error
|
||||||
Archive(ctx context.Context, msg *TaskMessage, errMsg string) error
|
WriteServerState(ss *ServerState, ttl time.Duration) error
|
||||||
ForwardIfReady(qnames ...string) error
|
ClearServerState(ss *ServerState) error
|
||||||
|
|
||||||
// Group aggregation related methods
|
|
||||||
AddToGroup(ctx context.Context, msg *TaskMessage, gname string) error
|
|
||||||
AddToGroupUnique(ctx context.Context, msg *TaskMessage, groupKey string, ttl time.Duration) error
|
|
||||||
ListGroups(qname string) ([]string, error)
|
|
||||||
AggregationCheck(qname, gname string, t time.Time, gracePeriod, maxDelay time.Duration, maxSize int) (aggregationSetID string, err error)
|
|
||||||
ReadAggregationSet(qname, gname, aggregationSetID string) ([]*TaskMessage, time.Time, error)
|
|
||||||
DeleteAggregationSet(ctx context.Context, qname, gname, aggregationSetID string) error
|
|
||||||
ReclaimStaleAggregationSets(qname string) error
|
|
||||||
|
|
||||||
// Task retention related method
|
|
||||||
DeleteExpiredCompletedTasks(qname string, batchSize int) error
|
|
||||||
|
|
||||||
// Lease related methods
|
|
||||||
ListLeaseExpired(cutoff time.Time, qnames ...string) ([]*TaskMessage, error)
|
|
||||||
ExtendLease(qname string, ids ...string) (time.Time, error)
|
|
||||||
|
|
||||||
// State snapshot related methods
|
|
||||||
WriteServerState(info *ServerInfo, workers []*WorkerInfo, ttl time.Duration) error
|
|
||||||
ClearServerState(host string, pid int, serverID string) error
|
|
||||||
|
|
||||||
// Cancelation related methods
|
|
||||||
CancelationPubSub() (*redis.PubSub, error) // TODO: Need to decouple from redis to support other brokers
|
CancelationPubSub() (*redis.PubSub, error) // TODO: Need to decouple from redis to support other brokers
|
||||||
PublishCancelation(id string) error
|
PublishCancelation(id string) error
|
||||||
|
Close() error
|
||||||
WriteResult(qname, id string, data []byte) (n int, err error)
|
|
||||||
}
|
}
|
||||||
|
@ -6,240 +6,62 @@ package base
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/md5"
|
"math/rand"
|
||||||
"encoding/hex"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
"github.com/google/go-cmp/cmp"
|
||||||
"github.com/google/uuid"
|
"github.com/google/go-cmp/cmp/cmpopts"
|
||||||
"github.com/hibiken/asynq/internal/timeutil"
|
"github.com/rs/xid"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestTaskKey(t *testing.T) {
|
|
||||||
id := uuid.NewString()
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
id string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", id, fmt.Sprintf("asynq:{default}:t:%s", id)},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := TaskKey(tc.qname, tc.id)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("TaskKey(%q, %s) = %q, want %q", tc.qname, tc.id, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestQueueKey(t *testing.T) {
|
func TestQueueKey(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
qname string
|
qname string
|
||||||
want string
|
want string
|
||||||
}{
|
}{
|
||||||
{"default", "asynq:{default}:pending"},
|
{"custom", "asynq:queues:custom"},
|
||||||
{"custom", "asynq:{custom}:pending"},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
got := PendingKey(tc.qname)
|
got := QueueKey(tc.qname)
|
||||||
if got != tc.want {
|
if got != tc.want {
|
||||||
t.Errorf("QueueKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
t.Errorf("QueueKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestActiveKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", "asynq:{default}:active"},
|
|
||||||
{"custom", "asynq:{custom}:active"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := ActiveKey(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("ActiveKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLeaseKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", "asynq:{default}:lease"},
|
|
||||||
{"custom", "asynq:{custom}:lease"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := LeaseKey(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("LeaseKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestScheduledKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", "asynq:{default}:scheduled"},
|
|
||||||
{"custom", "asynq:{custom}:scheduled"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := ScheduledKey(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("ScheduledKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestRetryKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", "asynq:{default}:retry"},
|
|
||||||
{"custom", "asynq:{custom}:retry"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := RetryKey(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("RetryKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestArchivedKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", "asynq:{default}:archived"},
|
|
||||||
{"custom", "asynq:{custom}:archived"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := ArchivedKey(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("ArchivedKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCompletedKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", "asynq:{default}:completed"},
|
|
||||||
{"custom", "asynq:{custom}:completed"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := CompletedKey(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("CompletedKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPausedKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", "asynq:{default}:paused"},
|
|
||||||
{"custom", "asynq:{custom}:paused"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := PausedKey(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("PausedKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestProcessedTotalKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", "asynq:{default}:processed"},
|
|
||||||
{"custom", "asynq:{custom}:processed"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := ProcessedTotalKey(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("ProcessedTotalKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFailedTotalKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"default", "asynq:{default}:failed"},
|
|
||||||
{"custom", "asynq:{custom}:failed"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := FailedTotalKey(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("FailedTotalKey(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestProcessedKey(t *testing.T) {
|
func TestProcessedKey(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
qname string
|
|
||||||
input time.Time
|
input time.Time
|
||||||
want string
|
want string
|
||||||
}{
|
}{
|
||||||
{"default", time.Date(2019, 11, 14, 10, 30, 1, 1, time.UTC), "asynq:{default}:processed:2019-11-14"},
|
{time.Date(2019, 11, 14, 10, 30, 1, 1, time.UTC), "asynq:processed:2019-11-14"},
|
||||||
{"critical", time.Date(2020, 12, 1, 1, 0, 1, 1, time.UTC), "asynq:{critical}:processed:2020-12-01"},
|
{time.Date(2020, 12, 1, 1, 0, 1, 1, time.UTC), "asynq:processed:2020-12-01"},
|
||||||
{"default", time.Date(2020, 1, 6, 15, 02, 1, 1, time.UTC), "asynq:{default}:processed:2020-01-06"},
|
{time.Date(2020, 1, 6, 15, 02, 1, 1, time.UTC), "asynq:processed:2020-01-06"},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
got := ProcessedKey(tc.qname, tc.input)
|
got := ProcessedKey(tc.input)
|
||||||
if got != tc.want {
|
if got != tc.want {
|
||||||
t.Errorf("ProcessedKey(%v) = %q, want %q", tc.input, got, tc.want)
|
t.Errorf("ProcessedKey(%v) = %q, want %q", tc.input, got, tc.want)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFailedKey(t *testing.T) {
|
func TestFailureKey(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
qname string
|
|
||||||
input time.Time
|
input time.Time
|
||||||
want string
|
want string
|
||||||
}{
|
}{
|
||||||
{"default", time.Date(2019, 11, 14, 10, 30, 1, 1, time.UTC), "asynq:{default}:failed:2019-11-14"},
|
{time.Date(2019, 11, 14, 10, 30, 1, 1, time.UTC), "asynq:failure:2019-11-14"},
|
||||||
{"custom", time.Date(2020, 12, 1, 1, 0, 1, 1, time.UTC), "asynq:{custom}:failed:2020-12-01"},
|
{time.Date(2020, 12, 1, 1, 0, 1, 1, time.UTC), "asynq:failure:2020-12-01"},
|
||||||
{"low", time.Date(2020, 1, 6, 15, 02, 1, 1, time.UTC), "asynq:{low}:failed:2020-01-06"},
|
{time.Date(2020, 1, 6, 15, 02, 1, 1, time.UTC), "asynq:failure:2020-01-06"},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
got := FailedKey(tc.qname, tc.input)
|
got := FailureKey(tc.input)
|
||||||
if got != tc.want {
|
if got != tc.want {
|
||||||
t.Errorf("FailureKey(%v) = %q, want %q", tc.input, got, tc.want)
|
t.Errorf("FailureKey(%v) = %q, want %q", tc.input, got, tc.want)
|
||||||
}
|
}
|
||||||
@ -253,15 +75,14 @@ func TestServerInfoKey(t *testing.T) {
|
|||||||
sid string
|
sid string
|
||||||
want string
|
want string
|
||||||
}{
|
}{
|
||||||
{"localhost", 9876, "server123", "asynq:servers:{localhost:9876:server123}"},
|
{"localhost", 9876, "server123", "asynq:servers:localhost:9876:server123"},
|
||||||
{"127.0.0.1", 1234, "server987", "asynq:servers:{127.0.0.1:1234:server987}"},
|
{"127.0.0.1", 1234, "server987", "asynq:servers:127.0.0.1:1234:server987"},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
got := ServerInfoKey(tc.hostname, tc.pid, tc.sid)
|
got := ServerInfoKey(tc.hostname, tc.pid, tc.sid)
|
||||||
if got != tc.want {
|
if got != tc.want {
|
||||||
t.Errorf("ServerInfoKey(%q, %d, %q) = %q, want %q",
|
t.Errorf("ServerInfoKey(%q, %d) = %q, want %q", tc.hostname, tc.pid, got, tc.want)
|
||||||
tc.hostname, tc.pid, tc.sid, got, tc.want)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -273,417 +94,80 @@ func TestWorkersKey(t *testing.T) {
|
|||||||
sid string
|
sid string
|
||||||
want string
|
want string
|
||||||
}{
|
}{
|
||||||
{"localhost", 9876, "server1", "asynq:workers:{localhost:9876:server1}"},
|
{"localhost", 9876, "server1", "asynq:workers:localhost:9876:server1"},
|
||||||
{"127.0.0.1", 1234, "server2", "asynq:workers:{127.0.0.1:1234:server2}"},
|
{"127.0.0.1", 1234, "server2", "asynq:workers:127.0.0.1:1234:server2"},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
got := WorkersKey(tc.hostname, tc.pid, tc.sid)
|
got := WorkersKey(tc.hostname, tc.pid, tc.sid)
|
||||||
if got != tc.want {
|
if got != tc.want {
|
||||||
t.Errorf("WorkersKey(%q, %d, %q) = %q, want = %q",
|
t.Errorf("WorkersKey(%q, %d) = %q, want = %q", tc.hostname, tc.pid, got, tc.want)
|
||||||
tc.hostname, tc.pid, tc.sid, got, tc.want)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSchedulerEntriesKey(t *testing.T) {
|
// Test for server state being accessed by multiple goroutines.
|
||||||
tests := []struct {
|
// Run with -race flag to check for data race.
|
||||||
schedulerID string
|
func TestServerStateConcurrentAccess(t *testing.T) {
|
||||||
want string
|
ss := NewServerState("127.0.0.1", 1234, 10, map[string]int{"default": 1}, false)
|
||||||
}{
|
var wg sync.WaitGroup
|
||||||
{"localhost:9876:scheduler123", "asynq:schedulers:{localhost:9876:scheduler123}"},
|
started := time.Now()
|
||||||
{"127.0.0.1:1234:scheduler987", "asynq:schedulers:{127.0.0.1:1234:scheduler987}"},
|
msgs := []*TaskMessage{
|
||||||
|
{ID: xid.New(), Type: "type1", Payload: map[string]interface{}{"user_id": 42}},
|
||||||
|
{ID: xid.New(), Type: "type2"},
|
||||||
|
{ID: xid.New(), Type: "type3"},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
// Simulate hearbeater calling SetStatus and SetStarted.
|
||||||
got := SchedulerEntriesKey(tc.schedulerID)
|
wg.Add(1)
|
||||||
if got != tc.want {
|
go func() {
|
||||||
t.Errorf("SchedulerEntriesKey(%q) = %q, want %q", tc.schedulerID, got, tc.want)
|
defer wg.Done()
|
||||||
|
ss.SetStarted(started)
|
||||||
|
ss.SetStatus(StatusRunning)
|
||||||
|
if status := ss.Status(); status != StatusRunning {
|
||||||
|
t.Errorf("(*ServerState).Status() = %v, want %v", status, StatusRunning)
|
||||||
}
|
}
|
||||||
}
|
}()
|
||||||
}
|
|
||||||
|
|
||||||
func TestSchedulerHistoryKey(t *testing.T) {
|
// Simulate processor starting worker goroutines.
|
||||||
tests := []struct {
|
for _, msg := range msgs {
|
||||||
entryID string
|
wg.Add(1)
|
||||||
want string
|
ss.AddWorkerStats(msg, time.Now())
|
||||||
}{
|
go func(msg *TaskMessage) {
|
||||||
{"entry876", "asynq:scheduler_history:entry876"},
|
defer wg.Done()
|
||||||
{"entry345", "asynq:scheduler_history:entry345"},
|
time.Sleep(time.Duration(rand.Intn(500)) * time.Millisecond)
|
||||||
|
ss.DeleteWorkerStats(msg)
|
||||||
|
}(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
// Simulate hearbeater calling Get and GetWorkers
|
||||||
got := SchedulerHistoryKey(tc.entryID)
|
wg.Add(1)
|
||||||
if got != tc.want {
|
go func() {
|
||||||
t.Errorf("SchedulerHistoryKey(%q) = %q, want %q",
|
wg.Done()
|
||||||
tc.entryID, got, tc.want)
|
for i := 0; i < 5; i++ {
|
||||||
|
ss.GetInfo()
|
||||||
|
ss.GetWorkers()
|
||||||
|
time.Sleep(time.Duration(rand.Intn(100)) * time.Millisecond)
|
||||||
}
|
}
|
||||||
}
|
}()
|
||||||
}
|
|
||||||
|
|
||||||
func toBytes(m map[string]interface{}) []byte {
|
wg.Wait()
|
||||||
b, err := json.Marshal(m)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestUniqueKey(t *testing.T) {
|
want := &ServerInfo{
|
||||||
payload1 := toBytes(map[string]interface{}{"a": 123, "b": "hello", "c": true})
|
Host: "127.0.0.1",
|
||||||
payload2 := toBytes(map[string]interface{}{"b": "hello", "c": true, "a": 123})
|
PID: 1234,
|
||||||
payload3 := toBytes(map[string]interface{}{
|
Concurrency: 10,
|
||||||
"address": map[string]string{"line": "123 Main St", "city": "Boston", "state": "MA"},
|
Queues: map[string]int{"default": 1},
|
||||||
"names": []string{"bob", "mike", "rob"}})
|
StrictPriority: false,
|
||||||
payload4 := toBytes(map[string]interface{}{
|
Status: "running",
|
||||||
"time": time.Date(2020, time.July, 28, 0, 0, 0, 0, time.UTC),
|
Started: started,
|
||||||
"duration": time.Hour})
|
ActiveWorkerCount: 0,
|
||||||
|
|
||||||
checksum := func(data []byte) string {
|
|
||||||
sum := md5.Sum(data)
|
|
||||||
return hex.EncodeToString(sum[:])
|
|
||||||
}
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
qname string
|
|
||||||
tasktype string
|
|
||||||
payload []byte
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
"with primitive types",
|
|
||||||
"default",
|
|
||||||
"email:send",
|
|
||||||
payload1,
|
|
||||||
fmt.Sprintf("asynq:{default}:unique:email:send:%s", checksum(payload1)),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"with unsorted keys",
|
|
||||||
"default",
|
|
||||||
"email:send",
|
|
||||||
payload2,
|
|
||||||
fmt.Sprintf("asynq:{default}:unique:email:send:%s", checksum(payload2)),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"with composite types",
|
|
||||||
"default",
|
|
||||||
"email:send",
|
|
||||||
payload3,
|
|
||||||
fmt.Sprintf("asynq:{default}:unique:email:send:%s", checksum(payload3)),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"with complex types",
|
|
||||||
"default",
|
|
||||||
"email:send",
|
|
||||||
payload4,
|
|
||||||
fmt.Sprintf("asynq:{default}:unique:email:send:%s", checksum(payload4)),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"with nil payload",
|
|
||||||
"default",
|
|
||||||
"reindex",
|
|
||||||
nil,
|
|
||||||
"asynq:{default}:unique:reindex:",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
got := ss.GetInfo()
|
||||||
got := UniqueKey(tc.qname, tc.tasktype, tc.payload)
|
if diff := cmp.Diff(want, got, cmpopts.IgnoreFields(ServerInfo{}, "ServerID")); diff != "" {
|
||||||
if got != tc.want {
|
t.Errorf("(*ServerState).GetInfo() = %+v, want %+v; (-want,+got)\n%s",
|
||||||
t.Errorf("%s: UniqueKey(%q, %q, %v) = %q, want %q", tc.desc, tc.qname, tc.tasktype, tc.payload, got, tc.want)
|
got, want, diff)
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGroupKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
gkey string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
qname: "default",
|
|
||||||
gkey: "mygroup",
|
|
||||||
want: "asynq:{default}:g:mygroup",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
qname: "custom",
|
|
||||||
gkey: "foo",
|
|
||||||
want: "asynq:{custom}:g:foo",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := GroupKey(tc.qname, tc.gkey)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("GroupKey(%q, %q) = %q, want %q", tc.qname, tc.gkey, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestAggregationSetKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
gname string
|
|
||||||
setID string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
qname: "default",
|
|
||||||
gname: "mygroup",
|
|
||||||
setID: "12345",
|
|
||||||
want: "asynq:{default}:g:mygroup:12345",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
qname: "custom",
|
|
||||||
gname: "foo",
|
|
||||||
setID: "98765",
|
|
||||||
want: "asynq:{custom}:g:foo:98765",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := AggregationSetKey(tc.qname, tc.gname, tc.setID)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("AggregationSetKey(%q, %q, %q) = %q, want %q", tc.qname, tc.gname, tc.setID, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestAllGroups(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
qname: "default",
|
|
||||||
want: "asynq:{default}:groups",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
qname: "custom",
|
|
||||||
want: "asynq:{custom}:groups",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := AllGroups(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("AllGroups(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestAllAggregationSets(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
qname string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
qname: "default",
|
|
||||||
want: "asynq:{default}:aggregation_sets",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
qname: "custom",
|
|
||||||
want: "asynq:{custom}:aggregation_sets",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := AllAggregationSets(tc.qname)
|
|
||||||
if got != tc.want {
|
|
||||||
t.Errorf("AllAggregationSets(%q) = %q, want %q", tc.qname, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestMessageEncoding(t *testing.T) {
|
|
||||||
id := uuid.NewString()
|
|
||||||
tests := []struct {
|
|
||||||
in *TaskMessage
|
|
||||||
out *TaskMessage
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
in: &TaskMessage{
|
|
||||||
Type: "task1",
|
|
||||||
Payload: toBytes(map[string]interface{}{"a": 1, "b": "hello!", "c": true}),
|
|
||||||
ID: id,
|
|
||||||
Queue: "default",
|
|
||||||
GroupKey: "mygroup",
|
|
||||||
Retry: 10,
|
|
||||||
Retried: 0,
|
|
||||||
Timeout: 1800,
|
|
||||||
Deadline: 1692311100,
|
|
||||||
Retention: 3600,
|
|
||||||
},
|
|
||||||
out: &TaskMessage{
|
|
||||||
Type: "task1",
|
|
||||||
Payload: toBytes(map[string]interface{}{"a": json.Number("1"), "b": "hello!", "c": true}),
|
|
||||||
ID: id,
|
|
||||||
Queue: "default",
|
|
||||||
GroupKey: "mygroup",
|
|
||||||
Retry: 10,
|
|
||||||
Retried: 0,
|
|
||||||
Timeout: 1800,
|
|
||||||
Deadline: 1692311100,
|
|
||||||
Retention: 3600,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
encoded, err := EncodeMessage(tc.in)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("EncodeMessage(msg) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
decoded, err := DecodeMessage(encoded)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("DecodeMessage(encoded) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(tc.out, decoded); diff != "" {
|
|
||||||
t.Errorf("Decoded message == %+v, want %+v;(-want,+got)\n%s",
|
|
||||||
decoded, tc.out, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestServerInfoEncoding(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
info ServerInfo
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
info: ServerInfo{
|
|
||||||
Host: "127.0.0.1",
|
|
||||||
PID: 9876,
|
|
||||||
ServerID: "abc123",
|
|
||||||
Concurrency: 10,
|
|
||||||
Queues: map[string]int{"default": 1, "critical": 2},
|
|
||||||
StrictPriority: false,
|
|
||||||
Status: "active",
|
|
||||||
Started: time.Now().Add(-3 * time.Hour),
|
|
||||||
ActiveWorkerCount: 8,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
encoded, err := EncodeServerInfo(&tc.info)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("EncodeServerInfo(info) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
decoded, err := DecodeServerInfo(encoded)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("DecodeServerInfo(encoded) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(&tc.info, decoded); diff != "" {
|
|
||||||
t.Errorf("Decoded ServerInfo == %+v, want %+v;(-want,+got)\n%s",
|
|
||||||
decoded, tc.info, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestWorkerInfoEncoding(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
info WorkerInfo
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
info: WorkerInfo{
|
|
||||||
Host: "127.0.0.1",
|
|
||||||
PID: 9876,
|
|
||||||
ServerID: "abc123",
|
|
||||||
ID: uuid.NewString(),
|
|
||||||
Type: "taskA",
|
|
||||||
Payload: toBytes(map[string]interface{}{"foo": "bar"}),
|
|
||||||
Queue: "default",
|
|
||||||
Started: time.Now().Add(-3 * time.Hour),
|
|
||||||
Deadline: time.Now().Add(30 * time.Second),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
encoded, err := EncodeWorkerInfo(&tc.info)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("EncodeWorkerInfo(info) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
decoded, err := DecodeWorkerInfo(encoded)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("DecodeWorkerInfo(encoded) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(&tc.info, decoded); diff != "" {
|
|
||||||
t.Errorf("Decoded WorkerInfo == %+v, want %+v;(-want,+got)\n%s",
|
|
||||||
decoded, tc.info, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSchedulerEntryEncoding(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
entry SchedulerEntry
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
entry: SchedulerEntry{
|
|
||||||
ID: uuid.NewString(),
|
|
||||||
Spec: "* * * * *",
|
|
||||||
Type: "task_A",
|
|
||||||
Payload: toBytes(map[string]interface{}{"foo": "bar"}),
|
|
||||||
Opts: []string{"Queue('email')"},
|
|
||||||
Next: time.Now().Add(30 * time.Second).UTC(),
|
|
||||||
Prev: time.Now().Add(-2 * time.Minute).UTC(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
encoded, err := EncodeSchedulerEntry(&tc.entry)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("EncodeSchedulerEntry(entry) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
decoded, err := DecodeSchedulerEntry(encoded)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("DecodeSchedulerEntry(encoded) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(&tc.entry, decoded); diff != "" {
|
|
||||||
t.Errorf("Decoded SchedulerEntry == %+v, want %+v;(-want,+got)\n%s",
|
|
||||||
decoded, tc.entry, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSchedulerEnqueueEventEncoding(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
event SchedulerEnqueueEvent
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
event: SchedulerEnqueueEvent{
|
|
||||||
TaskID: uuid.NewString(),
|
|
||||||
EnqueuedAt: time.Now().Add(-30 * time.Second).UTC(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
encoded, err := EncodeSchedulerEnqueueEvent(&tc.event)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("EncodeSchedulerEnqueueEvent(event) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
decoded, err := DecodeSchedulerEnqueueEvent(encoded)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("DecodeSchedulerEnqueueEvent(encoded) returned error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(&tc.event, decoded); diff != "" {
|
|
||||||
t.Errorf("Decoded SchedulerEnqueueEvent == %+v, want %+v;(-want,+got)\n%s",
|
|
||||||
decoded, tc.event, diff)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -730,76 +214,9 @@ func TestCancelationsConcurrentAccess(t *testing.T) {
|
|||||||
if ok {
|
if ok {
|
||||||
t.Errorf("(*Cancelations).Get(%q) = _, true, want <nil>, false", key2)
|
t.Errorf("(*Cancelations).Get(%q) = _, true, want <nil>, false", key2)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
func TestLeaseReset(t *testing.T) {
|
funcs := c.GetAll()
|
||||||
now := time.Now()
|
if len(funcs) != 2 {
|
||||||
clock := timeutil.NewSimulatedClock(now)
|
t.Errorf("(*Cancelations).GetAll() returns %d functions, want 2", len(funcs))
|
||||||
|
|
||||||
l := NewLease(now.Add(30 * time.Second))
|
|
||||||
l.Clock = clock
|
|
||||||
|
|
||||||
// Check initial state
|
|
||||||
if !l.IsValid() {
|
|
||||||
t.Errorf("lease should be valid when expiration is set to a future time")
|
|
||||||
}
|
|
||||||
if want := now.Add(30 * time.Second); l.Deadline() != want {
|
|
||||||
t.Errorf("Lease.Deadline() = %v, want %v", l.Deadline(), want)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test Reset
|
|
||||||
if !l.Reset(now.Add(45 * time.Second)) {
|
|
||||||
t.Fatalf("Lease.Reset returned false when extending")
|
|
||||||
}
|
|
||||||
if want := now.Add(45 * time.Second); l.Deadline() != want {
|
|
||||||
t.Errorf("After Reset: Lease.Deadline() = %v, want %v", l.Deadline(), want)
|
|
||||||
}
|
|
||||||
|
|
||||||
clock.AdvanceTime(1 * time.Minute) // simulate lease expiration
|
|
||||||
|
|
||||||
if l.IsValid() {
|
|
||||||
t.Errorf("lease should be invalid after expiration")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset should return false if lease is expired.
|
|
||||||
if l.Reset(time.Now().Add(20 * time.Second)) {
|
|
||||||
t.Errorf("Lease.Reset should return false after expiration")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLeaseNotifyExpiration(t *testing.T) {
|
|
||||||
now := time.Now()
|
|
||||||
clock := timeutil.NewSimulatedClock(now)
|
|
||||||
|
|
||||||
l := NewLease(now.Add(30 * time.Second))
|
|
||||||
l.Clock = clock
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-l.Done():
|
|
||||||
t.Fatalf("Lease.Done() did not block")
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
|
|
||||||
if l.NotifyExpiration() {
|
|
||||||
t.Fatalf("Lease.NotifyExpiration() should return false when lease is still valid")
|
|
||||||
}
|
|
||||||
|
|
||||||
clock.AdvanceTime(1 * time.Minute) // simulate lease expiration
|
|
||||||
|
|
||||||
if l.IsValid() {
|
|
||||||
t.Errorf("Lease should be invalid after expiration")
|
|
||||||
}
|
|
||||||
if !l.NotifyExpiration() {
|
|
||||||
t.Errorf("Lease.NotifyExpiration() return return true after expiration")
|
|
||||||
}
|
|
||||||
if !l.NotifyExpiration() {
|
|
||||||
t.Errorf("It should be leagal to call Lease.NotifyExpiration multiple times")
|
|
||||||
}
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-l.Done():
|
|
||||||
// expected
|
|
||||||
default:
|
|
||||||
t.Errorf("Lease.Done() blocked after call to Lease.NotifyExpiration()")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,87 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package context
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
)
|
|
||||||
|
|
||||||
// A taskMetadata holds task scoped data to put in context.
|
|
||||||
type taskMetadata struct {
|
|
||||||
id string
|
|
||||||
maxRetry int
|
|
||||||
retryCount int
|
|
||||||
qname string
|
|
||||||
}
|
|
||||||
|
|
||||||
// ctxKey type is unexported to prevent collisions with context keys defined in
|
|
||||||
// other packages.
|
|
||||||
type ctxKey int
|
|
||||||
|
|
||||||
// metadataCtxKey is the context key for the task metadata.
|
|
||||||
// Its value of zero is arbitrary.
|
|
||||||
const metadataCtxKey ctxKey = 0
|
|
||||||
|
|
||||||
// New returns a context and cancel function for a given task message.
|
|
||||||
func New(base context.Context, msg *base.TaskMessage, deadline time.Time) (context.Context, context.CancelFunc) {
|
|
||||||
metadata := taskMetadata{
|
|
||||||
id: msg.ID,
|
|
||||||
maxRetry: msg.Retry,
|
|
||||||
retryCount: msg.Retried,
|
|
||||||
qname: msg.Queue,
|
|
||||||
}
|
|
||||||
ctx := context.WithValue(base, metadataCtxKey, metadata)
|
|
||||||
return context.WithDeadline(ctx, deadline)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetTaskID extracts a task ID from a context, if any.
|
|
||||||
//
|
|
||||||
// ID of a task is guaranteed to be unique.
|
|
||||||
// ID of a task doesn't change if the task is being retried.
|
|
||||||
func GetTaskID(ctx context.Context) (id string, ok bool) {
|
|
||||||
metadata, ok := ctx.Value(metadataCtxKey).(taskMetadata)
|
|
||||||
if !ok {
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
return metadata.id, true
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetRetryCount extracts retry count from a context, if any.
|
|
||||||
//
|
|
||||||
// Return value n indicates the number of times associated task has been
|
|
||||||
// retried so far.
|
|
||||||
func GetRetryCount(ctx context.Context) (n int, ok bool) {
|
|
||||||
metadata, ok := ctx.Value(metadataCtxKey).(taskMetadata)
|
|
||||||
if !ok {
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
return metadata.retryCount, true
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetMaxRetry extracts maximum retry from a context, if any.
|
|
||||||
//
|
|
||||||
// Return value n indicates the maximum number of times the associated task
|
|
||||||
// can be retried if ProcessTask returns a non-nil error.
|
|
||||||
func GetMaxRetry(ctx context.Context) (n int, ok bool) {
|
|
||||||
metadata, ok := ctx.Value(metadataCtxKey).(taskMetadata)
|
|
||||||
if !ok {
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
return metadata.maxRetry, true
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetQueueName extracts queue name from a context, if any.
|
|
||||||
//
|
|
||||||
// Return value qname indicates which queue the task was pulled from.
|
|
||||||
func GetQueueName(ctx context.Context) (qname string, ok bool) {
|
|
||||||
metadata, ok := ctx.Value(metadataCtxKey).(taskMetadata)
|
|
||||||
if !ok {
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
return metadata.qname, true
|
|
||||||
}
|
|
@ -1,207 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package context
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
"github.com/google/uuid"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestCreateContextWithFutureDeadline(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
deadline time.Time
|
|
||||||
}{
|
|
||||||
{time.Now().Add(time.Hour)},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
msg := &base.TaskMessage{
|
|
||||||
Type: "something",
|
|
||||||
ID: uuid.NewString(),
|
|
||||||
Payload: nil,
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx, cancel := New(context.Background(), msg, tc.deadline)
|
|
||||||
select {
|
|
||||||
case x := <-ctx.Done():
|
|
||||||
t.Errorf("<-ctx.Done() == %v, want nothing (it should block)", x)
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
|
|
||||||
got, ok := ctx.Deadline()
|
|
||||||
if !ok {
|
|
||||||
t.Errorf("ctx.Deadline() returned false, want deadline to be set")
|
|
||||||
}
|
|
||||||
if !cmp.Equal(tc.deadline, got) {
|
|
||||||
t.Errorf("ctx.Deadline() returned %v, want %v", got, tc.deadline)
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
default:
|
|
||||||
t.Errorf("ctx.Done() blocked, want it to be non-blocking")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCreateContextWithBaseContext(t *testing.T) {
|
|
||||||
type ctxKey string
|
|
||||||
type ctxValue string
|
|
||||||
var key ctxKey = "key"
|
|
||||||
var value ctxValue = "value"
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
baseCtx context.Context
|
|
||||||
validate func(ctx context.Context, t *testing.T) error
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
baseCtx: context.WithValue(context.Background(), key, value),
|
|
||||||
validate: func(ctx context.Context, t *testing.T) error {
|
|
||||||
got, ok := ctx.Value(key).(ctxValue)
|
|
||||||
if !ok {
|
|
||||||
return fmt.Errorf("ctx.Value().(ctxValue) returned false, expected to be true")
|
|
||||||
}
|
|
||||||
if want := value; got != want {
|
|
||||||
return fmt.Errorf("ctx.Value().(ctxValue) returned unknown value (%v), expected to be %s", got, value)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
msg := &base.TaskMessage{
|
|
||||||
Type: "something",
|
|
||||||
ID: uuid.NewString(),
|
|
||||||
Payload: nil,
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx, cancel := New(tc.baseCtx, msg, time.Now().Add(30*time.Minute))
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case x := <-ctx.Done():
|
|
||||||
t.Errorf("<-ctx.Done() == %v, want nothing (it should block)", x)
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tc.validate(ctx, t); err != nil {
|
|
||||||
t.Errorf("%v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCreateContextWithPastDeadline(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
deadline time.Time
|
|
||||||
}{
|
|
||||||
{time.Now().Add(-2 * time.Hour)},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
msg := &base.TaskMessage{
|
|
||||||
Type: "something",
|
|
||||||
ID: uuid.NewString(),
|
|
||||||
Payload: nil,
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx, cancel := New(context.Background(), msg, tc.deadline)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
default:
|
|
||||||
t.Errorf("ctx.Done() blocked, want it to be non-blocking")
|
|
||||||
}
|
|
||||||
|
|
||||||
got, ok := ctx.Deadline()
|
|
||||||
if !ok {
|
|
||||||
t.Errorf("ctx.Deadline() returned false, want deadline to be set")
|
|
||||||
}
|
|
||||||
if !cmp.Equal(tc.deadline, got) {
|
|
||||||
t.Errorf("ctx.Deadline() returned %v, want %v", got, tc.deadline)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetTaskMetadataFromContext(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
msg *base.TaskMessage
|
|
||||||
}{
|
|
||||||
{"with zero retried message", &base.TaskMessage{Type: "something", ID: uuid.NewString(), Retry: 25, Retried: 0, Timeout: 1800, Queue: "default"}},
|
|
||||||
{"with non-zero retried message", &base.TaskMessage{Type: "something", ID: uuid.NewString(), Retry: 10, Retried: 5, Timeout: 1800, Queue: "default"}},
|
|
||||||
{"with custom queue name", &base.TaskMessage{Type: "something", ID: uuid.NewString(), Retry: 25, Retried: 0, Timeout: 1800, Queue: "custom"}},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
ctx, cancel := New(context.Background(), tc.msg, time.Now().Add(30*time.Minute))
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
id, ok := GetTaskID(ctx)
|
|
||||||
if !ok {
|
|
||||||
t.Errorf("%s: GetTaskID(ctx) returned ok == false", tc.desc)
|
|
||||||
}
|
|
||||||
if ok && id != tc.msg.ID {
|
|
||||||
t.Errorf("%s: GetTaskID(ctx) returned id == %q, want %q", tc.desc, id, tc.msg.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
retried, ok := GetRetryCount(ctx)
|
|
||||||
if !ok {
|
|
||||||
t.Errorf("%s: GetRetryCount(ctx) returned ok == false", tc.desc)
|
|
||||||
}
|
|
||||||
if ok && retried != tc.msg.Retried {
|
|
||||||
t.Errorf("%s: GetRetryCount(ctx) returned n == %d want %d", tc.desc, retried, tc.msg.Retried)
|
|
||||||
}
|
|
||||||
|
|
||||||
maxRetry, ok := GetMaxRetry(ctx)
|
|
||||||
if !ok {
|
|
||||||
t.Errorf("%s: GetMaxRetry(ctx) returned ok == false", tc.desc)
|
|
||||||
}
|
|
||||||
if ok && maxRetry != tc.msg.Retry {
|
|
||||||
t.Errorf("%s: GetMaxRetry(ctx) returned n == %d want %d", tc.desc, maxRetry, tc.msg.Retry)
|
|
||||||
}
|
|
||||||
|
|
||||||
qname, ok := GetQueueName(ctx)
|
|
||||||
if !ok {
|
|
||||||
t.Errorf("%s: GetQueueName(ctx) returned ok == false", tc.desc)
|
|
||||||
}
|
|
||||||
if ok && qname != tc.msg.Queue {
|
|
||||||
t.Errorf("%s: GetQueueName(ctx) returned qname == %q, want %q", tc.desc, qname, tc.msg.Queue)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetTaskMetadataFromContextError(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
ctx context.Context
|
|
||||||
}{
|
|
||||||
{"with background context", context.Background()},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
if _, ok := GetTaskID(tc.ctx); ok {
|
|
||||||
t.Errorf("%s: GetTaskID(ctx) returned ok == true", tc.desc)
|
|
||||||
}
|
|
||||||
if _, ok := GetRetryCount(tc.ctx); ok {
|
|
||||||
t.Errorf("%s: GetRetryCount(ctx) returned ok == true", tc.desc)
|
|
||||||
}
|
|
||||||
if _, ok := GetMaxRetry(tc.ctx); ok {
|
|
||||||
t.Errorf("%s: GetMaxRetry(ctx) returned ok == true", tc.desc)
|
|
||||||
}
|
|
||||||
if _, ok := GetQueueName(tc.ctx); ok {
|
|
||||||
t.Errorf("%s: GetQueueName(ctx) returned ok == true", tc.desc)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,303 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
// Package errors defines the error type and functions used by
|
|
||||||
// asynq and its internal packages.
|
|
||||||
package errors
|
|
||||||
|
|
||||||
// Note: This package is inspired by a blog post about error handling in project Upspin
|
|
||||||
// https://commandcenter.blogspot.com/2017/12/error-handling-in-upspin.html.
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"log"
|
|
||||||
"runtime"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Error is the type that implements the error interface.
|
|
||||||
// It contains a number of fields, each of different type.
|
|
||||||
// An Error value may leave some values unset.
|
|
||||||
type Error struct {
|
|
||||||
Code Code
|
|
||||||
Op Op
|
|
||||||
Err error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *Error) DebugString() string {
|
|
||||||
var b strings.Builder
|
|
||||||
if e.Op != "" {
|
|
||||||
b.WriteString(string(e.Op))
|
|
||||||
}
|
|
||||||
if e.Code != Unspecified {
|
|
||||||
if b.Len() > 0 {
|
|
||||||
b.WriteString(": ")
|
|
||||||
}
|
|
||||||
b.WriteString(e.Code.String())
|
|
||||||
}
|
|
||||||
if e.Err != nil {
|
|
||||||
if b.Len() > 0 {
|
|
||||||
b.WriteString(": ")
|
|
||||||
}
|
|
||||||
b.WriteString(e.Err.Error())
|
|
||||||
}
|
|
||||||
return b.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *Error) Error() string {
|
|
||||||
var b strings.Builder
|
|
||||||
if e.Code != Unspecified {
|
|
||||||
b.WriteString(e.Code.String())
|
|
||||||
}
|
|
||||||
if e.Err != nil {
|
|
||||||
if b.Len() > 0 {
|
|
||||||
b.WriteString(": ")
|
|
||||||
}
|
|
||||||
b.WriteString(e.Err.Error())
|
|
||||||
}
|
|
||||||
return b.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *Error) Unwrap() error {
|
|
||||||
return e.Err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Code defines the canonical error code.
|
|
||||||
type Code uint8
|
|
||||||
|
|
||||||
// List of canonical error codes.
|
|
||||||
const (
|
|
||||||
Unspecified Code = iota
|
|
||||||
NotFound
|
|
||||||
FailedPrecondition
|
|
||||||
Internal
|
|
||||||
AlreadyExists
|
|
||||||
Unknown
|
|
||||||
// Note: If you add a new value here, make sure to update String method.
|
|
||||||
)
|
|
||||||
|
|
||||||
func (c Code) String() string {
|
|
||||||
switch c {
|
|
||||||
case Unspecified:
|
|
||||||
return "ERROR_CODE_UNSPECIFIED"
|
|
||||||
case NotFound:
|
|
||||||
return "NOT_FOUND"
|
|
||||||
case FailedPrecondition:
|
|
||||||
return "FAILED_PRECONDITION"
|
|
||||||
case Internal:
|
|
||||||
return "INTERNAL_ERROR"
|
|
||||||
case AlreadyExists:
|
|
||||||
return "ALREADY_EXISTS"
|
|
||||||
case Unknown:
|
|
||||||
return "UNKNOWN"
|
|
||||||
}
|
|
||||||
panic(fmt.Sprintf("unknown error code %d", c))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Op describes an operation, usually as the package and method,
|
|
||||||
// such as "rdb.Enqueue".
|
|
||||||
type Op string
|
|
||||||
|
|
||||||
// E builds an error value from its arguments.
|
|
||||||
// There must be at least one argument or E panics.
|
|
||||||
// The type of each argument determines its meaning.
|
|
||||||
// If more than one argument of a given type is presented,
|
|
||||||
// only the last one is recorded.
|
|
||||||
//
|
|
||||||
// The types are:
|
|
||||||
// errors.Op
|
|
||||||
// The operation being performed, usually the method
|
|
||||||
// being invoked (Get, Put, etc.).
|
|
||||||
// errors.Code
|
|
||||||
// The canonical error code, such as NOT_FOUND.
|
|
||||||
// string
|
|
||||||
// Treated as an error message and assigned to the
|
|
||||||
// Err field after a call to errors.New.
|
|
||||||
// error
|
|
||||||
// The underlying error that triggered this one.
|
|
||||||
//
|
|
||||||
// If the error is printed, only those items that have been
|
|
||||||
// set to non-zero values will appear in the result.
|
|
||||||
func E(args ...interface{}) error {
|
|
||||||
if len(args) == 0 {
|
|
||||||
panic("call to errors.E with no arguments")
|
|
||||||
}
|
|
||||||
e := &Error{}
|
|
||||||
for _, arg := range args {
|
|
||||||
switch arg := arg.(type) {
|
|
||||||
case Op:
|
|
||||||
e.Op = arg
|
|
||||||
case Code:
|
|
||||||
e.Code = arg
|
|
||||||
case error:
|
|
||||||
e.Err = arg
|
|
||||||
case string:
|
|
||||||
e.Err = errors.New(arg)
|
|
||||||
default:
|
|
||||||
_, file, line, _ := runtime.Caller(1)
|
|
||||||
log.Printf("errors.E: bad call from %s:%d: %v", file, line, args)
|
|
||||||
return fmt.Errorf("unknown type %T, value %v in error call", arg, arg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return e
|
|
||||||
}
|
|
||||||
|
|
||||||
// CanonicalCode returns the canonical code of the given error if one is present.
|
|
||||||
// Otherwise it returns Unspecified.
|
|
||||||
func CanonicalCode(err error) Code {
|
|
||||||
if err == nil {
|
|
||||||
return Unspecified
|
|
||||||
}
|
|
||||||
e, ok := err.(*Error)
|
|
||||||
if !ok {
|
|
||||||
return Unspecified
|
|
||||||
}
|
|
||||||
if e.Code == Unspecified {
|
|
||||||
return CanonicalCode(e.Err)
|
|
||||||
}
|
|
||||||
return e.Code
|
|
||||||
}
|
|
||||||
|
|
||||||
/******************************************
|
|
||||||
Domain Specific Error Types & Values
|
|
||||||
*******************************************/
|
|
||||||
|
|
||||||
var (
|
|
||||||
// ErrNoProcessableTask indicates that there are no tasks ready to be processed.
|
|
||||||
ErrNoProcessableTask = errors.New("no tasks are ready for processing")
|
|
||||||
|
|
||||||
// ErrDuplicateTask indicates that another task with the same unique key holds the uniqueness lock.
|
|
||||||
ErrDuplicateTask = errors.New("task already exists")
|
|
||||||
|
|
||||||
// ErrTaskIdConflict indicates that another task with the same task ID already exist
|
|
||||||
ErrTaskIdConflict = errors.New("task id conflicts with another task")
|
|
||||||
)
|
|
||||||
|
|
||||||
// TaskNotFoundError indicates that a task with the given ID does not exist
|
|
||||||
// in the given queue.
|
|
||||||
type TaskNotFoundError struct {
|
|
||||||
Queue string // queue name
|
|
||||||
ID string // task id
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *TaskNotFoundError) Error() string {
|
|
||||||
return fmt.Sprintf("cannot find task with id=%s in queue %q", e.ID, e.Queue)
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsTaskNotFound reports whether any error in err's chain is of type TaskNotFoundError.
|
|
||||||
func IsTaskNotFound(err error) bool {
|
|
||||||
var target *TaskNotFoundError
|
|
||||||
return As(err, &target)
|
|
||||||
}
|
|
||||||
|
|
||||||
// QueueNotFoundError indicates that a queue with the given name does not exist.
|
|
||||||
type QueueNotFoundError struct {
|
|
||||||
Queue string // queue name
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *QueueNotFoundError) Error() string {
|
|
||||||
return fmt.Sprintf("queue %q does not exist", e.Queue)
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsQueueNotFound reports whether any error in err's chain is of type QueueNotFoundError.
|
|
||||||
func IsQueueNotFound(err error) bool {
|
|
||||||
var target *QueueNotFoundError
|
|
||||||
return As(err, &target)
|
|
||||||
}
|
|
||||||
|
|
||||||
// QueueNotEmptyError indicates that the given queue is not empty.
|
|
||||||
type QueueNotEmptyError struct {
|
|
||||||
Queue string // queue name
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *QueueNotEmptyError) Error() string {
|
|
||||||
return fmt.Sprintf("queue %q is not empty", e.Queue)
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsQueueNotEmpty reports whether any error in err's chain is of type QueueNotEmptyError.
|
|
||||||
func IsQueueNotEmpty(err error) bool {
|
|
||||||
var target *QueueNotEmptyError
|
|
||||||
return As(err, &target)
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskAlreadyArchivedError indicates that the task in question is already archived.
|
|
||||||
type TaskAlreadyArchivedError struct {
|
|
||||||
Queue string // queue name
|
|
||||||
ID string // task id
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *TaskAlreadyArchivedError) Error() string {
|
|
||||||
return fmt.Sprintf("task is already archived: id=%s, queue=%s", e.ID, e.Queue)
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsTaskAlreadyArchived reports whether any error in err's chain is of type TaskAlreadyArchivedError.
|
|
||||||
func IsTaskAlreadyArchived(err error) bool {
|
|
||||||
var target *TaskAlreadyArchivedError
|
|
||||||
return As(err, &target)
|
|
||||||
}
|
|
||||||
|
|
||||||
// RedisCommandError indicates that the given redis command returned error.
|
|
||||||
type RedisCommandError struct {
|
|
||||||
Command string // redis command (e.g. LRANGE, ZADD, etc)
|
|
||||||
Err error // underlying error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *RedisCommandError) Error() string {
|
|
||||||
return fmt.Sprintf("redis command error: %s failed: %v", strings.ToUpper(e.Command), e.Err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *RedisCommandError) Unwrap() error { return e.Err }
|
|
||||||
|
|
||||||
// IsRedisCommandError reports whether any error in err's chain is of type RedisCommandError.
|
|
||||||
func IsRedisCommandError(err error) bool {
|
|
||||||
var target *RedisCommandError
|
|
||||||
return As(err, &target)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PanicError defines an error when occurred a panic error.
|
|
||||||
type PanicError struct {
|
|
||||||
ErrMsg string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *PanicError) Error() string {
|
|
||||||
return fmt.Sprintf("panic error cause by: %s", e.ErrMsg)
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsPanicError reports whether any error in err's chain is of type PanicError.
|
|
||||||
func IsPanicError(err error) bool {
|
|
||||||
var target *PanicError
|
|
||||||
return As(err, &target)
|
|
||||||
}
|
|
||||||
|
|
||||||
/*************************************************
|
|
||||||
Standard Library errors package functions
|
|
||||||
*************************************************/
|
|
||||||
|
|
||||||
// New returns an error that formats as the given text.
|
|
||||||
// Each call to New returns a distinct error value even if the text is identical.
|
|
||||||
//
|
|
||||||
// This function is the errors.New function from the standard library (https://golang.org/pkg/errors/#New).
|
|
||||||
// It is exported from this package for import convenience.
|
|
||||||
func New(text string) error { return errors.New(text) }
|
|
||||||
|
|
||||||
// Is reports whether any error in err's chain matches target.
|
|
||||||
//
|
|
||||||
// This function is the errors.Is function from the standard library (https://golang.org/pkg/errors/#Is).
|
|
||||||
// It is exported from this package for import convenience.
|
|
||||||
func Is(err, target error) bool { return errors.Is(err, target) }
|
|
||||||
|
|
||||||
// As finds the first error in err's chain that matches target, and if so, sets target to that error value and returns true.
|
|
||||||
// Otherwise, it returns false.
|
|
||||||
//
|
|
||||||
// This function is the errors.As function from the standard library (https://golang.org/pkg/errors/#As).
|
|
||||||
// It is exported from this package for import convenience.
|
|
||||||
func As(err error, target interface{}) bool { return errors.As(err, target) }
|
|
||||||
|
|
||||||
// Unwrap returns the result of calling the Unwrap method on err, if err's type contains an Unwrap method returning error.
|
|
||||||
// Otherwise, Unwrap returns nil.
|
|
||||||
//
|
|
||||||
// This function is the errors.Unwrap function from the standard library (https://golang.org/pkg/errors/#Unwrap).
|
|
||||||
// It is exported from this package for import convenience.
|
|
||||||
func Unwrap(err error) error { return errors.Unwrap(err) }
|
|
@ -1,182 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package errors
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func TestErrorDebugString(t *testing.T) {
|
|
||||||
// DebugString should include Op since its meant to be used by
|
|
||||||
// maintainers/contributors of the asynq package.
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
err error
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "With Op, Code, and string",
|
|
||||||
err: E(Op("rdb.DeleteTask"), NotFound, "cannot find task with id=123"),
|
|
||||||
want: "rdb.DeleteTask: NOT_FOUND: cannot find task with id=123",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "With Op, Code and error",
|
|
||||||
err: E(Op("rdb.DeleteTask"), NotFound, &TaskNotFoundError{Queue: "default", ID: "123"}),
|
|
||||||
want: `rdb.DeleteTask: NOT_FOUND: cannot find task with id=123 in queue "default"`,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
if got := tc.err.(*Error).DebugString(); got != tc.want {
|
|
||||||
t.Errorf("%s: got=%q, want=%q", tc.desc, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestErrorString(t *testing.T) {
|
|
||||||
// String method should omit Op since op is an internal detail
|
|
||||||
// and we don't want to provide it to users of the package.
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
err error
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "With Op, Code, and string",
|
|
||||||
err: E(Op("rdb.DeleteTask"), NotFound, "cannot find task with id=123"),
|
|
||||||
want: "NOT_FOUND: cannot find task with id=123",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "With Op, Code and error",
|
|
||||||
err: E(Op("rdb.DeleteTask"), NotFound, &TaskNotFoundError{Queue: "default", ID: "123"}),
|
|
||||||
want: `NOT_FOUND: cannot find task with id=123 in queue "default"`,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
if got := tc.err.Error(); got != tc.want {
|
|
||||||
t.Errorf("%s: got=%q, want=%q", tc.desc, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestErrorIs(t *testing.T) {
|
|
||||||
var ErrCustom = New("custom sentinel error")
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
err error
|
|
||||||
target error
|
|
||||||
want bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "should unwrap one level",
|
|
||||||
err: E(Op("rdb.DeleteTask"), ErrCustom),
|
|
||||||
target: ErrCustom,
|
|
||||||
want: true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
if got := Is(tc.err, tc.target); got != tc.want {
|
|
||||||
t.Errorf("%s: got=%t, want=%t", tc.desc, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestErrorAs(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
err error
|
|
||||||
target interface{}
|
|
||||||
want bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "should unwrap one level",
|
|
||||||
err: E(Op("rdb.DeleteTask"), NotFound, &QueueNotFoundError{Queue: "email"}),
|
|
||||||
target: &QueueNotFoundError{},
|
|
||||||
want: true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
if got := As(tc.err, &tc.target); got != tc.want {
|
|
||||||
t.Errorf("%s: got=%t, want=%t", tc.desc, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestErrorPredicates(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
fn func(err error) bool
|
|
||||||
err error
|
|
||||||
want bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "IsTaskNotFound should detect presence of TaskNotFoundError in err's chain",
|
|
||||||
fn: IsTaskNotFound,
|
|
||||||
err: E(Op("rdb.ArchiveTask"), NotFound, &TaskNotFoundError{Queue: "default", ID: "9876"}),
|
|
||||||
want: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "IsTaskNotFound should detect absence of TaskNotFoundError in err's chain",
|
|
||||||
fn: IsTaskNotFound,
|
|
||||||
err: E(Op("rdb.ArchiveTask"), NotFound, &QueueNotFoundError{Queue: "default"}),
|
|
||||||
want: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "IsQueueNotFound should detect presence of QueueNotFoundError in err's chain",
|
|
||||||
fn: IsQueueNotFound,
|
|
||||||
err: E(Op("rdb.ArchiveTask"), NotFound, &QueueNotFoundError{Queue: "default"}),
|
|
||||||
want: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "IsPanicError should detect presence of PanicError in err's chain",
|
|
||||||
fn: IsPanicError,
|
|
||||||
err: E(Op("unknown"), Unknown, &PanicError{ErrMsg: "Something went wrong"}),
|
|
||||||
want: true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
if got := tc.fn(tc.err); got != tc.want {
|
|
||||||
t.Errorf("%s: got=%t, want=%t", tc.desc, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCanonicalCode(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
err error
|
|
||||||
want Code
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "without nesting",
|
|
||||||
err: E(Op("rdb.DeleteTask"), NotFound, &TaskNotFoundError{Queue: "default", ID: "123"}),
|
|
||||||
want: NotFound,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with nesting",
|
|
||||||
err: E(FailedPrecondition, E(NotFound)),
|
|
||||||
want: FailedPrecondition,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "returns Unspecified if err is not *Error",
|
|
||||||
err: New("some other error"),
|
|
||||||
want: Unspecified,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "returns Unspecified if err is nil",
|
|
||||||
err: nil,
|
|
||||||
want: Unspecified,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
if got := CanonicalCode(tc.err); got != tc.want {
|
|
||||||
t.Errorf("%s: got=%s, want=%s", tc.desc, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -6,210 +6,52 @@
|
|||||||
package log
|
package log
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"io"
|
"io"
|
||||||
stdlog "log"
|
stdlog "log"
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Base supports logging at various log levels.
|
// NewLogger creates and returns a new instance of Logger.
|
||||||
type Base interface {
|
func NewLogger(out io.Writer) *Logger {
|
||||||
// Debug logs a message at Debug level.
|
return &Logger{
|
||||||
Debug(args ...interface{})
|
stdlog.New(out, "", stdlog.Ldate|stdlog.Ltime|stdlog.Lmicroseconds|stdlog.LUTC),
|
||||||
|
}
|
||||||
// Info logs a message at Info level.
|
|
||||||
Info(args ...interface{})
|
|
||||||
|
|
||||||
// Warn logs a message at Warning level.
|
|
||||||
Warn(args ...interface{})
|
|
||||||
|
|
||||||
// Error logs a message at Error level.
|
|
||||||
Error(args ...interface{})
|
|
||||||
|
|
||||||
// Fatal logs a message at Fatal level
|
|
||||||
// and process will exit with status set to 1.
|
|
||||||
Fatal(args ...interface{})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// baseLogger is a wrapper object around log.Logger from the standard library.
|
// Logger is a wrapper object around log.Logger from the standard library.
|
||||||
// It supports logging at various log levels.
|
// It supports logging at various log levels.
|
||||||
type baseLogger struct {
|
type Logger struct {
|
||||||
*stdlog.Logger
|
*stdlog.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
// Debug logs a message at Debug level.
|
// Debug logs a message at Debug level.
|
||||||
func (l *baseLogger) Debug(args ...interface{}) {
|
func (l *Logger) Debug(format string, args ...interface{}) {
|
||||||
l.prefixPrint("DEBUG: ", args...)
|
format = "DEBUG: " + format
|
||||||
|
l.Printf(format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Info logs a message at Info level.
|
// Info logs a message at Info level.
|
||||||
func (l *baseLogger) Info(args ...interface{}) {
|
func (l *Logger) Info(format string, args ...interface{}) {
|
||||||
l.prefixPrint("INFO: ", args...)
|
format = "INFO: " + format
|
||||||
|
l.Printf(format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Warn logs a message at Warning level.
|
// Warn logs a message at Warning level.
|
||||||
func (l *baseLogger) Warn(args ...interface{}) {
|
func (l *Logger) Warn(format string, args ...interface{}) {
|
||||||
l.prefixPrint("WARN: ", args...)
|
format = "WARN: " + format
|
||||||
|
l.Printf(format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Error logs a message at Error level.
|
// Error logs a message at Error level.
|
||||||
func (l *baseLogger) Error(args ...interface{}) {
|
func (l *Logger) Error(format string, args ...interface{}) {
|
||||||
l.prefixPrint("ERROR: ", args...)
|
format = "ERROR: " + format
|
||||||
|
l.Printf(format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fatal logs a message at Fatal level
|
// Fatal logs a message at Fatal level
|
||||||
// and process will exit with status set to 1.
|
// and process will exit with status set to 1.
|
||||||
func (l *baseLogger) Fatal(args ...interface{}) {
|
func (l *Logger) Fatal(format string, args ...interface{}) {
|
||||||
l.prefixPrint("FATAL: ", args...)
|
format = "FATAL: " + format
|
||||||
|
l.Printf(format, args...)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *baseLogger) prefixPrint(prefix string, args ...interface{}) {
|
|
||||||
args = append([]interface{}{prefix}, args...)
|
|
||||||
l.Print(args...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// newBase creates and returns a new instance of baseLogger.
|
|
||||||
func newBase(out io.Writer) *baseLogger {
|
|
||||||
prefix := fmt.Sprintf("asynq: pid=%d ", os.Getpid())
|
|
||||||
return &baseLogger{
|
|
||||||
stdlog.New(out, prefix, stdlog.Ldate|stdlog.Ltime|stdlog.Lmicroseconds|stdlog.LUTC),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewLogger creates and returns a new instance of Logger.
|
|
||||||
// Log level is set to DebugLevel by default.
|
|
||||||
func NewLogger(base Base) *Logger {
|
|
||||||
if base == nil {
|
|
||||||
base = newBase(os.Stderr)
|
|
||||||
}
|
|
||||||
return &Logger{base: base, level: DebugLevel}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Logger logs message to io.Writer at various log levels.
|
|
||||||
type Logger struct {
|
|
||||||
base Base
|
|
||||||
|
|
||||||
mu sync.Mutex
|
|
||||||
// Minimum log level for this logger.
|
|
||||||
// Message with level lower than this level won't be outputted.
|
|
||||||
level Level
|
|
||||||
}
|
|
||||||
|
|
||||||
// Level represents a log level.
|
|
||||||
type Level int32
|
|
||||||
|
|
||||||
const (
|
|
||||||
// DebugLevel is the lowest level of logging.
|
|
||||||
// Debug logs are intended for debugging and development purposes.
|
|
||||||
DebugLevel Level = iota
|
|
||||||
|
|
||||||
// InfoLevel is used for general informational log messages.
|
|
||||||
InfoLevel
|
|
||||||
|
|
||||||
// WarnLevel is used for undesired but relatively expected events,
|
|
||||||
// which may indicate a problem.
|
|
||||||
WarnLevel
|
|
||||||
|
|
||||||
// ErrorLevel is used for undesired and unexpected events that
|
|
||||||
// the program can recover from.
|
|
||||||
ErrorLevel
|
|
||||||
|
|
||||||
// FatalLevel is used for undesired and unexpected events that
|
|
||||||
// the program cannot recover from.
|
|
||||||
FatalLevel
|
|
||||||
)
|
|
||||||
|
|
||||||
// String is part of the fmt.Stringer interface.
|
|
||||||
//
|
|
||||||
// Used for testing and debugging purposes.
|
|
||||||
func (l Level) String() string {
|
|
||||||
switch l {
|
|
||||||
case DebugLevel:
|
|
||||||
return "debug"
|
|
||||||
case InfoLevel:
|
|
||||||
return "info"
|
|
||||||
case WarnLevel:
|
|
||||||
return "warning"
|
|
||||||
case ErrorLevel:
|
|
||||||
return "error"
|
|
||||||
case FatalLevel:
|
|
||||||
return "fatal"
|
|
||||||
default:
|
|
||||||
return "unknown"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// canLogAt reports whether logger can log at level v.
|
|
||||||
func (l *Logger) canLogAt(v Level) bool {
|
|
||||||
l.mu.Lock()
|
|
||||||
defer l.mu.Unlock()
|
|
||||||
return v >= l.level
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Debug(args ...interface{}) {
|
|
||||||
if !l.canLogAt(DebugLevel) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
l.base.Debug(args...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Info(args ...interface{}) {
|
|
||||||
if !l.canLogAt(InfoLevel) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
l.base.Info(args...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Warn(args ...interface{}) {
|
|
||||||
if !l.canLogAt(WarnLevel) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
l.base.Warn(args...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Error(args ...interface{}) {
|
|
||||||
if !l.canLogAt(ErrorLevel) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
l.base.Error(args...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Fatal(args ...interface{}) {
|
|
||||||
if !l.canLogAt(FatalLevel) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
l.base.Fatal(args...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Debugf(format string, args ...interface{}) {
|
|
||||||
l.Debug(fmt.Sprintf(format, args...))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Infof(format string, args ...interface{}) {
|
|
||||||
l.Info(fmt.Sprintf(format, args...))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Warnf(format string, args ...interface{}) {
|
|
||||||
l.Warn(fmt.Sprintf(format, args...))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Errorf(format string, args ...interface{}) {
|
|
||||||
l.Error(fmt.Sprintf(format, args...))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *Logger) Fatalf(format string, args ...interface{}) {
|
|
||||||
l.Fatal(fmt.Sprintf(format, args...))
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetLevel sets the logger level.
|
|
||||||
// It panics if v is less than DebugLevel or greater than FatalLevel.
|
|
||||||
func (l *Logger) SetLevel(v Level) {
|
|
||||||
l.mu.Lock()
|
|
||||||
defer l.mu.Unlock()
|
|
||||||
if v < DebugLevel || v > FatalLevel {
|
|
||||||
panic("log: invalid log level")
|
|
||||||
}
|
|
||||||
l.level = v
|
|
||||||
}
|
|
||||||
|
@ -13,7 +13,6 @@ import (
|
|||||||
|
|
||||||
// regexp for timestamps
|
// regexp for timestamps
|
||||||
const (
|
const (
|
||||||
rgxPID = `[0-9]+`
|
|
||||||
rgxdate = `[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]`
|
rgxdate = `[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]`
|
||||||
rgxtime = `[0-9][0-9]:[0-9][0-9]:[0-9][0-9]`
|
rgxtime = `[0-9][0-9]:[0-9][0-9]:[0-9][0-9]`
|
||||||
rgxmicroseconds = `\.[0-9][0-9][0-9][0-9][0-9][0-9]`
|
rgxmicroseconds = `\.[0-9][0-9][0-9][0-9][0-9][0-9]`
|
||||||
@ -28,22 +27,20 @@ type tester struct {
|
|||||||
func TestLoggerDebug(t *testing.T) {
|
func TestLoggerDebug(t *testing.T) {
|
||||||
tests := []tester{
|
tests := []tester{
|
||||||
{
|
{
|
||||||
desc: "without trailing newline, logger adds newline",
|
desc: "without trailing newline, logger adds newline",
|
||||||
message: "hello, world!",
|
message: "hello, world!",
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s DEBUG: hello, world!\n$",
|
wantPattern: fmt.Sprintf("^%s %s%s DEBUG: hello, world!\n$", rgxdate, rgxtime, rgxmicroseconds),
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
desc: "with trailing newline, logger preserves newline",
|
desc: "with trailing newline, logger preserves newline",
|
||||||
message: "hello, world!\n",
|
message: "hello, world!\n",
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s DEBUG: hello, world!\n$",
|
wantPattern: fmt.Sprintf("^%s %s%s DEBUG: hello, world!\n$", rgxdate, rgxtime, rgxmicroseconds),
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
logger := NewLogger(newBase(&buf))
|
logger := NewLogger(&buf)
|
||||||
|
|
||||||
logger.Debug(tc.message)
|
logger.Debug(tc.message)
|
||||||
|
|
||||||
@ -53,7 +50,7 @@ func TestLoggerDebug(t *testing.T) {
|
|||||||
t.Fatal("pattern did not compile:", err)
|
t.Fatal("pattern did not compile:", err)
|
||||||
}
|
}
|
||||||
if !matched {
|
if !matched {
|
||||||
t.Errorf("logger.Debug(%q) outputted %q, should match pattern %q",
|
t.Errorf("logger.info(%q) outputted %q, should match pattern %q",
|
||||||
tc.message, got, tc.wantPattern)
|
tc.message, got, tc.wantPattern)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -62,22 +59,20 @@ func TestLoggerDebug(t *testing.T) {
|
|||||||
func TestLoggerInfo(t *testing.T) {
|
func TestLoggerInfo(t *testing.T) {
|
||||||
tests := []tester{
|
tests := []tester{
|
||||||
{
|
{
|
||||||
desc: "without trailing newline, logger adds newline",
|
desc: "without trailing newline, logger adds newline",
|
||||||
message: "hello, world!",
|
message: "hello, world!",
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s INFO: hello, world!\n$",
|
wantPattern: fmt.Sprintf("^%s %s%s INFO: hello, world!\n$", rgxdate, rgxtime, rgxmicroseconds),
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
desc: "with trailing newline, logger preserves newline",
|
desc: "with trailing newline, logger preserves newline",
|
||||||
message: "hello, world!\n",
|
message: "hello, world!\n",
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s INFO: hello, world!\n$",
|
wantPattern: fmt.Sprintf("^%s %s%s INFO: hello, world!\n$", rgxdate, rgxtime, rgxmicroseconds),
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
logger := NewLogger(newBase(&buf))
|
logger := NewLogger(&buf)
|
||||||
|
|
||||||
logger.Info(tc.message)
|
logger.Info(tc.message)
|
||||||
|
|
||||||
@ -87,7 +82,7 @@ func TestLoggerInfo(t *testing.T) {
|
|||||||
t.Fatal("pattern did not compile:", err)
|
t.Fatal("pattern did not compile:", err)
|
||||||
}
|
}
|
||||||
if !matched {
|
if !matched {
|
||||||
t.Errorf("logger.Info(%q) outputted %q, should match pattern %q",
|
t.Errorf("logger.info(%q) outputted %q, should match pattern %q",
|
||||||
tc.message, got, tc.wantPattern)
|
tc.message, got, tc.wantPattern)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -96,22 +91,20 @@ func TestLoggerInfo(t *testing.T) {
|
|||||||
func TestLoggerWarn(t *testing.T) {
|
func TestLoggerWarn(t *testing.T) {
|
||||||
tests := []tester{
|
tests := []tester{
|
||||||
{
|
{
|
||||||
desc: "without trailing newline, logger adds newline",
|
desc: "without trailing newline, logger adds newline",
|
||||||
message: "hello, world!",
|
message: "hello, world!",
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s WARN: hello, world!\n$",
|
wantPattern: fmt.Sprintf("^%s %s%s WARN: hello, world!\n$", rgxdate, rgxtime, rgxmicroseconds),
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
desc: "with trailing newline, logger preserves newline",
|
desc: "with trailing newline, logger preserves newline",
|
||||||
message: "hello, world!\n",
|
message: "hello, world!\n",
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s WARN: hello, world!\n$",
|
wantPattern: fmt.Sprintf("^%s %s%s WARN: hello, world!\n$", rgxdate, rgxtime, rgxmicroseconds),
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
logger := NewLogger(newBase(&buf))
|
logger := NewLogger(&buf)
|
||||||
|
|
||||||
logger.Warn(tc.message)
|
logger.Warn(tc.message)
|
||||||
|
|
||||||
@ -121,7 +114,7 @@ func TestLoggerWarn(t *testing.T) {
|
|||||||
t.Fatal("pattern did not compile:", err)
|
t.Fatal("pattern did not compile:", err)
|
||||||
}
|
}
|
||||||
if !matched {
|
if !matched {
|
||||||
t.Errorf("logger.Warn(%q) outputted %q, should match pattern %q",
|
t.Errorf("logger.info(%q) outputted %q, should match pattern %q",
|
||||||
tc.message, got, tc.wantPattern)
|
tc.message, got, tc.wantPattern)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -130,22 +123,20 @@ func TestLoggerWarn(t *testing.T) {
|
|||||||
func TestLoggerError(t *testing.T) {
|
func TestLoggerError(t *testing.T) {
|
||||||
tests := []tester{
|
tests := []tester{
|
||||||
{
|
{
|
||||||
desc: "without trailing newline, logger adds newline",
|
desc: "without trailing newline, logger adds newline",
|
||||||
message: "hello, world!",
|
message: "hello, world!",
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s ERROR: hello, world!\n$",
|
wantPattern: fmt.Sprintf("^%s %s%s ERROR: hello, world!\n$", rgxdate, rgxtime, rgxmicroseconds),
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
desc: "with trailing newline, logger preserves newline",
|
desc: "with trailing newline, logger preserves newline",
|
||||||
message: "hello, world!\n",
|
message: "hello, world!\n",
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s ERROR: hello, world!\n$",
|
wantPattern: fmt.Sprintf("^%s %s%s ERROR: hello, world!\n$", rgxdate, rgxtime, rgxmicroseconds),
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
logger := NewLogger(newBase(&buf))
|
logger := NewLogger(&buf)
|
||||||
|
|
||||||
logger.Error(tc.message)
|
logger.Error(tc.message)
|
||||||
|
|
||||||
@ -155,234 +146,8 @@ func TestLoggerError(t *testing.T) {
|
|||||||
t.Fatal("pattern did not compile:", err)
|
t.Fatal("pattern did not compile:", err)
|
||||||
}
|
}
|
||||||
if !matched {
|
if !matched {
|
||||||
t.Errorf("logger.Error(%q) outputted %q, should match pattern %q",
|
t.Errorf("logger.info(%q) outputted %q, should match pattern %q",
|
||||||
tc.message, got, tc.wantPattern)
|
tc.message, got, tc.wantPattern)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type formatTester struct {
|
|
||||||
desc string
|
|
||||||
format string
|
|
||||||
args []interface{}
|
|
||||||
wantPattern string // regexp that log output must match
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoggerDebugf(t *testing.T) {
|
|
||||||
tests := []formatTester{
|
|
||||||
{
|
|
||||||
desc: "Formats message with DEBUG prefix",
|
|
||||||
format: "hello, %s!",
|
|
||||||
args: []interface{}{"Gopher"},
|
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s DEBUG: hello, Gopher!\n$",
|
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
logger := NewLogger(newBase(&buf))
|
|
||||||
|
|
||||||
logger.Debugf(tc.format, tc.args...)
|
|
||||||
|
|
||||||
got := buf.String()
|
|
||||||
matched, err := regexp.MatchString(tc.wantPattern, got)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal("pattern did not compile:", err)
|
|
||||||
}
|
|
||||||
if !matched {
|
|
||||||
t.Errorf("logger.Debugf(%q, %v) outputted %q, should match pattern %q",
|
|
||||||
tc.format, tc.args, got, tc.wantPattern)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoggerInfof(t *testing.T) {
|
|
||||||
tests := []formatTester{
|
|
||||||
{
|
|
||||||
desc: "Formats message with INFO prefix",
|
|
||||||
format: "%d,%d,%d",
|
|
||||||
args: []interface{}{1, 2, 3},
|
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s INFO: 1,2,3\n$",
|
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
logger := NewLogger(newBase(&buf))
|
|
||||||
|
|
||||||
logger.Infof(tc.format, tc.args...)
|
|
||||||
|
|
||||||
got := buf.String()
|
|
||||||
matched, err := regexp.MatchString(tc.wantPattern, got)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal("pattern did not compile:", err)
|
|
||||||
}
|
|
||||||
if !matched {
|
|
||||||
t.Errorf("logger.Infof(%q, %v) outputted %q, should match pattern %q",
|
|
||||||
tc.format, tc.args, got, tc.wantPattern)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoggerWarnf(t *testing.T) {
|
|
||||||
tests := []formatTester{
|
|
||||||
{
|
|
||||||
desc: "Formats message with WARN prefix",
|
|
||||||
format: "hello, %s",
|
|
||||||
args: []interface{}{"Gophers"},
|
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s WARN: hello, Gophers\n$",
|
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
logger := NewLogger(newBase(&buf))
|
|
||||||
|
|
||||||
logger.Warnf(tc.format, tc.args...)
|
|
||||||
|
|
||||||
got := buf.String()
|
|
||||||
matched, err := regexp.MatchString(tc.wantPattern, got)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal("pattern did not compile:", err)
|
|
||||||
}
|
|
||||||
if !matched {
|
|
||||||
t.Errorf("logger.Warnf(%q, %v) outputted %q, should match pattern %q",
|
|
||||||
tc.format, tc.args, got, tc.wantPattern)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoggerErrorf(t *testing.T) {
|
|
||||||
tests := []formatTester{
|
|
||||||
{
|
|
||||||
desc: "Formats message with ERROR prefix",
|
|
||||||
format: "hello, %s",
|
|
||||||
args: []interface{}{"Gophers"},
|
|
||||||
wantPattern: fmt.Sprintf("^asynq: pid=%s %s %s%s ERROR: hello, Gophers\n$",
|
|
||||||
rgxPID, rgxdate, rgxtime, rgxmicroseconds),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
logger := NewLogger(newBase(&buf))
|
|
||||||
|
|
||||||
logger.Errorf(tc.format, tc.args...)
|
|
||||||
|
|
||||||
got := buf.String()
|
|
||||||
matched, err := regexp.MatchString(tc.wantPattern, got)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal("pattern did not compile:", err)
|
|
||||||
}
|
|
||||||
if !matched {
|
|
||||||
t.Errorf("logger.Errorf(%q, %v) outputted %q, should match pattern %q",
|
|
||||||
tc.format, tc.args, got, tc.wantPattern)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoggerWithLowerLevels(t *testing.T) {
|
|
||||||
// Logger should not log messages at a level
|
|
||||||
// lower than the specified level.
|
|
||||||
tests := []struct {
|
|
||||||
level Level
|
|
||||||
op string
|
|
||||||
}{
|
|
||||||
// with level one above
|
|
||||||
{InfoLevel, "Debug"},
|
|
||||||
{InfoLevel, "Debugf"},
|
|
||||||
{WarnLevel, "Info"},
|
|
||||||
{WarnLevel, "Infof"},
|
|
||||||
{ErrorLevel, "Warn"},
|
|
||||||
{ErrorLevel, "Warnf"},
|
|
||||||
{FatalLevel, "Error"},
|
|
||||||
{FatalLevel, "Errorf"},
|
|
||||||
// with skip level
|
|
||||||
{WarnLevel, "Debug"},
|
|
||||||
{ErrorLevel, "Infof"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
logger := NewLogger(newBase(&buf))
|
|
||||||
logger.SetLevel(tc.level)
|
|
||||||
|
|
||||||
switch tc.op {
|
|
||||||
case "Debug":
|
|
||||||
logger.Debug("hello")
|
|
||||||
case "Debugf":
|
|
||||||
logger.Debugf("hello, %s", "world")
|
|
||||||
case "Info":
|
|
||||||
logger.Info("hello")
|
|
||||||
case "Infof":
|
|
||||||
logger.Infof("hello, %s", "world")
|
|
||||||
case "Warn":
|
|
||||||
logger.Warn("hello")
|
|
||||||
case "Warnf":
|
|
||||||
logger.Warnf("hello, %s", "world")
|
|
||||||
case "Error":
|
|
||||||
logger.Error("hello")
|
|
||||||
case "Errorf":
|
|
||||||
logger.Errorf("hello, %s", "world")
|
|
||||||
default:
|
|
||||||
t.Fatalf("unexpected op: %q", tc.op)
|
|
||||||
}
|
|
||||||
|
|
||||||
if buf.String() != "" {
|
|
||||||
t.Errorf("logger.%s outputted log message when level is set to %v", tc.op, tc.level)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoggerWithSameOrHigherLevels(t *testing.T) {
|
|
||||||
// Logger should log messages at a level
|
|
||||||
// same as or higher than the specified level.
|
|
||||||
tests := []struct {
|
|
||||||
level Level
|
|
||||||
op string
|
|
||||||
}{
|
|
||||||
// same level
|
|
||||||
{DebugLevel, "Debug"},
|
|
||||||
{InfoLevel, "Infof"},
|
|
||||||
{WarnLevel, "Warn"},
|
|
||||||
{ErrorLevel, "Errorf"},
|
|
||||||
// higher level
|
|
||||||
{DebugLevel, "Info"},
|
|
||||||
{InfoLevel, "Warnf"},
|
|
||||||
{WarnLevel, "Error"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
logger := NewLogger(newBase(&buf))
|
|
||||||
logger.SetLevel(tc.level)
|
|
||||||
|
|
||||||
switch tc.op {
|
|
||||||
case "Debug":
|
|
||||||
logger.Debug("hello")
|
|
||||||
case "Debugf":
|
|
||||||
logger.Debugf("hello, %s", "world")
|
|
||||||
case "Info":
|
|
||||||
logger.Info("hello")
|
|
||||||
case "Infof":
|
|
||||||
logger.Infof("hello, %s", "world")
|
|
||||||
case "Warn":
|
|
||||||
logger.Warn("hello")
|
|
||||||
case "Warnf":
|
|
||||||
logger.Warnf("hello, %s", "world")
|
|
||||||
case "Error":
|
|
||||||
logger.Error("hello")
|
|
||||||
case "Errorf":
|
|
||||||
logger.Errorf("hello, %s", "world")
|
|
||||||
default:
|
|
||||||
t.Fatalf("unexpected op: %q", tc.op)
|
|
||||||
}
|
|
||||||
|
|
||||||
if buf.String() == "" {
|
|
||||||
t.Errorf("logger.%s did not output log message when level is set to %v", tc.op, tc.level)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -1,846 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
|
||||||
// versions:
|
|
||||||
// protoc-gen-go v1.34.2
|
|
||||||
// protoc v3.19.6
|
|
||||||
// source: asynq.proto
|
|
||||||
|
|
||||||
package proto
|
|
||||||
|
|
||||||
import (
|
|
||||||
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
|
|
||||||
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
|
|
||||||
timestamppb "google.golang.org/protobuf/types/known/timestamppb"
|
|
||||||
reflect "reflect"
|
|
||||||
sync "sync"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
// Verify that this generated code is sufficiently up-to-date.
|
|
||||||
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
|
|
||||||
// Verify that runtime/protoimpl is sufficiently up-to-date.
|
|
||||||
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
|
|
||||||
)
|
|
||||||
|
|
||||||
// TaskMessage is the internal representation of a task with additional
|
|
||||||
// metadata fields.
|
|
||||||
// Next ID: 15
|
|
||||||
type TaskMessage struct {
|
|
||||||
state protoimpl.MessageState
|
|
||||||
sizeCache protoimpl.SizeCache
|
|
||||||
unknownFields protoimpl.UnknownFields
|
|
||||||
|
|
||||||
// Type indicates the kind of the task to be performed.
|
|
||||||
Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
|
|
||||||
// Payload holds data needed to process the task.
|
|
||||||
Payload []byte `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"`
|
|
||||||
// Unique identifier for the task.
|
|
||||||
Id string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
|
|
||||||
// Name of the queue to which this task belongs.
|
|
||||||
Queue string `protobuf:"bytes,4,opt,name=queue,proto3" json:"queue,omitempty"`
|
|
||||||
// Max number of retries for this task.
|
|
||||||
Retry int32 `protobuf:"varint,5,opt,name=retry,proto3" json:"retry,omitempty"`
|
|
||||||
// Number of times this task has been retried so far.
|
|
||||||
Retried int32 `protobuf:"varint,6,opt,name=retried,proto3" json:"retried,omitempty"`
|
|
||||||
// Error message from the last failure.
|
|
||||||
ErrorMsg string `protobuf:"bytes,7,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"`
|
|
||||||
// Time of last failure in Unix time,
|
|
||||||
// the number of seconds elapsed since January 1, 1970 UTC.
|
|
||||||
// Use zero to indicate no last failure.
|
|
||||||
LastFailedAt int64 `protobuf:"varint,11,opt,name=last_failed_at,json=lastFailedAt,proto3" json:"last_failed_at,omitempty"`
|
|
||||||
// Timeout specifies timeout in seconds.
|
|
||||||
// Use zero to indicate no timeout.
|
|
||||||
Timeout int64 `protobuf:"varint,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
|
|
||||||
// Deadline specifies the deadline for the task in Unix time,
|
|
||||||
// the number of seconds elapsed since January 1, 1970 UTC.
|
|
||||||
// Use zero to indicate no deadline.
|
|
||||||
Deadline int64 `protobuf:"varint,9,opt,name=deadline,proto3" json:"deadline,omitempty"`
|
|
||||||
// UniqueKey holds the redis key used for uniqueness lock for this task.
|
|
||||||
// Empty string indicates that no uniqueness lock was used.
|
|
||||||
UniqueKey string `protobuf:"bytes,10,opt,name=unique_key,json=uniqueKey,proto3" json:"unique_key,omitempty"`
|
|
||||||
// GroupKey is a name of the group used for task aggregation.
|
|
||||||
// This field is optional and empty value means no aggregation for the task.
|
|
||||||
GroupKey string `protobuf:"bytes,14,opt,name=group_key,json=groupKey,proto3" json:"group_key,omitempty"`
|
|
||||||
// Retention period specified in a number of seconds.
|
|
||||||
// The task will be stored in redis as a completed task until the TTL
|
|
||||||
// expires.
|
|
||||||
Retention int64 `protobuf:"varint,12,opt,name=retention,proto3" json:"retention,omitempty"`
|
|
||||||
// Time when the task completed in success in Unix time,
|
|
||||||
// the number of seconds elapsed since January 1, 1970 UTC.
|
|
||||||
// This field is populated if result_ttl > 0 upon completion.
|
|
||||||
CompletedAt int64 `protobuf:"varint,13,opt,name=completed_at,json=completedAt,proto3" json:"completed_at,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) Reset() {
|
|
||||||
*x = TaskMessage{}
|
|
||||||
if protoimpl.UnsafeEnabled {
|
|
||||||
mi := &file_asynq_proto_msgTypes[0]
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) String() string {
|
|
||||||
return protoimpl.X.MessageStringOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (*TaskMessage) ProtoMessage() {}
|
|
||||||
|
|
||||||
func (x *TaskMessage) ProtoReflect() protoreflect.Message {
|
|
||||||
mi := &file_asynq_proto_msgTypes[0]
|
|
||||||
if protoimpl.UnsafeEnabled && x != nil {
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
if ms.LoadMessageInfo() == nil {
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
return ms
|
|
||||||
}
|
|
||||||
return mi.MessageOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Deprecated: Use TaskMessage.ProtoReflect.Descriptor instead.
|
|
||||||
func (*TaskMessage) Descriptor() ([]byte, []int) {
|
|
||||||
return file_asynq_proto_rawDescGZIP(), []int{0}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetType() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Type
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetPayload() []byte {
|
|
||||||
if x != nil {
|
|
||||||
return x.Payload
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetId() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Id
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetQueue() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Queue
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetRetry() int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Retry
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetRetried() int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Retried
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetErrorMsg() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.ErrorMsg
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetLastFailedAt() int64 {
|
|
||||||
if x != nil {
|
|
||||||
return x.LastFailedAt
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetTimeout() int64 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Timeout
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetDeadline() int64 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Deadline
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetUniqueKey() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.UniqueKey
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetGroupKey() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.GroupKey
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetRetention() int64 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Retention
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *TaskMessage) GetCompletedAt() int64 {
|
|
||||||
if x != nil {
|
|
||||||
return x.CompletedAt
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// ServerInfo holds information about a running server.
|
|
||||||
type ServerInfo struct {
|
|
||||||
state protoimpl.MessageState
|
|
||||||
sizeCache protoimpl.SizeCache
|
|
||||||
unknownFields protoimpl.UnknownFields
|
|
||||||
|
|
||||||
// Host machine the server is running on.
|
|
||||||
Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
|
|
||||||
// PID of the server process.
|
|
||||||
Pid int32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
|
|
||||||
// Unique identifier for this server.
|
|
||||||
ServerId string `protobuf:"bytes,3,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
|
|
||||||
// Maximum number of concurrency this server will use.
|
|
||||||
Concurrency int32 `protobuf:"varint,4,opt,name=concurrency,proto3" json:"concurrency,omitempty"`
|
|
||||||
// List of queue names with their priorities.
|
|
||||||
// The server will consume tasks from the queues and prioritize
|
|
||||||
// queues with higher priority numbers.
|
|
||||||
Queues map[string]int32 `protobuf:"bytes,5,rep,name=queues,proto3" json:"queues,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
|
|
||||||
// If set, the server will always consume tasks from a queue with higher
|
|
||||||
// priority.
|
|
||||||
StrictPriority bool `protobuf:"varint,6,opt,name=strict_priority,json=strictPriority,proto3" json:"strict_priority,omitempty"`
|
|
||||||
// Status indicates the status of the server.
|
|
||||||
Status string `protobuf:"bytes,7,opt,name=status,proto3" json:"status,omitempty"`
|
|
||||||
// Time this server was started.
|
|
||||||
StartTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
|
|
||||||
// Number of workers currently processing tasks.
|
|
||||||
ActiveWorkerCount int32 `protobuf:"varint,9,opt,name=active_worker_count,json=activeWorkerCount,proto3" json:"active_worker_count,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) Reset() {
|
|
||||||
*x = ServerInfo{}
|
|
||||||
if protoimpl.UnsafeEnabled {
|
|
||||||
mi := &file_asynq_proto_msgTypes[1]
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) String() string {
|
|
||||||
return protoimpl.X.MessageStringOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (*ServerInfo) ProtoMessage() {}
|
|
||||||
|
|
||||||
func (x *ServerInfo) ProtoReflect() protoreflect.Message {
|
|
||||||
mi := &file_asynq_proto_msgTypes[1]
|
|
||||||
if protoimpl.UnsafeEnabled && x != nil {
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
if ms.LoadMessageInfo() == nil {
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
return ms
|
|
||||||
}
|
|
||||||
return mi.MessageOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Deprecated: Use ServerInfo.ProtoReflect.Descriptor instead.
|
|
||||||
func (*ServerInfo) Descriptor() ([]byte, []int) {
|
|
||||||
return file_asynq_proto_rawDescGZIP(), []int{1}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) GetHost() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Host
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) GetPid() int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Pid
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) GetServerId() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.ServerId
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) GetConcurrency() int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Concurrency
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) GetQueues() map[string]int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Queues
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) GetStrictPriority() bool {
|
|
||||||
if x != nil {
|
|
||||||
return x.StrictPriority
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) GetStatus() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Status
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) GetStartTime() *timestamppb.Timestamp {
|
|
||||||
if x != nil {
|
|
||||||
return x.StartTime
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *ServerInfo) GetActiveWorkerCount() int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.ActiveWorkerCount
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// WorkerInfo holds information about a running worker.
|
|
||||||
type WorkerInfo struct {
|
|
||||||
state protoimpl.MessageState
|
|
||||||
sizeCache protoimpl.SizeCache
|
|
||||||
unknownFields protoimpl.UnknownFields
|
|
||||||
|
|
||||||
// Host matchine this worker is running on.
|
|
||||||
Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
|
|
||||||
// PID of the process in which this worker is running.
|
|
||||||
Pid int32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
|
|
||||||
// ID of the server in which this worker is running.
|
|
||||||
ServerId string `protobuf:"bytes,3,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
|
|
||||||
// ID of the task this worker is processing.
|
|
||||||
TaskId string `protobuf:"bytes,4,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
|
|
||||||
// Type of the task this worker is processing.
|
|
||||||
TaskType string `protobuf:"bytes,5,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"`
|
|
||||||
// Payload of the task this worker is processing.
|
|
||||||
TaskPayload []byte `protobuf:"bytes,6,opt,name=task_payload,json=taskPayload,proto3" json:"task_payload,omitempty"`
|
|
||||||
// Name of the queue the task the worker is processing belongs.
|
|
||||||
Queue string `protobuf:"bytes,7,opt,name=queue,proto3" json:"queue,omitempty"`
|
|
||||||
// Time this worker started processing the task.
|
|
||||||
StartTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
|
|
||||||
// Deadline by which the worker needs to complete processing
|
|
||||||
// the task. If worker exceeds the deadline, the task will fail.
|
|
||||||
Deadline *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=deadline,proto3" json:"deadline,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) Reset() {
|
|
||||||
*x = WorkerInfo{}
|
|
||||||
if protoimpl.UnsafeEnabled {
|
|
||||||
mi := &file_asynq_proto_msgTypes[2]
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) String() string {
|
|
||||||
return protoimpl.X.MessageStringOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (*WorkerInfo) ProtoMessage() {}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) ProtoReflect() protoreflect.Message {
|
|
||||||
mi := &file_asynq_proto_msgTypes[2]
|
|
||||||
if protoimpl.UnsafeEnabled && x != nil {
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
if ms.LoadMessageInfo() == nil {
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
return ms
|
|
||||||
}
|
|
||||||
return mi.MessageOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Deprecated: Use WorkerInfo.ProtoReflect.Descriptor instead.
|
|
||||||
func (*WorkerInfo) Descriptor() ([]byte, []int) {
|
|
||||||
return file_asynq_proto_rawDescGZIP(), []int{2}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) GetHost() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Host
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) GetPid() int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Pid
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) GetServerId() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.ServerId
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) GetTaskId() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.TaskId
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) GetTaskType() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.TaskType
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) GetTaskPayload() []byte {
|
|
||||||
if x != nil {
|
|
||||||
return x.TaskPayload
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) GetQueue() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Queue
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) GetStartTime() *timestamppb.Timestamp {
|
|
||||||
if x != nil {
|
|
||||||
return x.StartTime
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorkerInfo) GetDeadline() *timestamppb.Timestamp {
|
|
||||||
if x != nil {
|
|
||||||
return x.Deadline
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchedulerEntry holds information about a periodic task registered
|
|
||||||
// with a scheduler.
|
|
||||||
type SchedulerEntry struct {
|
|
||||||
state protoimpl.MessageState
|
|
||||||
sizeCache protoimpl.SizeCache
|
|
||||||
unknownFields protoimpl.UnknownFields
|
|
||||||
|
|
||||||
// Identifier of the scheduler entry.
|
|
||||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
|
|
||||||
// Periodic schedule spec of the entry.
|
|
||||||
Spec string `protobuf:"bytes,2,opt,name=spec,proto3" json:"spec,omitempty"`
|
|
||||||
// Task type of the periodic task.
|
|
||||||
TaskType string `protobuf:"bytes,3,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"`
|
|
||||||
// Task payload of the periodic task.
|
|
||||||
TaskPayload []byte `protobuf:"bytes,4,opt,name=task_payload,json=taskPayload,proto3" json:"task_payload,omitempty"`
|
|
||||||
// Options used to enqueue the periodic task.
|
|
||||||
EnqueueOptions []string `protobuf:"bytes,5,rep,name=enqueue_options,json=enqueueOptions,proto3" json:"enqueue_options,omitempty"`
|
|
||||||
// Next time the task will be enqueued.
|
|
||||||
NextEnqueueTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=next_enqueue_time,json=nextEnqueueTime,proto3" json:"next_enqueue_time,omitempty"`
|
|
||||||
// Last time the task was enqueued.
|
|
||||||
// Zero time if task was never enqueued.
|
|
||||||
PrevEnqueueTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=prev_enqueue_time,json=prevEnqueueTime,proto3" json:"prev_enqueue_time,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) Reset() {
|
|
||||||
*x = SchedulerEntry{}
|
|
||||||
if protoimpl.UnsafeEnabled {
|
|
||||||
mi := &file_asynq_proto_msgTypes[3]
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) String() string {
|
|
||||||
return protoimpl.X.MessageStringOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (*SchedulerEntry) ProtoMessage() {}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) ProtoReflect() protoreflect.Message {
|
|
||||||
mi := &file_asynq_proto_msgTypes[3]
|
|
||||||
if protoimpl.UnsafeEnabled && x != nil {
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
if ms.LoadMessageInfo() == nil {
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
return ms
|
|
||||||
}
|
|
||||||
return mi.MessageOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Deprecated: Use SchedulerEntry.ProtoReflect.Descriptor instead.
|
|
||||||
func (*SchedulerEntry) Descriptor() ([]byte, []int) {
|
|
||||||
return file_asynq_proto_rawDescGZIP(), []int{3}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) GetId() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Id
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) GetSpec() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Spec
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) GetTaskType() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.TaskType
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) GetTaskPayload() []byte {
|
|
||||||
if x != nil {
|
|
||||||
return x.TaskPayload
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) GetEnqueueOptions() []string {
|
|
||||||
if x != nil {
|
|
||||||
return x.EnqueueOptions
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) GetNextEnqueueTime() *timestamppb.Timestamp {
|
|
||||||
if x != nil {
|
|
||||||
return x.NextEnqueueTime
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEntry) GetPrevEnqueueTime() *timestamppb.Timestamp {
|
|
||||||
if x != nil {
|
|
||||||
return x.PrevEnqueueTime
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchedulerEnqueueEvent holds information about an enqueue event
|
|
||||||
// by a scheduler.
|
|
||||||
type SchedulerEnqueueEvent struct {
|
|
||||||
state protoimpl.MessageState
|
|
||||||
sizeCache protoimpl.SizeCache
|
|
||||||
unknownFields protoimpl.UnknownFields
|
|
||||||
|
|
||||||
// ID of the task that was enqueued.
|
|
||||||
TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
|
|
||||||
// Time the task was enqueued.
|
|
||||||
EnqueueTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=enqueue_time,json=enqueueTime,proto3" json:"enqueue_time,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEnqueueEvent) Reset() {
|
|
||||||
*x = SchedulerEnqueueEvent{}
|
|
||||||
if protoimpl.UnsafeEnabled {
|
|
||||||
mi := &file_asynq_proto_msgTypes[4]
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEnqueueEvent) String() string {
|
|
||||||
return protoimpl.X.MessageStringOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (*SchedulerEnqueueEvent) ProtoMessage() {}
|
|
||||||
|
|
||||||
func (x *SchedulerEnqueueEvent) ProtoReflect() protoreflect.Message {
|
|
||||||
mi := &file_asynq_proto_msgTypes[4]
|
|
||||||
if protoimpl.UnsafeEnabled && x != nil {
|
|
||||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
||||||
if ms.LoadMessageInfo() == nil {
|
|
||||||
ms.StoreMessageInfo(mi)
|
|
||||||
}
|
|
||||||
return ms
|
|
||||||
}
|
|
||||||
return mi.MessageOf(x)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Deprecated: Use SchedulerEnqueueEvent.ProtoReflect.Descriptor instead.
|
|
||||||
func (*SchedulerEnqueueEvent) Descriptor() ([]byte, []int) {
|
|
||||||
return file_asynq_proto_rawDescGZIP(), []int{4}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEnqueueEvent) GetTaskId() string {
|
|
||||||
if x != nil {
|
|
||||||
return x.TaskId
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *SchedulerEnqueueEvent) GetEnqueueTime() *timestamppb.Timestamp {
|
|
||||||
if x != nil {
|
|
||||||
return x.EnqueueTime
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var File_asynq_proto protoreflect.FileDescriptor
|
|
||||||
|
|
||||||
var file_asynq_proto_rawDesc = []byte{
|
|
||||||
0x0a, 0x0b, 0x61, 0x73, 0x79, 0x6e, 0x71, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x61,
|
|
||||||
0x73, 0x79, 0x6e, 0x71, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f,
|
|
||||||
0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e,
|
|
||||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x87, 0x03, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x65,
|
|
||||||
0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
|
|
||||||
0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79,
|
|
||||||
0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c,
|
|
||||||
0x6f, 0x61, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
||||||
0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01,
|
|
||||||
0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x74,
|
|
||||||
0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x65, 0x74, 0x72, 0x79, 0x12,
|
|
||||||
0x18, 0x0a, 0x07, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
|
|
||||||
0x52, 0x07, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72,
|
|
||||||
0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72,
|
|
||||||
0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x24, 0x0a, 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x66,
|
|
||||||
0x61, 0x69, 0x6c, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c,
|
|
||||||
0x6c, 0x61, 0x73, 0x74, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x41, 0x74, 0x12, 0x18, 0x0a, 0x07,
|
|
||||||
0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x74,
|
|
||||||
0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x61, 0x64, 0x6c, 0x69,
|
|
||||||
0x6e, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x65, 0x61, 0x64, 0x6c, 0x69,
|
|
||||||
0x6e, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x5f, 0x6b, 0x65, 0x79,
|
|
||||||
0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4b, 0x65,
|
|
||||||
0x79, 0x12, 0x1b, 0x0a, 0x09, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x0e,
|
|
||||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x1c,
|
|
||||||
0x0a, 0x09, 0x72, 0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28,
|
|
||||||
0x03, 0x52, 0x09, 0x72, 0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x0c,
|
|
||||||
0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01,
|
|
||||||
0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x22,
|
|
||||||
0x8f, 0x03, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12,
|
|
||||||
0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f,
|
|
||||||
0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
|
|
||||||
0x03, 0x70, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x69,
|
|
||||||
0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49,
|
|
||||||
0x64, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79,
|
|
||||||
0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65,
|
|
||||||
0x6e, 0x63, 0x79, 0x12, 0x35, 0x0a, 0x06, 0x71, 0x75, 0x65, 0x75, 0x65, 0x73, 0x18, 0x05, 0x20,
|
|
||||||
0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x61, 0x73, 0x79, 0x6e, 0x71, 0x2e, 0x53, 0x65, 0x72, 0x76,
|
|
||||||
0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x51, 0x75, 0x65, 0x75, 0x65, 0x73, 0x45, 0x6e, 0x74,
|
|
||||||
0x72, 0x79, 0x52, 0x06, 0x71, 0x75, 0x65, 0x75, 0x65, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x74,
|
|
||||||
0x72, 0x69, 0x63, 0x74, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20,
|
|
||||||
0x01, 0x28, 0x08, 0x52, 0x0e, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x50, 0x72, 0x69, 0x6f, 0x72,
|
|
||||||
0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20,
|
|
||||||
0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x73,
|
|
||||||
0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
|
||||||
0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
|
|
||||||
0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x73, 0x74, 0x61,
|
|
||||||
0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65,
|
|
||||||
0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20,
|
|
||||||
0x01, 0x28, 0x05, 0x52, 0x11, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x57, 0x6f, 0x72, 0x6b, 0x65,
|
|
||||||
0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x51, 0x75, 0x65, 0x75, 0x65, 0x73,
|
|
||||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
|
|
||||||
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
|
||||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
|
||||||
0x01, 0x22, 0xb1, 0x02, 0x0a, 0x0a, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
|
|
||||||
0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
|
|
||||||
0x68, 0x6f, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
|
|
||||||
0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
|
|
||||||
0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65,
|
|
||||||
0x72, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x04,
|
|
||||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09,
|
|
||||||
0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
||||||
0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x61, 0x73,
|
|
||||||
0x6b, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52,
|
|
||||||
0x0b, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x14, 0x0a, 0x05,
|
|
||||||
0x71, 0x75, 0x65, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65,
|
|
||||||
0x75, 0x65, 0x12, 0x39, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65,
|
|
||||||
0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
|
|
||||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
|
|
||||||
0x6d, 0x70, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a,
|
|
||||||
0x08, 0x64, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
|
||||||
0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
|
|
||||||
0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x64, 0x65, 0x61,
|
|
||||||
0x64, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0xad, 0x02, 0x0a, 0x0e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75,
|
|
||||||
0x6c, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
|
|
||||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63,
|
|
||||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x1b, 0x0a, 0x09,
|
|
||||||
0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
||||||
0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x61, 0x73,
|
|
||||||
0x6b, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52,
|
|
||||||
0x0b, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x27, 0x0a, 0x0f,
|
|
||||||
0x65, 0x6e, 0x71, 0x75, 0x65, 0x75, 0x65, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
|
|
||||||
0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x65, 0x6e, 0x71, 0x75, 0x65, 0x75, 0x65, 0x4f, 0x70,
|
|
||||||
0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x46, 0x0a, 0x11, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x65, 0x6e,
|
|
||||||
0x71, 0x75, 0x65, 0x75, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
|
|
||||||
0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
|
|
||||||
0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0f, 0x6e, 0x65,
|
|
||||||
0x78, 0x74, 0x45, 0x6e, 0x71, 0x75, 0x65, 0x75, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x46, 0x0a,
|
|
||||||
0x11, 0x70, 0x72, 0x65, 0x76, 0x5f, 0x65, 0x6e, 0x71, 0x75, 0x65, 0x75, 0x65, 0x5f, 0x74, 0x69,
|
|
||||||
0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
|
|
||||||
0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73,
|
|
||||||
0x74, 0x61, 0x6d, 0x70, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x76, 0x45, 0x6e, 0x71, 0x75, 0x65, 0x75,
|
|
||||||
0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x6f, 0x0a, 0x15, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c,
|
|
||||||
0x65, 0x72, 0x45, 0x6e, 0x71, 0x75, 0x65, 0x75, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x17,
|
|
||||||
0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
||||||
0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x3d, 0x0a, 0x0c, 0x65, 0x6e, 0x71, 0x75, 0x65,
|
|
||||||
0x75, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
|
|
||||||
0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
|
|
||||||
0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x65, 0x6e, 0x71, 0x75, 0x65,
|
|
||||||
0x75, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
|
|
||||||
0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x69, 0x62, 0x69, 0x6b, 0x65, 0x6e, 0x2f, 0x61, 0x73, 0x79,
|
|
||||||
0x6e, 0x71, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74,
|
|
||||||
0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
file_asynq_proto_rawDescOnce sync.Once
|
|
||||||
file_asynq_proto_rawDescData = file_asynq_proto_rawDesc
|
|
||||||
)
|
|
||||||
|
|
||||||
func file_asynq_proto_rawDescGZIP() []byte {
|
|
||||||
file_asynq_proto_rawDescOnce.Do(func() {
|
|
||||||
file_asynq_proto_rawDescData = protoimpl.X.CompressGZIP(file_asynq_proto_rawDescData)
|
|
||||||
})
|
|
||||||
return file_asynq_proto_rawDescData
|
|
||||||
}
|
|
||||||
|
|
||||||
var file_asynq_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
|
|
||||||
var file_asynq_proto_goTypes = []any{
|
|
||||||
(*TaskMessage)(nil), // 0: asynq.TaskMessage
|
|
||||||
(*ServerInfo)(nil), // 1: asynq.ServerInfo
|
|
||||||
(*WorkerInfo)(nil), // 2: asynq.WorkerInfo
|
|
||||||
(*SchedulerEntry)(nil), // 3: asynq.SchedulerEntry
|
|
||||||
(*SchedulerEnqueueEvent)(nil), // 4: asynq.SchedulerEnqueueEvent
|
|
||||||
nil, // 5: asynq.ServerInfo.QueuesEntry
|
|
||||||
(*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp
|
|
||||||
}
|
|
||||||
var file_asynq_proto_depIdxs = []int32{
|
|
||||||
5, // 0: asynq.ServerInfo.queues:type_name -> asynq.ServerInfo.QueuesEntry
|
|
||||||
6, // 1: asynq.ServerInfo.start_time:type_name -> google.protobuf.Timestamp
|
|
||||||
6, // 2: asynq.WorkerInfo.start_time:type_name -> google.protobuf.Timestamp
|
|
||||||
6, // 3: asynq.WorkerInfo.deadline:type_name -> google.protobuf.Timestamp
|
|
||||||
6, // 4: asynq.SchedulerEntry.next_enqueue_time:type_name -> google.protobuf.Timestamp
|
|
||||||
6, // 5: asynq.SchedulerEntry.prev_enqueue_time:type_name -> google.protobuf.Timestamp
|
|
||||||
6, // 6: asynq.SchedulerEnqueueEvent.enqueue_time:type_name -> google.protobuf.Timestamp
|
|
||||||
7, // [7:7] is the sub-list for method output_type
|
|
||||||
7, // [7:7] is the sub-list for method input_type
|
|
||||||
7, // [7:7] is the sub-list for extension type_name
|
|
||||||
7, // [7:7] is the sub-list for extension extendee
|
|
||||||
0, // [0:7] is the sub-list for field type_name
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() { file_asynq_proto_init() }
|
|
||||||
func file_asynq_proto_init() {
|
|
||||||
if File_asynq_proto != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if !protoimpl.UnsafeEnabled {
|
|
||||||
file_asynq_proto_msgTypes[0].Exporter = func(v any, i int) any {
|
|
||||||
switch v := v.(*TaskMessage); i {
|
|
||||||
case 0:
|
|
||||||
return &v.state
|
|
||||||
case 1:
|
|
||||||
return &v.sizeCache
|
|
||||||
case 2:
|
|
||||||
return &v.unknownFields
|
|
||||||
default:
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
file_asynq_proto_msgTypes[1].Exporter = func(v any, i int) any {
|
|
||||||
switch v := v.(*ServerInfo); i {
|
|
||||||
case 0:
|
|
||||||
return &v.state
|
|
||||||
case 1:
|
|
||||||
return &v.sizeCache
|
|
||||||
case 2:
|
|
||||||
return &v.unknownFields
|
|
||||||
default:
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
file_asynq_proto_msgTypes[2].Exporter = func(v any, i int) any {
|
|
||||||
switch v := v.(*WorkerInfo); i {
|
|
||||||
case 0:
|
|
||||||
return &v.state
|
|
||||||
case 1:
|
|
||||||
return &v.sizeCache
|
|
||||||
case 2:
|
|
||||||
return &v.unknownFields
|
|
||||||
default:
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
file_asynq_proto_msgTypes[3].Exporter = func(v any, i int) any {
|
|
||||||
switch v := v.(*SchedulerEntry); i {
|
|
||||||
case 0:
|
|
||||||
return &v.state
|
|
||||||
case 1:
|
|
||||||
return &v.sizeCache
|
|
||||||
case 2:
|
|
||||||
return &v.unknownFields
|
|
||||||
default:
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
file_asynq_proto_msgTypes[4].Exporter = func(v any, i int) any {
|
|
||||||
switch v := v.(*SchedulerEnqueueEvent); i {
|
|
||||||
case 0:
|
|
||||||
return &v.state
|
|
||||||
case 1:
|
|
||||||
return &v.sizeCache
|
|
||||||
case 2:
|
|
||||||
return &v.unknownFields
|
|
||||||
default:
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
type x struct{}
|
|
||||||
out := protoimpl.TypeBuilder{
|
|
||||||
File: protoimpl.DescBuilder{
|
|
||||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
|
||||||
RawDescriptor: file_asynq_proto_rawDesc,
|
|
||||||
NumEnums: 0,
|
|
||||||
NumMessages: 6,
|
|
||||||
NumExtensions: 0,
|
|
||||||
NumServices: 0,
|
|
||||||
},
|
|
||||||
GoTypes: file_asynq_proto_goTypes,
|
|
||||||
DependencyIndexes: file_asynq_proto_depIdxs,
|
|
||||||
MessageInfos: file_asynq_proto_msgTypes,
|
|
||||||
}.Build()
|
|
||||||
File_asynq_proto = out.File
|
|
||||||
file_asynq_proto_rawDesc = nil
|
|
||||||
file_asynq_proto_goTypes = nil
|
|
||||||
file_asynq_proto_depIdxs = nil
|
|
||||||
}
|
|
@ -1,168 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
syntax = "proto3";
|
|
||||||
package asynq;
|
|
||||||
|
|
||||||
import "google/protobuf/timestamp.proto";
|
|
||||||
|
|
||||||
option go_package = "github.com/hibiken/asynq/internal/proto";
|
|
||||||
|
|
||||||
// TaskMessage is the internal representation of a task with additional
|
|
||||||
// metadata fields.
|
|
||||||
// Next ID: 15
|
|
||||||
message TaskMessage {
|
|
||||||
// Type indicates the kind of the task to be performed.
|
|
||||||
string type = 1;
|
|
||||||
|
|
||||||
// Payload holds data needed to process the task.
|
|
||||||
bytes payload = 2;
|
|
||||||
|
|
||||||
// Unique identifier for the task.
|
|
||||||
string id = 3;
|
|
||||||
|
|
||||||
// Name of the queue to which this task belongs.
|
|
||||||
string queue = 4;
|
|
||||||
|
|
||||||
// Max number of retries for this task.
|
|
||||||
int32 retry = 5;
|
|
||||||
|
|
||||||
// Number of times this task has been retried so far.
|
|
||||||
int32 retried = 6;
|
|
||||||
|
|
||||||
// Error message from the last failure.
|
|
||||||
string error_msg = 7;
|
|
||||||
|
|
||||||
// Time of last failure in Unix time,
|
|
||||||
// the number of seconds elapsed since January 1, 1970 UTC.
|
|
||||||
// Use zero to indicate no last failure.
|
|
||||||
int64 last_failed_at = 11;
|
|
||||||
|
|
||||||
// Timeout specifies timeout in seconds.
|
|
||||||
// Use zero to indicate no timeout.
|
|
||||||
int64 timeout = 8;
|
|
||||||
|
|
||||||
// Deadline specifies the deadline for the task in Unix time,
|
|
||||||
// the number of seconds elapsed since January 1, 1970 UTC.
|
|
||||||
// Use zero to indicate no deadline.
|
|
||||||
int64 deadline = 9;
|
|
||||||
|
|
||||||
// UniqueKey holds the redis key used for uniqueness lock for this task.
|
|
||||||
// Empty string indicates that no uniqueness lock was used.
|
|
||||||
string unique_key = 10;
|
|
||||||
|
|
||||||
// GroupKey is a name of the group used for task aggregation.
|
|
||||||
// This field is optional and empty value means no aggregation for the task.
|
|
||||||
string group_key = 14;
|
|
||||||
|
|
||||||
// Retention period specified in a number of seconds.
|
|
||||||
// The task will be stored in redis as a completed task until the TTL
|
|
||||||
// expires.
|
|
||||||
int64 retention = 12;
|
|
||||||
|
|
||||||
// Time when the task completed in success in Unix time,
|
|
||||||
// the number of seconds elapsed since January 1, 1970 UTC.
|
|
||||||
// This field is populated if result_ttl > 0 upon completion.
|
|
||||||
int64 completed_at = 13;
|
|
||||||
};
|
|
||||||
|
|
||||||
// ServerInfo holds information about a running server.
|
|
||||||
message ServerInfo {
|
|
||||||
// Host machine the server is running on.
|
|
||||||
string host = 1;
|
|
||||||
|
|
||||||
// PID of the server process.
|
|
||||||
int32 pid = 2;
|
|
||||||
|
|
||||||
// Unique identifier for this server.
|
|
||||||
string server_id = 3;
|
|
||||||
|
|
||||||
// Maximum number of concurrency this server will use.
|
|
||||||
int32 concurrency = 4;
|
|
||||||
|
|
||||||
// List of queue names with their priorities.
|
|
||||||
// The server will consume tasks from the queues and prioritize
|
|
||||||
// queues with higher priority numbers.
|
|
||||||
map<string, int32> queues = 5;
|
|
||||||
|
|
||||||
// If set, the server will always consume tasks from a queue with higher
|
|
||||||
// priority.
|
|
||||||
bool strict_priority = 6;
|
|
||||||
|
|
||||||
// Status indicates the status of the server.
|
|
||||||
string status = 7;
|
|
||||||
|
|
||||||
// Time this server was started.
|
|
||||||
google.protobuf.Timestamp start_time = 8;
|
|
||||||
|
|
||||||
// Number of workers currently processing tasks.
|
|
||||||
int32 active_worker_count = 9;
|
|
||||||
};
|
|
||||||
|
|
||||||
// WorkerInfo holds information about a running worker.
|
|
||||||
message WorkerInfo {
|
|
||||||
// Host matchine this worker is running on.
|
|
||||||
string host = 1;
|
|
||||||
|
|
||||||
// PID of the process in which this worker is running.
|
|
||||||
int32 pid = 2;
|
|
||||||
|
|
||||||
// ID of the server in which this worker is running.
|
|
||||||
string server_id = 3;
|
|
||||||
|
|
||||||
// ID of the task this worker is processing.
|
|
||||||
string task_id = 4;
|
|
||||||
|
|
||||||
// Type of the task this worker is processing.
|
|
||||||
string task_type = 5;
|
|
||||||
|
|
||||||
// Payload of the task this worker is processing.
|
|
||||||
bytes task_payload = 6;
|
|
||||||
|
|
||||||
// Name of the queue the task the worker is processing belongs.
|
|
||||||
string queue = 7;
|
|
||||||
|
|
||||||
// Time this worker started processing the task.
|
|
||||||
google.protobuf.Timestamp start_time = 8;
|
|
||||||
|
|
||||||
// Deadline by which the worker needs to complete processing
|
|
||||||
// the task. If worker exceeds the deadline, the task will fail.
|
|
||||||
google.protobuf.Timestamp deadline = 9;
|
|
||||||
};
|
|
||||||
|
|
||||||
// SchedulerEntry holds information about a periodic task registered
|
|
||||||
// with a scheduler.
|
|
||||||
message SchedulerEntry {
|
|
||||||
// Identifier of the scheduler entry.
|
|
||||||
string id = 1;
|
|
||||||
|
|
||||||
// Periodic schedule spec of the entry.
|
|
||||||
string spec = 2;
|
|
||||||
|
|
||||||
// Task type of the periodic task.
|
|
||||||
string task_type = 3;
|
|
||||||
|
|
||||||
// Task payload of the periodic task.
|
|
||||||
bytes task_payload = 4;
|
|
||||||
|
|
||||||
// Options used to enqueue the periodic task.
|
|
||||||
repeated string enqueue_options = 5;
|
|
||||||
|
|
||||||
// Next time the task will be enqueued.
|
|
||||||
google.protobuf.Timestamp next_enqueue_time = 6;
|
|
||||||
|
|
||||||
// Last time the task was enqueued.
|
|
||||||
// Zero time if task was never enqueued.
|
|
||||||
google.protobuf.Timestamp prev_enqueue_time = 7;
|
|
||||||
};
|
|
||||||
|
|
||||||
// SchedulerEnqueueEvent holds information about an enqueue event
|
|
||||||
// by a scheduler.
|
|
||||||
message SchedulerEnqueueEvent {
|
|
||||||
// ID of the task that was enqueued.
|
|
||||||
string task_id = 1;
|
|
||||||
|
|
||||||
// Time the task was enqueued.
|
|
||||||
google.protobuf.Timestamp enqueue_time = 2;
|
|
||||||
};
|
|
@ -5,273 +5,37 @@
|
|||||||
package rdb
|
package rdb
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v7"
|
||||||
|
h "github.com/hibiken/asynq/internal/asynqtest"
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/hibiken/asynq/internal/testutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func BenchmarkEnqueue(b *testing.B) {
|
|
||||||
r := setup(b)
|
|
||||||
ctx := context.Background()
|
|
||||||
msg := testutil.NewTaskMessage("task1", nil)
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if err := r.Enqueue(ctx, msg); err != nil {
|
|
||||||
b.Fatalf("Enqueue failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkEnqueueUnique(b *testing.B) {
|
|
||||||
r := setup(b)
|
|
||||||
ctx := context.Background()
|
|
||||||
msg := &base.TaskMessage{
|
|
||||||
Type: "task1",
|
|
||||||
Payload: nil,
|
|
||||||
Queue: base.DefaultQueueName,
|
|
||||||
UniqueKey: base.UniqueKey("default", "task1", nil),
|
|
||||||
}
|
|
||||||
uniqueTTL := 5 * time.Minute
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if err := r.EnqueueUnique(ctx, msg, uniqueTTL); err != nil {
|
|
||||||
b.Fatalf("EnqueueUnique failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkSchedule(b *testing.B) {
|
|
||||||
r := setup(b)
|
|
||||||
ctx := context.Background()
|
|
||||||
msg := testutil.NewTaskMessage("task1", nil)
|
|
||||||
processAt := time.Now().Add(3 * time.Minute)
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if err := r.Schedule(ctx, msg, processAt); err != nil {
|
|
||||||
b.Fatalf("Schedule failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkScheduleUnique(b *testing.B) {
|
|
||||||
r := setup(b)
|
|
||||||
ctx := context.Background()
|
|
||||||
msg := &base.TaskMessage{
|
|
||||||
Type: "task1",
|
|
||||||
Payload: nil,
|
|
||||||
Queue: base.DefaultQueueName,
|
|
||||||
UniqueKey: base.UniqueKey("default", "task1", nil),
|
|
||||||
}
|
|
||||||
processAt := time.Now().Add(3 * time.Minute)
|
|
||||||
uniqueTTL := 5 * time.Minute
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if err := r.ScheduleUnique(ctx, msg, processAt, uniqueTTL); err != nil {
|
|
||||||
b.Fatalf("EnqueueUnique failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkDequeueSingleQueue(b *testing.B) {
|
|
||||||
r := setup(b)
|
|
||||||
ctx := context.Background()
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
for i := 0; i < 10; i++ {
|
|
||||||
m := testutil.NewTaskMessageWithQueue(
|
|
||||||
fmt.Sprintf("task%d", i), nil, base.DefaultQueueName)
|
|
||||||
if err := r.Enqueue(ctx, m); err != nil {
|
|
||||||
b.Fatalf("Enqueue failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if _, _, err := r.Dequeue(base.DefaultQueueName); err != nil {
|
|
||||||
b.Fatalf("Dequeue failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkDequeueMultipleQueues(b *testing.B) {
|
|
||||||
qnames := []string{"critical", "default", "low"}
|
|
||||||
r := setup(b)
|
|
||||||
ctx := context.Background()
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
for i := 0; i < 10; i++ {
|
|
||||||
for _, qname := range qnames {
|
|
||||||
m := testutil.NewTaskMessageWithQueue(
|
|
||||||
fmt.Sprintf("%s_task%d", qname, i), nil, qname)
|
|
||||||
if err := r.Enqueue(ctx, m); err != nil {
|
|
||||||
b.Fatalf("Enqueue failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if _, _, err := r.Dequeue(qnames...); err != nil {
|
|
||||||
b.Fatalf("Dequeue failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkDone(b *testing.B) {
|
func BenchmarkDone(b *testing.B) {
|
||||||
r := setup(b)
|
r := redis.NewClient(&redis.Options{
|
||||||
m1 := testutil.NewTaskMessage("task1", nil)
|
Addr: "localhost:6379",
|
||||||
m2 := testutil.NewTaskMessage("task2", nil)
|
DB: 8,
|
||||||
m3 := testutil.NewTaskMessage("task3", nil)
|
})
|
||||||
msgs := []*base.TaskMessage{m1, m2, m3}
|
h.FlushDB(b, r)
|
||||||
zs := []base.Z{
|
|
||||||
{Message: m1, Score: time.Now().Add(10 * time.Second).Unix()},
|
|
||||||
{Message: m2, Score: time.Now().Add(20 * time.Second).Unix()},
|
|
||||||
{Message: m3, Score: time.Now().Add(30 * time.Second).Unix()},
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
// populate in-progress queue with messages
|
||||||
|
var inProgress []*base.TaskMessage
|
||||||
|
for i := 0; i < 40; i++ {
|
||||||
|
inProgress = append(inProgress,
|
||||||
|
h.NewTaskMessage("send_email", map[string]interface{}{"subject": "hello", "recipient_id": 123}))
|
||||||
|
}
|
||||||
|
h.SeedInProgressQueue(b, r, inProgress)
|
||||||
|
|
||||||
|
rdb := NewRDB(r)
|
||||||
|
|
||||||
|
b.ResetTimer()
|
||||||
|
for n := 0; n < b.N; n++ {
|
||||||
b.StopTimer()
|
b.StopTimer()
|
||||||
testutil.FlushDB(b, r.client)
|
msg := h.NewTaskMessage("reindex", map[string]interface{}{"config": "path/to/config/file"})
|
||||||
testutil.SeedActiveQueue(b, r.client, msgs, base.DefaultQueueName)
|
r.LPush(base.InProgressQueue, h.MustMarshal(b, msg))
|
||||||
testutil.SeedLease(b, r.client, zs, base.DefaultQueueName)
|
|
||||||
b.StartTimer()
|
b.StartTimer()
|
||||||
|
|
||||||
if err := r.Done(ctx, msgs[0]); err != nil {
|
rdb.Done(msg)
|
||||||
b.Fatalf("Done failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkRetry(b *testing.B) {
|
|
||||||
r := setup(b)
|
|
||||||
m1 := testutil.NewTaskMessage("task1", nil)
|
|
||||||
m2 := testutil.NewTaskMessage("task2", nil)
|
|
||||||
m3 := testutil.NewTaskMessage("task3", nil)
|
|
||||||
msgs := []*base.TaskMessage{m1, m2, m3}
|
|
||||||
zs := []base.Z{
|
|
||||||
{Message: m1, Score: time.Now().Add(10 * time.Second).Unix()},
|
|
||||||
{Message: m2, Score: time.Now().Add(20 * time.Second).Unix()},
|
|
||||||
{Message: m3, Score: time.Now().Add(30 * time.Second).Unix()},
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
testutil.SeedActiveQueue(b, r.client, msgs, base.DefaultQueueName)
|
|
||||||
testutil.SeedLease(b, r.client, zs, base.DefaultQueueName)
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if err := r.Retry(ctx, msgs[0], time.Now().Add(1*time.Minute), "error", true /*isFailure*/); err != nil {
|
|
||||||
b.Fatalf("Retry failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkArchive(b *testing.B) {
|
|
||||||
r := setup(b)
|
|
||||||
m1 := testutil.NewTaskMessage("task1", nil)
|
|
||||||
m2 := testutil.NewTaskMessage("task2", nil)
|
|
||||||
m3 := testutil.NewTaskMessage("task3", nil)
|
|
||||||
msgs := []*base.TaskMessage{m1, m2, m3}
|
|
||||||
zs := []base.Z{
|
|
||||||
{Message: m1, Score: time.Now().Add(10 * time.Second).Unix()},
|
|
||||||
{Message: m2, Score: time.Now().Add(20 * time.Second).Unix()},
|
|
||||||
{Message: m3, Score: time.Now().Add(30 * time.Second).Unix()},
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
testutil.SeedActiveQueue(b, r.client, msgs, base.DefaultQueueName)
|
|
||||||
testutil.SeedLease(b, r.client, zs, base.DefaultQueueName)
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if err := r.Archive(ctx, msgs[0], "error"); err != nil {
|
|
||||||
b.Fatalf("Archive failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkRequeue(b *testing.B) {
|
|
||||||
r := setup(b)
|
|
||||||
m1 := testutil.NewTaskMessage("task1", nil)
|
|
||||||
m2 := testutil.NewTaskMessage("task2", nil)
|
|
||||||
m3 := testutil.NewTaskMessage("task3", nil)
|
|
||||||
msgs := []*base.TaskMessage{m1, m2, m3}
|
|
||||||
zs := []base.Z{
|
|
||||||
{Message: m1, Score: time.Now().Add(10 * time.Second).Unix()},
|
|
||||||
{Message: m2, Score: time.Now().Add(20 * time.Second).Unix()},
|
|
||||||
{Message: m3, Score: time.Now().Add(30 * time.Second).Unix()},
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
testutil.SeedActiveQueue(b, r.client, msgs, base.DefaultQueueName)
|
|
||||||
testutil.SeedLease(b, r.client, zs, base.DefaultQueueName)
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if err := r.Requeue(ctx, msgs[0]); err != nil {
|
|
||||||
b.Fatalf("Requeue failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkCheckAndEnqueue(b *testing.B) {
|
|
||||||
r := setup(b)
|
|
||||||
now := time.Now()
|
|
||||||
var zs []base.Z
|
|
||||||
for i := -100; i < 100; i++ {
|
|
||||||
msg := testutil.NewTaskMessage(fmt.Sprintf("task%d", i), nil)
|
|
||||||
score := now.Add(time.Duration(i) * time.Second).Unix()
|
|
||||||
zs = append(zs, base.Z{Message: msg, Score: score})
|
|
||||||
}
|
|
||||||
b.ResetTimer()
|
|
||||||
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
b.StopTimer()
|
|
||||||
testutil.FlushDB(b, r.client)
|
|
||||||
testutil.SeedScheduledQueue(b, r.client, zs, base.DefaultQueueName)
|
|
||||||
b.StartTimer()
|
|
||||||
|
|
||||||
if err := r.ForwardIfReady(base.DefaultQueueName); err != nil {
|
|
||||||
b.Fatalf("ForwardIfReady failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
1805
internal/rdb/rdb.go
1805
internal/rdb/rdb.go
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -6,16 +6,15 @@
|
|||||||
package testbroker
|
package testbroker
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"errors"
|
"errors"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v7"
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var errRedisDown = errors.New("testutil: redis is down")
|
var errRedisDown = errors.New("asynqtest: redis is down")
|
||||||
|
|
||||||
// TestBroker is a broker implementation which enables
|
// TestBroker is a broker implementation which enables
|
||||||
// to simulate Redis failure in tests.
|
// to simulate Redis failure in tests.
|
||||||
@ -27,9 +26,6 @@ type TestBroker struct {
|
|||||||
real base.Broker
|
real base.Broker
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make sure TestBroker implements Broker interface at compile time.
|
|
||||||
var _ base.Broker = (*TestBroker)(nil)
|
|
||||||
|
|
||||||
func NewTestBroker(b base.Broker) *TestBroker {
|
func NewTestBroker(b base.Broker) *TestBroker {
|
||||||
return &TestBroker{real: b}
|
return &TestBroker{real: b}
|
||||||
}
|
}
|
||||||
@ -46,148 +42,121 @@ func (tb *TestBroker) Wakeup() {
|
|||||||
tb.sleeping = false
|
tb.sleeping = false
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tb *TestBroker) Enqueue(ctx context.Context, msg *base.TaskMessage) error {
|
func (tb *TestBroker) Enqueue(msg *base.TaskMessage) error {
|
||||||
tb.mu.Lock()
|
tb.mu.Lock()
|
||||||
defer tb.mu.Unlock()
|
defer tb.mu.Unlock()
|
||||||
if tb.sleeping {
|
if tb.sleeping {
|
||||||
return errRedisDown
|
return errRedisDown
|
||||||
}
|
}
|
||||||
return tb.real.Enqueue(ctx, msg)
|
return tb.real.Enqueue(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tb *TestBroker) EnqueueUnique(ctx context.Context, msg *base.TaskMessage, ttl time.Duration) error {
|
func (tb *TestBroker) EnqueueUnique(msg *base.TaskMessage, ttl time.Duration) error {
|
||||||
tb.mu.Lock()
|
tb.mu.Lock()
|
||||||
defer tb.mu.Unlock()
|
defer tb.mu.Unlock()
|
||||||
if tb.sleeping {
|
if tb.sleeping {
|
||||||
return errRedisDown
|
return errRedisDown
|
||||||
}
|
}
|
||||||
return tb.real.EnqueueUnique(ctx, msg, ttl)
|
return tb.real.EnqueueUnique(msg, ttl)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tb *TestBroker) Dequeue(qnames ...string) (*base.TaskMessage, time.Time, error) {
|
func (tb *TestBroker) Dequeue(qnames ...string) (*base.TaskMessage, error) {
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return nil, time.Time{}, errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.Dequeue(qnames...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) Done(ctx context.Context, msg *base.TaskMessage) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.Done(ctx, msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) MarkAsComplete(ctx context.Context, msg *base.TaskMessage) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.MarkAsComplete(ctx, msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) Requeue(ctx context.Context, msg *base.TaskMessage) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.Requeue(ctx, msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) Schedule(ctx context.Context, msg *base.TaskMessage, processAt time.Time) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.Schedule(ctx, msg, processAt)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) ScheduleUnique(ctx context.Context, msg *base.TaskMessage, processAt time.Time, ttl time.Duration) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.ScheduleUnique(ctx, msg, processAt, ttl)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) Retry(ctx context.Context, msg *base.TaskMessage, processAt time.Time, errMsg string, isFailure bool) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.Retry(ctx, msg, processAt, errMsg, isFailure)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) Archive(ctx context.Context, msg *base.TaskMessage, errMsg string) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.Archive(ctx, msg, errMsg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) ForwardIfReady(qnames ...string) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.ForwardIfReady(qnames...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) DeleteExpiredCompletedTasks(qname string, batchSize int) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.DeleteExpiredCompletedTasks(qname, batchSize)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) ListLeaseExpired(cutoff time.Time, qnames ...string) ([]*base.TaskMessage, error) {
|
|
||||||
tb.mu.Lock()
|
tb.mu.Lock()
|
||||||
defer tb.mu.Unlock()
|
defer tb.mu.Unlock()
|
||||||
if tb.sleeping {
|
if tb.sleeping {
|
||||||
return nil, errRedisDown
|
return nil, errRedisDown
|
||||||
}
|
}
|
||||||
return tb.real.ListLeaseExpired(cutoff, qnames...)
|
return tb.real.Dequeue(qnames...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tb *TestBroker) ExtendLease(qname string, ids ...string) (time.Time, error) {
|
func (tb *TestBroker) Done(msg *base.TaskMessage) error {
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return time.Time{}, errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.ExtendLease(qname, ids...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) WriteServerState(info *base.ServerInfo, workers []*base.WorkerInfo, ttl time.Duration) error {
|
|
||||||
tb.mu.Lock()
|
tb.mu.Lock()
|
||||||
defer tb.mu.Unlock()
|
defer tb.mu.Unlock()
|
||||||
if tb.sleeping {
|
if tb.sleeping {
|
||||||
return errRedisDown
|
return errRedisDown
|
||||||
}
|
}
|
||||||
return tb.real.WriteServerState(info, workers, ttl)
|
return tb.real.Done(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tb *TestBroker) ClearServerState(host string, pid int, serverID string) error {
|
func (tb *TestBroker) Requeue(msg *base.TaskMessage) error {
|
||||||
tb.mu.Lock()
|
tb.mu.Lock()
|
||||||
defer tb.mu.Unlock()
|
defer tb.mu.Unlock()
|
||||||
if tb.sleeping {
|
if tb.sleeping {
|
||||||
return errRedisDown
|
return errRedisDown
|
||||||
}
|
}
|
||||||
return tb.real.ClearServerState(host, pid, serverID)
|
return tb.real.Requeue(msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tb *TestBroker) Schedule(msg *base.TaskMessage, processAt time.Time) error {
|
||||||
|
tb.mu.Lock()
|
||||||
|
defer tb.mu.Unlock()
|
||||||
|
if tb.sleeping {
|
||||||
|
return errRedisDown
|
||||||
|
}
|
||||||
|
return tb.real.Schedule(msg, processAt)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tb *TestBroker) ScheduleUnique(msg *base.TaskMessage, processAt time.Time, ttl time.Duration) error {
|
||||||
|
tb.mu.Lock()
|
||||||
|
defer tb.mu.Unlock()
|
||||||
|
if tb.sleeping {
|
||||||
|
return errRedisDown
|
||||||
|
}
|
||||||
|
return tb.real.ScheduleUnique(msg, processAt, ttl)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tb *TestBroker) Retry(msg *base.TaskMessage, processAt time.Time, errMsg string) error {
|
||||||
|
tb.mu.Lock()
|
||||||
|
defer tb.mu.Unlock()
|
||||||
|
if tb.sleeping {
|
||||||
|
return errRedisDown
|
||||||
|
}
|
||||||
|
return tb.real.Retry(msg, processAt, errMsg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tb *TestBroker) Kill(msg *base.TaskMessage, errMsg string) error {
|
||||||
|
tb.mu.Lock()
|
||||||
|
defer tb.mu.Unlock()
|
||||||
|
if tb.sleeping {
|
||||||
|
return errRedisDown
|
||||||
|
}
|
||||||
|
return tb.real.Kill(msg, errMsg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tb *TestBroker) RequeueAll() (int64, error) {
|
||||||
|
tb.mu.Lock()
|
||||||
|
defer tb.mu.Unlock()
|
||||||
|
if tb.sleeping {
|
||||||
|
return 0, errRedisDown
|
||||||
|
}
|
||||||
|
return tb.real.RequeueAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tb *TestBroker) CheckAndEnqueue(qnames ...string) error {
|
||||||
|
tb.mu.Lock()
|
||||||
|
defer tb.mu.Unlock()
|
||||||
|
if tb.sleeping {
|
||||||
|
return errRedisDown
|
||||||
|
}
|
||||||
|
return tb.real.CheckAndEnqueue()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tb *TestBroker) WriteServerState(ss *base.ServerState, ttl time.Duration) error {
|
||||||
|
tb.mu.Lock()
|
||||||
|
defer tb.mu.Unlock()
|
||||||
|
if tb.sleeping {
|
||||||
|
return errRedisDown
|
||||||
|
}
|
||||||
|
return tb.real.WriteServerState(ss, ttl)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tb *TestBroker) ClearServerState(ss *base.ServerState) error {
|
||||||
|
tb.mu.Lock()
|
||||||
|
defer tb.mu.Unlock()
|
||||||
|
if tb.sleeping {
|
||||||
|
return errRedisDown
|
||||||
|
}
|
||||||
|
return tb.real.ClearServerState(ss)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tb *TestBroker) CancelationPubSub() (*redis.PubSub, error) {
|
func (tb *TestBroker) CancelationPubSub() (*redis.PubSub, error) {
|
||||||
@ -208,24 +177,6 @@ func (tb *TestBroker) PublishCancelation(id string) error {
|
|||||||
return tb.real.PublishCancelation(id)
|
return tb.real.PublishCancelation(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tb *TestBroker) WriteResult(qname, id string, data []byte) (int, error) {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return 0, errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.WriteResult(qname, id, data)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) Ping() error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.Ping()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) Close() error {
|
func (tb *TestBroker) Close() error {
|
||||||
tb.mu.Lock()
|
tb.mu.Lock()
|
||||||
defer tb.mu.Unlock()
|
defer tb.mu.Unlock()
|
||||||
@ -234,66 +185,3 @@ func (tb *TestBroker) Close() error {
|
|||||||
}
|
}
|
||||||
return tb.real.Close()
|
return tb.real.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tb *TestBroker) AddToGroup(ctx context.Context, msg *base.TaskMessage, gname string) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.AddToGroup(ctx, msg, gname)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) AddToGroupUnique(ctx context.Context, msg *base.TaskMessage, gname string, ttl time.Duration) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.AddToGroupUnique(ctx, msg, gname, ttl)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) ListGroups(qname string) ([]string, error) {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return nil, errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.ListGroups(qname)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) AggregationCheck(qname, gname string, t time.Time, gracePeriod, maxDelay time.Duration, maxSize int) (aggregationSetID string, err error) {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return "", errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.AggregationCheck(qname, gname, t, gracePeriod, maxDelay, maxSize)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) ReadAggregationSet(qname, gname, aggregationSetID string) ([]*base.TaskMessage, time.Time, error) {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return nil, time.Time{}, errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.ReadAggregationSet(qname, gname, aggregationSetID)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) DeleteAggregationSet(ctx context.Context, qname, gname, aggregationSetID string) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.DeleteAggregationSet(ctx, qname, gname, aggregationSetID)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tb *TestBroker) ReclaimStaleAggregationSets(qname string) error {
|
|
||||||
tb.mu.Lock()
|
|
||||||
defer tb.mu.Unlock()
|
|
||||||
if tb.sleeping {
|
|
||||||
return errRedisDown
|
|
||||||
}
|
|
||||||
return tb.real.ReclaimStaleAggregationSets(qname)
|
|
||||||
}
|
|
||||||
|
@ -1,84 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package testutil
|
|
||||||
|
|
||||||
import (
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
)
|
|
||||||
|
|
||||||
func makeDefaultTaskMessage() *base.TaskMessage {
|
|
||||||
return &base.TaskMessage{
|
|
||||||
ID: uuid.NewString(),
|
|
||||||
Type: "default_task",
|
|
||||||
Queue: "default",
|
|
||||||
Retry: 25,
|
|
||||||
Timeout: 1800, // default timeout of 30 mins
|
|
||||||
Deadline: 0, // no deadline
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type TaskMessageBuilder struct {
|
|
||||||
msg *base.TaskMessage
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewTaskMessageBuilder() *TaskMessageBuilder {
|
|
||||||
return &TaskMessageBuilder{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *TaskMessageBuilder) lazyInit() {
|
|
||||||
if b.msg == nil {
|
|
||||||
b.msg = makeDefaultTaskMessage()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *TaskMessageBuilder) Build() *base.TaskMessage {
|
|
||||||
b.lazyInit()
|
|
||||||
return b.msg
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *TaskMessageBuilder) SetType(typename string) *TaskMessageBuilder {
|
|
||||||
b.lazyInit()
|
|
||||||
b.msg.Type = typename
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *TaskMessageBuilder) SetPayload(payload []byte) *TaskMessageBuilder {
|
|
||||||
b.lazyInit()
|
|
||||||
b.msg.Payload = payload
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *TaskMessageBuilder) SetQueue(qname string) *TaskMessageBuilder {
|
|
||||||
b.lazyInit()
|
|
||||||
b.msg.Queue = qname
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *TaskMessageBuilder) SetRetry(n int) *TaskMessageBuilder {
|
|
||||||
b.lazyInit()
|
|
||||||
b.msg.Retry = n
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *TaskMessageBuilder) SetTimeout(timeout time.Duration) *TaskMessageBuilder {
|
|
||||||
b.lazyInit()
|
|
||||||
b.msg.Timeout = int64(timeout.Seconds())
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *TaskMessageBuilder) SetDeadline(deadline time.Time) *TaskMessageBuilder {
|
|
||||||
b.lazyInit()
|
|
||||||
b.msg.Deadline = deadline.Unix()
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *TaskMessageBuilder) SetGroup(gname string) *TaskMessageBuilder {
|
|
||||||
b.lazyInit()
|
|
||||||
b.msg.GroupKey = gname
|
|
||||||
return b
|
|
||||||
}
|
|
@ -1,94 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package testutil
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
"github.com/google/go-cmp/cmp/cmpopts"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestTaskMessageBuilder(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
ops func(b *TaskMessageBuilder) // operations to perform on the builder
|
|
||||||
want *base.TaskMessage
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "zero value and build",
|
|
||||||
ops: nil,
|
|
||||||
want: &base.TaskMessage{
|
|
||||||
Type: "default_task",
|
|
||||||
Queue: "default",
|
|
||||||
Payload: nil,
|
|
||||||
Retry: 25,
|
|
||||||
Timeout: 1800, // 30m
|
|
||||||
Deadline: 0,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with type, payload, and queue",
|
|
||||||
ops: func(b *TaskMessageBuilder) {
|
|
||||||
b.SetType("foo").SetPayload([]byte("hello")).SetQueue("myqueue")
|
|
||||||
},
|
|
||||||
want: &base.TaskMessage{
|
|
||||||
Type: "foo",
|
|
||||||
Queue: "myqueue",
|
|
||||||
Payload: []byte("hello"),
|
|
||||||
Retry: 25,
|
|
||||||
Timeout: 1800, // 30m
|
|
||||||
Deadline: 0,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with retry, timeout, and deadline",
|
|
||||||
ops: func(b *TaskMessageBuilder) {
|
|
||||||
b.SetRetry(1).
|
|
||||||
SetTimeout(20 * time.Second).
|
|
||||||
SetDeadline(time.Date(2017, 3, 6, 0, 0, 0, 0, time.UTC))
|
|
||||||
},
|
|
||||||
want: &base.TaskMessage{
|
|
||||||
Type: "default_task",
|
|
||||||
Queue: "default",
|
|
||||||
Payload: nil,
|
|
||||||
Retry: 1,
|
|
||||||
Timeout: 20,
|
|
||||||
Deadline: time.Date(2017, 3, 6, 0, 0, 0, 0, time.UTC).Unix(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with group",
|
|
||||||
ops: func(b *TaskMessageBuilder) {
|
|
||||||
b.SetGroup("mygroup")
|
|
||||||
},
|
|
||||||
want: &base.TaskMessage{
|
|
||||||
Type: "default_task",
|
|
||||||
Queue: "default",
|
|
||||||
Payload: nil,
|
|
||||||
Retry: 25,
|
|
||||||
Timeout: 1800,
|
|
||||||
Deadline: 0,
|
|
||||||
GroupKey: "mygroup",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
cmpOpts := []cmp.Option{cmpopts.IgnoreFields(base.TaskMessage{}, "ID")}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
var b TaskMessageBuilder
|
|
||||||
if tc.ops != nil {
|
|
||||||
tc.ops(&b)
|
|
||||||
}
|
|
||||||
|
|
||||||
got := b.Build()
|
|
||||||
if diff := cmp.Diff(tc.want, got, cmpOpts...); diff != "" {
|
|
||||||
t.Errorf("%s: TaskMessageBuilder.Build() = %+v, want %+v;\n(-want,+got)\n%s",
|
|
||||||
tc.desc, got, tc.want, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,642 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
// Package testutil defines test helpers for asynq and its internal packages.
|
|
||||||
package testutil
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"math"
|
|
||||||
"sort"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
"github.com/google/go-cmp/cmp/cmpopts"
|
|
||||||
"github.com/google/uuid"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/timeutil"
|
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
)
|
|
||||||
|
|
||||||
// EquateInt64Approx returns a Comparer option that treats int64 values
|
|
||||||
// to be equal if they are within the given margin.
|
|
||||||
func EquateInt64Approx(margin int64) cmp.Option {
|
|
||||||
return cmp.Comparer(func(a, b int64) bool {
|
|
||||||
return math.Abs(float64(a-b)) <= float64(margin)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// SortMsgOpt is a cmp.Option to sort base.TaskMessage for comparing slice of task messages.
|
|
||||||
var SortMsgOpt = cmp.Transformer("SortTaskMessages", func(in []*base.TaskMessage) []*base.TaskMessage {
|
|
||||||
out := append([]*base.TaskMessage(nil), in...) // Copy input to avoid mutating it
|
|
||||||
sort.Slice(out, func(i, j int) bool {
|
|
||||||
return out[i].ID < out[j].ID
|
|
||||||
})
|
|
||||||
return out
|
|
||||||
})
|
|
||||||
|
|
||||||
// SortZSetEntryOpt is an cmp.Option to sort ZSetEntry for comparing slice of zset entries.
|
|
||||||
var SortZSetEntryOpt = cmp.Transformer("SortZSetEntries", func(in []base.Z) []base.Z {
|
|
||||||
out := append([]base.Z(nil), in...) // Copy input to avoid mutating it
|
|
||||||
sort.Slice(out, func(i, j int) bool {
|
|
||||||
return out[i].Message.ID < out[j].Message.ID
|
|
||||||
})
|
|
||||||
return out
|
|
||||||
})
|
|
||||||
|
|
||||||
// SortServerInfoOpt is a cmp.Option to sort base.ServerInfo for comparing slice of process info.
|
|
||||||
var SortServerInfoOpt = cmp.Transformer("SortServerInfo", func(in []*base.ServerInfo) []*base.ServerInfo {
|
|
||||||
out := append([]*base.ServerInfo(nil), in...) // Copy input to avoid mutating it
|
|
||||||
sort.Slice(out, func(i, j int) bool {
|
|
||||||
if out[i].Host != out[j].Host {
|
|
||||||
return out[i].Host < out[j].Host
|
|
||||||
}
|
|
||||||
return out[i].PID < out[j].PID
|
|
||||||
})
|
|
||||||
return out
|
|
||||||
})
|
|
||||||
|
|
||||||
// SortWorkerInfoOpt is a cmp.Option to sort base.WorkerInfo for comparing slice of worker info.
|
|
||||||
var SortWorkerInfoOpt = cmp.Transformer("SortWorkerInfo", func(in []*base.WorkerInfo) []*base.WorkerInfo {
|
|
||||||
out := append([]*base.WorkerInfo(nil), in...) // Copy input to avoid mutating it
|
|
||||||
sort.Slice(out, func(i, j int) bool {
|
|
||||||
return out[i].ID < out[j].ID
|
|
||||||
})
|
|
||||||
return out
|
|
||||||
})
|
|
||||||
|
|
||||||
// SortSchedulerEntryOpt is a cmp.Option to sort base.SchedulerEntry for comparing slice of entries.
|
|
||||||
var SortSchedulerEntryOpt = cmp.Transformer("SortSchedulerEntry", func(in []*base.SchedulerEntry) []*base.SchedulerEntry {
|
|
||||||
out := append([]*base.SchedulerEntry(nil), in...) // Copy input to avoid mutating it
|
|
||||||
sort.Slice(out, func(i, j int) bool {
|
|
||||||
return out[i].Spec < out[j].Spec
|
|
||||||
})
|
|
||||||
return out
|
|
||||||
})
|
|
||||||
|
|
||||||
// SortSchedulerEnqueueEventOpt is a cmp.Option to sort base.SchedulerEnqueueEvent for comparing slice of events.
|
|
||||||
var SortSchedulerEnqueueEventOpt = cmp.Transformer("SortSchedulerEnqueueEvent", func(in []*base.SchedulerEnqueueEvent) []*base.SchedulerEnqueueEvent {
|
|
||||||
out := append([]*base.SchedulerEnqueueEvent(nil), in...)
|
|
||||||
sort.Slice(out, func(i, j int) bool {
|
|
||||||
return out[i].EnqueuedAt.Unix() < out[j].EnqueuedAt.Unix()
|
|
||||||
})
|
|
||||||
return out
|
|
||||||
})
|
|
||||||
|
|
||||||
// SortStringSliceOpt is a cmp.Option to sort string slice.
|
|
||||||
var SortStringSliceOpt = cmp.Transformer("SortStringSlice", func(in []string) []string {
|
|
||||||
out := append([]string(nil), in...)
|
|
||||||
sort.Strings(out)
|
|
||||||
return out
|
|
||||||
})
|
|
||||||
|
|
||||||
var SortRedisZSetEntryOpt = cmp.Transformer("SortZSetEntries", func(in []redis.Z) []redis.Z {
|
|
||||||
out := append([]redis.Z(nil), in...) // Copy input to avoid mutating it
|
|
||||||
sort.Slice(out, func(i, j int) bool {
|
|
||||||
// TODO: If member is a comparable type (int, string, etc) compare by the member
|
|
||||||
// Use generic comparable type here once update to go1.18
|
|
||||||
if _, ok := out[i].Member.(string); ok {
|
|
||||||
// If member is a string, compare the member
|
|
||||||
return out[i].Member.(string) < out[j].Member.(string)
|
|
||||||
}
|
|
||||||
return out[i].Score < out[j].Score
|
|
||||||
})
|
|
||||||
return out
|
|
||||||
})
|
|
||||||
|
|
||||||
// IgnoreIDOpt is an cmp.Option to ignore ID field in task messages when comparing.
|
|
||||||
var IgnoreIDOpt = cmpopts.IgnoreFields(base.TaskMessage{}, "ID")
|
|
||||||
|
|
||||||
// NewTaskMessage returns a new instance of TaskMessage given a task type and payload.
|
|
||||||
func NewTaskMessage(taskType string, payload []byte) *base.TaskMessage {
|
|
||||||
return NewTaskMessageWithQueue(taskType, payload, base.DefaultQueueName)
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewTaskMessageWithQueue returns a new instance of TaskMessage given a
|
|
||||||
// task type, payload and queue name.
|
|
||||||
func NewTaskMessageWithQueue(taskType string, payload []byte, qname string) *base.TaskMessage {
|
|
||||||
return &base.TaskMessage{
|
|
||||||
ID: uuid.NewString(),
|
|
||||||
Type: taskType,
|
|
||||||
Queue: qname,
|
|
||||||
Retry: 25,
|
|
||||||
Payload: payload,
|
|
||||||
Timeout: 1800, // default timeout of 30 mins
|
|
||||||
Deadline: 0, // no deadline
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewLeaseWithClock returns a new lease with the given expiration time and clock.
|
|
||||||
func NewLeaseWithClock(expirationTime time.Time, clock timeutil.Clock) *base.Lease {
|
|
||||||
l := base.NewLease(expirationTime)
|
|
||||||
l.Clock = clock
|
|
||||||
return l
|
|
||||||
}
|
|
||||||
|
|
||||||
// JSON serializes the given key-value pairs into stream of bytes in JSON.
|
|
||||||
func JSON(kv map[string]interface{}) []byte {
|
|
||||||
b, err := json.Marshal(kv)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskMessageAfterRetry returns an updated copy of t after retry.
|
|
||||||
// It increments retry count and sets the error message and last_failed_at time.
|
|
||||||
func TaskMessageAfterRetry(t base.TaskMessage, errMsg string, failedAt time.Time) *base.TaskMessage {
|
|
||||||
t.Retried = t.Retried + 1
|
|
||||||
t.ErrorMsg = errMsg
|
|
||||||
t.LastFailedAt = failedAt.Unix()
|
|
||||||
return &t
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskMessageWithError returns an updated copy of t with the given error message.
|
|
||||||
func TaskMessageWithError(t base.TaskMessage, errMsg string, failedAt time.Time) *base.TaskMessage {
|
|
||||||
t.ErrorMsg = errMsg
|
|
||||||
t.LastFailedAt = failedAt.Unix()
|
|
||||||
return &t
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskMessageWithCompletedAt returns an updated copy of t after completion.
|
|
||||||
func TaskMessageWithCompletedAt(t base.TaskMessage, completedAt time.Time) *base.TaskMessage {
|
|
||||||
t.CompletedAt = completedAt.Unix()
|
|
||||||
return &t
|
|
||||||
}
|
|
||||||
|
|
||||||
// MustMarshal marshals given task message and returns a json string.
|
|
||||||
// Calling test will fail if marshaling errors out.
|
|
||||||
func MustMarshal(tb testing.TB, msg *base.TaskMessage) string {
|
|
||||||
tb.Helper()
|
|
||||||
data, err := base.EncodeMessage(msg)
|
|
||||||
if err != nil {
|
|
||||||
tb.Fatal(err)
|
|
||||||
}
|
|
||||||
return string(data)
|
|
||||||
}
|
|
||||||
|
|
||||||
// MustUnmarshal unmarshals given string into task message struct.
|
|
||||||
// Calling test will fail if unmarshaling errors out.
|
|
||||||
func MustUnmarshal(tb testing.TB, data string) *base.TaskMessage {
|
|
||||||
tb.Helper()
|
|
||||||
msg, err := base.DecodeMessage([]byte(data))
|
|
||||||
if err != nil {
|
|
||||||
tb.Fatal(err)
|
|
||||||
}
|
|
||||||
return msg
|
|
||||||
}
|
|
||||||
|
|
||||||
// FlushDB deletes all the keys of the currently selected DB.
|
|
||||||
func FlushDB(tb testing.TB, r redis.UniversalClient) {
|
|
||||||
tb.Helper()
|
|
||||||
switch r := r.(type) {
|
|
||||||
case *redis.Client:
|
|
||||||
if err := r.FlushDB(context.Background()).Err(); err != nil {
|
|
||||||
tb.Fatal(err)
|
|
||||||
}
|
|
||||||
case *redis.ClusterClient:
|
|
||||||
err := r.ForEachMaster(context.Background(), func(ctx context.Context, c *redis.Client) error {
|
|
||||||
if err := c.FlushAll(ctx).Err(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
tb.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedPendingQueue initializes the specified queue with the given messages.
|
|
||||||
func SeedPendingQueue(tb testing.TB, r redis.UniversalClient, msgs []*base.TaskMessage, qname string) {
|
|
||||||
tb.Helper()
|
|
||||||
r.SAdd(context.Background(), base.AllQueues, qname)
|
|
||||||
seedRedisList(tb, r, base.PendingKey(qname), msgs, base.TaskStatePending)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedActiveQueue initializes the active queue with the given messages.
|
|
||||||
func SeedActiveQueue(tb testing.TB, r redis.UniversalClient, msgs []*base.TaskMessage, qname string) {
|
|
||||||
tb.Helper()
|
|
||||||
r.SAdd(context.Background(), base.AllQueues, qname)
|
|
||||||
seedRedisList(tb, r, base.ActiveKey(qname), msgs, base.TaskStateActive)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedScheduledQueue initializes the scheduled queue with the given messages.
|
|
||||||
func SeedScheduledQueue(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) {
|
|
||||||
tb.Helper()
|
|
||||||
r.SAdd(context.Background(), base.AllQueues, qname)
|
|
||||||
seedRedisZSet(tb, r, base.ScheduledKey(qname), entries, base.TaskStateScheduled)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedRetryQueue initializes the retry queue with the given messages.
|
|
||||||
func SeedRetryQueue(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) {
|
|
||||||
tb.Helper()
|
|
||||||
r.SAdd(context.Background(), base.AllQueues, qname)
|
|
||||||
seedRedisZSet(tb, r, base.RetryKey(qname), entries, base.TaskStateRetry)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedArchivedQueue initializes the archived queue with the given messages.
|
|
||||||
func SeedArchivedQueue(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) {
|
|
||||||
tb.Helper()
|
|
||||||
r.SAdd(context.Background(), base.AllQueues, qname)
|
|
||||||
seedRedisZSet(tb, r, base.ArchivedKey(qname), entries, base.TaskStateArchived)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedLease initializes the lease set with the given entries.
|
|
||||||
func SeedLease(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) {
|
|
||||||
tb.Helper()
|
|
||||||
r.SAdd(context.Background(), base.AllQueues, qname)
|
|
||||||
seedRedisZSet(tb, r, base.LeaseKey(qname), entries, base.TaskStateActive)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedCompletedQueue initializes the completed set with the given entries.
|
|
||||||
func SeedCompletedQueue(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) {
|
|
||||||
tb.Helper()
|
|
||||||
r.SAdd(context.Background(), base.AllQueues, qname)
|
|
||||||
seedRedisZSet(tb, r, base.CompletedKey(qname), entries, base.TaskStateCompleted)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedGroup initializes the group with the given entries.
|
|
||||||
func SeedGroup(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname, gname string) {
|
|
||||||
tb.Helper()
|
|
||||||
ctx := context.Background()
|
|
||||||
r.SAdd(ctx, base.AllQueues, qname)
|
|
||||||
r.SAdd(ctx, base.AllGroups(qname), gname)
|
|
||||||
seedRedisZSet(tb, r, base.GroupKey(qname, gname), entries, base.TaskStateAggregating)
|
|
||||||
}
|
|
||||||
|
|
||||||
func SeedAggregationSet(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname, gname, setID string) {
|
|
||||||
tb.Helper()
|
|
||||||
r.SAdd(context.Background(), base.AllQueues, qname)
|
|
||||||
seedRedisZSet(tb, r, base.AggregationSetKey(qname, gname, setID), entries, base.TaskStateAggregating)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedAllPendingQueues initializes all of the specified queues with the given messages.
|
|
||||||
//
|
|
||||||
// pending maps a queue name to a list of messages.
|
|
||||||
func SeedAllPendingQueues(tb testing.TB, r redis.UniversalClient, pending map[string][]*base.TaskMessage) {
|
|
||||||
tb.Helper()
|
|
||||||
for q, msgs := range pending {
|
|
||||||
SeedPendingQueue(tb, r, msgs, q)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedAllActiveQueues initializes all of the specified active queues with the given messages.
|
|
||||||
func SeedAllActiveQueues(tb testing.TB, r redis.UniversalClient, active map[string][]*base.TaskMessage) {
|
|
||||||
tb.Helper()
|
|
||||||
for q, msgs := range active {
|
|
||||||
SeedActiveQueue(tb, r, msgs, q)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedAllScheduledQueues initializes all of the specified scheduled queues with the given entries.
|
|
||||||
func SeedAllScheduledQueues(tb testing.TB, r redis.UniversalClient, scheduled map[string][]base.Z) {
|
|
||||||
tb.Helper()
|
|
||||||
for q, entries := range scheduled {
|
|
||||||
SeedScheduledQueue(tb, r, entries, q)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedAllRetryQueues initializes all of the specified retry queues with the given entries.
|
|
||||||
func SeedAllRetryQueues(tb testing.TB, r redis.UniversalClient, retry map[string][]base.Z) {
|
|
||||||
tb.Helper()
|
|
||||||
for q, entries := range retry {
|
|
||||||
SeedRetryQueue(tb, r, entries, q)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedAllArchivedQueues initializes all of the specified archived queues with the given entries.
|
|
||||||
func SeedAllArchivedQueues(tb testing.TB, r redis.UniversalClient, archived map[string][]base.Z) {
|
|
||||||
tb.Helper()
|
|
||||||
for q, entries := range archived {
|
|
||||||
SeedArchivedQueue(tb, r, entries, q)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedAllLease initializes all of the lease sets with the given entries.
|
|
||||||
func SeedAllLease(tb testing.TB, r redis.UniversalClient, lease map[string][]base.Z) {
|
|
||||||
tb.Helper()
|
|
||||||
for q, entries := range lease {
|
|
||||||
SeedLease(tb, r, entries, q)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedAllCompletedQueues initializes all of the completed queues with the given entries.
|
|
||||||
func SeedAllCompletedQueues(tb testing.TB, r redis.UniversalClient, completed map[string][]base.Z) {
|
|
||||||
tb.Helper()
|
|
||||||
for q, entries := range completed {
|
|
||||||
SeedCompletedQueue(tb, r, entries, q)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeedAllGroups initializes all groups in all queues.
|
|
||||||
// The map maps queue names to group names which maps to a list of task messages and the time it was
|
|
||||||
// added to the group.
|
|
||||||
func SeedAllGroups(tb testing.TB, r redis.UniversalClient, groups map[string]map[string][]base.Z) {
|
|
||||||
tb.Helper()
|
|
||||||
for qname, g := range groups {
|
|
||||||
for gname, entries := range g {
|
|
||||||
SeedGroup(tb, r, entries, qname, gname)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func seedRedisList(tb testing.TB, c redis.UniversalClient, key string,
|
|
||||||
msgs []*base.TaskMessage, state base.TaskState) {
|
|
||||||
tb.Helper()
|
|
||||||
for _, msg := range msgs {
|
|
||||||
encoded := MustMarshal(tb, msg)
|
|
||||||
if err := c.LPush(context.Background(), key, msg.ID).Err(); err != nil {
|
|
||||||
tb.Fatal(err)
|
|
||||||
}
|
|
||||||
taskKey := base.TaskKey(msg.Queue, msg.ID)
|
|
||||||
data := map[string]interface{}{
|
|
||||||
"msg": encoded,
|
|
||||||
"state": state.String(),
|
|
||||||
"unique_key": msg.UniqueKey,
|
|
||||||
"group": msg.GroupKey,
|
|
||||||
}
|
|
||||||
if err := c.HSet(context.Background(), taskKey, data).Err(); err != nil {
|
|
||||||
tb.Fatal(err)
|
|
||||||
}
|
|
||||||
if len(msg.UniqueKey) > 0 {
|
|
||||||
err := c.SetNX(context.Background(), msg.UniqueKey, msg.ID, 1*time.Minute).Err()
|
|
||||||
if err != nil {
|
|
||||||
tb.Fatalf("Failed to set unique lock in redis: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func seedRedisZSet(tb testing.TB, c redis.UniversalClient, key string,
|
|
||||||
items []base.Z, state base.TaskState) {
|
|
||||||
tb.Helper()
|
|
||||||
for _, item := range items {
|
|
||||||
msg := item.Message
|
|
||||||
encoded := MustMarshal(tb, msg)
|
|
||||||
z := redis.Z{Member: msg.ID, Score: float64(item.Score)}
|
|
||||||
if err := c.ZAdd(context.Background(), key, z).Err(); err != nil {
|
|
||||||
tb.Fatal(err)
|
|
||||||
}
|
|
||||||
taskKey := base.TaskKey(msg.Queue, msg.ID)
|
|
||||||
data := map[string]interface{}{
|
|
||||||
"msg": encoded,
|
|
||||||
"state": state.String(),
|
|
||||||
"unique_key": msg.UniqueKey,
|
|
||||||
"group": msg.GroupKey,
|
|
||||||
}
|
|
||||||
if err := c.HSet(context.Background(), taskKey, data).Err(); err != nil {
|
|
||||||
tb.Fatal(err)
|
|
||||||
}
|
|
||||||
if len(msg.UniqueKey) > 0 {
|
|
||||||
err := c.SetNX(context.Background(), msg.UniqueKey, msg.ID, 1*time.Minute).Err()
|
|
||||||
if err != nil {
|
|
||||||
tb.Fatalf("Failed to set unique lock in redis: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPendingMessages returns all pending messages in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetPendingMessages(tb testing.TB, r redis.UniversalClient, qname string) []*base.TaskMessage {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromList(tb, r, qname, base.PendingKey, base.TaskStatePending)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetActiveMessages returns all active messages in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetActiveMessages(tb testing.TB, r redis.UniversalClient, qname string) []*base.TaskMessage {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromList(tb, r, qname, base.ActiveKey, base.TaskStateActive)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetScheduledMessages returns all scheduled task messages in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetScheduledMessages(tb testing.TB, r redis.UniversalClient, qname string) []*base.TaskMessage {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSet(tb, r, qname, base.ScheduledKey, base.TaskStateScheduled)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetRetryMessages returns all retry messages in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetRetryMessages(tb testing.TB, r redis.UniversalClient, qname string) []*base.TaskMessage {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSet(tb, r, qname, base.RetryKey, base.TaskStateRetry)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetArchivedMessages returns all archived messages in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetArchivedMessages(tb testing.TB, r redis.UniversalClient, qname string) []*base.TaskMessage {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSet(tb, r, qname, base.ArchivedKey, base.TaskStateArchived)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetCompletedMessages returns all completed task messages in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetCompletedMessages(tb testing.TB, r redis.UniversalClient, qname string) []*base.TaskMessage {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSet(tb, r, qname, base.CompletedKey, base.TaskStateCompleted)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetScheduledEntries returns all scheduled messages and its score in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetScheduledEntries(tb testing.TB, r redis.UniversalClient, qname string) []base.Z {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSetWithScores(tb, r, qname, base.ScheduledKey, base.TaskStateScheduled)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetRetryEntries returns all retry messages and its score in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetRetryEntries(tb testing.TB, r redis.UniversalClient, qname string) []base.Z {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSetWithScores(tb, r, qname, base.RetryKey, base.TaskStateRetry)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetArchivedEntries returns all archived messages and its score in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetArchivedEntries(tb testing.TB, r redis.UniversalClient, qname string) []base.Z {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSetWithScores(tb, r, qname, base.ArchivedKey, base.TaskStateArchived)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetLeaseEntries returns all task IDs and its score in the lease set for the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetLeaseEntries(tb testing.TB, r redis.UniversalClient, qname string) []base.Z {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSetWithScores(tb, r, qname, base.LeaseKey, base.TaskStateActive)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetCompletedEntries returns all completed messages and its score in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetCompletedEntries(tb testing.TB, r redis.UniversalClient, qname string) []base.Z {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSetWithScores(tb, r, qname, base.CompletedKey, base.TaskStateCompleted)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetGroupEntries returns all scheduled messages and its score in the given queue.
|
|
||||||
// It also asserts the state field of the task.
|
|
||||||
func GetGroupEntries(tb testing.TB, r redis.UniversalClient, qname, groupKey string) []base.Z {
|
|
||||||
tb.Helper()
|
|
||||||
return getMessagesFromZSetWithScores(tb, r, qname,
|
|
||||||
func(qname string) string { return base.GroupKey(qname, groupKey) }, base.TaskStateAggregating)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retrieves all messages stored under `keyFn(qname)` key in redis list.
|
|
||||||
func getMessagesFromList(tb testing.TB, r redis.UniversalClient, qname string,
|
|
||||||
keyFn func(qname string) string, state base.TaskState) []*base.TaskMessage {
|
|
||||||
tb.Helper()
|
|
||||||
ids := r.LRange(context.Background(), keyFn(qname), 0, -1).Val()
|
|
||||||
var msgs []*base.TaskMessage
|
|
||||||
for _, id := range ids {
|
|
||||||
taskKey := base.TaskKey(qname, id)
|
|
||||||
data := r.HGet(context.Background(), taskKey, "msg").Val()
|
|
||||||
msgs = append(msgs, MustUnmarshal(tb, data))
|
|
||||||
if gotState := r.HGet(context.Background(), taskKey, "state").Val(); gotState != state.String() {
|
|
||||||
tb.Errorf("task (id=%q) is in %q state, want %v", id, gotState, state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return msgs
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retrieves all messages stored under `keyFn(qname)` key in redis zset (sorted-set).
|
|
||||||
func getMessagesFromZSet(tb testing.TB, r redis.UniversalClient, qname string,
|
|
||||||
keyFn func(qname string) string, state base.TaskState) []*base.TaskMessage {
|
|
||||||
tb.Helper()
|
|
||||||
ids := r.ZRange(context.Background(), keyFn(qname), 0, -1).Val()
|
|
||||||
var msgs []*base.TaskMessage
|
|
||||||
for _, id := range ids {
|
|
||||||
taskKey := base.TaskKey(qname, id)
|
|
||||||
msg := r.HGet(context.Background(), taskKey, "msg").Val()
|
|
||||||
msgs = append(msgs, MustUnmarshal(tb, msg))
|
|
||||||
if gotState := r.HGet(context.Background(), taskKey, "state").Val(); gotState != state.String() {
|
|
||||||
tb.Errorf("task (id=%q) is in %q state, want %v", id, gotState, state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return msgs
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retrieves all messages along with their scores stored under `keyFn(qname)` key in redis zset (sorted-set).
|
|
||||||
func getMessagesFromZSetWithScores(tb testing.TB, r redis.UniversalClient,
|
|
||||||
qname string, keyFn func(qname string) string, state base.TaskState) []base.Z {
|
|
||||||
tb.Helper()
|
|
||||||
zs := r.ZRangeWithScores(context.Background(), keyFn(qname), 0, -1).Val()
|
|
||||||
var res []base.Z
|
|
||||||
for _, z := range zs {
|
|
||||||
taskID := z.Member.(string)
|
|
||||||
taskKey := base.TaskKey(qname, taskID)
|
|
||||||
msg := r.HGet(context.Background(), taskKey, "msg").Val()
|
|
||||||
res = append(res, base.Z{Message: MustUnmarshal(tb, msg), Score: int64(z.Score)})
|
|
||||||
if gotState := r.HGet(context.Background(), taskKey, "state").Val(); gotState != state.String() {
|
|
||||||
tb.Errorf("task (id=%q) is in %q state, want %v", taskID, gotState, state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskSeedData holds the data required to seed tasks under the task key in test.
|
|
||||||
type TaskSeedData struct {
|
|
||||||
Msg *base.TaskMessage
|
|
||||||
State base.TaskState
|
|
||||||
PendingSince time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
func SeedTasks(tb testing.TB, r redis.UniversalClient, taskData []*TaskSeedData) {
|
|
||||||
for _, data := range taskData {
|
|
||||||
msg := data.Msg
|
|
||||||
ctx := context.Background()
|
|
||||||
key := base.TaskKey(msg.Queue, msg.ID)
|
|
||||||
v := map[string]interface{}{
|
|
||||||
"msg": MustMarshal(tb, msg),
|
|
||||||
"state": data.State.String(),
|
|
||||||
"unique_key": msg.UniqueKey,
|
|
||||||
"group": msg.GroupKey,
|
|
||||||
}
|
|
||||||
if !data.PendingSince.IsZero() {
|
|
||||||
v["pending_since"] = data.PendingSince.Unix()
|
|
||||||
}
|
|
||||||
if err := r.HSet(ctx, key, v).Err(); err != nil {
|
|
||||||
tb.Fatalf("Failed to write task data in redis: %v", err)
|
|
||||||
}
|
|
||||||
if len(msg.UniqueKey) > 0 {
|
|
||||||
err := r.SetNX(ctx, msg.UniqueKey, msg.ID, 1*time.Minute).Err()
|
|
||||||
if err != nil {
|
|
||||||
tb.Fatalf("Failed to set unique lock in redis: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func SeedRedisZSets(tb testing.TB, r redis.UniversalClient, zsets map[string][]redis.Z) {
|
|
||||||
for key, zs := range zsets {
|
|
||||||
// FIXME: How come we can't simply do ZAdd(ctx, key, zs...) here?
|
|
||||||
for _, z := range zs {
|
|
||||||
if err := r.ZAdd(context.Background(), key, z).Err(); err != nil {
|
|
||||||
tb.Fatalf("Failed to seed zset (key=%q): %v", key, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func SeedRedisSets(tb testing.TB, r redis.UniversalClient, sets map[string][]string) {
|
|
||||||
for key, set := range sets {
|
|
||||||
SeedRedisSet(tb, r, key, set)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func SeedRedisSet(tb testing.TB, r redis.UniversalClient, key string, members []string) {
|
|
||||||
for _, mem := range members {
|
|
||||||
if err := r.SAdd(context.Background(), key, mem).Err(); err != nil {
|
|
||||||
tb.Fatalf("Failed to seed set (key=%q): %v", key, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func SeedRedisLists(tb testing.TB, r redis.UniversalClient, lists map[string][]string) {
|
|
||||||
for key, vals := range lists {
|
|
||||||
for _, v := range vals {
|
|
||||||
if err := r.LPush(context.Background(), key, v).Err(); err != nil {
|
|
||||||
tb.Fatalf("Failed to seed list (key=%q): %v", key, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func AssertRedisLists(t *testing.T, r redis.UniversalClient, wantLists map[string][]string) {
|
|
||||||
for key, want := range wantLists {
|
|
||||||
got, err := r.LRange(context.Background(), key, 0, -1).Result()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Failed to read list (key=%q): %v", key, err)
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(want, got, SortStringSliceOpt); diff != "" {
|
|
||||||
t.Errorf("mismatch found in list (key=%q): (-want,+got)\n%s", key, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func AssertRedisSets(t *testing.T, r redis.UniversalClient, wantSets map[string][]string) {
|
|
||||||
for key, want := range wantSets {
|
|
||||||
got, err := r.SMembers(context.Background(), key).Result()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Failed to read set (key=%q): %v", key, err)
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(want, got, SortStringSliceOpt); diff != "" {
|
|
||||||
t.Errorf("mismatch found in set (key=%q): (-want,+got)\n%s", key, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func AssertRedisZSets(t *testing.T, r redis.UniversalClient, wantZSets map[string][]redis.Z) {
|
|
||||||
for key, want := range wantZSets {
|
|
||||||
got, err := r.ZRangeWithScores(context.Background(), key, 0, -1).Result()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Failed to read zset (key=%q): %v", key, err)
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(want, got, SortRedisZSetEntryOpt); diff != "" {
|
|
||||||
t.Errorf("mismatch found in zset (key=%q): (-want,+got)\n%s", key, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,59 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
// Package timeutil exports functions and types related to time and date.
|
|
||||||
package timeutil
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// A Clock is an object that can tell you the current time.
|
|
||||||
//
|
|
||||||
// This interface allows decoupling code that uses time from the code that creates
|
|
||||||
// a point in time. You can use this to your advantage by injecting Clocks into interfaces
|
|
||||||
// rather than having implementations call time.Now() directly.
|
|
||||||
//
|
|
||||||
// Use RealClock() in production.
|
|
||||||
// Use SimulatedClock() in test.
|
|
||||||
type Clock interface {
|
|
||||||
Now() time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewRealClock() Clock { return &realTimeClock{} }
|
|
||||||
|
|
||||||
type realTimeClock struct{}
|
|
||||||
|
|
||||||
func (_ *realTimeClock) Now() time.Time { return time.Now() }
|
|
||||||
|
|
||||||
// A SimulatedClock is a concrete Clock implementation that doesn't "tick" on its own.
|
|
||||||
// Time is advanced by explicit call to the AdvanceTime() or SetTime() functions.
|
|
||||||
// This object is concurrency safe.
|
|
||||||
type SimulatedClock struct {
|
|
||||||
mu sync.Mutex
|
|
||||||
t time.Time // guarded by mu
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewSimulatedClock(t time.Time) *SimulatedClock {
|
|
||||||
return &SimulatedClock{t: t}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *SimulatedClock) Now() time.Time {
|
|
||||||
c.mu.Lock()
|
|
||||||
defer c.mu.Unlock()
|
|
||||||
return c.t
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *SimulatedClock) SetTime(t time.Time) {
|
|
||||||
c.mu.Lock()
|
|
||||||
defer c.mu.Unlock()
|
|
||||||
c.t = t
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *SimulatedClock) AdvanceTime(d time.Duration) {
|
|
||||||
c.mu.Lock()
|
|
||||||
defer c.mu.Unlock()
|
|
||||||
c.t = c.t.Add(d)
|
|
||||||
}
|
|
@ -1,48 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package timeutil
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestSimulatedClock(t *testing.T) {
|
|
||||||
now := time.Now()
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
initTime time.Time
|
|
||||||
advanceBy time.Duration
|
|
||||||
wantTime time.Time
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "advance time forward",
|
|
||||||
initTime: now,
|
|
||||||
advanceBy: 30 * time.Second,
|
|
||||||
wantTime: now.Add(30 * time.Second),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "advance time backward",
|
|
||||||
initTime: now,
|
|
||||||
advanceBy: -10 * time.Second,
|
|
||||||
wantTime: now.Add(-10 * time.Second),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
c := NewSimulatedClock(tc.initTime)
|
|
||||||
|
|
||||||
if c.Now() != tc.initTime {
|
|
||||||
t.Errorf("%s: Before Advance; SimulatedClock.Now() = %v, want %v", tc.desc, c.Now(), tc.initTime)
|
|
||||||
}
|
|
||||||
|
|
||||||
c.AdvanceTime(tc.advanceBy)
|
|
||||||
|
|
||||||
if c.Now() != tc.wantTime {
|
|
||||||
t.Errorf("%s: After Advance; SimulatedClock.Now() = %v, want %v", tc.desc, c.Now(), tc.wantTime)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
86
janitor.go
86
janitor.go
@ -1,86 +0,0 @@
|
|||||||
// Copyright 2021 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
)
|
|
||||||
|
|
||||||
// A janitor is responsible for deleting expired completed tasks from the specified
|
|
||||||
// queues. It periodically checks for any expired tasks in the completed set, and
|
|
||||||
// deletes them.
|
|
||||||
type janitor struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
|
|
||||||
// channel to communicate back to the long running "janitor" goroutine.
|
|
||||||
done chan struct{}
|
|
||||||
|
|
||||||
// list of queue names to check.
|
|
||||||
queues []string
|
|
||||||
|
|
||||||
// average interval between checks.
|
|
||||||
avgInterval time.Duration
|
|
||||||
|
|
||||||
// number of tasks to be deleted when janitor runs to delete the expired completed tasks.
|
|
||||||
batchSize int
|
|
||||||
}
|
|
||||||
|
|
||||||
type janitorParams struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
queues []string
|
|
||||||
interval time.Duration
|
|
||||||
batchSize int
|
|
||||||
}
|
|
||||||
|
|
||||||
func newJanitor(params janitorParams) *janitor {
|
|
||||||
return &janitor{
|
|
||||||
logger: params.logger,
|
|
||||||
broker: params.broker,
|
|
||||||
done: make(chan struct{}),
|
|
||||||
queues: params.queues,
|
|
||||||
avgInterval: params.interval,
|
|
||||||
batchSize: params.batchSize,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (j *janitor) shutdown() {
|
|
||||||
j.logger.Debug("Janitor shutting down...")
|
|
||||||
// Signal the janitor goroutine to stop.
|
|
||||||
j.done <- struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// start starts the "janitor" goroutine.
|
|
||||||
func (j *janitor) start(wg *sync.WaitGroup) {
|
|
||||||
wg.Add(1)
|
|
||||||
timer := time.NewTimer(j.avgInterval) // randomize this interval with margin of 1s
|
|
||||||
go func() {
|
|
||||||
defer wg.Done()
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-j.done:
|
|
||||||
j.logger.Debug("Janitor done")
|
|
||||||
return
|
|
||||||
case <-timer.C:
|
|
||||||
j.exec()
|
|
||||||
timer.Reset(j.avgInterval)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (j *janitor) exec() {
|
|
||||||
for _, qname := range j.queues {
|
|
||||||
if err := j.broker.DeleteExpiredCompletedTasks(qname, j.batchSize); err != nil {
|
|
||||||
j.logger.Errorf("Failed to delete expired completed tasks from queue %q: %v",
|
|
||||||
qname, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,91 +0,0 @@
|
|||||||
// Copyright 2021 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
|
||||||
h "github.com/hibiken/asynq/internal/testutil"
|
|
||||||
)
|
|
||||||
|
|
||||||
func newCompletedTask(qname, tasktype string, payload []byte, completedAt time.Time) *base.TaskMessage {
|
|
||||||
msg := h.NewTaskMessageWithQueue(tasktype, payload, qname)
|
|
||||||
msg.CompletedAt = completedAt.Unix()
|
|
||||||
return msg
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestJanitor(t *testing.T) {
|
|
||||||
r := setup(t)
|
|
||||||
defer r.Close()
|
|
||||||
rdbClient := rdb.NewRDB(r)
|
|
||||||
const interval = 1 * time.Second
|
|
||||||
const batchSize = 100
|
|
||||||
janitor := newJanitor(janitorParams{
|
|
||||||
logger: testLogger,
|
|
||||||
broker: rdbClient,
|
|
||||||
queues: []string{"default", "custom"},
|
|
||||||
interval: interval,
|
|
||||||
batchSize: batchSize,
|
|
||||||
})
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
hourAgo := now.Add(-1 * time.Hour)
|
|
||||||
minuteAgo := now.Add(-1 * time.Minute)
|
|
||||||
halfHourAgo := now.Add(-30 * time.Minute)
|
|
||||||
halfHourFromNow := now.Add(30 * time.Minute)
|
|
||||||
fiveMinFromNow := now.Add(5 * time.Minute)
|
|
||||||
msg1 := newCompletedTask("default", "task1", nil, hourAgo)
|
|
||||||
msg2 := newCompletedTask("default", "task2", nil, minuteAgo)
|
|
||||||
msg3 := newCompletedTask("custom", "task3", nil, hourAgo)
|
|
||||||
msg4 := newCompletedTask("custom", "task4", nil, minuteAgo)
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
completed map[string][]base.Z // initial completed sets
|
|
||||||
wantCompleted map[string][]base.Z // expected completed sets after janitor runs
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
completed: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: msg1, Score: halfHourAgo.Unix()},
|
|
||||||
{Message: msg2, Score: fiveMinFromNow.Unix()},
|
|
||||||
},
|
|
||||||
"custom": {
|
|
||||||
{Message: msg3, Score: halfHourFromNow.Unix()},
|
|
||||||
{Message: msg4, Score: minuteAgo.Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
wantCompleted: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: msg2, Score: fiveMinFromNow.Unix()},
|
|
||||||
},
|
|
||||||
"custom": {
|
|
||||||
{Message: msg3, Score: halfHourFromNow.Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
h.FlushDB(t, r)
|
|
||||||
h.SeedAllCompletedQueues(t, r, tc.completed)
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
janitor.start(&wg)
|
|
||||||
time.Sleep(2 * interval) // make sure to let janitor run at least one time
|
|
||||||
janitor.shutdown()
|
|
||||||
|
|
||||||
for qname, want := range tc.wantCompleted {
|
|
||||||
got := h.GetCompletedEntries(t, r, qname)
|
|
||||||
if diff := cmp.Diff(want, got, h.SortZSetEntryOpt); diff != "" {
|
|
||||||
t.Errorf("diff found in %q after running janitor: (-want, +got)\n%s", base.CompletedKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
166
payload.go
Normal file
166
payload.go
Normal file
@ -0,0 +1,166 @@
|
|||||||
|
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT license
|
||||||
|
// that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package asynq
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/spf13/cast"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Payload holds arbitrary data needed for task execution.
|
||||||
|
type Payload struct {
|
||||||
|
data map[string]interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
type errKeyNotFound struct {
|
||||||
|
key string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *errKeyNotFound) Error() string {
|
||||||
|
return fmt.Sprintf("key %q does not exist", e.key)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Has reports whether key exists.
|
||||||
|
func (p Payload) Has(key string) bool {
|
||||||
|
_, ok := p.data[key]
|
||||||
|
return ok
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetString returns a string value if a string type is associated with
|
||||||
|
// the key, otherwise reports an error.
|
||||||
|
func (p Payload) GetString(key string) (string, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return "", &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToStringE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetInt returns an int value if a numeric type is associated with
|
||||||
|
// the key, otherwise reports an error.
|
||||||
|
func (p Payload) GetInt(key string) (int, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return 0, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToIntE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetFloat64 returns a float64 value if a numeric type is associated with
|
||||||
|
// the key, otherwise reports an error.
|
||||||
|
func (p Payload) GetFloat64(key string) (float64, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return 0, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToFloat64E(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetBool returns a boolean value if a boolean type is associated with
|
||||||
|
// the key, otherwise reports an error.
|
||||||
|
func (p Payload) GetBool(key string) (bool, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return false, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToBoolE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetStringSlice returns a slice of strings if a string slice type is associated with
|
||||||
|
// the key, otherwise reports an error.
|
||||||
|
func (p Payload) GetStringSlice(key string) ([]string, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return nil, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToStringSliceE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetIntSlice returns a slice of ints if a int slice type is associated with
|
||||||
|
// the key, otherwise reports an error.
|
||||||
|
func (p Payload) GetIntSlice(key string) ([]int, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return nil, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToIntSliceE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetStringMap returns a map of string to empty interface
|
||||||
|
// if a correct map type is associated with the key,
|
||||||
|
// otherwise reports an error.
|
||||||
|
func (p Payload) GetStringMap(key string) (map[string]interface{}, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return nil, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToStringMapE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetStringMapString returns a map of string to string
|
||||||
|
// if a correct map type is associated with the key,
|
||||||
|
// otherwise reports an error.
|
||||||
|
func (p Payload) GetStringMapString(key string) (map[string]string, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return nil, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToStringMapStringE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetStringMapStringSlice returns a map of string to string slice
|
||||||
|
// if a correct map type is associated with the key,
|
||||||
|
// otherwise reports an error.
|
||||||
|
func (p Payload) GetStringMapStringSlice(key string) (map[string][]string, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return nil, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToStringMapStringSliceE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetStringMapInt returns a map of string to int
|
||||||
|
// if a correct map type is associated with the key,
|
||||||
|
// otherwise reports an error.
|
||||||
|
func (p Payload) GetStringMapInt(key string) (map[string]int, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return nil, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToStringMapIntE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetStringMapBool returns a map of string to boolean
|
||||||
|
// if a correct map type is associated with the key,
|
||||||
|
// otherwise reports an error.
|
||||||
|
func (p Payload) GetStringMapBool(key string) (map[string]bool, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return nil, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToStringMapBoolE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTime returns a time value if a correct map type is associated with the key,
|
||||||
|
// otherwise reports an error.
|
||||||
|
func (p Payload) GetTime(key string) (time.Time, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return time.Time{}, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToTimeE(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDuration returns a duration value if a correct map type is associated with the key,
|
||||||
|
// otherwise reports an error.
|
||||||
|
func (p Payload) GetDuration(key string) (time.Duration, error) {
|
||||||
|
v, ok := p.data[key]
|
||||||
|
if !ok {
|
||||||
|
return 0, &errKeyNotFound{key}
|
||||||
|
}
|
||||||
|
return cast.ToDurationE(v)
|
||||||
|
}
|
651
payload_test.go
Normal file
651
payload_test.go
Normal file
@ -0,0 +1,651 @@
|
|||||||
|
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT license
|
||||||
|
// that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package asynq
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/go-cmp/cmp"
|
||||||
|
h "github.com/hibiken/asynq/internal/asynqtest"
|
||||||
|
"github.com/hibiken/asynq/internal/base"
|
||||||
|
)
|
||||||
|
|
||||||
|
type payloadTest struct {
|
||||||
|
data map[string]interface{}
|
||||||
|
key string
|
||||||
|
nonkey string
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadString(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"name": "gopher"},
|
||||||
|
key: "name",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetString(tc.key)
|
||||||
|
if err != nil || got != tc.data[tc.key] {
|
||||||
|
t.Errorf("Payload.GetString(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetString(tc.key)
|
||||||
|
if err != nil || got != tc.data[tc.key] {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetString(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetString(tc.nonkey)
|
||||||
|
if err == nil || got != "" {
|
||||||
|
t.Errorf("Payload.GetString(%q) = %v, %v; want '', error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadInt(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"user_id": 42},
|
||||||
|
key: "user_id",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetInt(tc.key)
|
||||||
|
if err != nil || got != tc.data[tc.key] {
|
||||||
|
t.Errorf("Payload.GetInt(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetInt(tc.key)
|
||||||
|
if err != nil || got != tc.data[tc.key] {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetInt(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetInt(tc.nonkey)
|
||||||
|
if err == nil || got != 0 {
|
||||||
|
t.Errorf("Payload.GetInt(%q) = %v, %v; want 0, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadFloat64(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"pi": 3.14},
|
||||||
|
key: "pi",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetFloat64(tc.key)
|
||||||
|
if err != nil || got != tc.data[tc.key] {
|
||||||
|
t.Errorf("Payload.GetFloat64(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetFloat64(tc.key)
|
||||||
|
if err != nil || got != tc.data[tc.key] {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetFloat64(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetFloat64(tc.nonkey)
|
||||||
|
if err == nil || got != 0 {
|
||||||
|
t.Errorf("Payload.GetFloat64(%q) = %v, %v; want 0, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadBool(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"enabled": true},
|
||||||
|
key: "enabled",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetBool(tc.key)
|
||||||
|
if err != nil || got != tc.data[tc.key] {
|
||||||
|
t.Errorf("Payload.GetBool(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetBool(tc.key)
|
||||||
|
if err != nil || got != tc.data[tc.key] {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetBool(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetBool(tc.nonkey)
|
||||||
|
if err == nil || got != false {
|
||||||
|
t.Errorf("Payload.GetBool(%q) = %v, %v; want false, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadStringSlice(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"names": []string{"luke", "rey", "anakin"}},
|
||||||
|
key: "names",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetStringSlice(tc.key)
|
||||||
|
diff := cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("Payload.GetStringSlice(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetStringSlice(tc.key)
|
||||||
|
diff = cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetStringSlice(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetStringSlice(tc.nonkey)
|
||||||
|
if err == nil || got != nil {
|
||||||
|
t.Errorf("Payload.GetStringSlice(%q) = %v, %v; want nil, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadIntSlice(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"nums": []int{9, 8, 7}},
|
||||||
|
key: "nums",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetIntSlice(tc.key)
|
||||||
|
diff := cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("Payload.GetIntSlice(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetIntSlice(tc.key)
|
||||||
|
diff = cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetIntSlice(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetIntSlice(tc.nonkey)
|
||||||
|
if err == nil || got != nil {
|
||||||
|
t.Errorf("Payload.GetIntSlice(%q) = %v, %v; want nil, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadStringMap(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"user": map[string]interface{}{"name": "Jon Doe", "score": 2.2}},
|
||||||
|
key: "user",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetStringMap(tc.key)
|
||||||
|
diff := cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("Payload.GetStringMap(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetStringMap(tc.key)
|
||||||
|
diff = cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetStringMap(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetStringMap(tc.nonkey)
|
||||||
|
if err == nil || got != nil {
|
||||||
|
t.Errorf("Payload.GetStringMap(%q) = %v, %v; want nil, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadStringMapString(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"address": map[string]string{"line": "123 Main St", "city": "San Francisco", "state": "CA"}},
|
||||||
|
key: "address",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetStringMapString(tc.key)
|
||||||
|
diff := cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("Payload.GetStringMapString(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetStringMapString(tc.key)
|
||||||
|
diff = cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetStringMapString(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetStringMapString(tc.nonkey)
|
||||||
|
if err == nil || got != nil {
|
||||||
|
t.Errorf("Payload.GetStringMapString(%q) = %v, %v; want nil, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadStringMapStringSlice(t *testing.T) {
|
||||||
|
favs := map[string][]string{
|
||||||
|
"movies": {"forrest gump", "star wars"},
|
||||||
|
"tv_shows": {"game of thrones", "HIMYM", "breaking bad"},
|
||||||
|
}
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"favorites": favs},
|
||||||
|
key: "favorites",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetStringMapStringSlice(tc.key)
|
||||||
|
diff := cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("Payload.GetStringMapStringSlice(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetStringMapStringSlice(tc.key)
|
||||||
|
diff = cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetStringMapStringSlice(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetStringMapStringSlice(tc.nonkey)
|
||||||
|
if err == nil || got != nil {
|
||||||
|
t.Errorf("Payload.GetStringMapStringSlice(%q) = %v, %v; want nil, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadStringMapInt(t *testing.T) {
|
||||||
|
counter := map[string]int{
|
||||||
|
"a": 1,
|
||||||
|
"b": 101,
|
||||||
|
"c": 42,
|
||||||
|
}
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"counts": counter},
|
||||||
|
key: "counts",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetStringMapInt(tc.key)
|
||||||
|
diff := cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("Payload.GetStringMapInt(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetStringMapInt(tc.key)
|
||||||
|
diff = cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetStringMapInt(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetStringMapInt(tc.nonkey)
|
||||||
|
if err == nil || got != nil {
|
||||||
|
t.Errorf("Payload.GetStringMapInt(%q) = %v, %v; want nil, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadStringMapBool(t *testing.T) {
|
||||||
|
features := map[string]bool{
|
||||||
|
"A": false,
|
||||||
|
"B": true,
|
||||||
|
"C": true,
|
||||||
|
}
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"features": features},
|
||||||
|
key: "features",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetStringMapBool(tc.key)
|
||||||
|
diff := cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("Payload.GetStringMapBool(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetStringMapBool(tc.key)
|
||||||
|
diff = cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetStringMapBool(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetStringMapBool(tc.nonkey)
|
||||||
|
if err == nil || got != nil {
|
||||||
|
t.Errorf("Payload.GetStringMapBool(%q) = %v, %v; want nil, error",
|
||||||
|
tc.key, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadTime(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"current": time.Now()},
|
||||||
|
key: "current",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetTime(tc.key)
|
||||||
|
diff := cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("Payload.GetTime(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetTime(tc.key)
|
||||||
|
diff = cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetTime(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetTime(tc.nonkey)
|
||||||
|
if err == nil || !got.IsZero() {
|
||||||
|
t.Errorf("Payload.GetTime(%q) = %v, %v; want %v, error",
|
||||||
|
tc.key, got, err, time.Time{})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadDuration(t *testing.T) {
|
||||||
|
tests := []payloadTest{
|
||||||
|
{
|
||||||
|
data: map[string]interface{}{"duration": 15 * time.Minute},
|
||||||
|
key: "duration",
|
||||||
|
nonkey: "unknown",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
payload := Payload{tc.data}
|
||||||
|
|
||||||
|
got, err := payload.GetDuration(tc.key)
|
||||||
|
diff := cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("Payload.GetDuration(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// encode and then decode task messsage.
|
||||||
|
in := h.NewTaskMessage("testing", tc.data)
|
||||||
|
b, err := json.Marshal(in)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var out base.TaskMessage
|
||||||
|
err = json.Unmarshal(b, &out)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
payload = Payload{out.Payload}
|
||||||
|
got, err = payload.GetDuration(tc.key)
|
||||||
|
diff = cmp.Diff(got, tc.data[tc.key])
|
||||||
|
if err != nil || diff != "" {
|
||||||
|
t.Errorf("With Marshaling: Payload.GetDuration(%q) = %v, %v, want %v, nil",
|
||||||
|
tc.key, got, err, tc.data[tc.key])
|
||||||
|
}
|
||||||
|
|
||||||
|
// access non-existent key.
|
||||||
|
got, err = payload.GetDuration(tc.nonkey)
|
||||||
|
if err == nil || got != 0 {
|
||||||
|
t.Errorf("Payload.GetDuration(%q) = %v, %v; want %v, error",
|
||||||
|
tc.key, got, err, time.Duration(0))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPayloadHas(t *testing.T) {
|
||||||
|
payload := Payload{map[string]interface{}{
|
||||||
|
"user_id": 123,
|
||||||
|
}}
|
||||||
|
|
||||||
|
if !payload.Has("user_id") {
|
||||||
|
t.Errorf("Payload.Has(%q) = false, want true", "user_id")
|
||||||
|
}
|
||||||
|
if payload.Has("name") {
|
||||||
|
t.Errorf("Payload.Has(%q) = true, want false", "name")
|
||||||
|
}
|
||||||
|
}
|
@ -1,253 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"crypto/sha256"
|
|
||||||
"fmt"
|
|
||||||
"sort"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
)
|
|
||||||
|
|
||||||
// PeriodicTaskManager manages scheduling of periodic tasks.
|
|
||||||
// It syncs scheduler's entries by calling the config provider periodically.
|
|
||||||
type PeriodicTaskManager struct {
|
|
||||||
s *Scheduler
|
|
||||||
p PeriodicTaskConfigProvider
|
|
||||||
syncInterval time.Duration
|
|
||||||
done chan (struct{})
|
|
||||||
wg sync.WaitGroup
|
|
||||||
m map[string]string // map[hash]entryID
|
|
||||||
}
|
|
||||||
|
|
||||||
type PeriodicTaskManagerOpts struct {
|
|
||||||
// Required: must be non nil
|
|
||||||
PeriodicTaskConfigProvider PeriodicTaskConfigProvider
|
|
||||||
|
|
||||||
// Optional: if RedisUniversalClient is nil must be non nil
|
|
||||||
RedisConnOpt RedisConnOpt
|
|
||||||
|
|
||||||
// Optional: if RedisUniversalClient is non nil, RedisConnOpt is ignored.
|
|
||||||
RedisUniversalClient redis.UniversalClient
|
|
||||||
|
|
||||||
// Optional: scheduler options
|
|
||||||
*SchedulerOpts
|
|
||||||
|
|
||||||
// Optional: default is 3m
|
|
||||||
SyncInterval time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
const defaultSyncInterval = 3 * time.Minute
|
|
||||||
|
|
||||||
// NewPeriodicTaskManager returns a new PeriodicTaskManager instance.
|
|
||||||
// The given opts should specify the RedisConnOp and PeriodicTaskConfigProvider at minimum.
|
|
||||||
func NewPeriodicTaskManager(opts PeriodicTaskManagerOpts) (*PeriodicTaskManager, error) {
|
|
||||||
if opts.PeriodicTaskConfigProvider == nil {
|
|
||||||
return nil, fmt.Errorf("PeriodicTaskConfigProvider cannot be nil")
|
|
||||||
}
|
|
||||||
if opts.RedisConnOpt == nil && opts.RedisUniversalClient == nil {
|
|
||||||
return nil, fmt.Errorf("RedisConnOpt/RedisUniversalClient cannot be nil")
|
|
||||||
}
|
|
||||||
var scheduler *Scheduler
|
|
||||||
if opts.RedisUniversalClient != nil {
|
|
||||||
scheduler = NewSchedulerFromRedisClient(opts.RedisUniversalClient, opts.SchedulerOpts)
|
|
||||||
} else {
|
|
||||||
scheduler = NewScheduler(opts.RedisConnOpt, opts.SchedulerOpts)
|
|
||||||
}
|
|
||||||
|
|
||||||
syncInterval := opts.SyncInterval
|
|
||||||
if syncInterval == 0 {
|
|
||||||
syncInterval = defaultSyncInterval
|
|
||||||
}
|
|
||||||
return &PeriodicTaskManager{
|
|
||||||
s: scheduler,
|
|
||||||
p: opts.PeriodicTaskConfigProvider,
|
|
||||||
syncInterval: syncInterval,
|
|
||||||
done: make(chan struct{}),
|
|
||||||
m: make(map[string]string),
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// PeriodicTaskConfigProvider provides configs for periodic tasks.
|
|
||||||
// GetConfigs will be called by a PeriodicTaskManager periodically to
|
|
||||||
// sync the scheduler's entries with the configs returned by the provider.
|
|
||||||
type PeriodicTaskConfigProvider interface {
|
|
||||||
GetConfigs() ([]*PeriodicTaskConfig, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PeriodicTaskConfig specifies the details of a periodic task.
|
|
||||||
type PeriodicTaskConfig struct {
|
|
||||||
Cronspec string // required: must be non empty string
|
|
||||||
Task *Task // required: must be non nil
|
|
||||||
Opts []Option // optional: can be nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *PeriodicTaskConfig) hash() string {
|
|
||||||
h := sha256.New()
|
|
||||||
_, _ = h.Write([]byte(c.Cronspec))
|
|
||||||
_, _ = h.Write([]byte(c.Task.Type()))
|
|
||||||
h.Write(c.Task.Payload())
|
|
||||||
opts := stringifyOptions(c.Opts)
|
|
||||||
sort.Strings(opts)
|
|
||||||
for _, opt := range opts {
|
|
||||||
_, _ = h.Write([]byte(opt))
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("%x", h.Sum(nil))
|
|
||||||
}
|
|
||||||
|
|
||||||
func validatePeriodicTaskConfig(c *PeriodicTaskConfig) error {
|
|
||||||
if c == nil {
|
|
||||||
return fmt.Errorf("PeriodicTaskConfig cannot be nil")
|
|
||||||
}
|
|
||||||
if c.Task == nil {
|
|
||||||
return fmt.Errorf("PeriodicTaskConfig.Task cannot be nil")
|
|
||||||
}
|
|
||||||
if c.Cronspec == "" {
|
|
||||||
return fmt.Errorf("PeriodicTaskConfig.Cronspec cannot be empty")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start starts a scheduler and background goroutine to sync the scheduler with the configs
|
|
||||||
// returned by the provider.
|
|
||||||
//
|
|
||||||
// Start returns any error encountered at start up time.
|
|
||||||
func (mgr *PeriodicTaskManager) Start() error {
|
|
||||||
if mgr.s == nil || mgr.p == nil {
|
|
||||||
panic("asynq: cannot start uninitialized PeriodicTaskManager; use NewPeriodicTaskManager to initialize")
|
|
||||||
}
|
|
||||||
if err := mgr.initialSync(); err != nil {
|
|
||||||
return fmt.Errorf("asynq: %v", err)
|
|
||||||
}
|
|
||||||
if err := mgr.s.Start(); err != nil {
|
|
||||||
return fmt.Errorf("asynq: %v", err)
|
|
||||||
}
|
|
||||||
mgr.wg.Add(1)
|
|
||||||
go func() {
|
|
||||||
defer mgr.wg.Done()
|
|
||||||
ticker := time.NewTicker(mgr.syncInterval)
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-mgr.done:
|
|
||||||
mgr.s.logger.Debugf("Stopping syncer goroutine")
|
|
||||||
ticker.Stop()
|
|
||||||
return
|
|
||||||
case <-ticker.C:
|
|
||||||
mgr.sync()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Shutdown gracefully shuts down the manager.
|
|
||||||
// It notifies a background syncer goroutine to stop and stops scheduler.
|
|
||||||
func (mgr *PeriodicTaskManager) Shutdown() {
|
|
||||||
close(mgr.done)
|
|
||||||
mgr.wg.Wait()
|
|
||||||
mgr.s.Shutdown()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Run starts the manager and blocks until an os signal to exit the program is received.
|
|
||||||
// Once it receives a signal, it gracefully shuts down the manager.
|
|
||||||
func (mgr *PeriodicTaskManager) Run() error {
|
|
||||||
if err := mgr.Start(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
mgr.s.waitForSignals()
|
|
||||||
mgr.Shutdown()
|
|
||||||
mgr.s.logger.Debugf("PeriodicTaskManager exiting")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (mgr *PeriodicTaskManager) initialSync() error {
|
|
||||||
configs, err := mgr.p.GetConfigs()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("initial call to GetConfigs failed: %v", err)
|
|
||||||
}
|
|
||||||
for _, c := range configs {
|
|
||||||
if err := validatePeriodicTaskConfig(c); err != nil {
|
|
||||||
return fmt.Errorf("initial call to GetConfigs contained an invalid config: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mgr.add(configs)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (mgr *PeriodicTaskManager) add(configs []*PeriodicTaskConfig) {
|
|
||||||
for _, c := range configs {
|
|
||||||
entryID, err := mgr.s.Register(c.Cronspec, c.Task, c.Opts...)
|
|
||||||
if err != nil {
|
|
||||||
mgr.s.logger.Errorf("Failed to register periodic task: cronspec=%q task=%q err=%v",
|
|
||||||
c.Cronspec, c.Task.Type(), err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
mgr.m[c.hash()] = entryID
|
|
||||||
mgr.s.logger.Infof("Successfully registered periodic task: cronspec=%q task=%q, entryID=%s",
|
|
||||||
c.Cronspec, c.Task.Type(), entryID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (mgr *PeriodicTaskManager) remove(removed map[string]string) {
|
|
||||||
for hash, entryID := range removed {
|
|
||||||
if err := mgr.s.Unregister(entryID); err != nil {
|
|
||||||
mgr.s.logger.Errorf("Failed to unregister periodic task: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
delete(mgr.m, hash)
|
|
||||||
mgr.s.logger.Infof("Successfully unregistered periodic task: entryID=%s", entryID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (mgr *PeriodicTaskManager) sync() {
|
|
||||||
configs, err := mgr.p.GetConfigs()
|
|
||||||
if err != nil {
|
|
||||||
mgr.s.logger.Errorf("Failed to get periodic task configs: %v", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, c := range configs {
|
|
||||||
if err := validatePeriodicTaskConfig(c); err != nil {
|
|
||||||
mgr.s.logger.Errorf("Failed to sync: GetConfigs returned an invalid config: %v", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Diff and only register/unregister the newly added/removed entries.
|
|
||||||
removed := mgr.diffRemoved(configs)
|
|
||||||
added := mgr.diffAdded(configs)
|
|
||||||
mgr.remove(removed)
|
|
||||||
mgr.add(added)
|
|
||||||
}
|
|
||||||
|
|
||||||
// diffRemoved diffs the incoming configs with the registered config and returns
|
|
||||||
// a map containing hash and entryID of each config that was removed.
|
|
||||||
func (mgr *PeriodicTaskManager) diffRemoved(configs []*PeriodicTaskConfig) map[string]string {
|
|
||||||
newConfigs := make(map[string]string)
|
|
||||||
for _, c := range configs {
|
|
||||||
newConfigs[c.hash()] = "" // empty value since we don't have entryID yet
|
|
||||||
}
|
|
||||||
removed := make(map[string]string)
|
|
||||||
for k, v := range mgr.m {
|
|
||||||
// test whether existing config is present in the incoming configs
|
|
||||||
if _, found := newConfigs[k]; !found {
|
|
||||||
removed[k] = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return removed
|
|
||||||
}
|
|
||||||
|
|
||||||
// diffAdded diffs the incoming configs with the registered configs and returns
|
|
||||||
// a list of configs that were added.
|
|
||||||
func (mgr *PeriodicTaskManager) diffAdded(configs []*PeriodicTaskConfig) []*PeriodicTaskConfig {
|
|
||||||
var added []*PeriodicTaskConfig
|
|
||||||
for _, c := range configs {
|
|
||||||
if _, found := mgr.m[c.hash()]; !found {
|
|
||||||
added = append(added, c)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return added
|
|
||||||
}
|
|
@ -1,340 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sort"
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Trivial implementation of PeriodicTaskConfigProvider for testing purpose.
|
|
||||||
type FakeConfigProvider struct {
|
|
||||||
mu sync.Mutex
|
|
||||||
cfgs []*PeriodicTaskConfig
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *FakeConfigProvider) SetConfigs(cfgs []*PeriodicTaskConfig) {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
p.cfgs = cfgs
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *FakeConfigProvider) GetConfigs() ([]*PeriodicTaskConfig, error) {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
return p.cfgs, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestNewPeriodicTaskManager(t *testing.T) {
|
|
||||||
redisConnOpt := getRedisConnOpt(t)
|
|
||||||
cfgs := []*PeriodicTaskConfig{
|
|
||||||
{Cronspec: "* * * * *", Task: NewTask("foo", nil)},
|
|
||||||
{Cronspec: "* * * * *", Task: NewTask("bar", nil)},
|
|
||||||
}
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
opts PeriodicTaskManagerOpts
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "with provider and redisConnOpt",
|
|
||||||
opts: PeriodicTaskManagerOpts{
|
|
||||||
RedisConnOpt: redisConnOpt,
|
|
||||||
PeriodicTaskConfigProvider: &FakeConfigProvider{cfgs: cfgs},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with sync option",
|
|
||||||
opts: PeriodicTaskManagerOpts{
|
|
||||||
RedisConnOpt: redisConnOpt,
|
|
||||||
PeriodicTaskConfigProvider: &FakeConfigProvider{cfgs: cfgs},
|
|
||||||
SyncInterval: 5 * time.Minute,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with scheduler option",
|
|
||||||
opts: PeriodicTaskManagerOpts{
|
|
||||||
RedisConnOpt: redisConnOpt,
|
|
||||||
PeriodicTaskConfigProvider: &FakeConfigProvider{cfgs: cfgs},
|
|
||||||
SyncInterval: 5 * time.Minute,
|
|
||||||
SchedulerOpts: &SchedulerOpts{
|
|
||||||
LogLevel: DebugLevel,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
_, err := NewPeriodicTaskManager(tc.opts)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("%s; NewPeriodicTaskManager returned error: %v", tc.desc, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Run("error", func(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
opts PeriodicTaskManagerOpts
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "without provider",
|
|
||||||
opts: PeriodicTaskManagerOpts{
|
|
||||||
RedisConnOpt: redisConnOpt,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "without redisConOpt",
|
|
||||||
opts: PeriodicTaskManagerOpts{
|
|
||||||
PeriodicTaskConfigProvider: &FakeConfigProvider{cfgs: cfgs},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
_, err := NewPeriodicTaskManager(tc.opts)
|
|
||||||
if err == nil {
|
|
||||||
t.Errorf("%s; NewPeriodicTaskManager did not return error", tc.desc)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPeriodicTaskConfigHash(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
a *PeriodicTaskConfig
|
|
||||||
b *PeriodicTaskConfig
|
|
||||||
isSame bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "basic identity test",
|
|
||||||
a: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
},
|
|
||||||
b: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
},
|
|
||||||
isSame: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with a option",
|
|
||||||
a: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
Opts: []Option{Queue("myqueue")},
|
|
||||||
},
|
|
||||||
b: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
Opts: []Option{Queue("myqueue")},
|
|
||||||
},
|
|
||||||
isSame: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with multiple options (different order)",
|
|
||||||
a: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
Opts: []Option{Unique(5 * time.Minute), Queue("myqueue")},
|
|
||||||
},
|
|
||||||
b: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
Opts: []Option{Queue("myqueue"), Unique(5 * time.Minute)},
|
|
||||||
},
|
|
||||||
isSame: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with payload",
|
|
||||||
a: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", []byte("hello world!")),
|
|
||||||
Opts: []Option{Queue("myqueue")},
|
|
||||||
},
|
|
||||||
b: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", []byte("hello world!")),
|
|
||||||
Opts: []Option{Queue("myqueue")},
|
|
||||||
},
|
|
||||||
isSame: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with different cronspecs",
|
|
||||||
a: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
},
|
|
||||||
b: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "5 * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
},
|
|
||||||
isSame: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with different task type",
|
|
||||||
a: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
},
|
|
||||||
b: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("bar", nil),
|
|
||||||
},
|
|
||||||
isSame: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with different options",
|
|
||||||
a: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
Opts: []Option{Queue("myqueue")},
|
|
||||||
},
|
|
||||||
b: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
Opts: []Option{Unique(10 * time.Minute)},
|
|
||||||
},
|
|
||||||
isSame: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with different options (one is subset of the other)",
|
|
||||||
a: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
Opts: []Option{Queue("myqueue")},
|
|
||||||
},
|
|
||||||
b: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", nil),
|
|
||||||
Opts: []Option{Queue("myqueue"), Unique(10 * time.Minute)},
|
|
||||||
},
|
|
||||||
isSame: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with different payload",
|
|
||||||
a: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", []byte("hello!")),
|
|
||||||
Opts: []Option{Queue("myqueue")},
|
|
||||||
},
|
|
||||||
b: &PeriodicTaskConfig{
|
|
||||||
Cronspec: "* * * * *",
|
|
||||||
Task: NewTask("foo", []byte("HELLO!")),
|
|
||||||
Opts: []Option{Queue("myqueue"), Unique(10 * time.Minute)},
|
|
||||||
},
|
|
||||||
isSame: false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
if tc.isSame && tc.a.hash() != tc.b.hash() {
|
|
||||||
t.Errorf("%s: a.hash=%s b.hash=%s expected to be equal",
|
|
||||||
tc.desc, tc.a.hash(), tc.b.hash())
|
|
||||||
}
|
|
||||||
if !tc.isSame && tc.a.hash() == tc.b.hash() {
|
|
||||||
t.Errorf("%s: a.hash=%s b.hash=%s expected to be not equal",
|
|
||||||
tc.desc, tc.a.hash(), tc.b.hash())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Things to test.
|
|
||||||
// - Run the manager
|
|
||||||
// - Change provider to return new configs
|
|
||||||
// - Verify that the scheduler synced with the new config
|
|
||||||
func TestPeriodicTaskManager(t *testing.T) {
|
|
||||||
// Note: In this test, we'll use task type as an ID for each config.
|
|
||||||
cfgs := []*PeriodicTaskConfig{
|
|
||||||
{Task: NewTask("task1", nil), Cronspec: "* * * * 1"},
|
|
||||||
{Task: NewTask("task2", nil), Cronspec: "* * * * 2"},
|
|
||||||
}
|
|
||||||
const syncInterval = 3 * time.Second
|
|
||||||
provider := &FakeConfigProvider{cfgs: cfgs}
|
|
||||||
mgr, err := NewPeriodicTaskManager(PeriodicTaskManagerOpts{
|
|
||||||
RedisConnOpt: getRedisConnOpt(t),
|
|
||||||
PeriodicTaskConfigProvider: provider,
|
|
||||||
SyncInterval: syncInterval,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Failed to initialize PeriodicTaskManager: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := mgr.Start(); err != nil {
|
|
||||||
t.Fatalf("Failed to start PeriodicTaskManager: %v", err)
|
|
||||||
}
|
|
||||||
defer mgr.Shutdown()
|
|
||||||
|
|
||||||
got := extractCronEntries(mgr.s)
|
|
||||||
want := []*cronEntry{
|
|
||||||
{Cronspec: "* * * * 1", TaskType: "task1"},
|
|
||||||
{Cronspec: "* * * * 2", TaskType: "task2"},
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(want, got, sortCronEntry); diff != "" {
|
|
||||||
t.Errorf("Diff found in scheduler's registered entries: %s", diff)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Change the underlying configs
|
|
||||||
// - task2 removed
|
|
||||||
// - task3 added
|
|
||||||
provider.SetConfigs([]*PeriodicTaskConfig{
|
|
||||||
{Task: NewTask("task1", nil), Cronspec: "* * * * 1"},
|
|
||||||
{Task: NewTask("task3", nil), Cronspec: "* * * * 3"},
|
|
||||||
})
|
|
||||||
|
|
||||||
// Wait for the next sync
|
|
||||||
time.Sleep(syncInterval * 2)
|
|
||||||
|
|
||||||
// Verify the entries are synced
|
|
||||||
got = extractCronEntries(mgr.s)
|
|
||||||
want = []*cronEntry{
|
|
||||||
{Cronspec: "* * * * 1", TaskType: "task1"},
|
|
||||||
{Cronspec: "* * * * 3", TaskType: "task3"},
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(want, got, sortCronEntry); diff != "" {
|
|
||||||
t.Errorf("Diff found in scheduler's registered entries: %s", diff)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Change the underlying configs
|
|
||||||
// All configs removed, empty set.
|
|
||||||
provider.SetConfigs([]*PeriodicTaskConfig{})
|
|
||||||
|
|
||||||
// Wait for the next sync
|
|
||||||
time.Sleep(syncInterval * 2)
|
|
||||||
|
|
||||||
// Verify the entries are synced
|
|
||||||
got = extractCronEntries(mgr.s)
|
|
||||||
want = []*cronEntry{}
|
|
||||||
if diff := cmp.Diff(want, got, sortCronEntry); diff != "" {
|
|
||||||
t.Errorf("Diff found in scheduler's registered entries: %s", diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func extractCronEntries(s *Scheduler) []*cronEntry {
|
|
||||||
var out []*cronEntry
|
|
||||||
for _, e := range s.cron.Entries() {
|
|
||||||
job := e.Job.(*enqueueJob)
|
|
||||||
out = append(out, &cronEntry{Cronspec: job.cronspec, TaskType: job.task.Type()})
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
var sortCronEntry = cmp.Transformer("sortCronEntry", func(in []*cronEntry) []*cronEntry {
|
|
||||||
out := append([]*cronEntry(nil), in...)
|
|
||||||
sort.Slice(out, func(i, j int) bool {
|
|
||||||
return out[i].TaskType < out[j].TaskType
|
|
||||||
})
|
|
||||||
return out
|
|
||||||
})
|
|
||||||
|
|
||||||
// A simple struct to allow for simpler comparison in test.
|
|
||||||
type cronEntry struct {
|
|
||||||
Cronspec string
|
|
||||||
TaskType string
|
|
||||||
}
|
|
442
processor.go
442
processor.go
@ -7,41 +7,33 @@ package asynq
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
"math/rand"
|
||||||
"math/rand/v2"
|
|
||||||
"runtime"
|
|
||||||
"runtime/debug"
|
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
asynqcontext "github.com/hibiken/asynq/internal/context"
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
"github.com/hibiken/asynq/internal/errors"
|
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
"github.com/hibiken/asynq/internal/timeutil"
|
|
||||||
"golang.org/x/time/rate"
|
"golang.org/x/time/rate"
|
||||||
)
|
)
|
||||||
|
|
||||||
type processor struct {
|
type processor struct {
|
||||||
logger *log.Logger
|
logger Logger
|
||||||
broker base.Broker
|
broker base.Broker
|
||||||
clock timeutil.Clock
|
|
||||||
|
|
||||||
handler Handler
|
ss *base.ServerState
|
||||||
baseCtxFn func() context.Context
|
|
||||||
|
handler Handler
|
||||||
|
|
||||||
queueConfig map[string]int
|
queueConfig map[string]int
|
||||||
|
|
||||||
// orderedQueues is set only in strict-priority mode.
|
// orderedQueues is set only in strict-priority mode.
|
||||||
orderedQueues []string
|
orderedQueues []string
|
||||||
|
|
||||||
taskCheckInterval time.Duration
|
retryDelayFunc retryDelayFunc
|
||||||
retryDelayFunc RetryDelayFunc
|
|
||||||
isFailureFunc func(error) bool
|
errHandler ErrorHandler
|
||||||
|
|
||||||
errHandler ErrorHandler
|
|
||||||
shutdownTimeout time.Duration
|
shutdownTimeout time.Duration
|
||||||
|
|
||||||
// channel via which to send sync requests to syncer.
|
// channel via which to send sync requests to syncer.
|
||||||
@ -59,66 +51,53 @@ type processor struct {
|
|||||||
done chan struct{}
|
done chan struct{}
|
||||||
once sync.Once
|
once sync.Once
|
||||||
|
|
||||||
// quit channel is closed when the shutdown of the "processor" goroutine starts.
|
// abort channel is closed when the shutdown of the "processor" goroutine starts.
|
||||||
quit chan struct{}
|
|
||||||
|
|
||||||
// abort channel communicates to the in-flight worker goroutines to stop.
|
|
||||||
abort chan struct{}
|
abort chan struct{}
|
||||||
|
|
||||||
// cancelations is a set of cancel functions for all active tasks.
|
// quit channel communicates to the in-flight worker goroutines to stop.
|
||||||
cancelations *base.Cancelations
|
quit chan struct{}
|
||||||
|
|
||||||
starting chan<- *workerInfo
|
// cancelations is a set of cancel functions for all in-progress tasks.
|
||||||
finished chan<- *base.TaskMessage
|
cancelations *base.Cancelations
|
||||||
}
|
}
|
||||||
|
|
||||||
type processorParams struct {
|
type retryDelayFunc func(n int, err error, task *Task) time.Duration
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
type newProcessorParams struct {
|
||||||
baseCtxFn func() context.Context
|
logger Logger
|
||||||
retryDelayFunc RetryDelayFunc
|
broker base.Broker
|
||||||
taskCheckInterval time.Duration
|
ss *base.ServerState
|
||||||
isFailureFunc func(error) bool
|
retryDelayFunc retryDelayFunc
|
||||||
syncCh chan<- *syncRequest
|
syncCh chan<- *syncRequest
|
||||||
cancelations *base.Cancelations
|
cancelations *base.Cancelations
|
||||||
concurrency int
|
errHandler ErrorHandler
|
||||||
queues map[string]int
|
shutdownTimeout time.Duration
|
||||||
strictPriority bool
|
|
||||||
errHandler ErrorHandler
|
|
||||||
shutdownTimeout time.Duration
|
|
||||||
starting chan<- *workerInfo
|
|
||||||
finished chan<- *base.TaskMessage
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// newProcessor constructs a new processor.
|
// newProcessor constructs a new processor.
|
||||||
func newProcessor(params processorParams) *processor {
|
func newProcessor(params newProcessorParams) *processor {
|
||||||
queues := normalizeQueues(params.queues)
|
info := params.ss.GetInfo()
|
||||||
|
qcfg := normalizeQueueCfg(info.Queues)
|
||||||
orderedQueues := []string(nil)
|
orderedQueues := []string(nil)
|
||||||
if params.strictPriority {
|
if info.StrictPriority {
|
||||||
orderedQueues = sortByPriority(queues)
|
orderedQueues = sortByPriority(qcfg)
|
||||||
}
|
}
|
||||||
return &processor{
|
return &processor{
|
||||||
logger: params.logger,
|
logger: params.logger,
|
||||||
broker: params.broker,
|
broker: params.broker,
|
||||||
baseCtxFn: params.baseCtxFn,
|
ss: params.ss,
|
||||||
clock: timeutil.NewRealClock(),
|
queueConfig: qcfg,
|
||||||
queueConfig: queues,
|
orderedQueues: orderedQueues,
|
||||||
orderedQueues: orderedQueues,
|
retryDelayFunc: params.retryDelayFunc,
|
||||||
taskCheckInterval: params.taskCheckInterval,
|
syncRequestCh: params.syncCh,
|
||||||
retryDelayFunc: params.retryDelayFunc,
|
cancelations: params.cancelations,
|
||||||
isFailureFunc: params.isFailureFunc,
|
errLogLimiter: rate.NewLimiter(rate.Every(3*time.Second), 1),
|
||||||
syncRequestCh: params.syncCh,
|
sema: make(chan struct{}, info.Concurrency),
|
||||||
cancelations: params.cancelations,
|
done: make(chan struct{}),
|
||||||
errLogLimiter: rate.NewLimiter(rate.Every(3*time.Second), 1),
|
abort: make(chan struct{}),
|
||||||
sema: make(chan struct{}, params.concurrency),
|
quit: make(chan struct{}),
|
||||||
done: make(chan struct{}),
|
errHandler: params.errHandler,
|
||||||
quit: make(chan struct{}),
|
handler: HandlerFunc(func(ctx context.Context, t *Task) error { return fmt.Errorf("handler not set") }),
|
||||||
abort: make(chan struct{}),
|
|
||||||
errHandler: params.errHandler,
|
|
||||||
handler: HandlerFunc(func(ctx context.Context, t *Task) error { return fmt.Errorf("handler not set") }),
|
|
||||||
shutdownTimeout: params.shutdownTimeout,
|
|
||||||
starting: params.starting,
|
|
||||||
finished: params.finished,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,37 +105,46 @@ func newProcessor(params processorParams) *processor {
|
|||||||
// It's safe to call this method multiple times.
|
// It's safe to call this method multiple times.
|
||||||
func (p *processor) stop() {
|
func (p *processor) stop() {
|
||||||
p.once.Do(func() {
|
p.once.Do(func() {
|
||||||
p.logger.Debug("Processor shutting down...")
|
p.logger.Info("Processor shutting down...")
|
||||||
// Unblock if processor is waiting for sema token.
|
// Unblock if processor is waiting for sema token.
|
||||||
close(p.quit)
|
close(p.abort)
|
||||||
// Signal the processor goroutine to stop processing tasks
|
// Signal the processor goroutine to stop processing tasks
|
||||||
// from the queue.
|
// from the queue.
|
||||||
p.done <- struct{}{}
|
p.done <- struct{}{}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOTE: once shutdown, processor cannot be re-started.
|
// NOTE: once terminated, processor cannot be re-started.
|
||||||
func (p *processor) shutdown() {
|
func (p *processor) terminate() {
|
||||||
p.stop()
|
p.stop()
|
||||||
|
|
||||||
time.AfterFunc(p.shutdownTimeout, func() { close(p.abort) })
|
time.AfterFunc(p.shutdownTimeout, func() { close(p.quit) })
|
||||||
|
|
||||||
p.logger.Info("Waiting for all workers to finish...")
|
p.logger.Info("Waiting for all workers to finish...")
|
||||||
|
|
||||||
|
// send cancellation signal to all in-progress task handlers
|
||||||
|
for _, cancel := range p.cancelations.GetAll() {
|
||||||
|
cancel()
|
||||||
|
}
|
||||||
|
|
||||||
// block until all workers have released the token
|
// block until all workers have released the token
|
||||||
for i := 0; i < cap(p.sema); i++ {
|
for i := 0; i < cap(p.sema); i++ {
|
||||||
p.sema <- struct{}{}
|
p.sema <- struct{}{}
|
||||||
}
|
}
|
||||||
p.logger.Info("All workers have finished")
|
p.logger.Info("All workers have finished")
|
||||||
|
p.restore() // move any unfinished tasks back to the queue.
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *processor) start(wg *sync.WaitGroup) {
|
func (p *processor) start(wg *sync.WaitGroup) {
|
||||||
|
// NOTE: The call to "restore" needs to complete before starting
|
||||||
|
// the processor goroutine.
|
||||||
|
p.restore()
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
go func() {
|
go func() {
|
||||||
defer wg.Done()
|
defer wg.Done()
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-p.done:
|
case <-p.done:
|
||||||
p.logger.Debug("Processor done")
|
p.logger.Info("Processor done")
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
p.exec()
|
p.exec()
|
||||||
@ -168,225 +156,134 @@ func (p *processor) start(wg *sync.WaitGroup) {
|
|||||||
// exec pulls a task out of the queue and starts a worker goroutine to
|
// exec pulls a task out of the queue and starts a worker goroutine to
|
||||||
// process the task.
|
// process the task.
|
||||||
func (p *processor) exec() {
|
func (p *processor) exec() {
|
||||||
|
qnames := p.queues()
|
||||||
|
msg, err := p.broker.Dequeue(qnames...)
|
||||||
|
if err == rdb.ErrNoProcessableTask { // TODO: Need to decouple this error from rdb to support other brokers
|
||||||
|
// queues are empty, this is a normal behavior.
|
||||||
|
if len(p.queueConfig) > 1 {
|
||||||
|
// sleep to avoid slamming redis and let scheduler move tasks into queues.
|
||||||
|
// Note: With multiple queues, we are not using blocking pop operation and
|
||||||
|
// polling queues instead. This adds significant load to redis.
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
if p.errLogLimiter.Allow() {
|
||||||
|
p.logger.Error("Dequeue error: %v", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
select {
|
select {
|
||||||
case <-p.quit:
|
case <-p.abort:
|
||||||
|
// shutdown is starting, return immediately after requeuing the message.
|
||||||
|
p.requeue(msg)
|
||||||
return
|
return
|
||||||
case p.sema <- struct{}{}: // acquire token
|
case p.sema <- struct{}{}: // acquire token
|
||||||
qnames := p.queues()
|
p.ss.AddWorkerStats(msg, time.Now())
|
||||||
msg, leaseExpirationTime, err := p.broker.Dequeue(qnames...)
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, errors.ErrNoProcessableTask):
|
|
||||||
p.logger.Debug("All queues are empty")
|
|
||||||
// Queues are empty, this is a normal behavior.
|
|
||||||
// Sleep to avoid slamming redis and let scheduler move tasks into queues.
|
|
||||||
// Note: We are not using blocking pop operation and polling queues instead.
|
|
||||||
// This adds significant load to redis.
|
|
||||||
jitter := rand.N(p.taskCheckInterval)
|
|
||||||
time.Sleep(p.taskCheckInterval/2 + jitter)
|
|
||||||
<-p.sema // release token
|
|
||||||
return
|
|
||||||
case err != nil:
|
|
||||||
if p.errLogLimiter.Allow() {
|
|
||||||
p.logger.Errorf("Dequeue error: %v", err)
|
|
||||||
}
|
|
||||||
<-p.sema // release token
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
lease := base.NewLease(leaseExpirationTime)
|
|
||||||
deadline := p.computeDeadline(msg)
|
|
||||||
p.starting <- &workerInfo{msg, time.Now(), deadline, lease}
|
|
||||||
go func() {
|
go func() {
|
||||||
defer func() {
|
defer func() {
|
||||||
p.finished <- msg
|
p.ss.DeleteWorkerStats(msg)
|
||||||
<-p.sema // release token
|
<-p.sema /* release token */
|
||||||
}()
|
}()
|
||||||
|
|
||||||
ctx, cancel := asynqcontext.New(p.baseCtxFn(), msg, deadline)
|
|
||||||
p.cancelations.Add(msg.ID, cancel)
|
|
||||||
defer func() {
|
|
||||||
cancel()
|
|
||||||
p.cancelations.Delete(msg.ID)
|
|
||||||
}()
|
|
||||||
|
|
||||||
// check context before starting a worker goroutine.
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
// already canceled (e.g. deadline exceeded).
|
|
||||||
p.handleFailedMessage(ctx, lease, msg, ctx.Err())
|
|
||||||
return
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
|
|
||||||
resCh := make(chan error, 1)
|
resCh := make(chan error, 1)
|
||||||
|
task := NewTask(msg.Type, msg.Payload)
|
||||||
|
ctx, cancel := createContext(msg)
|
||||||
|
p.cancelations.Add(msg.ID.String(), cancel)
|
||||||
go func() {
|
go func() {
|
||||||
task := newTask(
|
resCh <- perform(ctx, task, p.handler)
|
||||||
msg.Type,
|
p.cancelations.Delete(msg.ID.String())
|
||||||
msg.Payload,
|
|
||||||
&ResultWriter{
|
|
||||||
id: msg.ID,
|
|
||||||
qname: msg.Queue,
|
|
||||||
broker: p.broker,
|
|
||||||
ctx: ctx,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
resCh <- p.perform(ctx, task)
|
|
||||||
}()
|
}()
|
||||||
|
|
||||||
select {
|
select {
|
||||||
case <-p.abort:
|
case <-p.quit:
|
||||||
// time is up, push the message back to queue and quit this worker goroutine.
|
// time is up, quit this worker goroutine.
|
||||||
p.logger.Warnf("Quitting worker. task id=%s", msg.ID)
|
p.logger.Warn("Quitting worker. task id=%s", msg.ID)
|
||||||
p.requeue(lease, msg)
|
|
||||||
return
|
|
||||||
case <-lease.Done():
|
|
||||||
cancel()
|
|
||||||
p.handleFailedMessage(ctx, lease, msg, ErrLeaseExpired)
|
|
||||||
return
|
|
||||||
case <-ctx.Done():
|
|
||||||
p.handleFailedMessage(ctx, lease, msg, ctx.Err())
|
|
||||||
return
|
return
|
||||||
case resErr := <-resCh:
|
case resErr := <-resCh:
|
||||||
|
// Note: One of three things should happen.
|
||||||
|
// 1) Done -> Removes the message from InProgress
|
||||||
|
// 2) Retry -> Removes the message from InProgress & Adds the message to Retry
|
||||||
|
// 3) Kill -> Removes the message from InProgress & Adds the message to Dead
|
||||||
if resErr != nil {
|
if resErr != nil {
|
||||||
p.handleFailedMessage(ctx, lease, msg, resErr)
|
if p.errHandler != nil {
|
||||||
|
p.errHandler.HandleError(task, resErr, msg.Retried, msg.Retry)
|
||||||
|
}
|
||||||
|
if msg.Retried >= msg.Retry {
|
||||||
|
p.kill(msg, resErr)
|
||||||
|
} else {
|
||||||
|
p.retry(msg, resErr)
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
p.handleSucceededMessage(lease, msg)
|
p.markAsDone(msg)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *processor) requeue(l *base.Lease, msg *base.TaskMessage) {
|
// restore moves all tasks from "in-progress" back to queue
|
||||||
if !l.IsValid() {
|
// to restore all unfinished tasks.
|
||||||
// If lease is not valid, do not write to redis; Let recoverer take care of it.
|
func (p *processor) restore() {
|
||||||
return
|
n, err := p.broker.RequeueAll()
|
||||||
}
|
|
||||||
ctx, cancel := context.WithDeadline(context.Background(), l.Deadline())
|
|
||||||
defer cancel()
|
|
||||||
err := p.broker.Requeue(ctx, msg)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
p.logger.Errorf("Could not push task id=%s back to queue: %v", msg.ID, err)
|
p.logger.Error("Could not restore unfinished tasks: %v", err)
|
||||||
} else {
|
}
|
||||||
p.logger.Infof("Pushed task id=%s back to queue", msg.ID)
|
if n > 0 {
|
||||||
|
p.logger.Info("Restored %d unfinished tasks back to queue", n)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *processor) handleSucceededMessage(l *base.Lease, msg *base.TaskMessage) {
|
func (p *processor) requeue(msg *base.TaskMessage) {
|
||||||
if msg.Retention > 0 {
|
err := p.broker.Requeue(msg)
|
||||||
p.markAsComplete(l, msg)
|
if err != nil {
|
||||||
} else {
|
p.logger.Error("Could not push task id=%s back to queue: %v", msg.ID, err)
|
||||||
p.markAsDone(l, msg)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *processor) markAsComplete(l *base.Lease, msg *base.TaskMessage) {
|
func (p *processor) markAsDone(msg *base.TaskMessage) {
|
||||||
if !l.IsValid() {
|
err := p.broker.Done(msg)
|
||||||
// If lease is not valid, do not write to redis; Let recoverer take care of it.
|
|
||||||
return
|
|
||||||
}
|
|
||||||
ctx, cancel := context.WithDeadline(context.Background(), l.Deadline())
|
|
||||||
defer cancel()
|
|
||||||
err := p.broker.MarkAsComplete(ctx, msg)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errMsg := fmt.Sprintf("Could not move task id=%s type=%q from %q to %q: %+v",
|
errMsg := fmt.Sprintf("Could not remove task id=%s from %q", msg.ID, base.InProgressQueue)
|
||||||
msg.ID, msg.Type, base.ActiveKey(msg.Queue), base.CompletedKey(msg.Queue), err)
|
p.logger.Warn("%s; Will retry syncing", errMsg)
|
||||||
p.logger.Warnf("%s; Will retry syncing", errMsg)
|
|
||||||
p.syncRequestCh <- &syncRequest{
|
p.syncRequestCh <- &syncRequest{
|
||||||
fn: func() error {
|
fn: func() error {
|
||||||
return p.broker.MarkAsComplete(ctx, msg)
|
return p.broker.Done(msg)
|
||||||
},
|
},
|
||||||
errMsg: errMsg,
|
errMsg: errMsg,
|
||||||
deadline: l.Deadline(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *processor) markAsDone(l *base.Lease, msg *base.TaskMessage) {
|
func (p *processor) retry(msg *base.TaskMessage, e error) {
|
||||||
if !l.IsValid() {
|
|
||||||
// If lease is not valid, do not write to redis; Let recoverer take care of it.
|
|
||||||
return
|
|
||||||
}
|
|
||||||
ctx, cancel := context.WithDeadline(context.Background(), l.Deadline())
|
|
||||||
defer cancel()
|
|
||||||
err := p.broker.Done(ctx, msg)
|
|
||||||
if err != nil {
|
|
||||||
errMsg := fmt.Sprintf("Could not remove task id=%s type=%q from %q err: %+v", msg.ID, msg.Type, base.ActiveKey(msg.Queue), err)
|
|
||||||
p.logger.Warnf("%s; Will retry syncing", errMsg)
|
|
||||||
p.syncRequestCh <- &syncRequest{
|
|
||||||
fn: func() error {
|
|
||||||
return p.broker.Done(ctx, msg)
|
|
||||||
},
|
|
||||||
errMsg: errMsg,
|
|
||||||
deadline: l.Deadline(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SkipRetry is used as a return value from Handler.ProcessTask to indicate that
|
|
||||||
// the task should not be retried and should be archived instead.
|
|
||||||
var SkipRetry = errors.New("skip retry for the task")
|
|
||||||
|
|
||||||
// RevokeTask is used as a return value from Handler.ProcessTask to indicate that
|
|
||||||
// the task should not be retried or archived.
|
|
||||||
var RevokeTask = errors.New("revoke task")
|
|
||||||
|
|
||||||
func (p *processor) handleFailedMessage(ctx context.Context, l *base.Lease, msg *base.TaskMessage, err error) {
|
|
||||||
if p.errHandler != nil {
|
|
||||||
p.errHandler.HandleError(ctx, NewTask(msg.Type, msg.Payload), err)
|
|
||||||
}
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, RevokeTask):
|
|
||||||
p.logger.Warnf("revoke task id=%s", msg.ID)
|
|
||||||
p.markAsDone(l, msg)
|
|
||||||
case msg.Retried >= msg.Retry || errors.Is(err, SkipRetry):
|
|
||||||
p.logger.Warnf("Retry exhausted for task id=%s", msg.ID)
|
|
||||||
p.archive(l, msg, err)
|
|
||||||
default:
|
|
||||||
p.retry(l, msg, err, p.isFailureFunc(err))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *processor) retry(l *base.Lease, msg *base.TaskMessage, e error, isFailure bool) {
|
|
||||||
if !l.IsValid() {
|
|
||||||
// If lease is not valid, do not write to redis; Let recoverer take care of it.
|
|
||||||
return
|
|
||||||
}
|
|
||||||
ctx, cancel := context.WithDeadline(context.Background(), l.Deadline())
|
|
||||||
defer cancel()
|
|
||||||
d := p.retryDelayFunc(msg.Retried, e, NewTask(msg.Type, msg.Payload))
|
d := p.retryDelayFunc(msg.Retried, e, NewTask(msg.Type, msg.Payload))
|
||||||
retryAt := time.Now().Add(d)
|
retryAt := time.Now().Add(d)
|
||||||
err := p.broker.Retry(ctx, msg, retryAt, e.Error(), isFailure)
|
err := p.broker.Retry(msg, retryAt, e.Error())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errMsg := fmt.Sprintf("Could not move task id=%s from %q to %q", msg.ID, base.ActiveKey(msg.Queue), base.RetryKey(msg.Queue))
|
errMsg := fmt.Sprintf("Could not move task id=%s from %q to %q", msg.ID, base.InProgressQueue, base.RetryQueue)
|
||||||
p.logger.Warnf("%s; Will retry syncing", errMsg)
|
p.logger.Warn("%s; Will retry syncing", errMsg)
|
||||||
p.syncRequestCh <- &syncRequest{
|
p.syncRequestCh <- &syncRequest{
|
||||||
fn: func() error {
|
fn: func() error {
|
||||||
return p.broker.Retry(ctx, msg, retryAt, e.Error(), isFailure)
|
return p.broker.Retry(msg, retryAt, e.Error())
|
||||||
},
|
},
|
||||||
errMsg: errMsg,
|
errMsg: errMsg,
|
||||||
deadline: l.Deadline(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *processor) archive(l *base.Lease, msg *base.TaskMessage, e error) {
|
func (p *processor) kill(msg *base.TaskMessage, e error) {
|
||||||
if !l.IsValid() {
|
p.logger.Warn("Retry exhausted for task id=%s", msg.ID)
|
||||||
// If lease is not valid, do not write to redis; Let recoverer take care of it.
|
err := p.broker.Kill(msg, e.Error())
|
||||||
return
|
|
||||||
}
|
|
||||||
ctx, cancel := context.WithDeadline(context.Background(), l.Deadline())
|
|
||||||
defer cancel()
|
|
||||||
err := p.broker.Archive(ctx, msg, e.Error())
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errMsg := fmt.Sprintf("Could not move task id=%s from %q to %q", msg.ID, base.ActiveKey(msg.Queue), base.ArchivedKey(msg.Queue))
|
errMsg := fmt.Sprintf("Could not move task id=%s from %q to %q", msg.ID, base.InProgressQueue, base.DeadQueue)
|
||||||
p.logger.Warnf("%s; Will retry syncing", errMsg)
|
p.logger.Warn("%s; Will retry syncing", errMsg)
|
||||||
p.syncRequestCh <- &syncRequest{
|
p.syncRequestCh <- &syncRequest{
|
||||||
fn: func() error {
|
fn: func() error {
|
||||||
return p.broker.Archive(ctx, msg, e.Error())
|
return p.broker.Kill(msg, e.Error())
|
||||||
},
|
},
|
||||||
errMsg: errMsg,
|
errMsg: errMsg,
|
||||||
deadline: l.Deadline(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -409,40 +306,25 @@ func (p *processor) queues() []string {
|
|||||||
}
|
}
|
||||||
var names []string
|
var names []string
|
||||||
for qname, priority := range p.queueConfig {
|
for qname, priority := range p.queueConfig {
|
||||||
for i := 0; i < priority; i++ {
|
for i := 0; i < int(priority); i++ {
|
||||||
names = append(names, qname)
|
names = append(names, qname)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rand.Shuffle(len(names), func(i, j int) { names[i], names[j] = names[j], names[i] })
|
r := rand.New(rand.NewSource(time.Now().UnixNano()))
|
||||||
|
r.Shuffle(len(names), func(i, j int) { names[i], names[j] = names[j], names[i] })
|
||||||
return uniq(names, len(p.queueConfig))
|
return uniq(names, len(p.queueConfig))
|
||||||
}
|
}
|
||||||
|
|
||||||
// perform calls the handler with the given task.
|
// perform calls the handler with the given task.
|
||||||
// If the call returns without panic, it simply returns the value,
|
// If the call returns without panic, it simply returns the value,
|
||||||
// otherwise, it recovers from panic and returns an error.
|
// otherwise, it recovers from panic and returns an error.
|
||||||
func (p *processor) perform(ctx context.Context, task *Task) (err error) {
|
func perform(ctx context.Context, task *Task, h Handler) (err error) {
|
||||||
defer func() {
|
defer func() {
|
||||||
if x := recover(); x != nil {
|
if x := recover(); x != nil {
|
||||||
p.logger.Errorf("recovering from panic. See the stack trace below for details:\n%s", string(debug.Stack()))
|
err = fmt.Errorf("panic: %v", x)
|
||||||
_, file, line, ok := runtime.Caller(1) // skip the first frame (panic itself)
|
|
||||||
if ok && strings.Contains(file, "runtime/") {
|
|
||||||
// The panic came from the runtime, most likely due to incorrect
|
|
||||||
// map/slice usage. The parent frame should have the real trigger.
|
|
||||||
_, file, line, ok = runtime.Caller(2)
|
|
||||||
}
|
|
||||||
var errMsg string
|
|
||||||
// Include the file and line number info in the error, if runtime.Caller returned ok.
|
|
||||||
if ok {
|
|
||||||
errMsg = fmt.Sprintf("panic [%s:%d]: %v", file, line, x)
|
|
||||||
} else {
|
|
||||||
errMsg = fmt.Sprintf("panic: %v", x)
|
|
||||||
}
|
|
||||||
err = &errors.PanicError{
|
|
||||||
ErrMsg: errMsg,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
return p.handler.ProcessTask(ctx, task)
|
return h.ProcessTask(ctx, task)
|
||||||
}
|
}
|
||||||
|
|
||||||
// uniq dedupes elements and returns a slice of unique names of length l.
|
// uniq dedupes elements and returns a slice of unique names of length l.
|
||||||
@ -488,15 +370,16 @@ func (x byPriority) Len() int { return len(x) }
|
|||||||
func (x byPriority) Less(i, j int) bool { return x[i].priority < x[j].priority }
|
func (x byPriority) Less(i, j int) bool { return x[i].priority < x[j].priority }
|
||||||
func (x byPriority) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
|
func (x byPriority) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
|
||||||
|
|
||||||
// normalizeQueues divides priority numbers by their greatest common divisor.
|
// normalizeQueueCfg divides priority numbers by their
|
||||||
func normalizeQueues(queues map[string]int) map[string]int {
|
// greatest common divisor.
|
||||||
|
func normalizeQueueCfg(queueCfg map[string]int) map[string]int {
|
||||||
var xs []int
|
var xs []int
|
||||||
for _, x := range queues {
|
for _, x := range queueCfg {
|
||||||
xs = append(xs, x)
|
xs = append(xs, x)
|
||||||
}
|
}
|
||||||
d := gcd(xs...)
|
d := gcd(xs...)
|
||||||
res := make(map[string]int)
|
res := make(map[string]int)
|
||||||
for q, x := range queues {
|
for q, x := range queueCfg {
|
||||||
res[q] = x / d
|
res[q] = x / d
|
||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
@ -519,22 +402,19 @@ func gcd(xs ...int) int {
|
|||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
// computeDeadline returns the given task's deadline,
|
// createContext returns a context and cancel function for a given task message.
|
||||||
func (p *processor) computeDeadline(msg *base.TaskMessage) time.Time {
|
func createContext(msg *base.TaskMessage) (ctx context.Context, cancel context.CancelFunc) {
|
||||||
if msg.Timeout == 0 && msg.Deadline == 0 {
|
ctx = context.Background()
|
||||||
p.logger.Errorf("asynq: internal error: both timeout and deadline are not set for the task message: %s", msg.ID)
|
timeout, err := time.ParseDuration(msg.Timeout)
|
||||||
return p.clock.Now().Add(defaultTimeout)
|
if err == nil && timeout != 0 {
|
||||||
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
}
|
}
|
||||||
if msg.Timeout != 0 && msg.Deadline != 0 {
|
deadline, err := time.Parse(time.RFC3339, msg.Deadline)
|
||||||
deadlineUnix := math.Min(float64(p.clock.Now().Unix()+msg.Timeout), float64(msg.Deadline))
|
if err == nil && !deadline.IsZero() {
|
||||||
return time.Unix(int64(deadlineUnix), 0)
|
ctx, cancel = context.WithDeadline(ctx, deadline)
|
||||||
}
|
}
|
||||||
if msg.Timeout != 0 {
|
if cancel == nil {
|
||||||
return p.clock.Now().Add(time.Duration(msg.Timeout) * time.Second)
|
ctx, cancel = context.WithCancel(ctx)
|
||||||
}
|
}
|
||||||
return time.Unix(msg.Deadline, 0)
|
return ctx, cancel
|
||||||
}
|
|
||||||
|
|
||||||
func IsPanicError(err error) bool {
|
|
||||||
return errors.IsPanicError(err)
|
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
126
recoverer.go
126
recoverer.go
@ -1,126 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/errors"
|
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
)
|
|
||||||
|
|
||||||
type recoverer struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
retryDelayFunc RetryDelayFunc
|
|
||||||
isFailureFunc func(error) bool
|
|
||||||
|
|
||||||
// channel to communicate back to the long running "recoverer" goroutine.
|
|
||||||
done chan struct{}
|
|
||||||
|
|
||||||
// list of queues to check for deadline.
|
|
||||||
queues []string
|
|
||||||
|
|
||||||
// poll interval.
|
|
||||||
interval time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
type recovererParams struct {
|
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
queues []string
|
|
||||||
interval time.Duration
|
|
||||||
retryDelayFunc RetryDelayFunc
|
|
||||||
isFailureFunc func(error) bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func newRecoverer(params recovererParams) *recoverer {
|
|
||||||
return &recoverer{
|
|
||||||
logger: params.logger,
|
|
||||||
broker: params.broker,
|
|
||||||
done: make(chan struct{}),
|
|
||||||
queues: params.queues,
|
|
||||||
interval: params.interval,
|
|
||||||
retryDelayFunc: params.retryDelayFunc,
|
|
||||||
isFailureFunc: params.isFailureFunc,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *recoverer) shutdown() {
|
|
||||||
r.logger.Debug("Recoverer shutting down...")
|
|
||||||
// Signal the recoverer goroutine to stop polling.
|
|
||||||
r.done <- struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *recoverer) start(wg *sync.WaitGroup) {
|
|
||||||
wg.Add(1)
|
|
||||||
go func() {
|
|
||||||
defer wg.Done()
|
|
||||||
r.recover()
|
|
||||||
timer := time.NewTimer(r.interval)
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-r.done:
|
|
||||||
r.logger.Debug("Recoverer done")
|
|
||||||
timer.Stop()
|
|
||||||
return
|
|
||||||
case <-timer.C:
|
|
||||||
r.recover()
|
|
||||||
timer.Reset(r.interval)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
// ErrLeaseExpired error indicates that the task failed because the worker working on the task
|
|
||||||
// could not extend its lease due to missing heartbeats. The worker may have crashed or got cutoff from the network.
|
|
||||||
var ErrLeaseExpired = errors.New("asynq: task lease expired")
|
|
||||||
|
|
||||||
func (r *recoverer) recover() {
|
|
||||||
r.recoverLeaseExpiredTasks()
|
|
||||||
r.recoverStaleAggregationSets()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *recoverer) recoverLeaseExpiredTasks() {
|
|
||||||
// Get all tasks which have expired 30 seconds ago or earlier to accommodate certain amount of clock skew.
|
|
||||||
cutoff := time.Now().Add(-30 * time.Second)
|
|
||||||
msgs, err := r.broker.ListLeaseExpired(cutoff, r.queues...)
|
|
||||||
if err != nil {
|
|
||||||
r.logger.Warnf("recoverer: could not list lease expired tasks: %v", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, msg := range msgs {
|
|
||||||
if msg.Retried >= msg.Retry {
|
|
||||||
r.archive(msg, ErrLeaseExpired)
|
|
||||||
} else {
|
|
||||||
r.retry(msg, ErrLeaseExpired)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *recoverer) recoverStaleAggregationSets() {
|
|
||||||
for _, qname := range r.queues {
|
|
||||||
if err := r.broker.ReclaimStaleAggregationSets(qname); err != nil {
|
|
||||||
r.logger.Warnf("recoverer: could not reclaim stale aggregation sets in queue %q: %v", qname, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *recoverer) retry(msg *base.TaskMessage, err error) {
|
|
||||||
delay := r.retryDelayFunc(msg.Retried, err, NewTask(msg.Type, msg.Payload))
|
|
||||||
retryAt := time.Now().Add(delay)
|
|
||||||
if err := r.broker.Retry(context.Background(), msg, retryAt, err.Error(), r.isFailureFunc(err)); err != nil {
|
|
||||||
r.logger.Warnf("recoverer: could not retry lease expired task: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *recoverer) archive(msg *base.TaskMessage, err error) {
|
|
||||||
if err := r.broker.Archive(context.Background(), msg, err.Error()); err != nil {
|
|
||||||
r.logger.Warnf("recoverer: could not move task to archive: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,276 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package asynq
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
|
||||||
h "github.com/hibiken/asynq/internal/testutil"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestRecoverer(t *testing.T) {
|
|
||||||
r := setup(t)
|
|
||||||
defer r.Close()
|
|
||||||
rdbClient := rdb.NewRDB(r)
|
|
||||||
|
|
||||||
t1 := h.NewTaskMessageWithQueue("task1", nil, "default")
|
|
||||||
t2 := h.NewTaskMessageWithQueue("task2", nil, "default")
|
|
||||||
t3 := h.NewTaskMessageWithQueue("task3", nil, "critical")
|
|
||||||
t4 := h.NewTaskMessageWithQueue("task4", nil, "default")
|
|
||||||
t4.Retried = t4.Retry // t4 has reached its max retry count
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
desc string
|
|
||||||
active map[string][]*base.TaskMessage
|
|
||||||
lease map[string][]base.Z
|
|
||||||
retry map[string][]base.Z
|
|
||||||
archived map[string][]base.Z
|
|
||||||
wantActive map[string][]*base.TaskMessage
|
|
||||||
wantLease map[string][]base.Z
|
|
||||||
wantRetry map[string][]*base.TaskMessage
|
|
||||||
wantArchived map[string][]*base.TaskMessage
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
desc: "with one active task",
|
|
||||||
active: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t1},
|
|
||||||
},
|
|
||||||
lease: map[string][]base.Z{
|
|
||||||
"default": {{Message: t1, Score: now.Add(-1 * time.Minute).Unix()}},
|
|
||||||
},
|
|
||||||
retry: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
},
|
|
||||||
archived: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
},
|
|
||||||
wantActive: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
},
|
|
||||||
wantLease: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
},
|
|
||||||
wantRetry: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t1},
|
|
||||||
},
|
|
||||||
wantArchived: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with a task with max-retry reached",
|
|
||||||
active: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t4},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
lease: map[string][]base.Z{
|
|
||||||
"default": {{Message: t4, Score: now.Add(-40 * time.Second).Unix()}},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
retry: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
archived: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantActive: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantLease: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantRetry: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantArchived: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t4},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with multiple active tasks, and one expired",
|
|
||||||
active: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t1, t2},
|
|
||||||
"critical": {t3},
|
|
||||||
},
|
|
||||||
lease: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: t1, Score: now.Add(-2 * time.Minute).Unix()},
|
|
||||||
{Message: t2, Score: now.Add(20 * time.Second).Unix()},
|
|
||||||
},
|
|
||||||
"critical": {
|
|
||||||
{Message: t3, Score: now.Add(20 * time.Second).Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
retry: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
archived: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantActive: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t2},
|
|
||||||
"critical": {t3},
|
|
||||||
},
|
|
||||||
wantLease: map[string][]base.Z{
|
|
||||||
"default": {{Message: t2, Score: now.Add(20 * time.Second).Unix()}},
|
|
||||||
"critical": {{Message: t3, Score: now.Add(20 * time.Second).Unix()}},
|
|
||||||
},
|
|
||||||
wantRetry: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t1},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantArchived: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with multiple expired active tasks",
|
|
||||||
active: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t1, t2},
|
|
||||||
"critical": {t3},
|
|
||||||
},
|
|
||||||
lease: map[string][]base.Z{
|
|
||||||
"default": {
|
|
||||||
{Message: t1, Score: now.Add(-1 * time.Minute).Unix()},
|
|
||||||
{Message: t2, Score: now.Add(10 * time.Second).Unix()},
|
|
||||||
},
|
|
||||||
"critical": {
|
|
||||||
{Message: t3, Score: now.Add(-1 * time.Minute).Unix()},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
retry: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"cricial": {},
|
|
||||||
},
|
|
||||||
archived: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"cricial": {},
|
|
||||||
},
|
|
||||||
wantActive: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t2},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantLease: map[string][]base.Z{
|
|
||||||
"default": {{Message: t2, Score: now.Add(10 * time.Second).Unix()}},
|
|
||||||
},
|
|
||||||
wantRetry: map[string][]*base.TaskMessage{
|
|
||||||
"default": {t1},
|
|
||||||
"critical": {t3},
|
|
||||||
},
|
|
||||||
wantArchived: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "with empty active queue",
|
|
||||||
active: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
lease: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
retry: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
archived: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantActive: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantLease: map[string][]base.Z{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantRetry: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
wantArchived: map[string][]*base.TaskMessage{
|
|
||||||
"default": {},
|
|
||||||
"critical": {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
h.FlushDB(t, r)
|
|
||||||
h.SeedAllActiveQueues(t, r, tc.active)
|
|
||||||
h.SeedAllLease(t, r, tc.lease)
|
|
||||||
h.SeedAllRetryQueues(t, r, tc.retry)
|
|
||||||
h.SeedAllArchivedQueues(t, r, tc.archived)
|
|
||||||
|
|
||||||
recoverer := newRecoverer(recovererParams{
|
|
||||||
logger: testLogger,
|
|
||||||
broker: rdbClient,
|
|
||||||
queues: []string{"default", "critical"},
|
|
||||||
interval: 1 * time.Second,
|
|
||||||
retryDelayFunc: func(n int, err error, task *Task) time.Duration { return 30 * time.Second },
|
|
||||||
isFailureFunc: defaultIsFailureFunc,
|
|
||||||
})
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
recoverer.start(&wg)
|
|
||||||
runTime := time.Now() // time when recoverer is running
|
|
||||||
time.Sleep(2 * time.Second)
|
|
||||||
recoverer.shutdown()
|
|
||||||
|
|
||||||
for qname, want := range tc.wantActive {
|
|
||||||
gotActive := h.GetActiveMessages(t, r, qname)
|
|
||||||
if diff := cmp.Diff(want, gotActive, h.SortMsgOpt); diff != "" {
|
|
||||||
t.Errorf("%s; mismatch found in %q; (-want,+got)\n%s", tc.desc, base.ActiveKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for qname, want := range tc.wantLease {
|
|
||||||
gotLease := h.GetLeaseEntries(t, r, qname)
|
|
||||||
if diff := cmp.Diff(want, gotLease, h.SortZSetEntryOpt); diff != "" {
|
|
||||||
t.Errorf("%s; mismatch found in %q; (-want,+got)\n%s", tc.desc, base.LeaseKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
cmpOpt := h.EquateInt64Approx(2) // allow up to two-second difference in `LastFailedAt`
|
|
||||||
for qname, msgs := range tc.wantRetry {
|
|
||||||
gotRetry := h.GetRetryMessages(t, r, qname)
|
|
||||||
var wantRetry []*base.TaskMessage // Note: construct message here since `LastFailedAt` is relative to each test run
|
|
||||||
for _, msg := range msgs {
|
|
||||||
wantRetry = append(wantRetry, h.TaskMessageAfterRetry(*msg, ErrLeaseExpired.Error(), runTime))
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(wantRetry, gotRetry, h.SortMsgOpt, cmpOpt); diff != "" {
|
|
||||||
t.Errorf("%s; mismatch found in %q: (-want, +got)\n%s", tc.desc, base.RetryKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for qname, msgs := range tc.wantArchived {
|
|
||||||
gotArchived := h.GetArchivedMessages(t, r, qname)
|
|
||||||
var wantArchived []*base.TaskMessage
|
|
||||||
for _, msg := range msgs {
|
|
||||||
wantArchived = append(wantArchived, h.TaskMessageWithError(*msg, ErrLeaseExpired.Error(), runTime))
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(wantArchived, gotArchived, h.SortMsgOpt, cmpOpt); diff != "" {
|
|
||||||
t.Errorf("%s; mismatch found in %q: (-want, +got)\n%s", tc.desc, base.ArchivedKey(qname), diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
384
scheduler.go
384
scheduler.go
@ -5,371 +5,65 @@
|
|||||||
package asynq
|
package asynq
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
"github.com/robfig/cron/v3"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// A Scheduler kicks off tasks at regular intervals based on the user defined schedule.
|
type scheduler struct {
|
||||||
//
|
logger Logger
|
||||||
// Schedulers are safe for concurrent use by multiple goroutines.
|
broker base.Broker
|
||||||
type Scheduler struct {
|
|
||||||
id string
|
|
||||||
|
|
||||||
state *serverState
|
// channel to communicate back to the long running "scheduler" goroutine.
|
||||||
|
done chan struct{}
|
||||||
|
|
||||||
heartbeatInterval time.Duration
|
// poll interval on average
|
||||||
logger *log.Logger
|
avgInterval time.Duration
|
||||||
client *Client
|
|
||||||
rdb *rdb.RDB
|
|
||||||
cron *cron.Cron
|
|
||||||
location *time.Location
|
|
||||||
done chan struct{}
|
|
||||||
wg sync.WaitGroup
|
|
||||||
preEnqueueFunc func(task *Task, opts []Option)
|
|
||||||
postEnqueueFunc func(info *TaskInfo, err error)
|
|
||||||
errHandler func(task *Task, opts []Option, err error)
|
|
||||||
|
|
||||||
// guards idmap
|
// list of queues to move the tasks into.
|
||||||
mu sync.Mutex
|
qnames []string
|
||||||
// idmap maps Scheduler's entry ID to cron.EntryID
|
|
||||||
// to avoid using cron.EntryID as the public API of
|
|
||||||
// the Scheduler.
|
|
||||||
idmap map[string]cron.EntryID
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultHeartbeatInterval = 10 * time.Second
|
func newScheduler(l Logger, b base.Broker, avgInterval time.Duration, qcfg map[string]int) *scheduler {
|
||||||
|
var qnames []string
|
||||||
// NewScheduler returns a new Scheduler instance given the redis connection option.
|
for q := range qcfg {
|
||||||
// The parameter opts is optional, defaults will be used if opts is set to nil
|
qnames = append(qnames, q)
|
||||||
func NewScheduler(r RedisConnOpt, opts *SchedulerOpts) *Scheduler {
|
|
||||||
scheduler := newScheduler(opts)
|
|
||||||
|
|
||||||
redisClient, ok := r.MakeRedisClient().(redis.UniversalClient)
|
|
||||||
if !ok {
|
|
||||||
panic(fmt.Sprintf("asynq: unsupported RedisConnOpt type %T", r))
|
|
||||||
}
|
}
|
||||||
|
return &scheduler{
|
||||||
rdb := rdb.NewRDB(redisClient)
|
logger: l,
|
||||||
|
broker: b,
|
||||||
scheduler.rdb = rdb
|
done: make(chan struct{}),
|
||||||
scheduler.client = &Client{broker: rdb, sharedConnection: false}
|
avgInterval: avgInterval,
|
||||||
|
qnames: qnames,
|
||||||
return scheduler
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewSchedulerFromRedisClient returns a new instance of Scheduler given a redis.UniversalClient
|
|
||||||
// The parameter opts is optional, defaults will be used if opts is set to nil.
|
|
||||||
// Warning: The underlying redis connection pool will not be closed by Asynq, you are responsible for closing it.
|
|
||||||
func NewSchedulerFromRedisClient(c redis.UniversalClient, opts *SchedulerOpts) *Scheduler {
|
|
||||||
scheduler := newScheduler(opts)
|
|
||||||
|
|
||||||
scheduler.rdb = rdb.NewRDB(c)
|
|
||||||
scheduler.client = NewClientFromRedisClient(c)
|
|
||||||
|
|
||||||
return scheduler
|
|
||||||
}
|
|
||||||
|
|
||||||
func newScheduler(opts *SchedulerOpts) *Scheduler {
|
|
||||||
if opts == nil {
|
|
||||||
opts = &SchedulerOpts{}
|
|
||||||
}
|
|
||||||
|
|
||||||
heartbeatInterval := opts.HeartbeatInterval
|
|
||||||
if heartbeatInterval <= 0 {
|
|
||||||
heartbeatInterval = defaultHeartbeatInterval
|
|
||||||
}
|
|
||||||
|
|
||||||
logger := log.NewLogger(opts.Logger)
|
|
||||||
loglevel := opts.LogLevel
|
|
||||||
if loglevel == level_unspecified {
|
|
||||||
loglevel = InfoLevel
|
|
||||||
}
|
|
||||||
logger.SetLevel(toInternalLogLevel(loglevel))
|
|
||||||
|
|
||||||
loc := opts.Location
|
|
||||||
if loc == nil {
|
|
||||||
loc = time.UTC
|
|
||||||
}
|
|
||||||
|
|
||||||
return &Scheduler{
|
|
||||||
id: generateSchedulerID(),
|
|
||||||
state: &serverState{value: srvStateNew},
|
|
||||||
heartbeatInterval: heartbeatInterval,
|
|
||||||
logger: logger,
|
|
||||||
cron: cron.New(cron.WithLocation(loc)),
|
|
||||||
location: loc,
|
|
||||||
done: make(chan struct{}),
|
|
||||||
preEnqueueFunc: opts.PreEnqueueFunc,
|
|
||||||
postEnqueueFunc: opts.PostEnqueueFunc,
|
|
||||||
errHandler: opts.EnqueueErrorHandler,
|
|
||||||
idmap: make(map[string]cron.EntryID),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func generateSchedulerID() string {
|
func (s *scheduler) terminate() {
|
||||||
host, err := os.Hostname()
|
s.logger.Info("Scheduler shutting down...")
|
||||||
if err != nil {
|
// Signal the scheduler goroutine to stop polling.
|
||||||
host = "unknown-host"
|
s.done <- struct{}{}
|
||||||
}
|
|
||||||
return fmt.Sprintf("%s:%d:%v", host, os.Getpid(), uuid.New())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SchedulerOpts specifies scheduler options.
|
// start starts the "scheduler" goroutine.
|
||||||
type SchedulerOpts struct {
|
func (s *scheduler) start(wg *sync.WaitGroup) {
|
||||||
// HeartbeatInterval specifies the interval between scheduler heartbeats.
|
wg.Add(1)
|
||||||
//
|
go func() {
|
||||||
// If unset, zero or a negative value, the interval is set to 10 second.
|
defer wg.Done()
|
||||||
//
|
for {
|
||||||
// Note: Setting this value too low may add significant load to redis.
|
select {
|
||||||
//
|
case <-s.done:
|
||||||
// By default, HeartbeatInterval is set to 10 seconds.
|
s.logger.Info("Scheduler done")
|
||||||
HeartbeatInterval time.Duration
|
return
|
||||||
|
case <-time.After(s.avgInterval):
|
||||||
// Logger specifies the logger used by the scheduler instance.
|
s.exec()
|
||||||
//
|
|
||||||
// If unset, the default logger is used.
|
|
||||||
Logger Logger
|
|
||||||
|
|
||||||
// LogLevel specifies the minimum log level to enable.
|
|
||||||
//
|
|
||||||
// If unset, InfoLevel is used by default.
|
|
||||||
LogLevel LogLevel
|
|
||||||
|
|
||||||
// Location specifies the time zone location.
|
|
||||||
//
|
|
||||||
// If unset, the UTC time zone (time.UTC) is used.
|
|
||||||
Location *time.Location
|
|
||||||
|
|
||||||
// PreEnqueueFunc, if provided, is called before a task gets enqueued by Scheduler.
|
|
||||||
// The callback function should return quickly to not block the current thread.
|
|
||||||
PreEnqueueFunc func(task *Task, opts []Option)
|
|
||||||
|
|
||||||
// PostEnqueueFunc, if provided, is called after a task gets enqueued by Scheduler.
|
|
||||||
// The callback function should return quickly to not block the current thread.
|
|
||||||
PostEnqueueFunc func(info *TaskInfo, err error)
|
|
||||||
|
|
||||||
// Deprecated: Use PostEnqueueFunc instead
|
|
||||||
// EnqueueErrorHandler gets called when scheduler cannot enqueue a registered task
|
|
||||||
// due to an error.
|
|
||||||
EnqueueErrorHandler func(task *Task, opts []Option, err error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// enqueueJob encapsulates the job of enqueuing a task and recording the event.
|
|
||||||
type enqueueJob struct {
|
|
||||||
id uuid.UUID
|
|
||||||
cronspec string
|
|
||||||
task *Task
|
|
||||||
opts []Option
|
|
||||||
location *time.Location
|
|
||||||
logger *log.Logger
|
|
||||||
client *Client
|
|
||||||
rdb *rdb.RDB
|
|
||||||
preEnqueueFunc func(task *Task, opts []Option)
|
|
||||||
postEnqueueFunc func(info *TaskInfo, err error)
|
|
||||||
errHandler func(task *Task, opts []Option, err error)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (j *enqueueJob) Run() {
|
|
||||||
if j.preEnqueueFunc != nil {
|
|
||||||
j.preEnqueueFunc(j.task, j.opts)
|
|
||||||
}
|
|
||||||
info, err := j.client.Enqueue(j.task, j.opts...)
|
|
||||||
if j.postEnqueueFunc != nil {
|
|
||||||
j.postEnqueueFunc(info, err)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
if j.errHandler != nil {
|
|
||||||
j.errHandler(j.task, j.opts, err)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
j.logger.Debugf("scheduler enqueued a task: %+v", info)
|
|
||||||
event := &base.SchedulerEnqueueEvent{
|
|
||||||
TaskID: info.ID,
|
|
||||||
EnqueuedAt: time.Now().In(j.location),
|
|
||||||
}
|
|
||||||
err = j.rdb.RecordSchedulerEnqueueEvent(j.id.String(), event)
|
|
||||||
if err != nil {
|
|
||||||
j.logger.Warnf("scheduler could not record enqueue event of enqueued task %s: %v", info.ID, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Register registers a task to be enqueued on the given schedule specified by the cronspec.
|
|
||||||
// It returns an ID of the newly registered entry.
|
|
||||||
func (s *Scheduler) Register(cronspec string, task *Task, opts ...Option) (entryID string, err error) {
|
|
||||||
job := &enqueueJob{
|
|
||||||
id: uuid.New(),
|
|
||||||
cronspec: cronspec,
|
|
||||||
task: task,
|
|
||||||
opts: opts,
|
|
||||||
location: s.location,
|
|
||||||
client: s.client,
|
|
||||||
rdb: s.rdb,
|
|
||||||
logger: s.logger,
|
|
||||||
preEnqueueFunc: s.preEnqueueFunc,
|
|
||||||
postEnqueueFunc: s.postEnqueueFunc,
|
|
||||||
errHandler: s.errHandler,
|
|
||||||
}
|
|
||||||
cronID, err := s.cron.AddJob(cronspec, job)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
s.mu.Lock()
|
|
||||||
s.idmap[job.id.String()] = cronID
|
|
||||||
s.mu.Unlock()
|
|
||||||
return job.id.String(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unregister removes a registered entry by entry ID.
|
|
||||||
// Unregister returns a non-nil error if no entries were found for the given entryID.
|
|
||||||
func (s *Scheduler) Unregister(entryID string) error {
|
|
||||||
s.mu.Lock()
|
|
||||||
defer s.mu.Unlock()
|
|
||||||
cronID, ok := s.idmap[entryID]
|
|
||||||
if !ok {
|
|
||||||
return fmt.Errorf("asynq: no scheduler entry found")
|
|
||||||
}
|
|
||||||
delete(s.idmap, entryID)
|
|
||||||
s.cron.Remove(cronID)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Run starts the scheduler until an os signal to exit the program is received.
|
|
||||||
// It returns an error if scheduler is already running or has been shutdown.
|
|
||||||
func (s *Scheduler) Run() error {
|
|
||||||
if err := s.Start(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
s.waitForSignals()
|
|
||||||
s.Shutdown()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start starts the scheduler.
|
|
||||||
// It returns an error if the scheduler is already running or has been shutdown.
|
|
||||||
func (s *Scheduler) Start() error {
|
|
||||||
if err := s.start(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
s.logger.Info("Scheduler starting")
|
|
||||||
s.logger.Infof("Scheduler timezone is set to %v", s.location)
|
|
||||||
s.cron.Start()
|
|
||||||
s.wg.Add(1)
|
|
||||||
go s.runHeartbeater()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checks server state and returns an error if pre-condition is not met.
|
|
||||||
// Otherwise it sets the server state to active.
|
|
||||||
func (s *Scheduler) start() error {
|
|
||||||
s.state.mu.Lock()
|
|
||||||
defer s.state.mu.Unlock()
|
|
||||||
switch s.state.value {
|
|
||||||
case srvStateActive:
|
|
||||||
return fmt.Errorf("asynq: the scheduler is already running")
|
|
||||||
case srvStateClosed:
|
|
||||||
return fmt.Errorf("asynq: the scheduler has already been stopped")
|
|
||||||
}
|
|
||||||
s.state.value = srvStateActive
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Shutdown stops and shuts down the scheduler.
|
|
||||||
func (s *Scheduler) Shutdown() {
|
|
||||||
s.state.mu.Lock()
|
|
||||||
if s.state.value == srvStateNew || s.state.value == srvStateClosed {
|
|
||||||
// scheduler is not running, do nothing and return.
|
|
||||||
s.state.mu.Unlock()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
s.state.value = srvStateClosed
|
|
||||||
s.state.mu.Unlock()
|
|
||||||
|
|
||||||
s.logger.Info("Scheduler shutting down")
|
|
||||||
close(s.done) // signal heartbeater to stop
|
|
||||||
ctx := s.cron.Stop()
|
|
||||||
<-ctx.Done()
|
|
||||||
s.wg.Wait()
|
|
||||||
|
|
||||||
s.clearHistory()
|
|
||||||
if err := s.client.Close(); err != nil {
|
|
||||||
s.logger.Errorf("Failed to close redis client connection: %v", err)
|
|
||||||
}
|
|
||||||
s.logger.Info("Scheduler stopped")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Scheduler) runHeartbeater() {
|
|
||||||
defer s.wg.Done()
|
|
||||||
ticker := time.NewTicker(s.heartbeatInterval)
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-s.done:
|
|
||||||
s.logger.Debugf("Scheduler heatbeater shutting down")
|
|
||||||
if err := s.rdb.ClearSchedulerEntries(s.id); err != nil {
|
|
||||||
s.logger.Errorf("Failed to clear the scheduler entries: %v", err)
|
|
||||||
}
|
}
|
||||||
ticker.Stop()
|
|
||||||
return
|
|
||||||
case <-ticker.C:
|
|
||||||
s.beat()
|
|
||||||
}
|
}
|
||||||
}
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
// beat writes a snapshot of entries to redis.
|
func (s *scheduler) exec() {
|
||||||
func (s *Scheduler) beat() {
|
if err := s.broker.CheckAndEnqueue(s.qnames...); err != nil {
|
||||||
var entries []*base.SchedulerEntry
|
s.logger.Error("Could not enqueue scheduled tasks: %v", err)
|
||||||
for _, entry := range s.cron.Entries() {
|
|
||||||
job := entry.Job.(*enqueueJob)
|
|
||||||
e := &base.SchedulerEntry{
|
|
||||||
ID: job.id.String(),
|
|
||||||
Spec: job.cronspec,
|
|
||||||
Type: job.task.Type(),
|
|
||||||
Payload: job.task.Payload(),
|
|
||||||
Opts: stringifyOptions(job.opts),
|
|
||||||
Next: entry.Next,
|
|
||||||
Prev: entry.Prev,
|
|
||||||
}
|
|
||||||
entries = append(entries, e)
|
|
||||||
}
|
|
||||||
if err := s.rdb.WriteSchedulerEntries(s.id, entries, s.heartbeatInterval*2); err != nil {
|
|
||||||
s.logger.Warnf("Scheduler could not write heartbeat data: %v", err)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func stringifyOptions(opts []Option) []string {
|
|
||||||
var res []string
|
|
||||||
for _, opt := range opts {
|
|
||||||
res = append(res, opt.String())
|
|
||||||
}
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Scheduler) clearHistory() {
|
|
||||||
for _, entry := range s.cron.Entries() {
|
|
||||||
job := entry.Job.(*enqueueJob)
|
|
||||||
if err := s.rdb.ClearSchedulerHistory(job.id.String()); err != nil {
|
|
||||||
s.logger.Warnf("Could not clear scheduler history for entry %q: %v", job.id.String(), err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ping performs a ping against the redis connection.
|
|
||||||
func (s *Scheduler) Ping() error {
|
|
||||||
s.state.mu.Lock()
|
|
||||||
defer s.state.mu.Unlock()
|
|
||||||
if s.state.value == srvStateClosed {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return s.rdb.Ping()
|
|
||||||
}
|
|
||||||
|
@ -10,225 +10,84 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
"github.com/google/go-cmp/cmp"
|
||||||
"github.com/redis/go-redis/v9"
|
h "github.com/hibiken/asynq/internal/asynqtest"
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/hibiken/asynq/internal/testutil"
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestSchedulerRegister(t *testing.T) {
|
func TestScheduler(t *testing.T) {
|
||||||
|
r := setup(t)
|
||||||
|
rdbClient := rdb.NewRDB(r)
|
||||||
|
const pollInterval = time.Second
|
||||||
|
s := newScheduler(testLogger, rdbClient, pollInterval, defaultQueueConfig)
|
||||||
|
t1 := h.NewTaskMessage("gen_thumbnail", nil)
|
||||||
|
t2 := h.NewTaskMessage("send_email", nil)
|
||||||
|
t3 := h.NewTaskMessage("reindex", nil)
|
||||||
|
t4 := h.NewTaskMessage("sync", nil)
|
||||||
|
now := time.Now()
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
cronspec string
|
initScheduled []h.ZSetEntry // scheduled queue initial state
|
||||||
task *Task
|
initRetry []h.ZSetEntry // retry queue initial state
|
||||||
opts []Option
|
initQueue []*base.TaskMessage // default queue initial state
|
||||||
wait time.Duration
|
wait time.Duration // wait duration before checking for final state
|
||||||
queue string
|
wantScheduled []*base.TaskMessage // schedule queue final state
|
||||||
want []*base.TaskMessage
|
wantRetry []*base.TaskMessage // retry queue final state
|
||||||
|
wantQueue []*base.TaskMessage // default queue final state
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
cronspec: "@every 3s",
|
initScheduled: []h.ZSetEntry{
|
||||||
task: NewTask("task1", nil),
|
{Msg: t1, Score: float64(now.Add(time.Hour).Unix())},
|
||||||
opts: []Option{MaxRetry(10)},
|
{Msg: t2, Score: float64(now.Add(-2 * time.Second).Unix())},
|
||||||
wait: 10 * time.Second,
|
|
||||||
queue: "default",
|
|
||||||
want: []*base.TaskMessage{
|
|
||||||
{
|
|
||||||
Type: "task1",
|
|
||||||
Payload: nil,
|
|
||||||
Retry: 10,
|
|
||||||
Timeout: int64(defaultTimeout.Seconds()),
|
|
||||||
Queue: "default",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "task1",
|
|
||||||
Payload: nil,
|
|
||||||
Retry: 10,
|
|
||||||
Timeout: int64(defaultTimeout.Seconds()),
|
|
||||||
Queue: "default",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "task1",
|
|
||||||
Payload: nil,
|
|
||||||
Retry: 10,
|
|
||||||
Timeout: int64(defaultTimeout.Seconds()),
|
|
||||||
Queue: "default",
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
initRetry: []h.ZSetEntry{
|
||||||
|
{Msg: t3, Score: float64(time.Now().Add(-500 * time.Millisecond).Unix())},
|
||||||
|
},
|
||||||
|
initQueue: []*base.TaskMessage{t4},
|
||||||
|
wait: pollInterval * 2,
|
||||||
|
wantScheduled: []*base.TaskMessage{t1},
|
||||||
|
wantRetry: []*base.TaskMessage{},
|
||||||
|
wantQueue: []*base.TaskMessage{t2, t3, t4},
|
||||||
},
|
},
|
||||||
}
|
|
||||||
|
|
||||||
r := setup(t)
|
|
||||||
|
|
||||||
// Tests for new redis connection.
|
|
||||||
for _, tc := range tests {
|
|
||||||
scheduler := NewScheduler(getRedisConnOpt(t), nil)
|
|
||||||
if _, err := scheduler.Register(tc.cronspec, tc.task, tc.opts...); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := scheduler.Start(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
time.Sleep(tc.wait)
|
|
||||||
scheduler.Shutdown()
|
|
||||||
|
|
||||||
got := testutil.GetPendingMessages(t, r, tc.queue)
|
|
||||||
if diff := cmp.Diff(tc.want, got, testutil.IgnoreIDOpt); diff != "" {
|
|
||||||
t.Errorf("mismatch found in queue %q: (-want,+got)\n%s", tc.queue, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
r = setup(t)
|
|
||||||
|
|
||||||
// Tests for existing redis connection.
|
|
||||||
for _, tc := range tests {
|
|
||||||
redisClient := getRedisConnOpt(t).MakeRedisClient().(redis.UniversalClient)
|
|
||||||
scheduler := NewSchedulerFromRedisClient(redisClient, nil)
|
|
||||||
if _, err := scheduler.Register(tc.cronspec, tc.task, tc.opts...); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := scheduler.Start(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
time.Sleep(tc.wait)
|
|
||||||
scheduler.Shutdown()
|
|
||||||
|
|
||||||
got := testutil.GetPendingMessages(t, r, tc.queue)
|
|
||||||
if diff := cmp.Diff(tc.want, got, testutil.IgnoreIDOpt); diff != "" {
|
|
||||||
t.Errorf("mismatch found in queue %q: (-want,+got)\n%s", tc.queue, diff)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSchedulerWhenRedisDown(t *testing.T) {
|
|
||||||
var (
|
|
||||||
mu sync.Mutex
|
|
||||||
counter int
|
|
||||||
)
|
|
||||||
errorHandler := func(task *Task, opts []Option, err error) {
|
|
||||||
mu.Lock()
|
|
||||||
counter++
|
|
||||||
mu.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Connect to non-existent redis instance to simulate a redis server being down.
|
|
||||||
scheduler := NewScheduler(
|
|
||||||
RedisClientOpt{Addr: ":9876"}, // no Redis listening to this port.
|
|
||||||
&SchedulerOpts{EnqueueErrorHandler: errorHandler},
|
|
||||||
)
|
|
||||||
|
|
||||||
task := NewTask("test", nil)
|
|
||||||
|
|
||||||
if _, err := scheduler.Register("@every 3s", task); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := scheduler.Start(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
// Scheduler should attempt to enqueue the task three times (every 3s).
|
|
||||||
time.Sleep(10 * time.Second)
|
|
||||||
scheduler.Shutdown()
|
|
||||||
|
|
||||||
mu.Lock()
|
|
||||||
if counter != 3 {
|
|
||||||
t.Errorf("EnqueueErrorHandler was called %d times, want 3", counter)
|
|
||||||
}
|
|
||||||
mu.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSchedulerUnregister(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
cronspec string
|
|
||||||
task *Task
|
|
||||||
opts []Option
|
|
||||||
wait time.Duration
|
|
||||||
queue string
|
|
||||||
}{
|
|
||||||
{
|
{
|
||||||
cronspec: "@every 3s",
|
initScheduled: []h.ZSetEntry{
|
||||||
task: NewTask("task1", nil),
|
{Msg: t1, Score: float64(now.Unix())},
|
||||||
opts: []Option{MaxRetry(10)},
|
{Msg: t2, Score: float64(now.Add(-2 * time.Second).Unix())},
|
||||||
wait: 10 * time.Second,
|
{Msg: t3, Score: float64(now.Add(-500 * time.Millisecond).Unix())},
|
||||||
queue: "default",
|
},
|
||||||
|
initRetry: []h.ZSetEntry{},
|
||||||
|
initQueue: []*base.TaskMessage{t4},
|
||||||
|
wait: pollInterval * 2,
|
||||||
|
wantScheduled: []*base.TaskMessage{},
|
||||||
|
wantRetry: []*base.TaskMessage{},
|
||||||
|
wantQueue: []*base.TaskMessage{t1, t2, t3, t4},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
r := setup(t)
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
scheduler := NewScheduler(getRedisConnOpt(t), nil)
|
h.FlushDB(t, r) // clean up db before each test case.
|
||||||
entryID, err := scheduler.Register(tc.cronspec, tc.task, tc.opts...)
|
h.SeedScheduledQueue(t, r, tc.initScheduled) // initialize scheduled queue
|
||||||
if err != nil {
|
h.SeedRetryQueue(t, r, tc.initRetry) // initialize retry queue
|
||||||
t.Fatal(err)
|
h.SeedEnqueuedQueue(t, r, tc.initQueue) // initialize default queue
|
||||||
}
|
|
||||||
if err := scheduler.Unregister(entryID); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := scheduler.Start(); err != nil {
|
var wg sync.WaitGroup
|
||||||
t.Fatal(err)
|
s.start(&wg)
|
||||||
}
|
|
||||||
time.Sleep(tc.wait)
|
time.Sleep(tc.wait)
|
||||||
scheduler.Shutdown()
|
s.terminate()
|
||||||
|
|
||||||
got := testutil.GetPendingMessages(t, r, tc.queue)
|
gotScheduled := h.GetScheduledMessages(t, r)
|
||||||
if len(got) != 0 {
|
if diff := cmp.Diff(tc.wantScheduled, gotScheduled, h.SortMsgOpt); diff != "" {
|
||||||
t.Errorf("%d tasks were enqueued, want zero", len(got))
|
t.Errorf("mismatch found in %q after running scheduler: (-want, +got)\n%s", base.ScheduledQueue, diff)
|
||||||
|
}
|
||||||
|
|
||||||
|
gotRetry := h.GetRetryMessages(t, r)
|
||||||
|
if diff := cmp.Diff(tc.wantRetry, gotRetry, h.SortMsgOpt); diff != "" {
|
||||||
|
t.Errorf("mismatch found in %q after running scheduler: (-want, +got)\n%s", base.RetryQueue, diff)
|
||||||
|
}
|
||||||
|
|
||||||
|
gotEnqueued := h.GetEnqueuedMessages(t, r)
|
||||||
|
if diff := cmp.Diff(tc.wantQueue, gotEnqueued, h.SortMsgOpt); diff != "" {
|
||||||
|
t.Errorf("mismatch found in %q after running scheduler: (-want, +got)\n%s", base.DefaultQueue, diff)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSchedulerPostAndPreEnqueueHandler(t *testing.T) {
|
|
||||||
var (
|
|
||||||
preMu sync.Mutex
|
|
||||||
preCounter int
|
|
||||||
postMu sync.Mutex
|
|
||||||
postCounter int
|
|
||||||
)
|
|
||||||
preHandler := func(task *Task, opts []Option) {
|
|
||||||
preMu.Lock()
|
|
||||||
preCounter++
|
|
||||||
preMu.Unlock()
|
|
||||||
}
|
|
||||||
postHandler := func(info *TaskInfo, err error) {
|
|
||||||
postMu.Lock()
|
|
||||||
postCounter++
|
|
||||||
postMu.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Connect to non-existent redis instance to simulate a redis server being down.
|
|
||||||
scheduler := NewScheduler(
|
|
||||||
getRedisConnOpt(t),
|
|
||||||
&SchedulerOpts{
|
|
||||||
PreEnqueueFunc: preHandler,
|
|
||||||
PostEnqueueFunc: postHandler,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
task := NewTask("test", nil)
|
|
||||||
|
|
||||||
if _, err := scheduler.Register("@every 3s", task); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := scheduler.Start(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
// Scheduler should attempt to enqueue the task three times (every 3s).
|
|
||||||
time.Sleep(10 * time.Second)
|
|
||||||
scheduler.Shutdown()
|
|
||||||
|
|
||||||
preMu.Lock()
|
|
||||||
if preCounter != 3 {
|
|
||||||
t.Errorf("PreEnqueueFunc was called %d times, want 3", preCounter)
|
|
||||||
}
|
|
||||||
preMu.Unlock()
|
|
||||||
|
|
||||||
postMu.Lock()
|
|
||||||
if postCounter != 3 {
|
|
||||||
t.Errorf("PostEnqueueFunc was called %d times, want 3", postCounter)
|
|
||||||
}
|
|
||||||
postMu.Unlock()
|
|
||||||
}
|
|
||||||
|
12
servemux.go
12
servemux.go
@ -15,7 +15,7 @@ import (
|
|||||||
// ServeMux is a multiplexer for asynchronous tasks.
|
// ServeMux is a multiplexer for asynchronous tasks.
|
||||||
// It matches the type of each task against a list of registered patterns
|
// It matches the type of each task against a list of registered patterns
|
||||||
// and calls the handler for the pattern that most closely matches the
|
// and calls the handler for the pattern that most closely matches the
|
||||||
// task's type name.
|
// taks's type name.
|
||||||
//
|
//
|
||||||
// Longer patterns take precedence over shorter ones, so that if there are
|
// Longer patterns take precedence over shorter ones, so that if there are
|
||||||
// handlers registered for both "images" and "images:thumbnails",
|
// handlers registered for both "images" and "images:thumbnails",
|
||||||
@ -62,7 +62,7 @@ func (mux *ServeMux) Handler(t *Task) (h Handler, pattern string) {
|
|||||||
mux.mu.RLock()
|
mux.mu.RLock()
|
||||||
defer mux.mu.RUnlock()
|
defer mux.mu.RUnlock()
|
||||||
|
|
||||||
h, pattern = mux.match(t.Type())
|
h, pattern = mux.match(t.Type)
|
||||||
if h == nil {
|
if h == nil {
|
||||||
h, pattern = NotFoundHandler(), ""
|
h, pattern = NotFoundHandler(), ""
|
||||||
}
|
}
|
||||||
@ -98,7 +98,7 @@ func (mux *ServeMux) Handle(pattern string, handler Handler) {
|
|||||||
mux.mu.Lock()
|
mux.mu.Lock()
|
||||||
defer mux.mu.Unlock()
|
defer mux.mu.Unlock()
|
||||||
|
|
||||||
if strings.TrimSpace(pattern) == "" {
|
if pattern == "" {
|
||||||
panic("asynq: invalid pattern")
|
panic("asynq: invalid pattern")
|
||||||
}
|
}
|
||||||
if handler == nil {
|
if handler == nil {
|
||||||
@ -144,12 +144,14 @@ func (mux *ServeMux) HandleFunc(pattern string, handler func(context.Context, *T
|
|||||||
func (mux *ServeMux) Use(mws ...MiddlewareFunc) {
|
func (mux *ServeMux) Use(mws ...MiddlewareFunc) {
|
||||||
mux.mu.Lock()
|
mux.mu.Lock()
|
||||||
defer mux.mu.Unlock()
|
defer mux.mu.Unlock()
|
||||||
mux.mws = append(mux.mws, mws...)
|
for _, fn := range mws {
|
||||||
|
mux.mws = append(mux.mws, fn)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// NotFound returns an error indicating that the handler was not found for the given task.
|
// NotFound returns an error indicating that the handler was not found for the given task.
|
||||||
func NotFound(ctx context.Context, task *Task) error {
|
func NotFound(ctx context.Context, task *Task) error {
|
||||||
return fmt.Errorf("handler not found for task %q", task.Type())
|
return fmt.Errorf("handler not found for task %q", task.Type)
|
||||||
}
|
}
|
||||||
|
|
||||||
// NotFoundHandler returns a simple task handler that returns a ``not found`` error.
|
// NotFoundHandler returns a simple task handler that returns a ``not found`` error.
|
||||||
|
@ -68,7 +68,7 @@ func TestServeMux(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if called != tc.want {
|
if called != tc.want {
|
||||||
t.Errorf("%q handler was called for task %q, want %q to be called", called, task.Type(), tc.want)
|
t.Errorf("%q handler was called for task %q, want %q to be called", called, task.Type, tc.want)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -124,7 +124,7 @@ func TestServeMuxNotFound(t *testing.T) {
|
|||||||
task := NewTask(tc.typename, nil)
|
task := NewTask(tc.typename, nil)
|
||||||
err := mux.ProcessTask(context.Background(), task)
|
err := mux.ProcessTask(context.Background(), task)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Errorf("ProcessTask did not return error for task %q, should return 'not found' error", task.Type())
|
t.Errorf("ProcessTask did not return error for task %q, should return 'not found' error", task.Type)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -164,7 +164,7 @@ func TestServeMuxMiddlewares(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if called != tc.want {
|
if called != tc.want {
|
||||||
t.Errorf("%q handler was called for task %q, want %q to be called", called, task.Type(), tc.want)
|
t.Errorf("%q handler was called for task %q, want %q to be called", called, task.Type, tc.want)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
703
server.go
703
server.go
@ -9,88 +9,43 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
"math/rand/v2"
|
"math/rand"
|
||||||
|
"os"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/hibiken/asynq/internal/log"
|
"github.com/hibiken/asynq/internal/log"
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Server is responsible for task processing and task lifecycle management.
|
// Server is responsible for managing the background-task processing.
|
||||||
//
|
//
|
||||||
// Server pulls tasks off queues and processes them.
|
// Server pulls tasks off queues and processes them.
|
||||||
// If the processing of a task is unsuccessful, server will schedule it for a retry.
|
// If the processing of a task is unsuccessful, server will
|
||||||
//
|
// schedule it for a retry.
|
||||||
// A task will be retried until either the task gets processed successfully
|
// A task will be retried until either the task gets processed successfully
|
||||||
// or until it reaches its max retry count.
|
// or until it reaches its max retry count.
|
||||||
//
|
//
|
||||||
// If a task exhausts its retries, it will be moved to the archive and
|
// If a task exhausts its retries, it will be moved to the "dead" queue and
|
||||||
// will be kept in the archive set.
|
// will be kept in the queue for some time until a certain condition is met
|
||||||
// Note that the archive size is finite and once it reaches its max size,
|
// (e.g., queue size reaches a certain limit, or the task has been in the
|
||||||
// oldest tasks in the archive will be deleted.
|
// queue for a certain amount of time).
|
||||||
type Server struct {
|
type Server struct {
|
||||||
logger *log.Logger
|
ss *base.ServerState
|
||||||
|
|
||||||
|
logger Logger
|
||||||
|
|
||||||
broker base.Broker
|
broker base.Broker
|
||||||
// When a Server has been created with an existing Redis connection, we do
|
|
||||||
// not want to close it.
|
|
||||||
sharedConnection bool
|
|
||||||
|
|
||||||
state *serverState
|
|
||||||
|
|
||||||
// wait group to wait for all goroutines to finish.
|
// wait group to wait for all goroutines to finish.
|
||||||
wg sync.WaitGroup
|
wg sync.WaitGroup
|
||||||
forwarder *forwarder
|
scheduler *scheduler
|
||||||
processor *processor
|
processor *processor
|
||||||
syncer *syncer
|
syncer *syncer
|
||||||
heartbeater *heartbeater
|
heartbeater *heartbeater
|
||||||
subscriber *subscriber
|
subscriber *subscriber
|
||||||
recoverer *recoverer
|
|
||||||
healthchecker *healthchecker
|
|
||||||
janitor *janitor
|
|
||||||
aggregator *aggregator
|
|
||||||
}
|
|
||||||
|
|
||||||
type serverState struct {
|
|
||||||
mu sync.Mutex
|
|
||||||
value serverStateValue
|
|
||||||
}
|
|
||||||
|
|
||||||
type serverStateValue int
|
|
||||||
|
|
||||||
const (
|
|
||||||
// StateNew represents a new server. Server begins in
|
|
||||||
// this state and then transition to StatusActive when
|
|
||||||
// Start or Run is callled.
|
|
||||||
srvStateNew serverStateValue = iota
|
|
||||||
|
|
||||||
// StateActive indicates the server is up and active.
|
|
||||||
srvStateActive
|
|
||||||
|
|
||||||
// StateStopped indicates the server is up but no longer processing new tasks.
|
|
||||||
srvStateStopped
|
|
||||||
|
|
||||||
// StateClosed indicates the server has been shutdown.
|
|
||||||
srvStateClosed
|
|
||||||
)
|
|
||||||
|
|
||||||
var serverStates = []string{
|
|
||||||
"new",
|
|
||||||
"active",
|
|
||||||
"stopped",
|
|
||||||
"closed",
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s serverStateValue) String() string {
|
|
||||||
if srvStateNew <= s && s <= srvStateClosed {
|
|
||||||
return serverStates[s]
|
|
||||||
}
|
|
||||||
return "unknown status"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Config specifies the server's background-task processing behavior.
|
// Config specifies the server's background-task processing behavior.
|
||||||
@ -98,36 +53,17 @@ type Config struct {
|
|||||||
// Maximum number of concurrent processing of tasks.
|
// Maximum number of concurrent processing of tasks.
|
||||||
//
|
//
|
||||||
// If set to a zero or negative value, NewServer will overwrite the value
|
// If set to a zero or negative value, NewServer will overwrite the value
|
||||||
// to the number of CPUs usable by the current process.
|
// to the number of CPUs usable by the currennt process.
|
||||||
Concurrency int
|
Concurrency int
|
||||||
|
|
||||||
// BaseContext optionally specifies a function that returns the base context for Handler invocations on this server.
|
|
||||||
//
|
|
||||||
// If BaseContext is nil, the default is context.Background().
|
|
||||||
// If this is defined, then it MUST return a non-nil context
|
|
||||||
BaseContext func() context.Context
|
|
||||||
|
|
||||||
// TaskCheckInterval specifies the interval between checks for new tasks to process when all queues are empty.
|
|
||||||
//
|
|
||||||
// If unset, zero or a negative value, the interval is set to 1 second.
|
|
||||||
//
|
|
||||||
// Note: Setting this value too low may add significant load to redis.
|
|
||||||
//
|
|
||||||
// By default, TaskCheckInterval is set to 1 seconds.
|
|
||||||
TaskCheckInterval time.Duration
|
|
||||||
|
|
||||||
// Function to calculate retry delay for a failed task.
|
// Function to calculate retry delay for a failed task.
|
||||||
//
|
//
|
||||||
// By default, it uses exponential backoff algorithm to calculate the delay.
|
// By default, it uses exponential backoff algorithm to calculate the delay.
|
||||||
RetryDelayFunc RetryDelayFunc
|
|
||||||
|
|
||||||
// Predicate function to determine whether the error returned from Handler is a failure.
|
|
||||||
// If the function returns false, Server will not increment the retried counter for the task,
|
|
||||||
// and Server won't record the queue stats (processed and failed stats) to avoid skewing the error
|
|
||||||
// rate of the queue.
|
|
||||||
//
|
//
|
||||||
// By default, if the given error is non-nil the function returns true.
|
// n is the number of times the task has been retried.
|
||||||
IsFailure func(error) bool
|
// e is the error returned by the task handler.
|
||||||
|
// t is the task in question.
|
||||||
|
RetryDelayFunc func(n int, e error, t *Task) time.Duration
|
||||||
|
|
||||||
// List of queues to process with given priority value. Keys are the names of the
|
// List of queues to process with given priority value. Keys are the names of the
|
||||||
// queues and values are associated priority value.
|
// queues and values are associated priority value.
|
||||||
@ -137,13 +73,11 @@ type Config struct {
|
|||||||
// Priority is treated as follows to avoid starving low priority queues.
|
// Priority is treated as follows to avoid starving low priority queues.
|
||||||
//
|
//
|
||||||
// Example:
|
// Example:
|
||||||
//
|
// Queues: map[string]int{
|
||||||
// Queues: map[string]int{
|
// "critical": 6,
|
||||||
// "critical": 6,
|
// "default": 3,
|
||||||
// "default": 3,
|
// "low": 1,
|
||||||
// "low": 1,
|
// }
|
||||||
// }
|
|
||||||
//
|
|
||||||
// With the above config and given that all queues are not empty, the tasks
|
// With the above config and given that all queues are not empty, the tasks
|
||||||
// in "critical", "default", "low" should be processed 60%, 30%, 10% of
|
// in "critical", "default", "low" should be processed 60%, 30%, 10% of
|
||||||
// the time respectively.
|
// the time respectively.
|
||||||
@ -163,26 +97,14 @@ type Config struct {
|
|||||||
// HandleError is invoked only if the task handler returns a non-nil error.
|
// HandleError is invoked only if the task handler returns a non-nil error.
|
||||||
//
|
//
|
||||||
// Example:
|
// Example:
|
||||||
|
// func reportError(task *asynq.Task, err error, retried, maxRetry int) {
|
||||||
|
// if retried >= maxRetry {
|
||||||
|
// err = fmt.Errorf("retry exhausted for task %s: %w", task.Type, err)
|
||||||
|
// }
|
||||||
|
// errorReportingService.Notify(err)
|
||||||
|
// })
|
||||||
//
|
//
|
||||||
// func reportError(ctx context, task *asynq.Task, err error) {
|
// ErrorHandler: asynq.ErrorHandlerFunc(reportError)
|
||||||
// retried, _ := asynq.GetRetryCount(ctx)
|
|
||||||
// maxRetry, _ := asynq.GetMaxRetry(ctx)
|
|
||||||
// if retried >= maxRetry {
|
|
||||||
// err = fmt.Errorf("retry exhausted for task %s: %w", task.Type, err)
|
|
||||||
// }
|
|
||||||
// errorReportingService.Notify(err)
|
|
||||||
// })
|
|
||||||
//
|
|
||||||
// ErrorHandler: asynq.ErrorHandlerFunc(reportError)
|
|
||||||
//
|
|
||||||
// we can also handle panic error like:
|
|
||||||
// func reportError(ctx context, task *asynq.Task, err error) {
|
|
||||||
// if asynq.IsPanicError(err) {
|
|
||||||
// errorReportingService.Notify(err)
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
//
|
|
||||||
// ErrorHandler: asynq.ErrorHandlerFunc(reportError)
|
|
||||||
ErrorHandler ErrorHandler
|
ErrorHandler ErrorHandler
|
||||||
|
|
||||||
// Logger specifies the logger used by the server instance.
|
// Logger specifies the logger used by the server instance.
|
||||||
@ -190,285 +112,72 @@ type Config struct {
|
|||||||
// If unset, default logger is used.
|
// If unset, default logger is used.
|
||||||
Logger Logger
|
Logger Logger
|
||||||
|
|
||||||
// LogLevel specifies the minimum log level to enable.
|
|
||||||
//
|
|
||||||
// If unset, InfoLevel is used by default.
|
|
||||||
LogLevel LogLevel
|
|
||||||
|
|
||||||
// ShutdownTimeout specifies the duration to wait to let workers finish their tasks
|
// ShutdownTimeout specifies the duration to wait to let workers finish their tasks
|
||||||
// before forcing them to abort when stopping the server.
|
// before forcing them to abort when stopping the server.
|
||||||
//
|
//
|
||||||
// If unset or zero, default timeout of 8 seconds is used.
|
// If unset or zero, default timeout of 8 seconds is used.
|
||||||
ShutdownTimeout time.Duration
|
ShutdownTimeout time.Duration
|
||||||
|
|
||||||
// HealthCheckFunc is called periodically with any errors encountered during ping to the
|
|
||||||
// connected redis server.
|
|
||||||
HealthCheckFunc func(error)
|
|
||||||
|
|
||||||
// HealthCheckInterval specifies the interval between healthchecks.
|
|
||||||
//
|
|
||||||
// If unset or zero, the interval is set to 15 seconds.
|
|
||||||
HealthCheckInterval time.Duration
|
|
||||||
|
|
||||||
// DelayedTaskCheckInterval specifies the interval between checks run on 'scheduled' and 'retry'
|
|
||||||
// tasks, and forwarding them to 'pending' state if they are ready to be processed.
|
|
||||||
//
|
|
||||||
// If unset or zero, the interval is set to 5 seconds.
|
|
||||||
DelayedTaskCheckInterval time.Duration
|
|
||||||
|
|
||||||
// GroupGracePeriod specifies the amount of time the server will wait for an incoming task before aggregating
|
|
||||||
// the tasks in a group. If an incoming task is received within this period, the server will wait for another
|
|
||||||
// period of the same length, up to GroupMaxDelay if specified.
|
|
||||||
//
|
|
||||||
// If unset or zero, the grace period is set to 1 minute.
|
|
||||||
// Minimum duration for GroupGracePeriod is 1 second. If value specified is less than a second, the call to
|
|
||||||
// NewServer will panic.
|
|
||||||
GroupGracePeriod time.Duration
|
|
||||||
|
|
||||||
// GroupMaxDelay specifies the maximum amount of time the server will wait for incoming tasks before aggregating
|
|
||||||
// the tasks in a group.
|
|
||||||
//
|
|
||||||
// If unset or zero, no delay limit is used.
|
|
||||||
GroupMaxDelay time.Duration
|
|
||||||
|
|
||||||
// GroupMaxSize specifies the maximum number of tasks that can be aggregated into a single task within a group.
|
|
||||||
// If GroupMaxSize is reached, the server will aggregate the tasks into one immediately.
|
|
||||||
//
|
|
||||||
// If unset or zero, no size limit is used.
|
|
||||||
GroupMaxSize int
|
|
||||||
|
|
||||||
// GroupAggregator specifies the aggregation function used to aggregate multiple tasks in a group into one task.
|
|
||||||
//
|
|
||||||
// If unset or nil, the group aggregation feature will be disabled on the server.
|
|
||||||
GroupAggregator GroupAggregator
|
|
||||||
|
|
||||||
// JanitorInterval specifies the average interval of janitor checks for expired completed tasks.
|
|
||||||
//
|
|
||||||
// If unset or zero, default interval of 8 seconds is used.
|
|
||||||
JanitorInterval time.Duration
|
|
||||||
|
|
||||||
// JanitorBatchSize specifies the number of expired completed tasks to be deleted in one run.
|
|
||||||
//
|
|
||||||
// If unset or zero, default batch size of 100 is used.
|
|
||||||
// Make sure to not put a big number as the batch size to prevent a long-running script.
|
|
||||||
JanitorBatchSize int
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GroupAggregator aggregates a group of tasks into one before the tasks are passed to the Handler.
|
// An ErrorHandler handles errors returned by the task handler.
|
||||||
type GroupAggregator interface {
|
|
||||||
// Aggregate aggregates the given tasks in a group with the given group name,
|
|
||||||
// and returns a new task which is the aggregation of those tasks.
|
|
||||||
//
|
|
||||||
// Use NewTask(typename, payload, opts...) to set any options for the aggregated task.
|
|
||||||
// The Queue option, if provided, will be ignored and the aggregated task will always be enqueued
|
|
||||||
// to the same queue the group belonged.
|
|
||||||
Aggregate(group string, tasks []*Task) *Task
|
|
||||||
}
|
|
||||||
|
|
||||||
// The GroupAggregatorFunc type is an adapter to allow the use of ordinary functions as a GroupAggregator.
|
|
||||||
// If f is a function with the appropriate signature, GroupAggregatorFunc(f) is a GroupAggregator that calls f.
|
|
||||||
type GroupAggregatorFunc func(group string, tasks []*Task) *Task
|
|
||||||
|
|
||||||
// Aggregate calls fn(group, tasks)
|
|
||||||
func (fn GroupAggregatorFunc) Aggregate(group string, tasks []*Task) *Task {
|
|
||||||
return fn(group, tasks)
|
|
||||||
}
|
|
||||||
|
|
||||||
// An ErrorHandler handles an error occurred during task processing.
|
|
||||||
type ErrorHandler interface {
|
type ErrorHandler interface {
|
||||||
HandleError(ctx context.Context, task *Task, err error)
|
HandleError(task *Task, err error, retried, maxRetry int)
|
||||||
}
|
}
|
||||||
|
|
||||||
// The ErrorHandlerFunc type is an adapter to allow the use of ordinary functions as a ErrorHandler.
|
// The ErrorHandlerFunc type is an adapter to allow the use of ordinary functions as a ErrorHandler.
|
||||||
// If f is a function with the appropriate signature, ErrorHandlerFunc(f) is a ErrorHandler that calls f.
|
// If f is a function with the appropriate signature, ErrorHandlerFunc(f) is a ErrorHandler that calls f.
|
||||||
type ErrorHandlerFunc func(ctx context.Context, task *Task, err error)
|
type ErrorHandlerFunc func(task *Task, err error, retried, maxRetry int)
|
||||||
|
|
||||||
// HandleError calls fn(ctx, task, err)
|
// HandleError calls fn(task, err, retried, maxRetry)
|
||||||
func (fn ErrorHandlerFunc) HandleError(ctx context.Context, task *Task, err error) {
|
func (fn ErrorHandlerFunc) HandleError(task *Task, err error, retried, maxRetry int) {
|
||||||
fn(ctx, task, err)
|
fn(task, err, retried, maxRetry)
|
||||||
}
|
}
|
||||||
|
|
||||||
// RetryDelayFunc calculates the retry delay duration for a failed task given
|
// Logger implements logging with various log levels.
|
||||||
// the retry count, error, and the task.
|
|
||||||
//
|
|
||||||
// n is the number of times the task has been retried.
|
|
||||||
// e is the error returned by the task handler.
|
|
||||||
// t is the task in question.
|
|
||||||
type RetryDelayFunc func(n int, e error, t *Task) time.Duration
|
|
||||||
|
|
||||||
// Logger supports logging at various log levels.
|
|
||||||
type Logger interface {
|
type Logger interface {
|
||||||
// Debug logs a message at Debug level.
|
// Debug logs a message at Debug level.
|
||||||
Debug(args ...interface{})
|
Debug(format string, args ...interface{})
|
||||||
|
|
||||||
// Info logs a message at Info level.
|
// Info logs a message at Info level.
|
||||||
Info(args ...interface{})
|
Info(format string, args ...interface{})
|
||||||
|
|
||||||
// Warn logs a message at Warning level.
|
// Warn logs a message at Warning level.
|
||||||
Warn(args ...interface{})
|
Warn(format string, args ...interface{})
|
||||||
|
|
||||||
// Error logs a message at Error level.
|
// Error logs a message at Error level.
|
||||||
Error(args ...interface{})
|
Error(format string, args ...interface{})
|
||||||
|
|
||||||
// Fatal logs a message at Fatal level
|
// Fatal logs a message at Fatal level
|
||||||
// and process will exit with status set to 1.
|
// and process will exit with status set to 1.
|
||||||
Fatal(args ...interface{})
|
Fatal(format string, args ...interface{})
|
||||||
}
|
}
|
||||||
|
|
||||||
// LogLevel represents logging level.
|
// Formula taken from https://github.com/mperham/sidekiq.
|
||||||
//
|
func defaultDelayFunc(n int, e error, t *Task) time.Duration {
|
||||||
// It satisfies flag.Value interface.
|
r := rand.New(rand.NewSource(time.Now().UnixNano()))
|
||||||
type LogLevel int32
|
s := int(math.Pow(float64(n), 4)) + 15 + (r.Intn(30) * (n + 1))
|
||||||
|
|
||||||
const (
|
|
||||||
// Note: reserving value zero to differentiate unspecified case.
|
|
||||||
level_unspecified LogLevel = iota
|
|
||||||
|
|
||||||
// DebugLevel is the lowest level of logging.
|
|
||||||
// Debug logs are intended for debugging and development purposes.
|
|
||||||
DebugLevel
|
|
||||||
|
|
||||||
// InfoLevel is used for general informational log messages.
|
|
||||||
InfoLevel
|
|
||||||
|
|
||||||
// WarnLevel is used for undesired but relatively expected events,
|
|
||||||
// which may indicate a problem.
|
|
||||||
WarnLevel
|
|
||||||
|
|
||||||
// ErrorLevel is used for undesired and unexpected events that
|
|
||||||
// the program can recover from.
|
|
||||||
ErrorLevel
|
|
||||||
|
|
||||||
// FatalLevel is used for undesired and unexpected events that
|
|
||||||
// the program cannot recover from.
|
|
||||||
FatalLevel
|
|
||||||
)
|
|
||||||
|
|
||||||
// String is part of the flag.Value interface.
|
|
||||||
func (l *LogLevel) String() string {
|
|
||||||
switch *l {
|
|
||||||
case DebugLevel:
|
|
||||||
return "debug"
|
|
||||||
case InfoLevel:
|
|
||||||
return "info"
|
|
||||||
case WarnLevel:
|
|
||||||
return "warn"
|
|
||||||
case ErrorLevel:
|
|
||||||
return "error"
|
|
||||||
case FatalLevel:
|
|
||||||
return "fatal"
|
|
||||||
}
|
|
||||||
panic(fmt.Sprintf("asynq: unexpected log level: %v", *l))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set is part of the flag.Value interface.
|
|
||||||
func (l *LogLevel) Set(val string) error {
|
|
||||||
switch strings.ToLower(val) {
|
|
||||||
case "debug":
|
|
||||||
*l = DebugLevel
|
|
||||||
case "info":
|
|
||||||
*l = InfoLevel
|
|
||||||
case "warn", "warning":
|
|
||||||
*l = WarnLevel
|
|
||||||
case "error":
|
|
||||||
*l = ErrorLevel
|
|
||||||
case "fatal":
|
|
||||||
*l = FatalLevel
|
|
||||||
default:
|
|
||||||
return fmt.Errorf("asynq: unsupported log level %q", val)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func toInternalLogLevel(l LogLevel) log.Level {
|
|
||||||
switch l {
|
|
||||||
case DebugLevel:
|
|
||||||
return log.DebugLevel
|
|
||||||
case InfoLevel:
|
|
||||||
return log.InfoLevel
|
|
||||||
case WarnLevel:
|
|
||||||
return log.WarnLevel
|
|
||||||
case ErrorLevel:
|
|
||||||
return log.ErrorLevel
|
|
||||||
case FatalLevel:
|
|
||||||
return log.FatalLevel
|
|
||||||
}
|
|
||||||
panic(fmt.Sprintf("asynq: unexpected log level: %v", l))
|
|
||||||
}
|
|
||||||
|
|
||||||
// DefaultRetryDelayFunc is the default RetryDelayFunc used if one is not specified in Config.
|
|
||||||
// It uses exponential back-off strategy to calculate the retry delay.
|
|
||||||
func DefaultRetryDelayFunc(n int, e error, t *Task) time.Duration {
|
|
||||||
// Formula taken from https://github.com/mperham/sidekiq.
|
|
||||||
s := int(math.Pow(float64(n), 4)) + 15 + (rand.IntN(30) * (n + 1))
|
|
||||||
return time.Duration(s) * time.Second
|
return time.Duration(s) * time.Second
|
||||||
}
|
}
|
||||||
|
|
||||||
func defaultIsFailureFunc(err error) bool { return err != nil }
|
|
||||||
|
|
||||||
var defaultQueueConfig = map[string]int{
|
var defaultQueueConfig = map[string]int{
|
||||||
base.DefaultQueueName: 1,
|
base.DefaultQueueName: 1,
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const defaultShutdownTimeout = 8 * time.Second
|
||||||
defaultTaskCheckInterval = 1 * time.Second
|
|
||||||
|
|
||||||
defaultShutdownTimeout = 8 * time.Second
|
|
||||||
|
|
||||||
defaultHealthCheckInterval = 15 * time.Second
|
|
||||||
|
|
||||||
defaultDelayedTaskCheckInterval = 5 * time.Second
|
|
||||||
|
|
||||||
defaultGroupGracePeriod = 1 * time.Minute
|
|
||||||
|
|
||||||
defaultJanitorInterval = 8 * time.Second
|
|
||||||
|
|
||||||
defaultJanitorBatchSize = 100
|
|
||||||
)
|
|
||||||
|
|
||||||
// NewServer returns a new Server given a redis connection option
|
// NewServer returns a new Server given a redis connection option
|
||||||
// and server configuration.
|
// and background processing configuration.
|
||||||
func NewServer(r RedisConnOpt, cfg Config) *Server {
|
func NewServer(r RedisConnOpt, cfg Config) *Server {
|
||||||
redisClient, ok := r.MakeRedisClient().(redis.UniversalClient)
|
|
||||||
if !ok {
|
|
||||||
panic(fmt.Sprintf("asynq: unsupported RedisConnOpt type %T", r))
|
|
||||||
}
|
|
||||||
server := NewServerFromRedisClient(redisClient, cfg)
|
|
||||||
server.sharedConnection = false
|
|
||||||
return server
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewServerFromRedisClient returns a new instance of Server given a redis.UniversalClient
|
|
||||||
// and server configuration
|
|
||||||
// Warning: The underlying redis connection pool will not be closed by Asynq, you are responsible for closing it.
|
|
||||||
func NewServerFromRedisClient(c redis.UniversalClient, cfg Config) *Server {
|
|
||||||
baseCtxFn := cfg.BaseContext
|
|
||||||
if baseCtxFn == nil {
|
|
||||||
baseCtxFn = context.Background
|
|
||||||
}
|
|
||||||
n := cfg.Concurrency
|
n := cfg.Concurrency
|
||||||
if n < 1 {
|
if n < 1 {
|
||||||
n = runtime.NumCPU()
|
n = runtime.NumCPU()
|
||||||
}
|
}
|
||||||
|
|
||||||
taskCheckInterval := cfg.TaskCheckInterval
|
|
||||||
if taskCheckInterval <= 0 {
|
|
||||||
taskCheckInterval = defaultTaskCheckInterval
|
|
||||||
}
|
|
||||||
|
|
||||||
delayFunc := cfg.RetryDelayFunc
|
delayFunc := cfg.RetryDelayFunc
|
||||||
if delayFunc == nil {
|
if delayFunc == nil {
|
||||||
delayFunc = DefaultRetryDelayFunc
|
delayFunc = defaultDelayFunc
|
||||||
}
|
|
||||||
isFailureFunc := cfg.IsFailure
|
|
||||||
if isFailureFunc == nil {
|
|
||||||
isFailureFunc = defaultIsFailureFunc
|
|
||||||
}
|
}
|
||||||
queues := make(map[string]int)
|
queues := make(map[string]int)
|
||||||
for qname, p := range cfg.Queues {
|
for qname, p := range cfg.Queues {
|
||||||
if err := base.ValidateQueueName(qname); err != nil {
|
|
||||||
continue // ignore invalid queue names
|
|
||||||
}
|
|
||||||
if p > 0 {
|
if p > 0 {
|
||||||
queues[qname] = p
|
queues[qname] = p
|
||||||
}
|
}
|
||||||
@ -476,146 +185,48 @@ func NewServerFromRedisClient(c redis.UniversalClient, cfg Config) *Server {
|
|||||||
if len(queues) == 0 {
|
if len(queues) == 0 {
|
||||||
queues = defaultQueueConfig
|
queues = defaultQueueConfig
|
||||||
}
|
}
|
||||||
var qnames []string
|
logger := cfg.Logger
|
||||||
for q := range queues {
|
if logger == nil {
|
||||||
qnames = append(qnames, q)
|
logger = log.NewLogger(os.Stderr)
|
||||||
}
|
}
|
||||||
shutdownTimeout := cfg.ShutdownTimeout
|
shutdownTimeout := cfg.ShutdownTimeout
|
||||||
if shutdownTimeout == 0 {
|
if shutdownTimeout == 0 {
|
||||||
shutdownTimeout = defaultShutdownTimeout
|
shutdownTimeout = defaultShutdownTimeout
|
||||||
}
|
}
|
||||||
healthcheckInterval := cfg.HealthCheckInterval
|
|
||||||
if healthcheckInterval == 0 {
|
|
||||||
healthcheckInterval = defaultHealthCheckInterval
|
|
||||||
}
|
|
||||||
// TODO: Create a helper to check for zero value and fall back to default (e.g. getDurationOrDefault())
|
|
||||||
groupGracePeriod := cfg.GroupGracePeriod
|
|
||||||
if groupGracePeriod == 0 {
|
|
||||||
groupGracePeriod = defaultGroupGracePeriod
|
|
||||||
}
|
|
||||||
if groupGracePeriod < time.Second {
|
|
||||||
panic("GroupGracePeriod cannot be less than a second")
|
|
||||||
}
|
|
||||||
logger := log.NewLogger(cfg.Logger)
|
|
||||||
loglevel := cfg.LogLevel
|
|
||||||
if loglevel == level_unspecified {
|
|
||||||
loglevel = InfoLevel
|
|
||||||
}
|
|
||||||
logger.SetLevel(toInternalLogLevel(loglevel))
|
|
||||||
|
|
||||||
rdb := rdb.NewRDB(c)
|
host, err := os.Hostname()
|
||||||
starting := make(chan *workerInfo)
|
if err != nil {
|
||||||
finished := make(chan *base.TaskMessage)
|
host = "unknown-host"
|
||||||
|
}
|
||||||
|
pid := os.Getpid()
|
||||||
|
|
||||||
|
rdb := rdb.NewRDB(createRedisClient(r))
|
||||||
|
ss := base.NewServerState(host, pid, n, queues, cfg.StrictPriority)
|
||||||
syncCh := make(chan *syncRequest)
|
syncCh := make(chan *syncRequest)
|
||||||
srvState := &serverState{value: srvStateNew}
|
|
||||||
cancels := base.NewCancelations()
|
cancels := base.NewCancelations()
|
||||||
|
syncer := newSyncer(logger, syncCh, 5*time.Second)
|
||||||
syncer := newSyncer(syncerParams{
|
heartbeater := newHeartbeater(logger, rdb, ss, 5*time.Second)
|
||||||
logger: logger,
|
scheduler := newScheduler(logger, rdb, 5*time.Second, queues)
|
||||||
requestsCh: syncCh,
|
subscriber := newSubscriber(logger, rdb, cancels)
|
||||||
interval: 5 * time.Second,
|
processor := newProcessor(newProcessorParams{
|
||||||
})
|
|
||||||
heartbeater := newHeartbeater(heartbeaterParams{
|
|
||||||
logger: logger,
|
|
||||||
broker: rdb,
|
|
||||||
interval: 5 * time.Second,
|
|
||||||
concurrency: n,
|
|
||||||
queues: queues,
|
|
||||||
strictPriority: cfg.StrictPriority,
|
|
||||||
state: srvState,
|
|
||||||
starting: starting,
|
|
||||||
finished: finished,
|
|
||||||
})
|
|
||||||
delayedTaskCheckInterval := cfg.DelayedTaskCheckInterval
|
|
||||||
if delayedTaskCheckInterval == 0 {
|
|
||||||
delayedTaskCheckInterval = defaultDelayedTaskCheckInterval
|
|
||||||
}
|
|
||||||
forwarder := newForwarder(forwarderParams{
|
|
||||||
logger: logger,
|
|
||||||
broker: rdb,
|
|
||||||
queues: qnames,
|
|
||||||
interval: delayedTaskCheckInterval,
|
|
||||||
})
|
|
||||||
subscriber := newSubscriber(subscriberParams{
|
|
||||||
logger: logger,
|
|
||||||
broker: rdb,
|
|
||||||
cancelations: cancels,
|
|
||||||
})
|
|
||||||
processor := newProcessor(processorParams{
|
|
||||||
logger: logger,
|
|
||||||
broker: rdb,
|
|
||||||
retryDelayFunc: delayFunc,
|
|
||||||
taskCheckInterval: taskCheckInterval,
|
|
||||||
baseCtxFn: baseCtxFn,
|
|
||||||
isFailureFunc: isFailureFunc,
|
|
||||||
syncCh: syncCh,
|
|
||||||
cancelations: cancels,
|
|
||||||
concurrency: n,
|
|
||||||
queues: queues,
|
|
||||||
strictPriority: cfg.StrictPriority,
|
|
||||||
errHandler: cfg.ErrorHandler,
|
|
||||||
shutdownTimeout: shutdownTimeout,
|
|
||||||
starting: starting,
|
|
||||||
finished: finished,
|
|
||||||
})
|
|
||||||
recoverer := newRecoverer(recovererParams{
|
|
||||||
logger: logger,
|
|
||||||
broker: rdb,
|
|
||||||
retryDelayFunc: delayFunc,
|
|
||||||
isFailureFunc: isFailureFunc,
|
|
||||||
queues: qnames,
|
|
||||||
interval: 1 * time.Minute,
|
|
||||||
})
|
|
||||||
healthchecker := newHealthChecker(healthcheckerParams{
|
|
||||||
logger: logger,
|
logger: logger,
|
||||||
broker: rdb,
|
broker: rdb,
|
||||||
interval: healthcheckInterval,
|
ss: ss,
|
||||||
healthcheckFunc: cfg.HealthCheckFunc,
|
retryDelayFunc: delayFunc,
|
||||||
})
|
syncCh: syncCh,
|
||||||
|
cancelations: cancels,
|
||||||
janitorInterval := cfg.JanitorInterval
|
errHandler: cfg.ErrorHandler,
|
||||||
if janitorInterval == 0 {
|
shutdownTimeout: shutdownTimeout,
|
||||||
janitorInterval = defaultJanitorInterval
|
|
||||||
}
|
|
||||||
|
|
||||||
janitorBatchSize := cfg.JanitorBatchSize
|
|
||||||
if janitorBatchSize == 0 {
|
|
||||||
janitorBatchSize = defaultJanitorBatchSize
|
|
||||||
}
|
|
||||||
if janitorBatchSize > defaultJanitorBatchSize {
|
|
||||||
logger.Warnf("Janitor batch size of %d is greater than the recommended batch size of %d. "+
|
|
||||||
"This might cause a long-running script", janitorBatchSize, defaultJanitorBatchSize)
|
|
||||||
}
|
|
||||||
janitor := newJanitor(janitorParams{
|
|
||||||
logger: logger,
|
|
||||||
broker: rdb,
|
|
||||||
queues: qnames,
|
|
||||||
interval: janitorInterval,
|
|
||||||
batchSize: janitorBatchSize,
|
|
||||||
})
|
|
||||||
aggregator := newAggregator(aggregatorParams{
|
|
||||||
logger: logger,
|
|
||||||
broker: rdb,
|
|
||||||
queues: qnames,
|
|
||||||
gracePeriod: groupGracePeriod,
|
|
||||||
maxDelay: cfg.GroupMaxDelay,
|
|
||||||
maxSize: cfg.GroupMaxSize,
|
|
||||||
groupAggregator: cfg.GroupAggregator,
|
|
||||||
})
|
})
|
||||||
return &Server{
|
return &Server{
|
||||||
logger: logger,
|
ss: ss,
|
||||||
broker: rdb,
|
logger: logger,
|
||||||
sharedConnection: true,
|
broker: rdb,
|
||||||
state: srvState,
|
scheduler: scheduler,
|
||||||
forwarder: forwarder,
|
processor: processor,
|
||||||
processor: processor,
|
syncer: syncer,
|
||||||
syncer: syncer,
|
heartbeater: heartbeater,
|
||||||
heartbeater: heartbeater,
|
subscriber: subscriber,
|
||||||
subscriber: subscriber,
|
|
||||||
recoverer: recoverer,
|
|
||||||
healthchecker: healthchecker,
|
|
||||||
janitor: janitor,
|
|
||||||
aggregator: aggregator,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -624,17 +235,8 @@ func NewServerFromRedisClient(c redis.UniversalClient, cfg Config) *Server {
|
|||||||
// ProcessTask should return nil if the processing of a task
|
// ProcessTask should return nil if the processing of a task
|
||||||
// is successful.
|
// is successful.
|
||||||
//
|
//
|
||||||
// If ProcessTask returns a non-nil error or panics, the task
|
// If ProcessTask return a non-nil error or panics, the task
|
||||||
// will be retried after delay if retry-count is remaining,
|
// will be retried after delay.
|
||||||
// otherwise the task will be archived.
|
|
||||||
//
|
|
||||||
// One exception to this rule is when ProcessTask returns a SkipRetry error.
|
|
||||||
// If the returned error is SkipRetry or an error wraps SkipRetry, retry is
|
|
||||||
// skipped and the task will be immediately archived instead.
|
|
||||||
//
|
|
||||||
// Another exception to this rule is when ProcessTask returns a RevokeTask error.
|
|
||||||
// If the returned error is RevokeTask or an error wraps RevokeTask, the task
|
|
||||||
// will not be retried or archived.
|
|
||||||
type Handler interface {
|
type Handler interface {
|
||||||
ProcessTask(context.Context, *Task) error
|
ProcessTask(context.Context, *Task) error
|
||||||
}
|
}
|
||||||
@ -650,138 +252,95 @@ func (fn HandlerFunc) ProcessTask(ctx context.Context, task *Task) error {
|
|||||||
return fn(ctx, task)
|
return fn(ctx, task)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ErrServerClosed indicates that the operation is now illegal because of the server has been shutdown.
|
// ErrServerStopped indicates that the operation is now illegal because of the server being stopped.
|
||||||
var ErrServerClosed = errors.New("asynq: Server closed")
|
var ErrServerStopped = errors.New("asynq: the server has been stopped")
|
||||||
|
|
||||||
// Run starts the task processing and blocks until
|
// Run starts the background-task processing and blocks until
|
||||||
// an os signal to exit the program is received. Once it receives
|
// an os signal to exit the program is received. Once it receives
|
||||||
// a signal, it gracefully shuts down all active workers and other
|
// a signal, it gracefully shuts down all active workers and other
|
||||||
// goroutines to process the tasks.
|
// goroutines to process the tasks.
|
||||||
//
|
//
|
||||||
// Run returns any error encountered at server startup time.
|
// Run returns any error encountered during server startup time.
|
||||||
// If the server has already been shutdown, ErrServerClosed is returned.
|
// If the server has already been stopped, ErrServerStopped is returned.
|
||||||
func (srv *Server) Run(handler Handler) error {
|
func (srv *Server) Run(handler Handler) error {
|
||||||
if err := srv.Start(handler); err != nil {
|
if err := srv.Start(handler); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
srv.waitForSignals()
|
srv.waitForSignals()
|
||||||
srv.Shutdown()
|
srv.Stop()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start starts the worker server. Once the server has started,
|
// Start starts the worker server. Once the server has started,
|
||||||
// it pulls tasks off queues and starts a worker goroutine for each task
|
// it pulls tasks off queues and starts a worker goroutine for each task.
|
||||||
// and then call Handler to process it.
|
// Tasks are processed concurrently by the workers up to the number of
|
||||||
// Tasks are processed concurrently by the workers up to the number of
|
// concurrency specified at the initialization time.
|
||||||
// concurrency specified in Config.Concurrency.
|
|
||||||
//
|
//
|
||||||
// Start returns any error encountered at server startup time.
|
// Start returns any error encountered during server startup time.
|
||||||
// If the server has already been shutdown, ErrServerClosed is returned.
|
// If the server has already been stopped, ErrServerStopped is returned.
|
||||||
func (srv *Server) Start(handler Handler) error {
|
func (srv *Server) Start(handler Handler) error {
|
||||||
if handler == nil {
|
if handler == nil {
|
||||||
return fmt.Errorf("asynq: server cannot run with nil handler")
|
return fmt.Errorf("asynq: server cannot run with nil handler")
|
||||||
}
|
}
|
||||||
|
switch srv.ss.Status() {
|
||||||
|
case base.StatusRunning:
|
||||||
|
return fmt.Errorf("asynq: the server is already running")
|
||||||
|
case base.StatusStopped:
|
||||||
|
return ErrServerStopped
|
||||||
|
}
|
||||||
|
srv.ss.SetStatus(base.StatusRunning)
|
||||||
srv.processor.handler = handler
|
srv.processor.handler = handler
|
||||||
|
|
||||||
if err := srv.start(); err != nil {
|
type prefixLogger interface {
|
||||||
return err
|
SetPrefix(prefix string)
|
||||||
|
}
|
||||||
|
// If logger supports setting prefix, then set prefix for log output.
|
||||||
|
if l, ok := srv.logger.(prefixLogger); ok {
|
||||||
|
l.SetPrefix(fmt.Sprintf("asynq: pid=%d ", os.Getpid()))
|
||||||
}
|
}
|
||||||
srv.logger.Info("Starting processing")
|
srv.logger.Info("Starting processing")
|
||||||
|
|
||||||
srv.heartbeater.start(&srv.wg)
|
srv.heartbeater.start(&srv.wg)
|
||||||
srv.healthchecker.start(&srv.wg)
|
|
||||||
srv.subscriber.start(&srv.wg)
|
srv.subscriber.start(&srv.wg)
|
||||||
srv.syncer.start(&srv.wg)
|
srv.syncer.start(&srv.wg)
|
||||||
srv.recoverer.start(&srv.wg)
|
srv.scheduler.start(&srv.wg)
|
||||||
srv.forwarder.start(&srv.wg)
|
|
||||||
srv.processor.start(&srv.wg)
|
srv.processor.start(&srv.wg)
|
||||||
srv.janitor.start(&srv.wg)
|
|
||||||
srv.aggregator.start(&srv.wg)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Checks server state and returns an error if pre-condition is not met.
|
// Stop stops the worker server.
|
||||||
// Otherwise it sets the server state to active.
|
|
||||||
func (srv *Server) start() error {
|
|
||||||
srv.state.mu.Lock()
|
|
||||||
defer srv.state.mu.Unlock()
|
|
||||||
switch srv.state.value {
|
|
||||||
case srvStateActive:
|
|
||||||
return fmt.Errorf("asynq: the server is already running")
|
|
||||||
case srvStateStopped:
|
|
||||||
return fmt.Errorf("asynq: the server is in the stopped state. Waiting for shutdown.")
|
|
||||||
case srvStateClosed:
|
|
||||||
return ErrServerClosed
|
|
||||||
}
|
|
||||||
srv.state.value = srvStateActive
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Shutdown gracefully shuts down the server.
|
|
||||||
// It gracefully closes all active workers. The server will wait for
|
// It gracefully closes all active workers. The server will wait for
|
||||||
// active workers to finish processing tasks for duration specified in Config.ShutdownTimeout.
|
// active workers to finish processing tasks for duration specified in Config.ShutdownTimeout.
|
||||||
// If worker didn't finish processing a task during the timeout, the task will be pushed back to Redis.
|
// If worker didn't finish processing a task during the timeout, the task will be pushed back to Redis.
|
||||||
func (srv *Server) Shutdown() {
|
func (srv *Server) Stop() {
|
||||||
srv.state.mu.Lock()
|
switch srv.ss.Status() {
|
||||||
if srv.state.value == srvStateNew || srv.state.value == srvStateClosed {
|
case base.StatusIdle, base.StatusStopped:
|
||||||
srv.state.mu.Unlock()
|
|
||||||
// server is not running, do nothing and return.
|
// server is not running, do nothing and return.
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
srv.state.value = srvStateClosed
|
|
||||||
srv.state.mu.Unlock()
|
|
||||||
|
|
||||||
|
fmt.Println() // print newline for prettier log.
|
||||||
srv.logger.Info("Starting graceful shutdown")
|
srv.logger.Info("Starting graceful shutdown")
|
||||||
// Note: The order of shutdown is important.
|
// Note: The order of termination is important.
|
||||||
// Sender goroutines should be terminated before the receiver goroutines.
|
// Sender goroutines should be terminated before the receiver goroutines.
|
||||||
// processor -> syncer (via syncCh)
|
// processor -> syncer (via syncCh)
|
||||||
// processor -> heartbeater (via starting, finished channels)
|
srv.scheduler.terminate()
|
||||||
srv.forwarder.shutdown()
|
srv.processor.terminate()
|
||||||
srv.processor.shutdown()
|
srv.syncer.terminate()
|
||||||
srv.recoverer.shutdown()
|
srv.subscriber.terminate()
|
||||||
srv.syncer.shutdown()
|
srv.heartbeater.terminate()
|
||||||
srv.subscriber.shutdown()
|
|
||||||
srv.janitor.shutdown()
|
|
||||||
srv.aggregator.shutdown()
|
|
||||||
srv.healthchecker.shutdown()
|
|
||||||
srv.heartbeater.shutdown()
|
|
||||||
srv.wg.Wait()
|
srv.wg.Wait()
|
||||||
|
|
||||||
if !srv.sharedConnection {
|
srv.broker.Close()
|
||||||
srv.broker.Close()
|
srv.ss.SetStatus(base.StatusStopped)
|
||||||
}
|
|
||||||
srv.logger.Info("Exiting")
|
srv.logger.Info("Bye!")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stop signals the server to stop pulling new tasks off queues.
|
// Quiet signals the server to stop pulling new tasks off queues.
|
||||||
// Stop can be used before shutting down the server to ensure that all
|
// Quiet should be used before stopping the server.
|
||||||
// currently active tasks are processed before server shutdown.
|
func (srv *Server) Quiet() {
|
||||||
//
|
|
||||||
// Stop does not shutdown the server, make sure to call Shutdown before exit.
|
|
||||||
func (srv *Server) Stop() {
|
|
||||||
srv.state.mu.Lock()
|
|
||||||
if srv.state.value != srvStateActive {
|
|
||||||
// Invalid call to Stop, server can only go from Active state to Stopped state.
|
|
||||||
srv.state.mu.Unlock()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
srv.state.value = srvStateStopped
|
|
||||||
srv.state.mu.Unlock()
|
|
||||||
|
|
||||||
srv.logger.Info("Stopping processor")
|
|
||||||
srv.processor.stop()
|
srv.processor.stop()
|
||||||
srv.logger.Info("Processor stopped")
|
srv.ss.SetStatus(base.StatusQuiet)
|
||||||
}
|
|
||||||
|
|
||||||
// Ping performs a ping against the redis connection.
|
|
||||||
//
|
|
||||||
// This is an alternative to the HealthCheckFunc available in the Config object.
|
|
||||||
func (srv *Server) Ping() error {
|
|
||||||
srv.state.mu.Lock()
|
|
||||||
defer srv.state.mu.Unlock()
|
|
||||||
if srv.state.value == srvStateClosed {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return srv.broker.Ping()
|
|
||||||
}
|
}
|
||||||
|
234
server_test.go
234
server_test.go
@ -6,20 +6,26 @@ package asynq
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"syscall"
|
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
|
||||||
"github.com/hibiken/asynq/internal/testbroker"
|
|
||||||
"github.com/hibiken/asynq/internal/testutil"
|
|
||||||
|
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
"go.uber.org/goleak"
|
"go.uber.org/goleak"
|
||||||
)
|
)
|
||||||
|
|
||||||
func testServer(t *testing.T, c *Client, srv *Server) {
|
func TestServer(t *testing.T) {
|
||||||
|
// https://github.com/go-redis/redis/issues/1029
|
||||||
|
ignoreOpt := goleak.IgnoreTopFunction("github.com/go-redis/redis/v7/internal/pool.(*ConnPool).reaper")
|
||||||
|
defer goleak.VerifyNoLeaks(t, ignoreOpt)
|
||||||
|
|
||||||
|
r := &RedisClientOpt{
|
||||||
|
Addr: "localhost:6379",
|
||||||
|
DB: 15,
|
||||||
|
}
|
||||||
|
c := NewClient(r)
|
||||||
|
srv := NewServer(r, Config{
|
||||||
|
Concurrency: 10,
|
||||||
|
})
|
||||||
|
|
||||||
// no-op handler
|
// no-op handler
|
||||||
h := func(ctx context.Context, task *Task) error {
|
h := func(ctx context.Context, task *Task) error {
|
||||||
return nil
|
return nil
|
||||||
@ -30,109 +36,43 @@ func testServer(t *testing.T, c *Client, srv *Server) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = c.Enqueue(NewTask("send_email", testutil.JSON(map[string]interface{}{"recipient_id": 123})))
|
err = c.Enqueue(NewTask("send_email", map[string]interface{}{"recipient_id": 123}))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("could not enqueue a task: %v", err)
|
t.Errorf("could not enqueue a task: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = c.Enqueue(NewTask("send_email", testutil.JSON(map[string]interface{}{"recipient_id": 456})), ProcessIn(1*time.Hour))
|
err = c.EnqueueAt(time.Now().Add(time.Hour), NewTask("send_email", map[string]interface{}{"recipient_id": 456}))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("could not enqueue a task: %v", err)
|
t.Errorf("could not enqueue a task: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
srv.Shutdown()
|
srv.Stop()
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestServer(t *testing.T) {
|
func TestServerErrServerStopped(t *testing.T) {
|
||||||
// https://github.com/go-redis/redis/issues/1029
|
srv := NewServer(RedisClientOpt{Addr: ":6379"}, Config{})
|
||||||
ignoreOpt := goleak.IgnoreTopFunction("github.com/redis/go-redis/v9/internal/pool.(*ConnPool).reaper")
|
|
||||||
defer goleak.VerifyNone(t, ignoreOpt)
|
|
||||||
|
|
||||||
redisConnOpt := getRedisConnOpt(t)
|
|
||||||
c := NewClient(redisConnOpt)
|
|
||||||
defer c.Close()
|
|
||||||
srv := NewServer(redisConnOpt, Config{
|
|
||||||
Concurrency: 10,
|
|
||||||
LogLevel: testLogLevel,
|
|
||||||
})
|
|
||||||
|
|
||||||
testServer(t, c, srv)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestServerFromRedisClient(t *testing.T) {
|
|
||||||
// https://github.com/go-redis/redis/issues/1029
|
|
||||||
ignoreOpt := goleak.IgnoreTopFunction("github.com/redis/go-redis/v9/internal/pool.(*ConnPool).reaper")
|
|
||||||
defer goleak.VerifyNone(t, ignoreOpt)
|
|
||||||
|
|
||||||
redisConnOpt := getRedisConnOpt(t)
|
|
||||||
redisClient := redisConnOpt.MakeRedisClient().(redis.UniversalClient)
|
|
||||||
c := NewClientFromRedisClient(redisClient)
|
|
||||||
srv := NewServerFromRedisClient(redisClient, Config{
|
|
||||||
Concurrency: 10,
|
|
||||||
LogLevel: testLogLevel,
|
|
||||||
})
|
|
||||||
|
|
||||||
testServer(t, c, srv)
|
|
||||||
|
|
||||||
err := c.Close()
|
|
||||||
if err == nil {
|
|
||||||
t.Error("client.Close() should have failed because of a shared client but it didn't")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestServerRun(t *testing.T) {
|
|
||||||
// https://github.com/go-redis/redis/issues/1029
|
|
||||||
ignoreOpt := goleak.IgnoreTopFunction("github.com/redis/go-redis/v9/internal/pool.(*ConnPool).reaper")
|
|
||||||
defer goleak.VerifyNone(t, ignoreOpt)
|
|
||||||
|
|
||||||
srv := NewServer(getRedisConnOpt(t), Config{LogLevel: testLogLevel})
|
|
||||||
|
|
||||||
done := make(chan struct{})
|
|
||||||
// Make sure server exits when receiving TERM signal.
|
|
||||||
go func() {
|
|
||||||
time.Sleep(2 * time.Second)
|
|
||||||
_ = syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
|
|
||||||
done <- struct{}{}
|
|
||||||
}()
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
select {
|
|
||||||
case <-time.After(10 * time.Second):
|
|
||||||
panic("server did not stop after receiving TERM signal")
|
|
||||||
case <-done:
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
mux := NewServeMux()
|
|
||||||
if err := srv.Run(mux); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestServerErrServerClosed(t *testing.T) {
|
|
||||||
srv := NewServer(getRedisConnOpt(t), Config{LogLevel: testLogLevel})
|
|
||||||
handler := NewServeMux()
|
handler := NewServeMux()
|
||||||
if err := srv.Start(handler); err != nil {
|
if err := srv.Start(handler); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
srv.Shutdown()
|
srv.Stop()
|
||||||
err := srv.Start(handler)
|
err := srv.Start(handler)
|
||||||
if err != ErrServerClosed {
|
if err != ErrServerStopped {
|
||||||
t.Errorf("Restarting server: (*Server).Start(handler) = %v, want ErrServerClosed error", err)
|
t.Errorf("Restarting server: (*Server).Start(handler) = %v, want ErrServerStopped error", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestServerErrNilHandler(t *testing.T) {
|
func TestServerErrNilHandler(t *testing.T) {
|
||||||
srv := NewServer(getRedisConnOpt(t), Config{LogLevel: testLogLevel})
|
srv := NewServer(RedisClientOpt{Addr: ":6379"}, Config{})
|
||||||
err := srv.Start(nil)
|
err := srv.Start(nil)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Error("Starting server with nil handler: (*Server).Start(nil) did not return error")
|
t.Error("Starting server with nil handler: (*Server).Start(nil) did not return error")
|
||||||
srv.Shutdown()
|
srv.Stop()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestServerErrServerRunning(t *testing.T) {
|
func TestServerErrServerRunning(t *testing.T) {
|
||||||
srv := NewServer(getRedisConnOpt(t), Config{LogLevel: testLogLevel})
|
srv := NewServer(RedisClientOpt{Addr: ":6379"}, Config{})
|
||||||
handler := NewServeMux()
|
handler := NewServeMux()
|
||||||
if err := srv.Start(handler); err != nil {
|
if err := srv.Start(handler); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@ -141,127 +81,5 @@ func TestServerErrServerRunning(t *testing.T) {
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
t.Error("Calling (*Server).Start(handler) on already running server did not return error")
|
t.Error("Calling (*Server).Start(handler) on already running server did not return error")
|
||||||
}
|
}
|
||||||
srv.Shutdown()
|
srv.Stop()
|
||||||
}
|
|
||||||
|
|
||||||
func TestServerWithRedisDown(t *testing.T) {
|
|
||||||
// Make sure that server does not panic and exit if redis is down.
|
|
||||||
defer func() {
|
|
||||||
if r := recover(); r != nil {
|
|
||||||
t.Errorf("panic occurred: %v", r)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
r := rdb.NewRDB(setup(t))
|
|
||||||
testBroker := testbroker.NewTestBroker(r)
|
|
||||||
srv := NewServer(getRedisConnOpt(t), Config{LogLevel: testLogLevel})
|
|
||||||
srv.broker = testBroker
|
|
||||||
srv.forwarder.broker = testBroker
|
|
||||||
srv.heartbeater.broker = testBroker
|
|
||||||
srv.processor.broker = testBroker
|
|
||||||
srv.subscriber.broker = testBroker
|
|
||||||
testBroker.Sleep()
|
|
||||||
|
|
||||||
// no-op handler
|
|
||||||
h := func(ctx context.Context, task *Task) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
err := srv.Start(HandlerFunc(h))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
time.Sleep(3 * time.Second)
|
|
||||||
|
|
||||||
srv.Shutdown()
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestServerWithFlakyBroker(t *testing.T) {
|
|
||||||
// Make sure that server does not panic and exit if redis is down.
|
|
||||||
defer func() {
|
|
||||||
if r := recover(); r != nil {
|
|
||||||
t.Errorf("panic occurred: %v", r)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
r := rdb.NewRDB(setup(t))
|
|
||||||
testBroker := testbroker.NewTestBroker(r)
|
|
||||||
redisConnOpt := getRedisConnOpt(t)
|
|
||||||
srv := NewServer(redisConnOpt, Config{LogLevel: testLogLevel})
|
|
||||||
srv.broker = testBroker
|
|
||||||
srv.forwarder.broker = testBroker
|
|
||||||
srv.heartbeater.broker = testBroker
|
|
||||||
srv.processor.broker = testBroker
|
|
||||||
srv.subscriber.broker = testBroker
|
|
||||||
|
|
||||||
c := NewClient(redisConnOpt)
|
|
||||||
|
|
||||||
h := func(ctx context.Context, task *Task) error {
|
|
||||||
// force task retry.
|
|
||||||
if task.Type() == "bad_task" {
|
|
||||||
return fmt.Errorf("could not process %q", task.Type())
|
|
||||||
}
|
|
||||||
time.Sleep(2 * time.Second)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
err := srv.Start(HandlerFunc(h))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := 0; i < 10; i++ {
|
|
||||||
_, err := c.Enqueue(NewTask("enqueued", nil), MaxRetry(i))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
_, err = c.Enqueue(NewTask("bad_task", nil))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
_, err = c.Enqueue(NewTask("scheduled", nil), ProcessIn(time.Duration(i)*time.Second))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// simulate redis going down.
|
|
||||||
testBroker.Sleep()
|
|
||||||
|
|
||||||
time.Sleep(3 * time.Second)
|
|
||||||
|
|
||||||
// simulate redis comes back online.
|
|
||||||
testBroker.Wakeup()
|
|
||||||
|
|
||||||
time.Sleep(3 * time.Second)
|
|
||||||
|
|
||||||
srv.Shutdown()
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLogLevel(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
flagVal string
|
|
||||||
want LogLevel
|
|
||||||
wantStr string
|
|
||||||
}{
|
|
||||||
{"debug", DebugLevel, "debug"},
|
|
||||||
{"Info", InfoLevel, "info"},
|
|
||||||
{"WARN", WarnLevel, "warn"},
|
|
||||||
{"warning", WarnLevel, "warn"},
|
|
||||||
{"Error", ErrorLevel, "error"},
|
|
||||||
{"fatal", FatalLevel, "fatal"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
level := new(LogLevel)
|
|
||||||
if err := level.Set(tc.flagVal); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
if *level != tc.want {
|
|
||||||
t.Errorf("Set(%q): got %v, want %v", tc.flagVal, level, &tc.want)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if got := level.String(); got != tc.wantStr {
|
|
||||||
t.Errorf("String() returned %q, want %q", got, tc.wantStr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//go:build linux || dragonfly || freebsd || netbsd || openbsd || darwin
|
// +build linux bsd darwin
|
||||||
|
|
||||||
package asynq
|
package asynq
|
||||||
|
|
||||||
@ -22,18 +22,9 @@ func (srv *Server) waitForSignals() {
|
|||||||
for {
|
for {
|
||||||
sig := <-sigs
|
sig := <-sigs
|
||||||
if sig == unix.SIGTSTP {
|
if sig == unix.SIGTSTP {
|
||||||
srv.Stop()
|
srv.Quiet()
|
||||||
continue
|
continue
|
||||||
} else {
|
|
||||||
srv.Stop()
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Scheduler) waitForSignals() {
|
|
||||||
s.logger.Info("Send signal TERM or INT to stop the scheduler")
|
|
||||||
sigs := make(chan os.Signal, 1)
|
|
||||||
signal.Notify(sigs, unix.SIGTERM, unix.SIGINT)
|
|
||||||
<-sigs
|
|
||||||
}
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//go:build windows
|
// +build windows
|
||||||
|
|
||||||
package asynq
|
package asynq
|
||||||
|
|
||||||
@ -20,10 +20,3 @@ func (srv *Server) waitForSignals() {
|
|||||||
signal.Notify(sigs, windows.SIGTERM, windows.SIGINT)
|
signal.Notify(sigs, windows.SIGTERM, windows.SIGINT)
|
||||||
<-sigs
|
<-sigs
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Scheduler) waitForSignals() {
|
|
||||||
s.logger.Info("Send signal TERM or INT to stop the scheduler")
|
|
||||||
sigs := make(chan os.Signal, 1)
|
|
||||||
signal.Notify(sigs, windows.SIGTERM, windows.SIGINT)
|
|
||||||
<-sigs
|
|
||||||
}
|
|
||||||
|
@ -8,43 +8,36 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/redis/go-redis/v9"
|
"github.com/go-redis/redis/v7"
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type subscriber struct {
|
type subscriber struct {
|
||||||
logger *log.Logger
|
logger Logger
|
||||||
broker base.Broker
|
broker base.Broker
|
||||||
|
|
||||||
// channel to communicate back to the long running "subscriber" goroutine.
|
// channel to communicate back to the long running "subscriber" goroutine.
|
||||||
done chan struct{}
|
done chan struct{}
|
||||||
|
|
||||||
// cancelations hold cancel functions for all active tasks.
|
// cancelations hold cancel functions for all in-progress tasks.
|
||||||
cancelations *base.Cancelations
|
cancelations *base.Cancelations
|
||||||
|
|
||||||
// time to wait before retrying to connect to redis.
|
// time to wait before retrying to connect to redis.
|
||||||
retryTimeout time.Duration
|
retryTimeout time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
type subscriberParams struct {
|
func newSubscriber(l Logger, b base.Broker, cancelations *base.Cancelations) *subscriber {
|
||||||
logger *log.Logger
|
|
||||||
broker base.Broker
|
|
||||||
cancelations *base.Cancelations
|
|
||||||
}
|
|
||||||
|
|
||||||
func newSubscriber(params subscriberParams) *subscriber {
|
|
||||||
return &subscriber{
|
return &subscriber{
|
||||||
logger: params.logger,
|
logger: l,
|
||||||
broker: params.broker,
|
broker: b,
|
||||||
done: make(chan struct{}),
|
done: make(chan struct{}),
|
||||||
cancelations: params.cancelations,
|
cancelations: cancelations,
|
||||||
retryTimeout: 5 * time.Second,
|
retryTimeout: 5 * time.Second,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *subscriber) shutdown() {
|
func (s *subscriber) terminate() {
|
||||||
s.logger.Debug("Subscriber shutting down...")
|
s.logger.Info("Subscriber shutting down...")
|
||||||
// Signal the subscriber goroutine to stop.
|
// Signal the subscriber goroutine to stop.
|
||||||
s.done <- struct{}{}
|
s.done <- struct{}{}
|
||||||
}
|
}
|
||||||
@ -61,12 +54,12 @@ func (s *subscriber) start(wg *sync.WaitGroup) {
|
|||||||
for {
|
for {
|
||||||
pubsub, err = s.broker.CancelationPubSub()
|
pubsub, err = s.broker.CancelationPubSub()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Errorf("cannot subscribe to cancelation channel: %v", err)
|
s.logger.Error("cannot subscribe to cancelation channel: %v", err)
|
||||||
select {
|
select {
|
||||||
case <-time.After(s.retryTimeout):
|
case <-time.After(s.retryTimeout):
|
||||||
continue
|
continue
|
||||||
case <-s.done:
|
case <-s.done:
|
||||||
s.logger.Debug("Subscriber done")
|
s.logger.Info("Subscriber done")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -77,7 +70,7 @@ func (s *subscriber) start(wg *sync.WaitGroup) {
|
|||||||
select {
|
select {
|
||||||
case <-s.done:
|
case <-s.done:
|
||||||
pubsub.Close()
|
pubsub.Close()
|
||||||
s.logger.Debug("Subscriber done")
|
s.logger.Info("Subscriber done")
|
||||||
return
|
return
|
||||||
case msg := <-cancelCh:
|
case msg := <-cancelCh:
|
||||||
cancel, ok := s.cancelations.Get(msg.Payload)
|
cancel, ok := s.cancelations.Get(msg.Payload)
|
||||||
|
@ -16,7 +16,6 @@ import (
|
|||||||
|
|
||||||
func TestSubscriber(t *testing.T) {
|
func TestSubscriber(t *testing.T) {
|
||||||
r := setup(t)
|
r := setup(t)
|
||||||
defer r.Close()
|
|
||||||
rdbClient := rdb.NewRDB(r)
|
rdbClient := rdb.NewRDB(r)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@ -39,14 +38,10 @@ func TestSubscriber(t *testing.T) {
|
|||||||
cancelations := base.NewCancelations()
|
cancelations := base.NewCancelations()
|
||||||
cancelations.Add(tc.registeredID, fakeCancelFunc)
|
cancelations.Add(tc.registeredID, fakeCancelFunc)
|
||||||
|
|
||||||
subscriber := newSubscriber(subscriberParams{
|
subscriber := newSubscriber(testLogger, rdbClient, cancelations)
|
||||||
logger: testLogger,
|
|
||||||
broker: rdbClient,
|
|
||||||
cancelations: cancelations,
|
|
||||||
})
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
subscriber.start(&wg)
|
subscriber.start(&wg)
|
||||||
defer subscriber.shutdown()
|
defer subscriber.terminate()
|
||||||
|
|
||||||
// wait for subscriber to establish connection to pubsub channel
|
// wait for subscriber to establish connection to pubsub channel
|
||||||
time.Sleep(time.Second)
|
time.Sleep(time.Second)
|
||||||
@ -77,21 +72,16 @@ func TestSubscriberWithRedisDown(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
r := rdb.NewRDB(setup(t))
|
r := rdb.NewRDB(setup(t))
|
||||||
defer r.Close()
|
|
||||||
testBroker := testbroker.NewTestBroker(r)
|
testBroker := testbroker.NewTestBroker(r)
|
||||||
|
|
||||||
cancelations := base.NewCancelations()
|
cancelations := base.NewCancelations()
|
||||||
subscriber := newSubscriber(subscriberParams{
|
subscriber := newSubscriber(testLogger, testBroker, cancelations)
|
||||||
logger: testLogger,
|
|
||||||
broker: testBroker,
|
|
||||||
cancelations: cancelations,
|
|
||||||
})
|
|
||||||
subscriber.retryTimeout = 1 * time.Second // set shorter retry timeout for testing purpose.
|
subscriber.retryTimeout = 1 * time.Second // set shorter retry timeout for testing purpose.
|
||||||
|
|
||||||
testBroker.Sleep() // simulate a situation where subscriber cannot connect to redis.
|
testBroker.Sleep() // simulate a situation where subscriber cannot connect to redis.
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
subscriber.start(&wg)
|
subscriber.start(&wg)
|
||||||
defer subscriber.shutdown()
|
defer subscriber.terminate()
|
||||||
|
|
||||||
time.Sleep(2 * time.Second) // subscriber should wait and retry connecting to redis.
|
time.Sleep(2 * time.Second) // subscriber should wait and retry connecting to redis.
|
||||||
|
|
||||||
|
32
syncer.go
32
syncer.go
@ -7,14 +7,12 @@ package asynq
|
|||||||
import (
|
import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/hibiken/asynq/internal/log"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// syncer is responsible for queuing up failed requests to redis and retry
|
// syncer is responsible for queuing up failed requests to redis and retry
|
||||||
// those requests to sync state between the background process and redis.
|
// those requests to sync state between the background process and redis.
|
||||||
type syncer struct {
|
type syncer struct {
|
||||||
logger *log.Logger
|
logger Logger
|
||||||
|
|
||||||
requestsCh <-chan *syncRequest
|
requestsCh <-chan *syncRequest
|
||||||
|
|
||||||
@ -26,28 +24,21 @@ type syncer struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type syncRequest struct {
|
type syncRequest struct {
|
||||||
fn func() error // sync operation
|
fn func() error // sync operation
|
||||||
errMsg string // error message
|
errMsg string // error message
|
||||||
deadline time.Time // request should be dropped if deadline has been exceeded
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type syncerParams struct {
|
func newSyncer(l Logger, requestsCh <-chan *syncRequest, interval time.Duration) *syncer {
|
||||||
logger *log.Logger
|
|
||||||
requestsCh <-chan *syncRequest
|
|
||||||
interval time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
func newSyncer(params syncerParams) *syncer {
|
|
||||||
return &syncer{
|
return &syncer{
|
||||||
logger: params.logger,
|
logger: l,
|
||||||
requestsCh: params.requestsCh,
|
requestsCh: requestsCh,
|
||||||
done: make(chan struct{}),
|
done: make(chan struct{}),
|
||||||
interval: params.interval,
|
interval: interval,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *syncer) shutdown() {
|
func (s *syncer) terminate() {
|
||||||
s.logger.Debug("Syncer shutting down...")
|
s.logger.Info("Syncer shutting down...")
|
||||||
// Signal the syncer goroutine to stop.
|
// Signal the syncer goroutine to stop.
|
||||||
s.done <- struct{}{}
|
s.done <- struct{}{}
|
||||||
}
|
}
|
||||||
@ -66,16 +57,13 @@ func (s *syncer) start(wg *sync.WaitGroup) {
|
|||||||
s.logger.Error(req.errMsg)
|
s.logger.Error(req.errMsg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
s.logger.Debug("Syncer done")
|
s.logger.Info("Syncer done")
|
||||||
return
|
return
|
||||||
case req := <-s.requestsCh:
|
case req := <-s.requestsCh:
|
||||||
requests = append(requests, req)
|
requests = append(requests, req)
|
||||||
case <-time.After(s.interval):
|
case <-time.After(s.interval):
|
||||||
var temp []*syncRequest
|
var temp []*syncRequest
|
||||||
for _, req := range requests {
|
for _, req := range requests {
|
||||||
if req.deadline.Before(time.Now()) {
|
|
||||||
continue // drop stale request
|
|
||||||
}
|
|
||||||
if err := req.fn(); err != nil {
|
if err := req.fn(); err != nil {
|
||||||
temp = append(temp, req)
|
temp = append(temp, req)
|
||||||
}
|
}
|
||||||
|
@ -5,15 +5,14 @@
|
|||||||
package asynq
|
package asynq
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
h "github.com/hibiken/asynq/internal/asynqtest"
|
||||||
"github.com/hibiken/asynq/internal/base"
|
"github.com/hibiken/asynq/internal/base"
|
||||||
"github.com/hibiken/asynq/internal/rdb"
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
h "github.com/hibiken/asynq/internal/testutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestSyncer(t *testing.T) {
|
func TestSyncer(t *testing.T) {
|
||||||
@ -23,51 +22,41 @@ func TestSyncer(t *testing.T) {
|
|||||||
h.NewTaskMessage("gen_thumbnail", nil),
|
h.NewTaskMessage("gen_thumbnail", nil),
|
||||||
}
|
}
|
||||||
r := setup(t)
|
r := setup(t)
|
||||||
defer r.Close()
|
|
||||||
rdbClient := rdb.NewRDB(r)
|
rdbClient := rdb.NewRDB(r)
|
||||||
h.SeedActiveQueue(t, r, inProgress, base.DefaultQueueName)
|
h.SeedInProgressQueue(t, r, inProgress)
|
||||||
|
|
||||||
const interval = time.Second
|
const interval = time.Second
|
||||||
syncRequestCh := make(chan *syncRequest)
|
syncRequestCh := make(chan *syncRequest)
|
||||||
syncer := newSyncer(syncerParams{
|
syncer := newSyncer(testLogger, syncRequestCh, interval)
|
||||||
logger: testLogger,
|
|
||||||
requestsCh: syncRequestCh,
|
|
||||||
interval: interval,
|
|
||||||
})
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
syncer.start(&wg)
|
syncer.start(&wg)
|
||||||
defer syncer.shutdown()
|
defer syncer.terminate()
|
||||||
|
|
||||||
for _, msg := range inProgress {
|
for _, msg := range inProgress {
|
||||||
m := msg
|
m := msg
|
||||||
syncRequestCh <- &syncRequest{
|
syncRequestCh <- &syncRequest{
|
||||||
fn: func() error {
|
fn: func() error {
|
||||||
return rdbClient.Done(context.Background(), m)
|
return rdbClient.Done(m)
|
||||||
},
|
},
|
||||||
deadline: time.Now().Add(5 * time.Minute),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
time.Sleep(2 * interval) // ensure that syncer runs at least once
|
time.Sleep(2 * interval) // ensure that syncer runs at least once
|
||||||
|
|
||||||
gotActive := h.GetActiveMessages(t, r, base.DefaultQueueName)
|
gotInProgress := h.GetInProgressMessages(t, r)
|
||||||
if l := len(gotActive); l != 0 {
|
if l := len(gotInProgress); l != 0 {
|
||||||
t.Errorf("%q has length %d; want 0", base.ActiveKey(base.DefaultQueueName), l)
|
t.Errorf("%q has length %d; want 0", base.InProgressQueue, l)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSyncerRetry(t *testing.T) {
|
func TestSyncerRetry(t *testing.T) {
|
||||||
const interval = time.Second
|
const interval = time.Second
|
||||||
syncRequestCh := make(chan *syncRequest)
|
syncRequestCh := make(chan *syncRequest)
|
||||||
syncer := newSyncer(syncerParams{
|
syncer := newSyncer(testLogger, syncRequestCh, interval)
|
||||||
logger: testLogger,
|
|
||||||
requestsCh: syncRequestCh,
|
|
||||||
interval: interval,
|
|
||||||
})
|
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
syncer.start(&wg)
|
syncer.start(&wg)
|
||||||
defer syncer.shutdown()
|
defer syncer.terminate()
|
||||||
|
|
||||||
var (
|
var (
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
@ -88,9 +77,8 @@ func TestSyncerRetry(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
syncRequestCh <- &syncRequest{
|
syncRequestCh <- &syncRequest{
|
||||||
fn: requestFunc,
|
fn: requestFunc,
|
||||||
errMsg: "error",
|
errMsg: "error",
|
||||||
deadline: time.Now().Add(5 * time.Minute),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// allow syncer to retry
|
// allow syncer to retry
|
||||||
@ -102,41 +90,3 @@ func TestSyncerRetry(t *testing.T) {
|
|||||||
}
|
}
|
||||||
mu.Unlock()
|
mu.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSyncerDropsStaleRequests(t *testing.T) {
|
|
||||||
const interval = time.Second
|
|
||||||
syncRequestCh := make(chan *syncRequest)
|
|
||||||
syncer := newSyncer(syncerParams{
|
|
||||||
logger: testLogger,
|
|
||||||
requestsCh: syncRequestCh,
|
|
||||||
interval: interval,
|
|
||||||
})
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
syncer.start(&wg)
|
|
||||||
|
|
||||||
var (
|
|
||||||
mu sync.Mutex
|
|
||||||
n int // number of times request has been processed
|
|
||||||
)
|
|
||||||
|
|
||||||
for i := 0; i < 10; i++ {
|
|
||||||
syncRequestCh <- &syncRequest{
|
|
||||||
fn: func() error {
|
|
||||||
mu.Lock()
|
|
||||||
n++
|
|
||||||
mu.Unlock()
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
deadline: time.Now().Add(time.Duration(-i) * time.Second), // already exceeded deadline
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
time.Sleep(2 * interval) // ensure that syncer runs at least once
|
|
||||||
syncer.shutdown()
|
|
||||||
|
|
||||||
mu.Lock()
|
|
||||||
if n != 0 {
|
|
||||||
t.Errorf("requests has been processed %d times, want 0", n)
|
|
||||||
}
|
|
||||||
mu.Unlock()
|
|
||||||
}
|
|
||||||
|
@ -1,57 +1,156 @@
|
|||||||
# Asynq CLI
|
# Asynq CLI
|
||||||
|
|
||||||
Asynq CLI is a command line tool to monitor the queues and tasks managed by `asynq` package.
|
Asynq CLI is a command line tool to monitor the tasks managed by `asynq` package.
|
||||||
|
|
||||||
## Table of Contents
|
## Table of Contents
|
||||||
|
|
||||||
- [Installation](#installation)
|
- [Installation](#installation)
|
||||||
- [Usage](#usage)
|
- [Quick Start](#quick-start)
|
||||||
|
- [Stats](#stats)
|
||||||
|
- [History](#history)
|
||||||
|
- [Servers](#servers)
|
||||||
|
- [List](#list)
|
||||||
|
- [Enqueue](#enqueue)
|
||||||
|
- [Delete](#delete)
|
||||||
|
- [Kill](#kill)
|
||||||
|
- [Cancel](#cancel)
|
||||||
- [Config File](#config-file)
|
- [Config File](#config-file)
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
In order to use the tool, compile it using the following command:
|
In order to use the tool, compile it using the following command:
|
||||||
|
|
||||||
go install github.com/hibiken/asynq/tools/asynq@latest
|
go get github.com/hibiken/asynq/tools/asynq
|
||||||
|
|
||||||
This will create the asynq executable under your `$GOPATH/bin` directory.
|
This will create the asynq executable under your `$GOPATH/bin` directory.
|
||||||
|
|
||||||
## Usage
|
## Quickstart
|
||||||
|
|
||||||
### Commands
|
The tool has a few commands to inspect the state of tasks and queues.
|
||||||
|
|
||||||
To view details on any command, use `asynq help <command> <subcommand>`.
|
Run `asynq help` to see all the available commands.
|
||||||
|
|
||||||
- `asynq dash`
|
|
||||||
- `asynq stats`
|
|
||||||
- `asynq queue [ls inspect history rm pause unpause]`
|
|
||||||
- `asynq task [ls cancel delete archive run deleteall archiveall runall]`
|
|
||||||
- `asynq server [ls]`
|
|
||||||
|
|
||||||
### Global flags
|
|
||||||
|
|
||||||
Asynq CLI needs to connect to a redis-server to inspect the state of queues and tasks. Use flags to specify the options to connect to the redis-server used by your application.
|
Asynq CLI needs to connect to a redis-server to inspect the state of queues and tasks. Use flags to specify the options to connect to the redis-server used by your application.
|
||||||
To connect to a redis cluster, pass `--cluster` and `--cluster_addrs` flags.
|
|
||||||
|
|
||||||
By default, CLI will try to connect to a redis server running at `localhost:6379`.
|
By default, CLI will try to connect to a redis server running at `localhost:6379`.
|
||||||
|
|
||||||
```
|
### Stats
|
||||||
--config string config file to set flag defaut values (default is $HOME/.asynq.yaml)
|
|
||||||
-n, --db int redis database number (default is 0)
|
|
||||||
-h, --help help for asynq
|
|
||||||
-p, --password string password to use when connecting to redis server
|
|
||||||
-u, --uri string redis server URI (default "127.0.0.1:6379")
|
|
||||||
|
|
||||||
--cluster connect to redis cluster
|
Stats command gives the overview of the current state of tasks and queues. You can run it in conjunction with `watch` command to repeatedly run `stats`.
|
||||||
--cluster_addrs string list of comma-separated redis server addresses
|
|
||||||
```
|
Example:
|
||||||
|
|
||||||
|
watch -n 3 asynq stats
|
||||||
|
|
||||||
|
This will run `asynq stats` command every 3 seconds.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
### History
|
||||||
|
|
||||||
|
History command shows the number of processed and failed tasks from the last x days.
|
||||||
|
|
||||||
|
By default, it shows the stats from the last 10 days. Use `--days` to specify the number of days.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq history --days=30
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
### Servers
|
||||||
|
|
||||||
|
Servers command shows the list of running worker servers pulling tasks from the given redis instance.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq servers
|
||||||
|
|
||||||
|
### List
|
||||||
|
|
||||||
|
List command shows all tasks in the specified state in a table format
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq ls retry
|
||||||
|
asynq ls scheduled
|
||||||
|
asynq ls dead
|
||||||
|
asynq ls enqueued:default
|
||||||
|
asynq ls inprogress
|
||||||
|
|
||||||
|
### Enqueue
|
||||||
|
|
||||||
|
There are two commands to enqueue tasks.
|
||||||
|
|
||||||
|
Command `enq` takes a task ID and moves the task to **Enqueued** state. You can obtain the task ID by running `ls` command.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq enq d:1575732274:bnogo8gt6toe23vhef0g
|
||||||
|
|
||||||
|
Command `enqall` moves all tasks to **Enqueued** state from the specified state.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq enqall retry
|
||||||
|
|
||||||
|
Running the above command will move all **Retry** tasks to **Enqueued** state.
|
||||||
|
|
||||||
|
### Delete
|
||||||
|
|
||||||
|
There are two commands for task deletion.
|
||||||
|
|
||||||
|
Command `del` takes a task ID and deletes the task. You can obtain the task ID by running `ls` command.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq del r:1575732274:bnogo8gt6toe23vhef0g
|
||||||
|
|
||||||
|
Command `delall` deletes all tasks which are in the specified state.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq delall retry
|
||||||
|
|
||||||
|
Running the above command will delete all **Retry** tasks.
|
||||||
|
|
||||||
|
### Kill
|
||||||
|
|
||||||
|
There are two commands to kill (i.e. move to dead state) tasks.
|
||||||
|
|
||||||
|
Command `kill` takes a task ID and kills the task. You can obtain the task ID by running `ls` command.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq kill r:1575732274:bnogo8gt6toe23vhef0g
|
||||||
|
|
||||||
|
Command `killall` kills all tasks which are in the specified state.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq killall retry
|
||||||
|
|
||||||
|
Running the above command will move all **Retry** tasks to **Dead** state.
|
||||||
|
|
||||||
|
### Cancel
|
||||||
|
|
||||||
|
Command `cancel` takes a task ID and sends a cancelation signal to the goroutine processing the specified task.
|
||||||
|
You can obtain the task ID by running `ls` command.
|
||||||
|
|
||||||
|
The task should be in "in-progress" state.
|
||||||
|
Handler implementation needs to be context aware in order to actually stop processing.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
asynq cancel bnogo8gt6toe23vhef0g
|
||||||
|
|
||||||
## Config File
|
## Config File
|
||||||
|
|
||||||
You can use a config file to set default values for the flags.
|
You can use a config file to set default values for the flags.
|
||||||
|
This is useful, for example when you have to connect to a remote redis server.
|
||||||
|
|
||||||
By default, `asynq` will try to read config file located in
|
By default, `asynq` will try to read config file located in
|
||||||
`$HOME/.asynq.(yml|json)`. You can specify the file location via `--config` flag.
|
`$HOME/.asynq.(yaml|json)`. You can specify the file location via `--config` flag.
|
||||||
|
|
||||||
Config file example:
|
Config file example:
|
||||||
|
|
||||||
|
53
tools/asynq/cmd/cancel.go
Normal file
53
tools/asynq/cmd/cancel.go
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT license
|
||||||
|
// that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package cmd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v7"
|
||||||
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/spf13/viper"
|
||||||
|
)
|
||||||
|
|
||||||
|
// cancelCmd represents the cancel command
|
||||||
|
var cancelCmd = &cobra.Command{
|
||||||
|
Use: "cancel [task id]",
|
||||||
|
Short: "Sends a cancelation signal to the goroutine processing the specified task",
|
||||||
|
Long: `Cancel (asynq cancel) will send a cancelation signal to the goroutine processing
|
||||||
|
the specified task.
|
||||||
|
|
||||||
|
The command takes one argument which specifies the task to cancel.
|
||||||
|
The task should be in in-progress state.
|
||||||
|
Identifier for a task should be obtained by running "asynq ls" command.
|
||||||
|
|
||||||
|
Handler implementation needs to be context aware for cancelation signal to
|
||||||
|
actually cancel the processing.
|
||||||
|
|
||||||
|
Example: asynq cancel bnogo8gt6toe23vhef0g`,
|
||||||
|
Args: cobra.ExactArgs(1),
|
||||||
|
Run: cancel,
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
rootCmd.AddCommand(cancelCmd)
|
||||||
|
}
|
||||||
|
|
||||||
|
func cancel(cmd *cobra.Command, args []string) {
|
||||||
|
r := rdb.NewRDB(redis.NewClient(&redis.Options{
|
||||||
|
Addr: viper.GetString("uri"),
|
||||||
|
DB: viper.GetInt("db"),
|
||||||
|
Password: viper.GetString("password"),
|
||||||
|
}))
|
||||||
|
|
||||||
|
err := r.PublishCancelation(args[0])
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("could not send cancelation signal: %v\n", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
fmt.Printf("Successfully sent cancelation siganl for task %s\n", args[0])
|
||||||
|
}
|
@ -1,139 +0,0 @@
|
|||||||
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"sort"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/MakeNowJust/heredoc/v2"
|
|
||||||
"github.com/hibiken/asynq"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(cronCmd)
|
|
||||||
cronCmd.AddCommand(cronListCmd)
|
|
||||||
cronCmd.AddCommand(cronHistoryCmd)
|
|
||||||
cronHistoryCmd.Flags().Int("page", 1, "page number")
|
|
||||||
cronHistoryCmd.Flags().Int("size", 30, "page size")
|
|
||||||
}
|
|
||||||
|
|
||||||
var cronCmd = &cobra.Command{
|
|
||||||
Use: "cron <command> [flags]",
|
|
||||||
Short: "Manage cron",
|
|
||||||
Example: heredoc.Doc(`
|
|
||||||
$ asynq cron ls
|
|
||||||
$ asynq cron history 7837f142-6337-4217-9276-8f27281b67d1`),
|
|
||||||
}
|
|
||||||
|
|
||||||
var cronListCmd = &cobra.Command{
|
|
||||||
Use: "list",
|
|
||||||
Aliases: []string{"ls"},
|
|
||||||
Short: "List cron entries",
|
|
||||||
Run: cronList,
|
|
||||||
}
|
|
||||||
|
|
||||||
var cronHistoryCmd = &cobra.Command{
|
|
||||||
Use: "history <entry_id> [<entry_id>...]",
|
|
||||||
Short: "Show history of each cron tasks",
|
|
||||||
Args: cobra.MinimumNArgs(1),
|
|
||||||
Run: cronHistory,
|
|
||||||
Example: heredoc.Doc(`
|
|
||||||
$ asynq cron history 7837f142-6337-4217-9276-8f27281b67d1
|
|
||||||
$ asynq cron history 7837f142-6337-4217-9276-8f27281b67d1 bf6a8594-cd03-4968-b36a-8572c5e160dd
|
|
||||||
$ asynq cron history 7837f142-6337-4217-9276-8f27281b67d1 --size=100
|
|
||||||
$ asynq cron history 7837f142-6337-4217-9276-8f27281b67d1 --page=2`),
|
|
||||||
}
|
|
||||||
|
|
||||||
func cronList(cmd *cobra.Command, args []string) {
|
|
||||||
inspector := createInspector()
|
|
||||||
|
|
||||||
entries, err := inspector.SchedulerEntries()
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
if len(entries) == 0 {
|
|
||||||
fmt.Println("No scheduler entries")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sort entries by spec.
|
|
||||||
sort.Slice(entries, func(i, j int) bool {
|
|
||||||
x, y := entries[i], entries[j]
|
|
||||||
return x.Spec < y.Spec
|
|
||||||
})
|
|
||||||
|
|
||||||
cols := []string{"EntryID", "Spec", "Type", "Payload", "Options", "Next", "Prev"}
|
|
||||||
printRows := func(w io.Writer, tmpl string) {
|
|
||||||
for _, e := range entries {
|
|
||||||
fmt.Fprintf(w, tmpl, e.ID, e.Spec, e.Task.Type(), sprintBytes(e.Task.Payload()), e.Opts,
|
|
||||||
nextEnqueue(e.Next), prevEnqueue(e.Prev))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
printTable(cols, printRows)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns a string describing when the next enqueue will happen.
|
|
||||||
func nextEnqueue(nextEnqueueAt time.Time) string {
|
|
||||||
d := nextEnqueueAt.Sub(time.Now()).Round(time.Second)
|
|
||||||
if d < 0 {
|
|
||||||
return "Now"
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("In %v", d)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns a string describing when the previous enqueue was.
|
|
||||||
func prevEnqueue(prevEnqueuedAt time.Time) string {
|
|
||||||
if prevEnqueuedAt.IsZero() {
|
|
||||||
return "N/A"
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("%v ago", time.Since(prevEnqueuedAt).Round(time.Second))
|
|
||||||
}
|
|
||||||
|
|
||||||
func cronHistory(cmd *cobra.Command, args []string) {
|
|
||||||
pageNum, err := cmd.Flags().GetInt("page")
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
pageSize, err := cmd.Flags().GetInt("size")
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
inspector := createInspector()
|
|
||||||
for i, entryID := range args {
|
|
||||||
if i > 0 {
|
|
||||||
fmt.Printf("\n%s\n", separator)
|
|
||||||
}
|
|
||||||
fmt.Println()
|
|
||||||
|
|
||||||
fmt.Printf("Entry: %s\n\n", entryID)
|
|
||||||
|
|
||||||
events, err := inspector.ListSchedulerEnqueueEvents(
|
|
||||||
entryID, asynq.PageSize(pageSize), asynq.Page(pageNum))
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("error: %v\n", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if len(events) == 0 {
|
|
||||||
fmt.Printf("No scheduler enqueue events found for entry: %s\n", entryID)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
cols := []string{"TaskID", "EnqueuedAt"}
|
|
||||||
printRows := func(w io.Writer, tmpl string) {
|
|
||||||
for _, e := range events {
|
|
||||||
fmt.Fprintf(w, tmpl, e.TaskID, e.EnqueuedAt)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
printTable(cols, printRows)
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,45 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/MakeNowJust/heredoc/v2"
|
|
||||||
"github.com/hibiken/asynq/tools/asynq/cmd/dash"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
flagPollInterval = 8 * time.Second
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(dashCmd)
|
|
||||||
dashCmd.Flags().DurationVar(&flagPollInterval, "refresh", 8*time.Second, "Interval between data refresh (default: 8s, min allowed: 1s)")
|
|
||||||
}
|
|
||||||
|
|
||||||
var dashCmd = &cobra.Command{
|
|
||||||
Use: "dash",
|
|
||||||
Short: "View dashboard",
|
|
||||||
Long: heredoc.Doc(`
|
|
||||||
Display interactive dashboard.`),
|
|
||||||
Args: cobra.NoArgs,
|
|
||||||
Example: heredoc.Doc(`
|
|
||||||
$ asynq dash
|
|
||||||
$ asynq dash --refresh=3s`),
|
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
|
||||||
if flagPollInterval < 1*time.Second {
|
|
||||||
fmt.Println("error: --refresh cannot be less than 1s")
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
dash.Run(dash.Options{
|
|
||||||
PollInterval: flagPollInterval,
|
|
||||||
RedisConnOpt: getRedisConnOpt(),
|
|
||||||
})
|
|
||||||
},
|
|
||||||
}
|
|
@ -1,220 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package dash
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/gdamore/tcell/v2"
|
|
||||||
"github.com/hibiken/asynq"
|
|
||||||
)
|
|
||||||
|
|
||||||
// viewType is an enum for dashboard views.
|
|
||||||
type viewType int
|
|
||||||
|
|
||||||
const (
|
|
||||||
viewTypeQueues viewType = iota
|
|
||||||
viewTypeQueueDetails
|
|
||||||
viewTypeHelp
|
|
||||||
)
|
|
||||||
|
|
||||||
// State holds dashboard state.
|
|
||||||
type State struct {
|
|
||||||
queues []*asynq.QueueInfo
|
|
||||||
tasks []*asynq.TaskInfo
|
|
||||||
groups []*asynq.GroupInfo
|
|
||||||
err error
|
|
||||||
|
|
||||||
// Note: index zero corresponds to the table header; index=1 correctponds to the first element
|
|
||||||
queueTableRowIdx int // highlighted row in queue table
|
|
||||||
taskTableRowIdx int // highlighted row in task table
|
|
||||||
groupTableRowIdx int // highlighted row in group table
|
|
||||||
taskState asynq.TaskState // highlighted task state in queue details view
|
|
||||||
taskID string // selected task ID
|
|
||||||
|
|
||||||
selectedQueue *asynq.QueueInfo // queue shown on queue details view
|
|
||||||
selectedGroup *asynq.GroupInfo
|
|
||||||
selectedTask *asynq.TaskInfo
|
|
||||||
|
|
||||||
pageNum int // pagination page number
|
|
||||||
|
|
||||||
view viewType // current view type
|
|
||||||
prevView viewType // to support "go back"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *State) DebugString() string {
|
|
||||||
var b strings.Builder
|
|
||||||
b.WriteString(fmt.Sprintf("len(queues)=%d ", len(s.queues)))
|
|
||||||
b.WriteString(fmt.Sprintf("len(tasks)=%d ", len(s.tasks)))
|
|
||||||
b.WriteString(fmt.Sprintf("len(groups)=%d ", len(s.groups)))
|
|
||||||
b.WriteString(fmt.Sprintf("err=%v ", s.err))
|
|
||||||
|
|
||||||
if s.taskState != 0 {
|
|
||||||
b.WriteString(fmt.Sprintf("taskState=%s ", s.taskState.String()))
|
|
||||||
} else {
|
|
||||||
b.WriteString(fmt.Sprintf("taskState=0"))
|
|
||||||
}
|
|
||||||
b.WriteString(fmt.Sprintf("taskID=%s ", s.taskID))
|
|
||||||
|
|
||||||
b.WriteString(fmt.Sprintf("queueTableRowIdx=%d ", s.queueTableRowIdx))
|
|
||||||
b.WriteString(fmt.Sprintf("taskTableRowIdx=%d ", s.taskTableRowIdx))
|
|
||||||
b.WriteString(fmt.Sprintf("groupTableRowIdx=%d ", s.groupTableRowIdx))
|
|
||||||
|
|
||||||
if s.selectedQueue != nil {
|
|
||||||
b.WriteString(fmt.Sprintf("selectedQueue={Queue:%s} ", s.selectedQueue.Queue))
|
|
||||||
} else {
|
|
||||||
b.WriteString("selectedQueue=nil ")
|
|
||||||
}
|
|
||||||
|
|
||||||
if s.selectedGroup != nil {
|
|
||||||
b.WriteString(fmt.Sprintf("selectedGroup={Group:%s} ", s.selectedGroup.Group))
|
|
||||||
} else {
|
|
||||||
b.WriteString("selectedGroup=nil ")
|
|
||||||
}
|
|
||||||
|
|
||||||
if s.selectedTask != nil {
|
|
||||||
b.WriteString(fmt.Sprintf("selectedTask={ID:%s} ", s.selectedTask.ID))
|
|
||||||
} else {
|
|
||||||
b.WriteString("selectedTask=nil ")
|
|
||||||
}
|
|
||||||
|
|
||||||
b.WriteString(fmt.Sprintf("pageNum=%d", s.pageNum))
|
|
||||||
return b.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
type Options struct {
|
|
||||||
DebugMode bool
|
|
||||||
PollInterval time.Duration
|
|
||||||
RedisConnOpt asynq.RedisConnOpt
|
|
||||||
}
|
|
||||||
|
|
||||||
func Run(opts Options) {
|
|
||||||
s, err := tcell.NewScreen()
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("failed to create a screen: %v\n", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
if err := s.Init(); err != nil {
|
|
||||||
fmt.Printf("failed to initialize screen: %v\n", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
s.SetStyle(baseStyle) // set default text style
|
|
||||||
|
|
||||||
var (
|
|
||||||
state = State{} // confined in this goroutine only; DO NOT SHARE
|
|
||||||
|
|
||||||
inspector = asynq.NewInspector(opts.RedisConnOpt)
|
|
||||||
ticker = time.NewTicker(opts.PollInterval)
|
|
||||||
|
|
||||||
eventCh = make(chan tcell.Event)
|
|
||||||
done = make(chan struct{})
|
|
||||||
|
|
||||||
// channels to send/receive data fetched asynchronously
|
|
||||||
errorCh = make(chan error)
|
|
||||||
queueCh = make(chan *asynq.QueueInfo)
|
|
||||||
taskCh = make(chan *asynq.TaskInfo)
|
|
||||||
queuesCh = make(chan []*asynq.QueueInfo)
|
|
||||||
groupsCh = make(chan []*asynq.GroupInfo)
|
|
||||||
tasksCh = make(chan []*asynq.TaskInfo)
|
|
||||||
)
|
|
||||||
defer ticker.Stop()
|
|
||||||
|
|
||||||
f := dataFetcher{
|
|
||||||
inspector,
|
|
||||||
opts,
|
|
||||||
s,
|
|
||||||
errorCh,
|
|
||||||
queueCh,
|
|
||||||
taskCh,
|
|
||||||
queuesCh,
|
|
||||||
groupsCh,
|
|
||||||
tasksCh,
|
|
||||||
}
|
|
||||||
|
|
||||||
d := dashDrawer{
|
|
||||||
s,
|
|
||||||
opts,
|
|
||||||
}
|
|
||||||
|
|
||||||
h := keyEventHandler{
|
|
||||||
s: s,
|
|
||||||
fetcher: &f,
|
|
||||||
drawer: &d,
|
|
||||||
state: &state,
|
|
||||||
done: done,
|
|
||||||
ticker: ticker,
|
|
||||||
pollInterval: opts.PollInterval,
|
|
||||||
}
|
|
||||||
|
|
||||||
go fetchQueues(inspector, queuesCh, errorCh, opts)
|
|
||||||
go s.ChannelEvents(eventCh, done) // TODO: Double check that we are not leaking goroutine with this one.
|
|
||||||
d.Draw(&state) // draw initial screen
|
|
||||||
|
|
||||||
for {
|
|
||||||
// Update screen
|
|
||||||
s.Show()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case ev := <-eventCh:
|
|
||||||
// Process event
|
|
||||||
switch ev := ev.(type) {
|
|
||||||
case *tcell.EventResize:
|
|
||||||
s.Sync()
|
|
||||||
case *tcell.EventKey:
|
|
||||||
h.HandleKeyEvent(ev)
|
|
||||||
}
|
|
||||||
|
|
||||||
case <-ticker.C:
|
|
||||||
f.Fetch(&state)
|
|
||||||
|
|
||||||
case queues := <-queuesCh:
|
|
||||||
state.queues = queues
|
|
||||||
state.err = nil
|
|
||||||
if len(queues) < state.queueTableRowIdx {
|
|
||||||
state.queueTableRowIdx = len(queues)
|
|
||||||
}
|
|
||||||
d.Draw(&state)
|
|
||||||
|
|
||||||
case q := <-queueCh:
|
|
||||||
state.selectedQueue = q
|
|
||||||
state.err = nil
|
|
||||||
d.Draw(&state)
|
|
||||||
|
|
||||||
case groups := <-groupsCh:
|
|
||||||
state.groups = groups
|
|
||||||
state.err = nil
|
|
||||||
if len(groups) < state.groupTableRowIdx {
|
|
||||||
state.groupTableRowIdx = len(groups)
|
|
||||||
}
|
|
||||||
d.Draw(&state)
|
|
||||||
|
|
||||||
case tasks := <-tasksCh:
|
|
||||||
state.tasks = tasks
|
|
||||||
state.err = nil
|
|
||||||
if len(tasks) < state.taskTableRowIdx {
|
|
||||||
state.taskTableRowIdx = len(tasks)
|
|
||||||
}
|
|
||||||
d.Draw(&state)
|
|
||||||
|
|
||||||
case t := <-taskCh:
|
|
||||||
state.selectedTask = t
|
|
||||||
state.err = nil
|
|
||||||
d.Draw(&state)
|
|
||||||
|
|
||||||
case err := <-errorCh:
|
|
||||||
if errors.Is(err, asynq.ErrTaskNotFound) {
|
|
||||||
state.selectedTask = nil
|
|
||||||
} else {
|
|
||||||
state.err = err
|
|
||||||
}
|
|
||||||
d.Draw(&state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,724 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package dash
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"math"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
"unicode"
|
|
||||||
"unicode/utf8"
|
|
||||||
|
|
||||||
"github.com/gdamore/tcell/v2"
|
|
||||||
"github.com/hibiken/asynq"
|
|
||||||
"github.com/mattn/go-runewidth"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
baseStyle = tcell.StyleDefault.Background(tcell.ColorReset).Foreground(tcell.ColorReset)
|
|
||||||
labelStyle = baseStyle.Foreground(tcell.ColorLightGray)
|
|
||||||
|
|
||||||
// styles for bar graph
|
|
||||||
activeStyle = baseStyle.Foreground(tcell.ColorBlue)
|
|
||||||
pendingStyle = baseStyle.Foreground(tcell.ColorGreen)
|
|
||||||
aggregatingStyle = baseStyle.Foreground(tcell.ColorLightGreen)
|
|
||||||
scheduledStyle = baseStyle.Foreground(tcell.ColorYellow)
|
|
||||||
retryStyle = baseStyle.Foreground(tcell.ColorPink)
|
|
||||||
archivedStyle = baseStyle.Foreground(tcell.ColorPurple)
|
|
||||||
completedStyle = baseStyle.Foreground(tcell.ColorDarkGreen)
|
|
||||||
)
|
|
||||||
|
|
||||||
// drawer draws UI with the given state.
|
|
||||||
type drawer interface {
|
|
||||||
Draw(state *State)
|
|
||||||
}
|
|
||||||
|
|
||||||
type dashDrawer struct {
|
|
||||||
s tcell.Screen
|
|
||||||
opts Options
|
|
||||||
}
|
|
||||||
|
|
||||||
func (dd *dashDrawer) Draw(state *State) {
|
|
||||||
s, opts := dd.s, dd.opts
|
|
||||||
s.Clear()
|
|
||||||
// Simulate data update on every render
|
|
||||||
d := NewScreenDrawer(s)
|
|
||||||
switch state.view {
|
|
||||||
case viewTypeQueues:
|
|
||||||
d.Println("=== Queues ===", baseStyle.Bold(true))
|
|
||||||
d.NL()
|
|
||||||
drawQueueSizeGraphs(d, state)
|
|
||||||
d.NL()
|
|
||||||
drawQueueTable(d, baseStyle, state)
|
|
||||||
case viewTypeQueueDetails:
|
|
||||||
d.Println("=== Queue Summary ===", baseStyle.Bold(true))
|
|
||||||
d.NL()
|
|
||||||
drawQueueSummary(d, state)
|
|
||||||
d.NL()
|
|
||||||
d.NL()
|
|
||||||
d.Println("=== Tasks ===", baseStyle.Bold(true))
|
|
||||||
d.NL()
|
|
||||||
drawTaskStateBreakdown(d, baseStyle, state)
|
|
||||||
d.NL()
|
|
||||||
drawTaskTable(d, state)
|
|
||||||
drawTaskModal(d, state)
|
|
||||||
case viewTypeHelp:
|
|
||||||
drawHelp(d)
|
|
||||||
}
|
|
||||||
d.GoToBottom()
|
|
||||||
if opts.DebugMode {
|
|
||||||
drawDebugInfo(d, state)
|
|
||||||
} else {
|
|
||||||
drawFooter(d, state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawQueueSizeGraphs(d *ScreenDrawer, state *State) {
|
|
||||||
var qnames []string
|
|
||||||
var qsizes []string // queue size in strings
|
|
||||||
maxSize := 1 // not zero to avoid division by zero
|
|
||||||
for _, q := range state.queues {
|
|
||||||
qnames = append(qnames, q.Queue)
|
|
||||||
qsizes = append(qsizes, strconv.Itoa(q.Size))
|
|
||||||
if q.Size > maxSize {
|
|
||||||
maxSize = q.Size
|
|
||||||
}
|
|
||||||
}
|
|
||||||
qnameWidth := maxwidth(qnames)
|
|
||||||
qsizeWidth := maxwidth(qsizes)
|
|
||||||
|
|
||||||
// Calculate the multipler to scale the graph
|
|
||||||
screenWidth, _ := d.Screen().Size()
|
|
||||||
graphMaxWidth := screenWidth - (qnameWidth + qsizeWidth + 3) // <qname> |<graph> <size>
|
|
||||||
multipiler := 1.0
|
|
||||||
if graphMaxWidth < maxSize {
|
|
||||||
multipiler = float64(graphMaxWidth) / float64(maxSize)
|
|
||||||
}
|
|
||||||
|
|
||||||
const tick = '▇'
|
|
||||||
for _, q := range state.queues {
|
|
||||||
d.Print(q.Queue, baseStyle)
|
|
||||||
d.Print(strings.Repeat(" ", qnameWidth-runewidth.StringWidth(q.Queue)+1), baseStyle) // padding between qname and graph
|
|
||||||
d.Print("|", baseStyle)
|
|
||||||
d.Print(strings.Repeat(string(tick), int(math.Floor(float64(q.Active)*multipiler))), activeStyle)
|
|
||||||
d.Print(strings.Repeat(string(tick), int(math.Floor(float64(q.Pending)*multipiler))), pendingStyle)
|
|
||||||
d.Print(strings.Repeat(string(tick), int(math.Floor(float64(q.Aggregating)*multipiler))), aggregatingStyle)
|
|
||||||
d.Print(strings.Repeat(string(tick), int(math.Floor(float64(q.Scheduled)*multipiler))), scheduledStyle)
|
|
||||||
d.Print(strings.Repeat(string(tick), int(math.Floor(float64(q.Retry)*multipiler))), retryStyle)
|
|
||||||
d.Print(strings.Repeat(string(tick), int(math.Floor(float64(q.Archived)*multipiler))), archivedStyle)
|
|
||||||
d.Print(strings.Repeat(string(tick), int(math.Floor(float64(q.Completed)*multipiler))), completedStyle)
|
|
||||||
d.Print(fmt.Sprintf(" %d", q.Size), baseStyle)
|
|
||||||
d.NL()
|
|
||||||
}
|
|
||||||
d.NL()
|
|
||||||
d.Print("active=", baseStyle)
|
|
||||||
d.Print(string(tick), activeStyle)
|
|
||||||
d.Print(" pending=", baseStyle)
|
|
||||||
d.Print(string(tick), pendingStyle)
|
|
||||||
d.Print(" aggregating=", baseStyle)
|
|
||||||
d.Print(string(tick), aggregatingStyle)
|
|
||||||
d.Print(" scheduled=", baseStyle)
|
|
||||||
d.Print(string(tick), scheduledStyle)
|
|
||||||
d.Print(" retry=", baseStyle)
|
|
||||||
d.Print(string(tick), retryStyle)
|
|
||||||
d.Print(" archived=", baseStyle)
|
|
||||||
d.Print(string(tick), archivedStyle)
|
|
||||||
d.Print(" completed=", baseStyle)
|
|
||||||
d.Print(string(tick), completedStyle)
|
|
||||||
d.NL()
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawFooter(d *ScreenDrawer, state *State) {
|
|
||||||
if state.err != nil {
|
|
||||||
style := baseStyle.Background(tcell.ColorDarkRed)
|
|
||||||
d.Print(state.err.Error(), style)
|
|
||||||
d.FillLine(' ', style)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
style := baseStyle.Background(tcell.ColorDarkSlateGray).Foreground(tcell.ColorWhite)
|
|
||||||
switch state.view {
|
|
||||||
case viewTypeHelp:
|
|
||||||
d.Print("<Esc>: GoBack", style)
|
|
||||||
default:
|
|
||||||
d.Print("<?>: Help <Ctrl+C>: Exit ", style)
|
|
||||||
}
|
|
||||||
d.FillLine(' ', style)
|
|
||||||
}
|
|
||||||
|
|
||||||
// returns the maximum width from the given list of names
|
|
||||||
func maxwidth(names []string) int {
|
|
||||||
max := 0
|
|
||||||
for _, s := range names {
|
|
||||||
if w := runewidth.StringWidth(s); w > max {
|
|
||||||
max = w
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return max
|
|
||||||
}
|
|
||||||
|
|
||||||
// rpad adds padding to the right of a string.
|
|
||||||
func rpad(s string, padding int) string {
|
|
||||||
tmpl := fmt.Sprintf("%%-%ds ", padding)
|
|
||||||
return fmt.Sprintf(tmpl, s)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// lpad adds padding to the left of a string.
|
|
||||||
func lpad(s string, padding int) string {
|
|
||||||
tmpl := fmt.Sprintf("%%%ds ", padding)
|
|
||||||
return fmt.Sprintf(tmpl, s)
|
|
||||||
}
|
|
||||||
|
|
||||||
// byteCount converts the given bytes into human readable string
|
|
||||||
func byteCount(b int64) string {
|
|
||||||
const unit = 1000
|
|
||||||
if b < unit {
|
|
||||||
return fmt.Sprintf("%d B", b)
|
|
||||||
|
|
||||||
}
|
|
||||||
div, exp := int64(unit), 0
|
|
||||||
for n := b / unit; n >= unit; n /= unit {
|
|
||||||
div *= unit
|
|
||||||
exp++
|
|
||||||
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("%.1f %cB", float64(b)/float64(div), "kMGTPE"[exp])
|
|
||||||
}
|
|
||||||
|
|
||||||
var queueColumnConfigs = []*columnConfig[*asynq.QueueInfo]{
|
|
||||||
{"Queue", alignLeft, func(q *asynq.QueueInfo) string { return q.Queue }},
|
|
||||||
{"State", alignLeft, func(q *asynq.QueueInfo) string { return formatQueueState(q) }},
|
|
||||||
{"Size", alignRight, func(q *asynq.QueueInfo) string { return strconv.Itoa(q.Size) }},
|
|
||||||
{"Latency", alignRight, func(q *asynq.QueueInfo) string { return q.Latency.Round(time.Second).String() }},
|
|
||||||
{"MemoryUsage", alignRight, func(q *asynq.QueueInfo) string { return byteCount(q.MemoryUsage) }},
|
|
||||||
{"Processed", alignRight, func(q *asynq.QueueInfo) string { return strconv.Itoa(q.Processed) }},
|
|
||||||
{"Failed", alignRight, func(q *asynq.QueueInfo) string { return strconv.Itoa(q.Failed) }},
|
|
||||||
{"ErrorRate", alignRight, func(q *asynq.QueueInfo) string { return formatErrorRate(q.Processed, q.Failed) }},
|
|
||||||
}
|
|
||||||
|
|
||||||
func formatQueueState(q *asynq.QueueInfo) string {
|
|
||||||
if q.Paused {
|
|
||||||
return "PAUSED"
|
|
||||||
}
|
|
||||||
return "RUN"
|
|
||||||
}
|
|
||||||
|
|
||||||
func formatErrorRate(processed, failed int) string {
|
|
||||||
if processed == 0 {
|
|
||||||
return "-"
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("%.2f", float64(failed)/float64(processed))
|
|
||||||
}
|
|
||||||
|
|
||||||
func formatNextProcessTime(t time.Time) string {
|
|
||||||
now := time.Now()
|
|
||||||
if t.Before(now) {
|
|
||||||
return "now"
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("in %v", (t.Sub(now).Round(time.Second)))
|
|
||||||
}
|
|
||||||
|
|
||||||
func formatPastTime(t time.Time) string {
|
|
||||||
now := time.Now()
|
|
||||||
if t.After(now) || t.Equal(now) {
|
|
||||||
return "just now"
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("%v ago", time.Since(t).Round(time.Second))
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawQueueTable(d *ScreenDrawer, style tcell.Style, state *State) {
|
|
||||||
drawTable(d, style, queueColumnConfigs, state.queues, state.queueTableRowIdx-1)
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawQueueSummary(d *ScreenDrawer, state *State) {
|
|
||||||
q := state.selectedQueue
|
|
||||||
if q == nil {
|
|
||||||
d.Println("ERROR: Press q to go back", baseStyle)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
d.Print("Name ", labelStyle)
|
|
||||||
d.Println(q.Queue, baseStyle)
|
|
||||||
d.Print("Size ", labelStyle)
|
|
||||||
d.Println(strconv.Itoa(q.Size), baseStyle)
|
|
||||||
d.Print("Latency ", labelStyle)
|
|
||||||
d.Println(q.Latency.Round(time.Second).String(), baseStyle)
|
|
||||||
d.Print("MemUsage ", labelStyle)
|
|
||||||
d.Println(byteCount(q.MemoryUsage), baseStyle)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns the max number of groups that can be displayed.
|
|
||||||
func groupPageSize(s tcell.Screen) int {
|
|
||||||
_, h := s.Size()
|
|
||||||
return h - 16 // height - (# of rows used)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns the number of tasks to fetch.
|
|
||||||
func taskPageSize(s tcell.Screen) int {
|
|
||||||
_, h := s.Size()
|
|
||||||
return h - 15 // height - (# of rows used)
|
|
||||||
}
|
|
||||||
|
|
||||||
func shouldShowGroupTable(state *State) bool {
|
|
||||||
return state.taskState == asynq.TaskStateAggregating && state.selectedGroup == nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getTaskTableColumnConfig(taskState asynq.TaskState) []*columnConfig[*asynq.TaskInfo] {
|
|
||||||
switch taskState {
|
|
||||||
case asynq.TaskStateActive:
|
|
||||||
return activeTaskTableColumns
|
|
||||||
case asynq.TaskStatePending:
|
|
||||||
return pendingTaskTableColumns
|
|
||||||
case asynq.TaskStateAggregating:
|
|
||||||
return aggregatingTaskTableColumns
|
|
||||||
case asynq.TaskStateScheduled:
|
|
||||||
return scheduledTaskTableColumns
|
|
||||||
case asynq.TaskStateRetry:
|
|
||||||
return retryTaskTableColumns
|
|
||||||
case asynq.TaskStateArchived:
|
|
||||||
return archivedTaskTableColumns
|
|
||||||
case asynq.TaskStateCompleted:
|
|
||||||
return completedTaskTableColumns
|
|
||||||
}
|
|
||||||
panic("unknown task state")
|
|
||||||
}
|
|
||||||
|
|
||||||
var activeTaskTableColumns = []*columnConfig[*asynq.TaskInfo]{
|
|
||||||
{"ID", alignLeft, func(t *asynq.TaskInfo) string { return t.ID }},
|
|
||||||
{"Type", alignLeft, func(t *asynq.TaskInfo) string { return t.Type }},
|
|
||||||
{"Retried", alignRight, func(t *asynq.TaskInfo) string { return strconv.Itoa(t.Retried) }},
|
|
||||||
{"Max Retry", alignRight, func(t *asynq.TaskInfo) string { return strconv.Itoa(t.MaxRetry) }},
|
|
||||||
{"Payload", alignLeft, func(t *asynq.TaskInfo) string { return formatByteSlice(t.Payload) }},
|
|
||||||
}
|
|
||||||
|
|
||||||
var pendingTaskTableColumns = []*columnConfig[*asynq.TaskInfo]{
|
|
||||||
{"ID", alignLeft, func(t *asynq.TaskInfo) string { return t.ID }},
|
|
||||||
{"Type", alignLeft, func(t *asynq.TaskInfo) string { return t.Type }},
|
|
||||||
{"Retried", alignRight, func(t *asynq.TaskInfo) string { return strconv.Itoa(t.Retried) }},
|
|
||||||
{"Max Retry", alignRight, func(t *asynq.TaskInfo) string { return strconv.Itoa(t.MaxRetry) }},
|
|
||||||
{"Payload", alignLeft, func(t *asynq.TaskInfo) string { return formatByteSlice(t.Payload) }},
|
|
||||||
}
|
|
||||||
|
|
||||||
var aggregatingTaskTableColumns = []*columnConfig[*asynq.TaskInfo]{
|
|
||||||
{"ID", alignLeft, func(t *asynq.TaskInfo) string { return t.ID }},
|
|
||||||
{"Type", alignLeft, func(t *asynq.TaskInfo) string { return t.Type }},
|
|
||||||
{"Payload", alignLeft, func(t *asynq.TaskInfo) string { return formatByteSlice(t.Payload) }},
|
|
||||||
{"Group", alignLeft, func(t *asynq.TaskInfo) string { return t.Group }},
|
|
||||||
}
|
|
||||||
|
|
||||||
var scheduledTaskTableColumns = []*columnConfig[*asynq.TaskInfo]{
|
|
||||||
{"ID", alignLeft, func(t *asynq.TaskInfo) string { return t.ID }},
|
|
||||||
{"Type", alignLeft, func(t *asynq.TaskInfo) string { return t.Type }},
|
|
||||||
{"Next Process Time", alignLeft, func(t *asynq.TaskInfo) string {
|
|
||||||
return formatNextProcessTime(t.NextProcessAt)
|
|
||||||
}},
|
|
||||||
{"Payload", alignLeft, func(t *asynq.TaskInfo) string { return formatByteSlice(t.Payload) }},
|
|
||||||
}
|
|
||||||
|
|
||||||
var retryTaskTableColumns = []*columnConfig[*asynq.TaskInfo]{
|
|
||||||
{"ID", alignLeft, func(t *asynq.TaskInfo) string { return t.ID }},
|
|
||||||
{"Type", alignLeft, func(t *asynq.TaskInfo) string { return t.Type }},
|
|
||||||
{"Retry", alignRight, func(t *asynq.TaskInfo) string { return fmt.Sprintf("%d/%d", t.Retried, t.MaxRetry) }},
|
|
||||||
{"Last Failure", alignLeft, func(t *asynq.TaskInfo) string { return t.LastErr }},
|
|
||||||
{"Last Failure Time", alignLeft, func(t *asynq.TaskInfo) string { return formatPastTime(t.LastFailedAt) }},
|
|
||||||
{"Next Process Time", alignLeft, func(t *asynq.TaskInfo) string {
|
|
||||||
return formatNextProcessTime(t.NextProcessAt)
|
|
||||||
}},
|
|
||||||
{"Payload", alignLeft, func(t *asynq.TaskInfo) string { return formatByteSlice(t.Payload) }},
|
|
||||||
}
|
|
||||||
|
|
||||||
var archivedTaskTableColumns = []*columnConfig[*asynq.TaskInfo]{
|
|
||||||
{"ID", alignLeft, func(t *asynq.TaskInfo) string { return t.ID }},
|
|
||||||
{"Type", alignLeft, func(t *asynq.TaskInfo) string { return t.Type }},
|
|
||||||
{"Retry", alignRight, func(t *asynq.TaskInfo) string { return fmt.Sprintf("%d/%d", t.Retried, t.MaxRetry) }},
|
|
||||||
{"Last Failure", alignLeft, func(t *asynq.TaskInfo) string { return t.LastErr }},
|
|
||||||
{"Last Failure Time", alignLeft, func(t *asynq.TaskInfo) string { return formatPastTime(t.LastFailedAt) }},
|
|
||||||
{"Payload", alignLeft, func(t *asynq.TaskInfo) string { return formatByteSlice(t.Payload) }},
|
|
||||||
}
|
|
||||||
|
|
||||||
var completedTaskTableColumns = []*columnConfig[*asynq.TaskInfo]{
|
|
||||||
{"ID", alignLeft, func(t *asynq.TaskInfo) string { return t.ID }},
|
|
||||||
{"Type", alignLeft, func(t *asynq.TaskInfo) string { return t.Type }},
|
|
||||||
{"Completion Time", alignLeft, func(t *asynq.TaskInfo) string { return formatPastTime(t.CompletedAt) }},
|
|
||||||
{"Payload", alignLeft, func(t *asynq.TaskInfo) string { return formatByteSlice(t.Payload) }},
|
|
||||||
{"Result", alignLeft, func(t *asynq.TaskInfo) string { return formatByteSlice(t.Result) }},
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawTaskTable(d *ScreenDrawer, state *State) {
|
|
||||||
if shouldShowGroupTable(state) {
|
|
||||||
drawGroupTable(d, state)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if len(state.tasks) == 0 {
|
|
||||||
return // print nothing
|
|
||||||
}
|
|
||||||
drawTable(d, baseStyle, getTaskTableColumnConfig(state.taskState), state.tasks, state.taskTableRowIdx-1)
|
|
||||||
|
|
||||||
// Pagination
|
|
||||||
pageSize := taskPageSize(d.Screen())
|
|
||||||
totalCount := getTaskCount(state.selectedQueue, state.taskState)
|
|
||||||
if state.taskState == asynq.TaskStateAggregating {
|
|
||||||
// aggregating tasks are scoped to each group when shown in the table.
|
|
||||||
totalCount = state.selectedGroup.Size
|
|
||||||
}
|
|
||||||
if pageSize < totalCount {
|
|
||||||
start := (state.pageNum-1)*pageSize + 1
|
|
||||||
end := start + len(state.tasks) - 1
|
|
||||||
paginationStyle := baseStyle.Foreground(tcell.ColorLightGray)
|
|
||||||
d.Print(fmt.Sprintf("Showing %d-%d out of %d", start, end, totalCount), paginationStyle)
|
|
||||||
if isNextTaskPageAvailable(d.Screen(), state) {
|
|
||||||
d.Print(" n=NextPage", paginationStyle)
|
|
||||||
}
|
|
||||||
if state.pageNum > 1 {
|
|
||||||
d.Print(" p=PrevPage", paginationStyle)
|
|
||||||
}
|
|
||||||
d.FillLine(' ', paginationStyle)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func isNextTaskPageAvailable(s tcell.Screen, state *State) bool {
|
|
||||||
totalCount := getTaskCount(state.selectedQueue, state.taskState)
|
|
||||||
end := (state.pageNum-1)*taskPageSize(s) + len(state.tasks)
|
|
||||||
return end < totalCount
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawGroupTable(d *ScreenDrawer, state *State) {
|
|
||||||
if len(state.groups) == 0 {
|
|
||||||
return // print nothing
|
|
||||||
}
|
|
||||||
d.Println("<<< Select group >>>", baseStyle)
|
|
||||||
colConfigs := []*columnConfig[*asynq.GroupInfo]{
|
|
||||||
{"Name", alignLeft, func(g *asynq.GroupInfo) string { return g.Group }},
|
|
||||||
{"Size", alignRight, func(g *asynq.GroupInfo) string { return strconv.Itoa(g.Size) }},
|
|
||||||
}
|
|
||||||
// pagination
|
|
||||||
pageSize := groupPageSize(d.Screen())
|
|
||||||
total := len(state.groups)
|
|
||||||
start := (state.pageNum - 1) * pageSize
|
|
||||||
end := min(start+pageSize, total)
|
|
||||||
drawTable(d, baseStyle, colConfigs, state.groups[start:end], state.groupTableRowIdx-1)
|
|
||||||
|
|
||||||
if pageSize < total {
|
|
||||||
d.Print(fmt.Sprintf("Showing %d-%d out of %d", start+1, end, total), labelStyle)
|
|
||||||
if end < total {
|
|
||||||
d.Print(" n=NextPage", labelStyle)
|
|
||||||
}
|
|
||||||
if start > 0 {
|
|
||||||
d.Print(" p=PrevPage", labelStyle)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
d.FillLine(' ', labelStyle)
|
|
||||||
}
|
|
||||||
|
|
||||||
type number interface {
|
|
||||||
int | int64 | float64
|
|
||||||
}
|
|
||||||
|
|
||||||
// min returns the smaller of x and y. if x==y, returns x
|
|
||||||
func min[V number](x, y V) V {
|
|
||||||
if x > y {
|
|
||||||
return y
|
|
||||||
}
|
|
||||||
return x
|
|
||||||
}
|
|
||||||
|
|
||||||
// Define the order of states to show
|
|
||||||
var taskStates = []asynq.TaskState{
|
|
||||||
asynq.TaskStateActive,
|
|
||||||
asynq.TaskStatePending,
|
|
||||||
asynq.TaskStateAggregating,
|
|
||||||
asynq.TaskStateScheduled,
|
|
||||||
asynq.TaskStateRetry,
|
|
||||||
asynq.TaskStateArchived,
|
|
||||||
asynq.TaskStateCompleted,
|
|
||||||
}
|
|
||||||
|
|
||||||
func nextTaskState(current asynq.TaskState) asynq.TaskState {
|
|
||||||
for i, ts := range taskStates {
|
|
||||||
if current == ts {
|
|
||||||
if i == len(taskStates)-1 {
|
|
||||||
return taskStates[0]
|
|
||||||
} else {
|
|
||||||
return taskStates[i+1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
panic("unknown task state")
|
|
||||||
}
|
|
||||||
|
|
||||||
func prevTaskState(current asynq.TaskState) asynq.TaskState {
|
|
||||||
for i, ts := range taskStates {
|
|
||||||
if current == ts {
|
|
||||||
if i == 0 {
|
|
||||||
return taskStates[len(taskStates)-1]
|
|
||||||
} else {
|
|
||||||
return taskStates[i-1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
panic("unknown task state")
|
|
||||||
}
|
|
||||||
|
|
||||||
func getTaskCount(queue *asynq.QueueInfo, taskState asynq.TaskState) int {
|
|
||||||
switch taskState {
|
|
||||||
case asynq.TaskStateActive:
|
|
||||||
return queue.Active
|
|
||||||
case asynq.TaskStatePending:
|
|
||||||
return queue.Pending
|
|
||||||
case asynq.TaskStateAggregating:
|
|
||||||
return queue.Aggregating
|
|
||||||
case asynq.TaskStateScheduled:
|
|
||||||
return queue.Scheduled
|
|
||||||
case asynq.TaskStateRetry:
|
|
||||||
return queue.Retry
|
|
||||||
case asynq.TaskStateArchived:
|
|
||||||
return queue.Archived
|
|
||||||
case asynq.TaskStateCompleted:
|
|
||||||
return queue.Completed
|
|
||||||
}
|
|
||||||
panic("unkonwn task state")
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawTaskStateBreakdown(d *ScreenDrawer, style tcell.Style, state *State) {
|
|
||||||
const pad = " " // padding between states
|
|
||||||
for _, ts := range taskStates {
|
|
||||||
s := style
|
|
||||||
if state.taskState == ts {
|
|
||||||
s = s.Bold(true).Underline(true)
|
|
||||||
}
|
|
||||||
d.Print(fmt.Sprintf("%s:%d", strings.Title(ts.String()), getTaskCount(state.selectedQueue, ts)), s)
|
|
||||||
d.Print(pad, style)
|
|
||||||
}
|
|
||||||
d.NL()
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawTaskModal(d *ScreenDrawer, state *State) {
|
|
||||||
if state.taskID == "" {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
task := state.selectedTask
|
|
||||||
if task == nil {
|
|
||||||
// task no longer found
|
|
||||||
fns := []func(d *modalRowDrawer){
|
|
||||||
func(d *modalRowDrawer) { d.Print("=== Task Info ===", baseStyle.Bold(true)) },
|
|
||||||
func(d *modalRowDrawer) { d.Print("", baseStyle) },
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print(fmt.Sprintf("Task %q no longer exists", state.taskID), baseStyle)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
withModal(d, fns)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
fns := []func(d *modalRowDrawer){
|
|
||||||
func(d *modalRowDrawer) { d.Print("=== Task Info ===", baseStyle.Bold(true)) },
|
|
||||||
func(d *modalRowDrawer) { d.Print("", baseStyle) },
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("ID: ", labelStyle)
|
|
||||||
d.Print(task.ID, baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("Type: ", labelStyle)
|
|
||||||
d.Print(task.Type, baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("State: ", labelStyle)
|
|
||||||
d.Print(task.State.String(), baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("Queue: ", labelStyle)
|
|
||||||
d.Print(task.Queue, baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("Retry: ", labelStyle)
|
|
||||||
d.Print(fmt.Sprintf("%d/%d", task.Retried, task.MaxRetry), baseStyle)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
if task.LastErr != "" {
|
|
||||||
fns = append(fns, func(d *modalRowDrawer) {
|
|
||||||
d.Print("Last Failure: ", labelStyle)
|
|
||||||
d.Print(task.LastErr, baseStyle)
|
|
||||||
})
|
|
||||||
fns = append(fns, func(d *modalRowDrawer) {
|
|
||||||
d.Print("Last Failure Time: ", labelStyle)
|
|
||||||
d.Print(fmt.Sprintf("%v (%s)", task.LastFailedAt, formatPastTime(task.LastFailedAt)), baseStyle)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
if !task.NextProcessAt.IsZero() {
|
|
||||||
fns = append(fns, func(d *modalRowDrawer) {
|
|
||||||
d.Print("Next Process Time: ", labelStyle)
|
|
||||||
d.Print(fmt.Sprintf("%v (%s)", task.NextProcessAt, formatNextProcessTime(task.NextProcessAt)), baseStyle)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
if !task.CompletedAt.IsZero() {
|
|
||||||
fns = append(fns, func(d *modalRowDrawer) {
|
|
||||||
d.Print("Completion Time: ", labelStyle)
|
|
||||||
d.Print(fmt.Sprintf("%v (%s)", task.CompletedAt, formatPastTime(task.CompletedAt)), baseStyle)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
fns = append(fns, func(d *modalRowDrawer) {
|
|
||||||
d.Print("Payload: ", labelStyle)
|
|
||||||
d.Print(formatByteSlice(task.Payload), baseStyle)
|
|
||||||
})
|
|
||||||
if task.Result != nil {
|
|
||||||
fns = append(fns, func(d *modalRowDrawer) {
|
|
||||||
d.Print("Result: ", labelStyle)
|
|
||||||
d.Print(formatByteSlice(task.Result), baseStyle)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
withModal(d, fns)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reports whether the given byte slice is printable (i.e. human readable)
|
|
||||||
func isPrintable(data []byte) bool {
|
|
||||||
if !utf8.Valid(data) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
isAllSpace := true
|
|
||||||
for _, r := range string(data) {
|
|
||||||
if !unicode.IsGraphic(r) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if !unicode.IsSpace(r) {
|
|
||||||
isAllSpace = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return !isAllSpace
|
|
||||||
}
|
|
||||||
|
|
||||||
func formatByteSlice(data []byte) string {
|
|
||||||
if data == nil {
|
|
||||||
return "<nil>"
|
|
||||||
}
|
|
||||||
if !isPrintable(data) {
|
|
||||||
return "<non-printable>"
|
|
||||||
}
|
|
||||||
return strings.ReplaceAll(string(data), "\n", " ")
|
|
||||||
}
|
|
||||||
|
|
||||||
type modalRowDrawer struct {
|
|
||||||
d *ScreenDrawer
|
|
||||||
width int // current width occupied by content
|
|
||||||
maxWidth int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Note: s should not include newline
|
|
||||||
func (d *modalRowDrawer) Print(s string, style tcell.Style) {
|
|
||||||
if d.width >= d.maxWidth {
|
|
||||||
return // no longer write to this row
|
|
||||||
}
|
|
||||||
if d.width+runewidth.StringWidth(s) > d.maxWidth {
|
|
||||||
s = truncate(s, d.maxWidth-d.width)
|
|
||||||
}
|
|
||||||
d.d.Print(s, style)
|
|
||||||
}
|
|
||||||
|
|
||||||
// withModal draws a modal with the given functions row by row.
|
|
||||||
func withModal(d *ScreenDrawer, rowPrintFns []func(d *modalRowDrawer)) {
|
|
||||||
w, h := d.Screen().Size()
|
|
||||||
var (
|
|
||||||
modalWidth = int(math.Floor(float64(w) * 0.6))
|
|
||||||
modalHeight = int(math.Floor(float64(h) * 0.6))
|
|
||||||
rowOffset = int(math.Floor(float64(h) * 0.2)) // 20% from the top
|
|
||||||
colOffset = int(math.Floor(float64(w) * 0.2)) // 20% from the left
|
|
||||||
)
|
|
||||||
if modalHeight < 3 {
|
|
||||||
return // no content can be shown
|
|
||||||
}
|
|
||||||
d.Goto(colOffset, rowOffset)
|
|
||||||
d.Print(string(tcell.RuneULCorner), baseStyle)
|
|
||||||
d.Print(strings.Repeat(string(tcell.RuneHLine), modalWidth-2), baseStyle)
|
|
||||||
d.Print(string(tcell.RuneURCorner), baseStyle)
|
|
||||||
d.NL()
|
|
||||||
rowDrawer := modalRowDrawer{
|
|
||||||
d: d,
|
|
||||||
width: 0,
|
|
||||||
maxWidth: modalWidth - 4, /* borders + paddings */
|
|
||||||
}
|
|
||||||
for i := 1; i < modalHeight-1; i++ {
|
|
||||||
d.Goto(colOffset, rowOffset+i)
|
|
||||||
d.Print(fmt.Sprintf("%c ", tcell.RuneVLine), baseStyle)
|
|
||||||
if i <= len(rowPrintFns) {
|
|
||||||
rowPrintFns[i-1](&rowDrawer)
|
|
||||||
}
|
|
||||||
d.FillUntil(' ', baseStyle, colOffset+modalWidth-2)
|
|
||||||
d.Print(fmt.Sprintf(" %c", tcell.RuneVLine), baseStyle)
|
|
||||||
d.NL()
|
|
||||||
}
|
|
||||||
d.Goto(colOffset, rowOffset+modalHeight-1)
|
|
||||||
d.Print(string(tcell.RuneLLCorner), baseStyle)
|
|
||||||
d.Print(strings.Repeat(string(tcell.RuneHLine), modalWidth-2), baseStyle)
|
|
||||||
d.Print(string(tcell.RuneLRCorner), baseStyle)
|
|
||||||
d.NL()
|
|
||||||
}
|
|
||||||
|
|
||||||
func adjustWidth(s string, width int) string {
|
|
||||||
sw := runewidth.StringWidth(s)
|
|
||||||
if sw > width {
|
|
||||||
return truncate(s, width)
|
|
||||||
}
|
|
||||||
var b strings.Builder
|
|
||||||
b.WriteString(s)
|
|
||||||
b.WriteString(strings.Repeat(" ", width-sw))
|
|
||||||
return b.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// truncates s if s exceeds max length.
|
|
||||||
func truncate(s string, max int) string {
|
|
||||||
if runewidth.StringWidth(s) <= max {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
return string([]rune(s)[:max-1]) + "…"
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawDebugInfo(d *ScreenDrawer, state *State) {
|
|
||||||
d.Println(state.DebugString(), baseStyle)
|
|
||||||
}
|
|
||||||
|
|
||||||
func drawHelp(d *ScreenDrawer) {
|
|
||||||
keyStyle := labelStyle.Bold(true)
|
|
||||||
withModal(d, []func(*modalRowDrawer){
|
|
||||||
func(d *modalRowDrawer) { d.Print("=== Help ===", baseStyle.Bold(true)) },
|
|
||||||
func(d *modalRowDrawer) { d.Print("", baseStyle) },
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("<Enter>", keyStyle)
|
|
||||||
d.Print(" to select", baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("<Esc>", keyStyle)
|
|
||||||
d.Print(" or ", baseStyle)
|
|
||||||
d.Print("<q>", keyStyle)
|
|
||||||
d.Print(" to go back", baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("<UpArrow>", keyStyle)
|
|
||||||
d.Print(" or ", baseStyle)
|
|
||||||
d.Print("<k>", keyStyle)
|
|
||||||
d.Print(" to move up", baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("<DownArrow>", keyStyle)
|
|
||||||
d.Print(" or ", baseStyle)
|
|
||||||
d.Print("<j>", keyStyle)
|
|
||||||
d.Print(" to move down", baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("<LeftArrow>", keyStyle)
|
|
||||||
d.Print(" or ", baseStyle)
|
|
||||||
d.Print("<h>", keyStyle)
|
|
||||||
d.Print(" to move left", baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("<RightArrow>", keyStyle)
|
|
||||||
d.Print(" or ", baseStyle)
|
|
||||||
d.Print("<l>", keyStyle)
|
|
||||||
d.Print(" to move right", baseStyle)
|
|
||||||
},
|
|
||||||
func(d *modalRowDrawer) {
|
|
||||||
d.Print("<Ctrl+C>", keyStyle)
|
|
||||||
d.Print(" to quit", baseStyle)
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
@ -1,33 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package dash
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func TestTruncate(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
s string
|
|
||||||
max int
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
s: "hello world!",
|
|
||||||
max: 15,
|
|
||||||
want: "hello world!",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
s: "hello world!",
|
|
||||||
max: 6,
|
|
||||||
want: "hello…",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
got := truncate(tc.s, tc.max)
|
|
||||||
if tc.want != got {
|
|
||||||
t.Errorf("truncate(%q, %d) = %q, want %q", tc.s, tc.max, got, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,185 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package dash
|
|
||||||
|
|
||||||
import (
|
|
||||||
"sort"
|
|
||||||
|
|
||||||
"github.com/gdamore/tcell/v2"
|
|
||||||
"github.com/hibiken/asynq"
|
|
||||||
)
|
|
||||||
|
|
||||||
type fetcher interface {
|
|
||||||
// Fetch retries data required by the given state of the dashboard.
|
|
||||||
Fetch(state *State)
|
|
||||||
}
|
|
||||||
|
|
||||||
type dataFetcher struct {
|
|
||||||
inspector *asynq.Inspector
|
|
||||||
opts Options
|
|
||||||
s tcell.Screen
|
|
||||||
|
|
||||||
errorCh chan<- error
|
|
||||||
queueCh chan<- *asynq.QueueInfo
|
|
||||||
taskCh chan<- *asynq.TaskInfo
|
|
||||||
queuesCh chan<- []*asynq.QueueInfo
|
|
||||||
groupsCh chan<- []*asynq.GroupInfo
|
|
||||||
tasksCh chan<- []*asynq.TaskInfo
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *dataFetcher) Fetch(state *State) {
|
|
||||||
switch state.view {
|
|
||||||
case viewTypeQueues:
|
|
||||||
f.fetchQueues()
|
|
||||||
case viewTypeQueueDetails:
|
|
||||||
if shouldShowGroupTable(state) {
|
|
||||||
f.fetchGroups(state.selectedQueue.Queue)
|
|
||||||
} else if state.taskState == asynq.TaskStateAggregating {
|
|
||||||
f.fetchAggregatingTasks(state.selectedQueue.Queue, state.selectedGroup.Group, taskPageSize(f.s), state.pageNum)
|
|
||||||
} else {
|
|
||||||
f.fetchTasks(state.selectedQueue.Queue, state.taskState, taskPageSize(f.s), state.pageNum)
|
|
||||||
}
|
|
||||||
// if the task modal is open, additionally fetch the selected task's info
|
|
||||||
if state.taskID != "" {
|
|
||||||
f.fetchTaskInfo(state.selectedQueue.Queue, state.taskID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *dataFetcher) fetchQueues() {
|
|
||||||
var (
|
|
||||||
inspector = f.inspector
|
|
||||||
queuesCh = f.queuesCh
|
|
||||||
errorCh = f.errorCh
|
|
||||||
opts = f.opts
|
|
||||||
)
|
|
||||||
go fetchQueues(inspector, queuesCh, errorCh, opts)
|
|
||||||
}
|
|
||||||
|
|
||||||
func fetchQueues(i *asynq.Inspector, queuesCh chan<- []*asynq.QueueInfo, errorCh chan<- error, opts Options) {
|
|
||||||
queues, err := i.Queues()
|
|
||||||
if err != nil {
|
|
||||||
errorCh <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
sort.Strings(queues)
|
|
||||||
var res []*asynq.QueueInfo
|
|
||||||
for _, q := range queues {
|
|
||||||
info, err := i.GetQueueInfo(q)
|
|
||||||
if err != nil {
|
|
||||||
errorCh <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
res = append(res, info)
|
|
||||||
}
|
|
||||||
queuesCh <- res
|
|
||||||
}
|
|
||||||
|
|
||||||
func fetchQueueInfo(i *asynq.Inspector, qname string, queueCh chan<- *asynq.QueueInfo, errorCh chan<- error) {
|
|
||||||
q, err := i.GetQueueInfo(qname)
|
|
||||||
if err != nil {
|
|
||||||
errorCh <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
queueCh <- q
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *dataFetcher) fetchGroups(qname string) {
|
|
||||||
var (
|
|
||||||
i = f.inspector
|
|
||||||
groupsCh = f.groupsCh
|
|
||||||
errorCh = f.errorCh
|
|
||||||
queueCh = f.queueCh
|
|
||||||
)
|
|
||||||
go fetchGroups(i, qname, groupsCh, errorCh)
|
|
||||||
go fetchQueueInfo(i, qname, queueCh, errorCh)
|
|
||||||
}
|
|
||||||
|
|
||||||
func fetchGroups(i *asynq.Inspector, qname string, groupsCh chan<- []*asynq.GroupInfo, errorCh chan<- error) {
|
|
||||||
groups, err := i.Groups(qname)
|
|
||||||
if err != nil {
|
|
||||||
errorCh <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
groupsCh <- groups
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *dataFetcher) fetchAggregatingTasks(qname, group string, pageSize, pageNum int) {
|
|
||||||
var (
|
|
||||||
i = f.inspector
|
|
||||||
tasksCh = f.tasksCh
|
|
||||||
errorCh = f.errorCh
|
|
||||||
queueCh = f.queueCh
|
|
||||||
)
|
|
||||||
go fetchAggregatingTasks(i, qname, group, pageSize, pageNum, tasksCh, errorCh)
|
|
||||||
go fetchQueueInfo(i, qname, queueCh, errorCh)
|
|
||||||
}
|
|
||||||
|
|
||||||
func fetchAggregatingTasks(i *asynq.Inspector, qname, group string, pageSize, pageNum int,
|
|
||||||
tasksCh chan<- []*asynq.TaskInfo, errorCh chan<- error) {
|
|
||||||
tasks, err := i.ListAggregatingTasks(qname, group, asynq.PageSize(pageSize), asynq.Page(pageNum))
|
|
||||||
if err != nil {
|
|
||||||
errorCh <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
tasksCh <- tasks
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *dataFetcher) fetchTasks(qname string, taskState asynq.TaskState, pageSize, pageNum int) {
|
|
||||||
var (
|
|
||||||
i = f.inspector
|
|
||||||
tasksCh = f.tasksCh
|
|
||||||
errorCh = f.errorCh
|
|
||||||
queueCh = f.queueCh
|
|
||||||
)
|
|
||||||
go fetchTasks(i, qname, taskState, pageSize, pageNum, tasksCh, errorCh)
|
|
||||||
go fetchQueueInfo(i, qname, queueCh, errorCh)
|
|
||||||
}
|
|
||||||
|
|
||||||
func fetchTasks(i *asynq.Inspector, qname string, taskState asynq.TaskState, pageSize, pageNum int,
|
|
||||||
tasksCh chan<- []*asynq.TaskInfo, errorCh chan<- error) {
|
|
||||||
var (
|
|
||||||
tasks []*asynq.TaskInfo
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
opts := []asynq.ListOption{asynq.PageSize(pageSize), asynq.Page(pageNum)}
|
|
||||||
switch taskState {
|
|
||||||
case asynq.TaskStateActive:
|
|
||||||
tasks, err = i.ListActiveTasks(qname, opts...)
|
|
||||||
case asynq.TaskStatePending:
|
|
||||||
tasks, err = i.ListPendingTasks(qname, opts...)
|
|
||||||
case asynq.TaskStateScheduled:
|
|
||||||
tasks, err = i.ListScheduledTasks(qname, opts...)
|
|
||||||
case asynq.TaskStateRetry:
|
|
||||||
tasks, err = i.ListRetryTasks(qname, opts...)
|
|
||||||
case asynq.TaskStateArchived:
|
|
||||||
tasks, err = i.ListArchivedTasks(qname, opts...)
|
|
||||||
case asynq.TaskStateCompleted:
|
|
||||||
tasks, err = i.ListCompletedTasks(qname, opts...)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
errorCh <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
tasksCh <- tasks
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *dataFetcher) fetchTaskInfo(qname, taskID string) {
|
|
||||||
var (
|
|
||||||
i = f.inspector
|
|
||||||
taskCh = f.taskCh
|
|
||||||
errorCh = f.errorCh
|
|
||||||
)
|
|
||||||
go fetchTaskInfo(i, qname, taskID, taskCh, errorCh)
|
|
||||||
}
|
|
||||||
|
|
||||||
func fetchTaskInfo(i *asynq.Inspector, qname, taskID string, taskCh chan<- *asynq.TaskInfo, errorCh chan<- error) {
|
|
||||||
info, err := i.GetTaskInfo(qname, taskID)
|
|
||||||
if err != nil {
|
|
||||||
errorCh <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
taskCh <- info
|
|
||||||
}
|
|
@ -1,317 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package dash
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/gdamore/tcell/v2"
|
|
||||||
"github.com/hibiken/asynq"
|
|
||||||
)
|
|
||||||
|
|
||||||
// keyEventHandler handles keyboard events and updates the state.
|
|
||||||
// It delegates data fetching to fetcher and UI rendering to drawer.
|
|
||||||
type keyEventHandler struct {
|
|
||||||
s tcell.Screen
|
|
||||||
state *State
|
|
||||||
done chan struct{}
|
|
||||||
|
|
||||||
fetcher fetcher
|
|
||||||
drawer drawer
|
|
||||||
|
|
||||||
ticker *time.Ticker
|
|
||||||
pollInterval time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) quit() {
|
|
||||||
h.s.Fini()
|
|
||||||
close(h.done)
|
|
||||||
os.Exit(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) HandleKeyEvent(ev *tcell.EventKey) {
|
|
||||||
if ev.Key() == tcell.KeyEscape || ev.Rune() == 'q' {
|
|
||||||
h.goBack() // Esc and 'q' key have "go back" semantics
|
|
||||||
} else if ev.Key() == tcell.KeyCtrlC {
|
|
||||||
h.quit()
|
|
||||||
} else if ev.Key() == tcell.KeyCtrlL {
|
|
||||||
h.s.Sync()
|
|
||||||
} else if ev.Key() == tcell.KeyDown || ev.Rune() == 'j' {
|
|
||||||
h.handleDownKey()
|
|
||||||
} else if ev.Key() == tcell.KeyUp || ev.Rune() == 'k' {
|
|
||||||
h.handleUpKey()
|
|
||||||
} else if ev.Key() == tcell.KeyRight || ev.Rune() == 'l' {
|
|
||||||
h.handleRightKey()
|
|
||||||
} else if ev.Key() == tcell.KeyLeft || ev.Rune() == 'h' {
|
|
||||||
h.handleLeftKey()
|
|
||||||
} else if ev.Key() == tcell.KeyEnter {
|
|
||||||
h.handleEnterKey()
|
|
||||||
} else if ev.Rune() == '?' {
|
|
||||||
h.showHelp()
|
|
||||||
} else if ev.Rune() == 'n' {
|
|
||||||
h.nextPage()
|
|
||||||
} else if ev.Rune() == 'p' {
|
|
||||||
h.prevPage()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) goBack() {
|
|
||||||
var (
|
|
||||||
state = h.state
|
|
||||||
d = h.drawer
|
|
||||||
f = h.fetcher
|
|
||||||
)
|
|
||||||
if state.view == viewTypeHelp {
|
|
||||||
state.view = state.prevView // exit help
|
|
||||||
f.Fetch(state)
|
|
||||||
h.resetTicker()
|
|
||||||
d.Draw(state)
|
|
||||||
} else if state.view == viewTypeQueueDetails {
|
|
||||||
// if task modal is open close it; otherwise go back to the previous view
|
|
||||||
if state.taskID != "" {
|
|
||||||
state.taskID = ""
|
|
||||||
state.selectedTask = nil
|
|
||||||
d.Draw(state)
|
|
||||||
} else {
|
|
||||||
state.view = viewTypeQueues
|
|
||||||
f.Fetch(state)
|
|
||||||
h.resetTicker()
|
|
||||||
d.Draw(state)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
h.quit()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) handleDownKey() {
|
|
||||||
switch h.state.view {
|
|
||||||
case viewTypeQueues:
|
|
||||||
h.downKeyQueues()
|
|
||||||
case viewTypeQueueDetails:
|
|
||||||
h.downKeyQueueDetails()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) downKeyQueues() {
|
|
||||||
if h.state.queueTableRowIdx < len(h.state.queues) {
|
|
||||||
h.state.queueTableRowIdx++
|
|
||||||
} else {
|
|
||||||
h.state.queueTableRowIdx = 0 // loop back
|
|
||||||
}
|
|
||||||
h.drawer.Draw(h.state)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) downKeyQueueDetails() {
|
|
||||||
s, state := h.s, h.state
|
|
||||||
if shouldShowGroupTable(state) {
|
|
||||||
if state.groupTableRowIdx < groupPageSize(s) {
|
|
||||||
state.groupTableRowIdx++
|
|
||||||
} else {
|
|
||||||
state.groupTableRowIdx = 0 // loop back
|
|
||||||
}
|
|
||||||
} else if state.taskID == "" {
|
|
||||||
if state.taskTableRowIdx < len(state.tasks) {
|
|
||||||
state.taskTableRowIdx++
|
|
||||||
} else {
|
|
||||||
state.taskTableRowIdx = 0 // loop back
|
|
||||||
}
|
|
||||||
}
|
|
||||||
h.drawer.Draw(state)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) handleUpKey() {
|
|
||||||
switch h.state.view {
|
|
||||||
case viewTypeQueues:
|
|
||||||
h.upKeyQueues()
|
|
||||||
case viewTypeQueueDetails:
|
|
||||||
h.upKeyQueueDetails()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) upKeyQueues() {
|
|
||||||
state := h.state
|
|
||||||
if state.queueTableRowIdx == 0 {
|
|
||||||
state.queueTableRowIdx = len(state.queues)
|
|
||||||
} else {
|
|
||||||
state.queueTableRowIdx--
|
|
||||||
}
|
|
||||||
h.drawer.Draw(state)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) upKeyQueueDetails() {
|
|
||||||
s, state := h.s, h.state
|
|
||||||
if shouldShowGroupTable(state) {
|
|
||||||
if state.groupTableRowIdx == 0 {
|
|
||||||
state.groupTableRowIdx = groupPageSize(s)
|
|
||||||
} else {
|
|
||||||
state.groupTableRowIdx--
|
|
||||||
}
|
|
||||||
} else if state.taskID == "" {
|
|
||||||
if state.taskTableRowIdx == 0 {
|
|
||||||
state.taskTableRowIdx = len(state.tasks)
|
|
||||||
} else {
|
|
||||||
state.taskTableRowIdx--
|
|
||||||
}
|
|
||||||
}
|
|
||||||
h.drawer.Draw(state)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) handleEnterKey() {
|
|
||||||
switch h.state.view {
|
|
||||||
case viewTypeQueues:
|
|
||||||
h.enterKeyQueues()
|
|
||||||
case viewTypeQueueDetails:
|
|
||||||
h.enterKeyQueueDetails()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) resetTicker() {
|
|
||||||
h.ticker.Reset(h.pollInterval)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) enterKeyQueues() {
|
|
||||||
var (
|
|
||||||
state = h.state
|
|
||||||
f = h.fetcher
|
|
||||||
d = h.drawer
|
|
||||||
)
|
|
||||||
if state.queueTableRowIdx != 0 {
|
|
||||||
state.selectedQueue = state.queues[state.queueTableRowIdx-1]
|
|
||||||
state.view = viewTypeQueueDetails
|
|
||||||
state.taskState = asynq.TaskStateActive
|
|
||||||
state.tasks = nil
|
|
||||||
state.pageNum = 1
|
|
||||||
f.Fetch(state)
|
|
||||||
h.resetTicker()
|
|
||||||
d.Draw(state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) enterKeyQueueDetails() {
|
|
||||||
var (
|
|
||||||
state = h.state
|
|
||||||
f = h.fetcher
|
|
||||||
d = h.drawer
|
|
||||||
)
|
|
||||||
if shouldShowGroupTable(state) && state.groupTableRowIdx != 0 {
|
|
||||||
state.selectedGroup = state.groups[state.groupTableRowIdx-1]
|
|
||||||
state.tasks = nil
|
|
||||||
state.pageNum = 1
|
|
||||||
f.Fetch(state)
|
|
||||||
h.resetTicker()
|
|
||||||
d.Draw(state)
|
|
||||||
} else if !shouldShowGroupTable(state) && state.taskTableRowIdx != 0 {
|
|
||||||
task := state.tasks[state.taskTableRowIdx-1]
|
|
||||||
state.selectedTask = task
|
|
||||||
state.taskID = task.ID
|
|
||||||
f.Fetch(state)
|
|
||||||
h.resetTicker()
|
|
||||||
d.Draw(state)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) handleLeftKey() {
|
|
||||||
var (
|
|
||||||
state = h.state
|
|
||||||
f = h.fetcher
|
|
||||||
d = h.drawer
|
|
||||||
)
|
|
||||||
if state.view == viewTypeQueueDetails && state.taskID == "" {
|
|
||||||
state.taskState = prevTaskState(state.taskState)
|
|
||||||
state.pageNum = 1
|
|
||||||
state.taskTableRowIdx = 0
|
|
||||||
state.tasks = nil
|
|
||||||
state.selectedGroup = nil
|
|
||||||
f.Fetch(state)
|
|
||||||
h.resetTicker()
|
|
||||||
d.Draw(state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) handleRightKey() {
|
|
||||||
var (
|
|
||||||
state = h.state
|
|
||||||
f = h.fetcher
|
|
||||||
d = h.drawer
|
|
||||||
)
|
|
||||||
if state.view == viewTypeQueueDetails && state.taskID == "" {
|
|
||||||
state.taskState = nextTaskState(state.taskState)
|
|
||||||
state.pageNum = 1
|
|
||||||
state.taskTableRowIdx = 0
|
|
||||||
state.tasks = nil
|
|
||||||
state.selectedGroup = nil
|
|
||||||
f.Fetch(state)
|
|
||||||
h.resetTicker()
|
|
||||||
d.Draw(state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) nextPage() {
|
|
||||||
var (
|
|
||||||
s = h.s
|
|
||||||
state = h.state
|
|
||||||
f = h.fetcher
|
|
||||||
d = h.drawer
|
|
||||||
)
|
|
||||||
if state.view == viewTypeQueueDetails {
|
|
||||||
if shouldShowGroupTable(state) {
|
|
||||||
pageSize := groupPageSize(s)
|
|
||||||
total := len(state.groups)
|
|
||||||
start := (state.pageNum - 1) * pageSize
|
|
||||||
end := start + pageSize
|
|
||||||
if end <= total {
|
|
||||||
state.pageNum++
|
|
||||||
d.Draw(state)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
pageSize := taskPageSize(s)
|
|
||||||
totalCount := getTaskCount(state.selectedQueue, state.taskState)
|
|
||||||
if (state.pageNum-1)*pageSize+len(state.tasks) < totalCount {
|
|
||||||
state.pageNum++
|
|
||||||
f.Fetch(state)
|
|
||||||
h.resetTicker()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) prevPage() {
|
|
||||||
var (
|
|
||||||
s = h.s
|
|
||||||
state = h.state
|
|
||||||
f = h.fetcher
|
|
||||||
d = h.drawer
|
|
||||||
)
|
|
||||||
if state.view == viewTypeQueueDetails {
|
|
||||||
if shouldShowGroupTable(state) {
|
|
||||||
pageSize := groupPageSize(s)
|
|
||||||
start := (state.pageNum - 1) * pageSize
|
|
||||||
if start > 0 {
|
|
||||||
state.pageNum--
|
|
||||||
d.Draw(state)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if state.pageNum > 1 {
|
|
||||||
state.pageNum--
|
|
||||||
f.Fetch(state)
|
|
||||||
h.resetTicker()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *keyEventHandler) showHelp() {
|
|
||||||
var (
|
|
||||||
state = h.state
|
|
||||||
d = h.drawer
|
|
||||||
)
|
|
||||||
if state.view != viewTypeHelp {
|
|
||||||
state.prevView = state.view
|
|
||||||
state.view = viewTypeHelp
|
|
||||||
d.Draw(state)
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,234 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package dash
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/gdamore/tcell/v2"
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
"github.com/hibiken/asynq"
|
|
||||||
)
|
|
||||||
|
|
||||||
func makeKeyEventHandler(t *testing.T, state *State) *keyEventHandler {
|
|
||||||
ticker := time.NewTicker(time.Second)
|
|
||||||
t.Cleanup(func() { ticker.Stop() })
|
|
||||||
return &keyEventHandler{
|
|
||||||
s: tcell.NewSimulationScreen("UTF-8"),
|
|
||||||
state: state,
|
|
||||||
done: make(chan struct{}),
|
|
||||||
fetcher: &fakeFetcher{},
|
|
||||||
drawer: &fakeDrawer{},
|
|
||||||
ticker: ticker,
|
|
||||||
pollInterval: time.Second,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type keyEventHandlerTest struct {
|
|
||||||
desc string // test description
|
|
||||||
state *State // initial state, to be mutated by the handler
|
|
||||||
events []*tcell.EventKey // keyboard events
|
|
||||||
wantState State // expected state after the events
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestKeyEventHandler(t *testing.T) {
|
|
||||||
tests := []*keyEventHandlerTest{
|
|
||||||
{
|
|
||||||
desc: "navigates to help view",
|
|
||||||
state: &State{view: viewTypeQueues},
|
|
||||||
events: []*tcell.EventKey{tcell.NewEventKey(tcell.KeyRune, '?', tcell.ModNone)},
|
|
||||||
wantState: State{view: viewTypeHelp},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "navigates to queue details view",
|
|
||||||
state: &State{
|
|
||||||
view: viewTypeQueues,
|
|
||||||
queues: []*asynq.QueueInfo{
|
|
||||||
{Queue: "default", Size: 100, Active: 10, Pending: 40, Scheduled: 40, Completed: 10},
|
|
||||||
},
|
|
||||||
queueTableRowIdx: 0,
|
|
||||||
},
|
|
||||||
events: []*tcell.EventKey{
|
|
||||||
tcell.NewEventKey(tcell.KeyRune, 'j', tcell.ModNone), // down
|
|
||||||
tcell.NewEventKey(tcell.KeyEnter, '\n', tcell.ModNone), // Enter
|
|
||||||
},
|
|
||||||
wantState: State{
|
|
||||||
view: viewTypeQueueDetails,
|
|
||||||
queues: []*asynq.QueueInfo{
|
|
||||||
{Queue: "default", Size: 100, Active: 10, Pending: 40, Scheduled: 40, Completed: 10},
|
|
||||||
},
|
|
||||||
selectedQueue: &asynq.QueueInfo{Queue: "default", Size: 100, Active: 10, Pending: 40, Scheduled: 40, Completed: 10},
|
|
||||||
queueTableRowIdx: 1,
|
|
||||||
taskState: asynq.TaskStateActive,
|
|
||||||
pageNum: 1,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "does nothing if no queues are present",
|
|
||||||
state: &State{
|
|
||||||
view: viewTypeQueues,
|
|
||||||
queues: []*asynq.QueueInfo{}, // empty
|
|
||||||
queueTableRowIdx: 0,
|
|
||||||
},
|
|
||||||
events: []*tcell.EventKey{
|
|
||||||
tcell.NewEventKey(tcell.KeyRune, 'j', tcell.ModNone), // down
|
|
||||||
tcell.NewEventKey(tcell.KeyEnter, '\n', tcell.ModNone), // Enter
|
|
||||||
},
|
|
||||||
wantState: State{
|
|
||||||
view: viewTypeQueues,
|
|
||||||
queues: []*asynq.QueueInfo{},
|
|
||||||
queueTableRowIdx: 0,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "opens task info modal",
|
|
||||||
state: &State{
|
|
||||||
view: viewTypeQueueDetails,
|
|
||||||
queues: []*asynq.QueueInfo{
|
|
||||||
{Queue: "default", Size: 500, Active: 10, Pending: 40},
|
|
||||||
},
|
|
||||||
queueTableRowIdx: 1,
|
|
||||||
selectedQueue: &asynq.QueueInfo{Queue: "default", Size: 50, Active: 10, Pending: 40},
|
|
||||||
taskState: asynq.TaskStatePending,
|
|
||||||
pageNum: 1,
|
|
||||||
tasks: []*asynq.TaskInfo{
|
|
||||||
{ID: "xxxx", Type: "foo"},
|
|
||||||
{ID: "yyyy", Type: "bar"},
|
|
||||||
{ID: "zzzz", Type: "baz"},
|
|
||||||
},
|
|
||||||
taskTableRowIdx: 2,
|
|
||||||
},
|
|
||||||
events: []*tcell.EventKey{
|
|
||||||
tcell.NewEventKey(tcell.KeyEnter, '\n', tcell.ModNone), // Enter
|
|
||||||
},
|
|
||||||
wantState: State{
|
|
||||||
view: viewTypeQueueDetails,
|
|
||||||
queues: []*asynq.QueueInfo{
|
|
||||||
{Queue: "default", Size: 500, Active: 10, Pending: 40},
|
|
||||||
},
|
|
||||||
queueTableRowIdx: 1,
|
|
||||||
selectedQueue: &asynq.QueueInfo{Queue: "default", Size: 50, Active: 10, Pending: 40},
|
|
||||||
taskState: asynq.TaskStatePending,
|
|
||||||
pageNum: 1,
|
|
||||||
tasks: []*asynq.TaskInfo{
|
|
||||||
{ID: "xxxx", Type: "foo"},
|
|
||||||
{ID: "yyyy", Type: "bar"},
|
|
||||||
{ID: "zzzz", Type: "baz"},
|
|
||||||
},
|
|
||||||
taskTableRowIdx: 2,
|
|
||||||
// new states
|
|
||||||
taskID: "yyyy",
|
|
||||||
selectedTask: &asynq.TaskInfo{ID: "yyyy", Type: "bar"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "Esc closes task info modal",
|
|
||||||
state: &State{
|
|
||||||
view: viewTypeQueueDetails,
|
|
||||||
queues: []*asynq.QueueInfo{
|
|
||||||
{Queue: "default", Size: 500, Active: 10, Pending: 40},
|
|
||||||
},
|
|
||||||
queueTableRowIdx: 1,
|
|
||||||
selectedQueue: &asynq.QueueInfo{Queue: "default", Size: 50, Active: 10, Pending: 40},
|
|
||||||
taskState: asynq.TaskStatePending,
|
|
||||||
pageNum: 1,
|
|
||||||
tasks: []*asynq.TaskInfo{
|
|
||||||
{ID: "xxxx", Type: "foo"},
|
|
||||||
{ID: "yyyy", Type: "bar"},
|
|
||||||
{ID: "zzzz", Type: "baz"},
|
|
||||||
},
|
|
||||||
taskTableRowIdx: 2,
|
|
||||||
taskID: "yyyy", // presence of this field opens the modal
|
|
||||||
},
|
|
||||||
events: []*tcell.EventKey{
|
|
||||||
tcell.NewEventKey(tcell.KeyEscape, ' ', tcell.ModNone), // Esc
|
|
||||||
},
|
|
||||||
wantState: State{
|
|
||||||
view: viewTypeQueueDetails,
|
|
||||||
queues: []*asynq.QueueInfo{
|
|
||||||
{Queue: "default", Size: 500, Active: 10, Pending: 40},
|
|
||||||
},
|
|
||||||
queueTableRowIdx: 1,
|
|
||||||
selectedQueue: &asynq.QueueInfo{Queue: "default", Size: 50, Active: 10, Pending: 40},
|
|
||||||
taskState: asynq.TaskStatePending,
|
|
||||||
pageNum: 1,
|
|
||||||
tasks: []*asynq.TaskInfo{
|
|
||||||
{ID: "xxxx", Type: "foo"},
|
|
||||||
{ID: "yyyy", Type: "bar"},
|
|
||||||
{ID: "zzzz", Type: "baz"},
|
|
||||||
},
|
|
||||||
taskTableRowIdx: 2,
|
|
||||||
taskID: "", // this field should be unset
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
desc: "Arrow keys are disabled while task info modal is open",
|
|
||||||
state: &State{
|
|
||||||
view: viewTypeQueueDetails,
|
|
||||||
queues: []*asynq.QueueInfo{
|
|
||||||
{Queue: "default", Size: 500, Active: 10, Pending: 40},
|
|
||||||
},
|
|
||||||
queueTableRowIdx: 1,
|
|
||||||
selectedQueue: &asynq.QueueInfo{Queue: "default", Size: 50, Active: 10, Pending: 40},
|
|
||||||
taskState: asynq.TaskStatePending,
|
|
||||||
pageNum: 1,
|
|
||||||
tasks: []*asynq.TaskInfo{
|
|
||||||
{ID: "xxxx", Type: "foo"},
|
|
||||||
{ID: "yyyy", Type: "bar"},
|
|
||||||
{ID: "zzzz", Type: "baz"},
|
|
||||||
},
|
|
||||||
taskTableRowIdx: 2,
|
|
||||||
taskID: "yyyy", // presence of this field opens the modal
|
|
||||||
},
|
|
||||||
events: []*tcell.EventKey{
|
|
||||||
tcell.NewEventKey(tcell.KeyLeft, ' ', tcell.ModNone),
|
|
||||||
},
|
|
||||||
|
|
||||||
// no change
|
|
||||||
wantState: State{
|
|
||||||
view: viewTypeQueueDetails,
|
|
||||||
queues: []*asynq.QueueInfo{
|
|
||||||
{Queue: "default", Size: 500, Active: 10, Pending: 40},
|
|
||||||
},
|
|
||||||
queueTableRowIdx: 1,
|
|
||||||
selectedQueue: &asynq.QueueInfo{Queue: "default", Size: 50, Active: 10, Pending: 40},
|
|
||||||
taskState: asynq.TaskStatePending,
|
|
||||||
pageNum: 1,
|
|
||||||
tasks: []*asynq.TaskInfo{
|
|
||||||
{ID: "xxxx", Type: "foo"},
|
|
||||||
{ID: "yyyy", Type: "bar"},
|
|
||||||
{ID: "zzzz", Type: "baz"},
|
|
||||||
},
|
|
||||||
taskTableRowIdx: 2,
|
|
||||||
taskID: "yyyy", // presence of this field opens the modal
|
|
||||||
},
|
|
||||||
},
|
|
||||||
// TODO: Add more tests
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
t.Run(tc.desc, func(t *testing.T) {
|
|
||||||
h := makeKeyEventHandler(t, tc.state)
|
|
||||||
for _, e := range tc.events {
|
|
||||||
h.HandleKeyEvent(e)
|
|
||||||
}
|
|
||||||
if diff := cmp.Diff(tc.wantState, *tc.state, cmp.AllowUnexported(State{})); diff != "" {
|
|
||||||
t.Errorf("after state was %+v, want %+v: (-want,+got)\n%s", *tc.state, tc.wantState, diff)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/*** fake implementation for tests ***/
|
|
||||||
|
|
||||||
type fakeFetcher struct{}
|
|
||||||
|
|
||||||
func (f *fakeFetcher) Fetch(s *State) {}
|
|
||||||
|
|
||||||
type fakeDrawer struct{}
|
|
||||||
|
|
||||||
func (d *fakeDrawer) Draw(s *State) {}
|
|
@ -1,100 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package dash
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/gdamore/tcell/v2"
|
|
||||||
"github.com/mattn/go-runewidth"
|
|
||||||
)
|
|
||||||
|
|
||||||
/*** Screen Drawer ***/
|
|
||||||
|
|
||||||
// ScreenDrawer is used to draw contents on screen.
|
|
||||||
//
|
|
||||||
// Usage example:
|
|
||||||
// d := NewScreenDrawer(s)
|
|
||||||
// d.Println("Hello world", mystyle)
|
|
||||||
// d.NL() // adds newline
|
|
||||||
// d.Print("foo", mystyle.Bold(true))
|
|
||||||
// d.Print("bar", mystyle.Italic(true))
|
|
||||||
type ScreenDrawer struct {
|
|
||||||
l *LineDrawer
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewScreenDrawer(s tcell.Screen) *ScreenDrawer {
|
|
||||||
return &ScreenDrawer{l: NewLineDrawer(0, s)}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *ScreenDrawer) Print(s string, style tcell.Style) {
|
|
||||||
d.l.Draw(s, style)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *ScreenDrawer) Println(s string, style tcell.Style) {
|
|
||||||
d.Print(s, style)
|
|
||||||
d.NL()
|
|
||||||
}
|
|
||||||
|
|
||||||
// FillLine prints the given rune until the end of the current line
|
|
||||||
// and adds a newline.
|
|
||||||
func (d *ScreenDrawer) FillLine(r rune, style tcell.Style) {
|
|
||||||
w, _ := d.Screen().Size()
|
|
||||||
if w-d.l.col < 0 {
|
|
||||||
d.NL()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
s := strings.Repeat(string(r), w-d.l.col)
|
|
||||||
d.Print(s, style)
|
|
||||||
d.NL()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *ScreenDrawer) FillUntil(r rune, style tcell.Style, limit int) {
|
|
||||||
if d.l.col > limit {
|
|
||||||
return // already passed the limit
|
|
||||||
}
|
|
||||||
s := strings.Repeat(string(r), limit-d.l.col)
|
|
||||||
d.Print(s, style)
|
|
||||||
}
|
|
||||||
|
|
||||||
// NL adds a newline (i.e., moves to the next line).
|
|
||||||
func (d *ScreenDrawer) NL() {
|
|
||||||
d.l.row++
|
|
||||||
d.l.col = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *ScreenDrawer) Screen() tcell.Screen {
|
|
||||||
return d.l.s
|
|
||||||
}
|
|
||||||
|
|
||||||
// Goto moves the screendrawer to the specified cell.
|
|
||||||
func (d *ScreenDrawer) Goto(x, y int) {
|
|
||||||
d.l.row = y
|
|
||||||
d.l.col = x
|
|
||||||
}
|
|
||||||
|
|
||||||
// Go to the bottom of the screen.
|
|
||||||
func (d *ScreenDrawer) GoToBottom() {
|
|
||||||
_, h := d.Screen().Size()
|
|
||||||
d.l.row = h - 1
|
|
||||||
d.l.col = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
type LineDrawer struct {
|
|
||||||
s tcell.Screen
|
|
||||||
row int
|
|
||||||
col int
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewLineDrawer(row int, s tcell.Screen) *LineDrawer {
|
|
||||||
return &LineDrawer{row: row, col: 0, s: s}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *LineDrawer) Draw(s string, style tcell.Style) {
|
|
||||||
for _, r := range s {
|
|
||||||
d.s.SetContent(d.col, d.row, r, nil, style)
|
|
||||||
d.col += runewidth.RuneWidth(r)
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,70 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package dash
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/gdamore/tcell/v2"
|
|
||||||
"github.com/mattn/go-runewidth"
|
|
||||||
)
|
|
||||||
|
|
||||||
type columnAlignment int
|
|
||||||
|
|
||||||
const (
|
|
||||||
alignRight columnAlignment = iota
|
|
||||||
alignLeft
|
|
||||||
)
|
|
||||||
|
|
||||||
type columnConfig[V any] struct {
|
|
||||||
name string
|
|
||||||
alignment columnAlignment
|
|
||||||
displayFn func(v V) string
|
|
||||||
}
|
|
||||||
|
|
||||||
type column[V any] struct {
|
|
||||||
*columnConfig[V]
|
|
||||||
width int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper to draw a table.
|
|
||||||
func drawTable[V any](d *ScreenDrawer, style tcell.Style, configs []*columnConfig[V], data []V, highlightRowIdx int) {
|
|
||||||
const colBuffer = " " // extra buffer between columns
|
|
||||||
cols := make([]*column[V], len(configs))
|
|
||||||
for i, cfg := range configs {
|
|
||||||
cols[i] = &column[V]{cfg, runewidth.StringWidth(cfg.name)}
|
|
||||||
}
|
|
||||||
// adjust the column width to accommodate the widest value.
|
|
||||||
for _, v := range data {
|
|
||||||
for _, col := range cols {
|
|
||||||
if w := runewidth.StringWidth(col.displayFn(v)); col.width < w {
|
|
||||||
col.width = w
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// print header
|
|
||||||
headerStyle := style.Background(tcell.ColorDimGray).Foreground(tcell.ColorWhite)
|
|
||||||
for _, col := range cols {
|
|
||||||
if col.alignment == alignLeft {
|
|
||||||
d.Print(rpad(col.name, col.width)+colBuffer, headerStyle)
|
|
||||||
} else {
|
|
||||||
d.Print(lpad(col.name, col.width)+colBuffer, headerStyle)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
d.FillLine(' ', headerStyle)
|
|
||||||
// print body
|
|
||||||
for i, v := range data {
|
|
||||||
rowStyle := style
|
|
||||||
if highlightRowIdx == i {
|
|
||||||
rowStyle = style.Background(tcell.ColorDarkOliveGreen)
|
|
||||||
}
|
|
||||||
for _, col := range cols {
|
|
||||||
if col.alignment == alignLeft {
|
|
||||||
d.Print(rpad(col.displayFn(v), col.width)+colBuffer, rowStyle)
|
|
||||||
} else {
|
|
||||||
d.Print(lpad(col.displayFn(v), col.width)+colBuffer, rowStyle)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
d.FillLine(' ', rowStyle)
|
|
||||||
}
|
|
||||||
}
|
|
73
tools/asynq/cmd/del.go
Normal file
73
tools/asynq/cmd/del.go
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT license
|
||||||
|
// that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package cmd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v7"
|
||||||
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/spf13/viper"
|
||||||
|
)
|
||||||
|
|
||||||
|
// delCmd represents the del command
|
||||||
|
var delCmd = &cobra.Command{
|
||||||
|
Use: "del [task id]",
|
||||||
|
Short: "Deletes a task given an identifier",
|
||||||
|
Long: `Del (asynq del) will delete a task given an identifier.
|
||||||
|
|
||||||
|
The command takes one argument which specifies the task to delete.
|
||||||
|
The task should be in either scheduled, retry or dead state.
|
||||||
|
Identifier for a task should be obtained by running "asynq ls" command.
|
||||||
|
|
||||||
|
Example: asynq enq d:1575732274:bnogo8gt6toe23vhef0g`,
|
||||||
|
Args: cobra.ExactArgs(1),
|
||||||
|
Run: del,
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
rootCmd.AddCommand(delCmd)
|
||||||
|
|
||||||
|
// Here you will define your flags and configuration settings.
|
||||||
|
|
||||||
|
// Cobra supports Persistent Flags which will work for this command
|
||||||
|
// and all subcommands, e.g.:
|
||||||
|
// delCmd.PersistentFlags().String("foo", "", "A help for foo")
|
||||||
|
|
||||||
|
// Cobra supports local flags which will only run when this command
|
||||||
|
// is called directly, e.g.:
|
||||||
|
// delCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
||||||
|
}
|
||||||
|
|
||||||
|
func del(cmd *cobra.Command, args []string) {
|
||||||
|
id, score, qtype, err := parseQueryID(args[0])
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
r := rdb.NewRDB(redis.NewClient(&redis.Options{
|
||||||
|
Addr: viper.GetString("uri"),
|
||||||
|
DB: viper.GetInt("db"),
|
||||||
|
Password: viper.GetString("password"),
|
||||||
|
}))
|
||||||
|
switch qtype {
|
||||||
|
case "s":
|
||||||
|
err = r.DeleteScheduledTask(id, score)
|
||||||
|
case "r":
|
||||||
|
err = r.DeleteRetryTask(id, score)
|
||||||
|
case "d":
|
||||||
|
err = r.DeleteDeadTask(id, score)
|
||||||
|
default:
|
||||||
|
fmt.Println("invalid argument")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
fmt.Printf("Successfully deleted %v\n", args[0])
|
||||||
|
}
|
71
tools/asynq/cmd/delall.go
Normal file
71
tools/asynq/cmd/delall.go
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT license
|
||||||
|
// that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package cmd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v7"
|
||||||
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/spf13/viper"
|
||||||
|
)
|
||||||
|
|
||||||
|
var delallValidArgs = []string{"scheduled", "retry", "dead"}
|
||||||
|
|
||||||
|
// delallCmd represents the delall command
|
||||||
|
var delallCmd = &cobra.Command{
|
||||||
|
Use: "delall [state]",
|
||||||
|
Short: "Deletes all tasks in the specified state",
|
||||||
|
Long: `Delall (asynq delall) will delete all tasks in the specified state.
|
||||||
|
|
||||||
|
The argument should be one of "scheduled", "retry", or "dead".
|
||||||
|
|
||||||
|
Example: asynq delall dead -> Deletes all dead tasks`,
|
||||||
|
ValidArgs: delallValidArgs,
|
||||||
|
Args: cobra.ExactValidArgs(1),
|
||||||
|
Run: delall,
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
rootCmd.AddCommand(delallCmd)
|
||||||
|
|
||||||
|
// Here you will define your flags and configuration settings.
|
||||||
|
|
||||||
|
// Cobra supports Persistent Flags which will work for this command
|
||||||
|
// and all subcommands, e.g.:
|
||||||
|
// delallCmd.PersistentFlags().String("foo", "", "A help for foo")
|
||||||
|
|
||||||
|
// Cobra supports local flags which will only run when this command
|
||||||
|
// is called directly, e.g.:
|
||||||
|
// delallCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
||||||
|
}
|
||||||
|
|
||||||
|
func delall(cmd *cobra.Command, args []string) {
|
||||||
|
c := redis.NewClient(&redis.Options{
|
||||||
|
Addr: viper.GetString("uri"),
|
||||||
|
DB: viper.GetInt("db"),
|
||||||
|
Password: viper.GetString("password"),
|
||||||
|
})
|
||||||
|
r := rdb.NewRDB(c)
|
||||||
|
var err error
|
||||||
|
switch args[0] {
|
||||||
|
case "scheduled":
|
||||||
|
err = r.DeleteAllScheduledTasks()
|
||||||
|
case "retry":
|
||||||
|
err = r.DeleteAllRetryTasks()
|
||||||
|
case "dead":
|
||||||
|
err = r.DeleteAllDeadTasks()
|
||||||
|
default:
|
||||||
|
fmt.Printf("error: `asynq delall [state]` only accepts %v as the argument.\n", delallValidArgs)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
fmt.Printf("Deleted all tasks in %q state\n", args[0])
|
||||||
|
}
|
76
tools/asynq/cmd/enq.go
Normal file
76
tools/asynq/cmd/enq.go
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT license
|
||||||
|
// that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package cmd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v7"
|
||||||
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/spf13/viper"
|
||||||
|
)
|
||||||
|
|
||||||
|
// enqCmd represents the enq command
|
||||||
|
var enqCmd = &cobra.Command{
|
||||||
|
Use: "enq [task id]",
|
||||||
|
Short: "Enqueues a task given an identifier",
|
||||||
|
Long: `Enq (asynq enq) will enqueue a task given an identifier.
|
||||||
|
|
||||||
|
The command takes one argument which specifies the task to enqueue.
|
||||||
|
The task should be in either scheduled, retry or dead state.
|
||||||
|
Identifier for a task should be obtained by running "asynq ls" command.
|
||||||
|
|
||||||
|
The task enqueued by this command will be processed as soon as the task
|
||||||
|
gets dequeued by a processor.
|
||||||
|
|
||||||
|
Example: asynq enq d:1575732274:bnogo8gt6toe23vhef0g`,
|
||||||
|
Args: cobra.ExactArgs(1),
|
||||||
|
Run: enq,
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
rootCmd.AddCommand(enqCmd)
|
||||||
|
|
||||||
|
// Here you will define your flags and configuration settings.
|
||||||
|
|
||||||
|
// Cobra supports Persistent Flags which will work for this command
|
||||||
|
// and all subcommands, e.g.:
|
||||||
|
// enqCmd.PersistentFlags().String("foo", "", "A help for foo")
|
||||||
|
|
||||||
|
// Cobra supports local flags which will only run when this command
|
||||||
|
// is called directly, e.g.:
|
||||||
|
// enqCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
||||||
|
}
|
||||||
|
|
||||||
|
func enq(cmd *cobra.Command, args []string) {
|
||||||
|
id, score, qtype, err := parseQueryID(args[0])
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
r := rdb.NewRDB(redis.NewClient(&redis.Options{
|
||||||
|
Addr: viper.GetString("uri"),
|
||||||
|
DB: viper.GetInt("db"),
|
||||||
|
Password: viper.GetString("password"),
|
||||||
|
}))
|
||||||
|
switch qtype {
|
||||||
|
case "s":
|
||||||
|
err = r.EnqueueScheduledTask(id, score)
|
||||||
|
case "r":
|
||||||
|
err = r.EnqueueRetryTask(id, score)
|
||||||
|
case "d":
|
||||||
|
err = r.EnqueueDeadTask(id, score)
|
||||||
|
default:
|
||||||
|
fmt.Println("invalid argument")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
fmt.Printf("Successfully enqueued %v\n", args[0])
|
||||||
|
}
|
75
tools/asynq/cmd/enqall.go
Normal file
75
tools/asynq/cmd/enqall.go
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
// Copyright 2020 Kentaro Hibino. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT license
|
||||||
|
// that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package cmd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v7"
|
||||||
|
"github.com/hibiken/asynq/internal/rdb"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/spf13/viper"
|
||||||
|
)
|
||||||
|
|
||||||
|
var enqallValidArgs = []string{"scheduled", "retry", "dead"}
|
||||||
|
|
||||||
|
// enqallCmd represents the enqall command
|
||||||
|
var enqallCmd = &cobra.Command{
|
||||||
|
Use: "enqall [state]",
|
||||||
|
Short: "Enqueues all tasks in the specified state",
|
||||||
|
Long: `Enqall (asynq enqall) will enqueue all tasks in the specified state.
|
||||||
|
|
||||||
|
The argument should be one of "scheduled", "retry", or "dead".
|
||||||
|
|
||||||
|
The tasks enqueued by this command will be processed as soon as it
|
||||||
|
gets dequeued by a processor.
|
||||||
|
|
||||||
|
Example: asynq enqall dead -> Enqueues all dead tasks`,
|
||||||
|
ValidArgs: enqallValidArgs,
|
||||||
|
Args: cobra.ExactValidArgs(1),
|
||||||
|
Run: enqall,
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
rootCmd.AddCommand(enqallCmd)
|
||||||
|
|
||||||
|
// Here you will define your flags and configuration settings.
|
||||||
|
|
||||||
|
// Cobra supports Persistent Flags which will work for this command
|
||||||
|
// and all subcommands, e.g.:
|
||||||
|
// enqallCmd.PersistentFlags().String("foo", "", "A help for foo")
|
||||||
|
|
||||||
|
// Cobra supports local flags which will only run when this command
|
||||||
|
// is called directly, e.g.:
|
||||||
|
// enqallCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
||||||
|
}
|
||||||
|
|
||||||
|
func enqall(cmd *cobra.Command, args []string) {
|
||||||
|
c := redis.NewClient(&redis.Options{
|
||||||
|
Addr: viper.GetString("uri"),
|
||||||
|
DB: viper.GetInt("db"),
|
||||||
|
Password: viper.GetString("password"),
|
||||||
|
})
|
||||||
|
r := rdb.NewRDB(c)
|
||||||
|
var n int64
|
||||||
|
var err error
|
||||||
|
switch args[0] {
|
||||||
|
case "scheduled":
|
||||||
|
n, err = r.EnqueueAllScheduledTasks()
|
||||||
|
case "retry":
|
||||||
|
n, err = r.EnqueueAllRetryTasks()
|
||||||
|
case "dead":
|
||||||
|
n, err = r.EnqueueAllDeadTasks()
|
||||||
|
default:
|
||||||
|
fmt.Printf("error: `asynq enqall [state]` only accepts %v as the argument.\n", enqallValidArgs)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
fmt.Printf("Enqueued %d tasks in %q state\n", n, args[0])
|
||||||
|
}
|
@ -1,52 +0,0 @@
|
|||||||
// Copyright 2022 Kentaro Hibino. All rights reserved.
|
|
||||||
// Use of this source code is governed by a MIT license
|
|
||||||
// that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/MakeNowJust/heredoc/v2"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(groupCmd)
|
|
||||||
groupCmd.AddCommand(groupListCmd)
|
|
||||||
groupListCmd.Flags().StringP("queue", "q", "", "queue to inspect")
|
|
||||||
groupListCmd.MarkFlagRequired("queue")
|
|
||||||
}
|
|
||||||
|
|
||||||
var groupCmd = &cobra.Command{
|
|
||||||
Use: "group <command> [flags]",
|
|
||||||
Short: "Manage groups",
|
|
||||||
Example: heredoc.Doc(`
|
|
||||||
$ asynq group list --queue=myqueue`),
|
|
||||||
}
|
|
||||||
|
|
||||||
var groupListCmd = &cobra.Command{
|
|
||||||
Use: "list",
|
|
||||||
Aliases: []string{"ls"},
|
|
||||||
Short: "List groups",
|
|
||||||
Args: cobra.NoArgs,
|
|
||||||
Run: groupLists,
|
|
||||||
}
|
|
||||||
|
|
||||||
func groupLists(cmd *cobra.Command, args []string) {
|
|
||||||
qname, err := cmd.Flags().GetString("queue")
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
inspector := createInspector()
|
|
||||||
groups, err := inspector.Groups(qname)
|
|
||||||
if len(groups) == 0 {
|
|
||||||
fmt.Printf("No groups found in queue %q\n", qname)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, g := range groups {
|
|
||||||
fmt.Println(g.Group)
|
|
||||||
}
|
|
||||||
}
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user