feat: 上云周期任务添加最低任务间隔时间配置 --story=120737215 #7619
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--bug=129170523 # Reviewed, transaction id: 23091
# Reviewed, transaction id: 23746
# Reviewed, transaction id: 24302
normal-wls
requested changes
Nov 21, 2024
normal-wls
requested changes
Nov 25, 2024
| @@ -234,6 +237,19 @@ def test_delete(self): | |||
| PipelinePeriodicTask.DoesNotExist, PipelinePeriodicTask.objects.get, id=pipeline_periodic_task_id | |||
| ) | |||
|
|
|||
| def test_inspect_time(self): | |||
There was a problem hiding this comment.
测试样例：
- 全是 *
- 没有超过时间限制的
- 前面 n 次内有超过时间的
- 前面 n 次没有超过时间限制，但是 n 次之后超过的
…nto edit_time_interval
normal-wls
requested changes
Nov 25, 2024
env.py
Outdated
| # 周期任务最短时间间隔，以分钟为单位，例如：30 | ||
| PERIODIC_TASK_SHORTEST_TIME = os.getenv("PERIODIC_TASK_SHORTEST_TIME", "") | ||
| # 周期任务迭代次数 | ||
| PERIODIC_TASK_ITERATION = os.getenv("PERIODIC_TASK_ITERATION", 10) |
| item_num=int(settings.PERIODIC_TASK_ITERATION), | ||
| ) | ||
| if not result: | ||
| raise ValidationException( |
There was a problem hiding this comment.
这里理论上用 serializer 校验失败的 exception
| return attrs | ||
|
|
||
| def inspect_time(self, request, cron): | ||
| if settings.PERIODIC_TASK_SHORTEST_TIME: |
There was a problem hiding this comment.
if not settings.PERIODIC_TASK_SHORTEST_TIME:
return
env.py
Outdated
| @@ -150,6 +150,11 @@ | |||
| # 周期任务消息通知类型 | |||
| PERIODIC_TASK_REMINDER_NOTIFY_TYPE = json.loads(os.getenv("PERIODIC_TASK_REMINDER_NOTIFY_TYPE", '["email"]')) | |||
|
|
|||
| # 周期任务最短时间间隔，以分钟为单位，例如：30 | |||
| PERIODIC_TASK_SHORTEST_TIME = os.getenv("PERIODIC_TASK_SHORTEST_TIME", "") | |||
There was a problem hiding this comment.
如果是 30，是否用 int 比较合理，默认 0 代表没有限制
gcloud/periodictask/models.py
Outdated
| @@ -254,6 +256,38 @@ def delete(self, using=None): | |||
| super(PeriodicTask, self).delete(using) | |||
| PeriodicTaskHistory.objects.filter(task=self).delete() | |||
|
|
|||
| def inspect_time(self, is_superuser, cron, shortest_time, item_num): | |||
gcloud/periodictask/models.py
Outdated
|
|
||
| schedule_iter = croniter(cron_expression) | ||
| # 计算指定次数内的最短时间间隔 | ||
| next_times = [schedule_iter.get_next(datetime) for _ in range(item_num)] |
There was a problem hiding this comment.
如果是后面只会执行一次或两次的，item_num 过大会不会有问题，补充下单测
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.