Skip to content
New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/pipeline cron compensate #3119

Merged
merged 1 commit into from
Nov 22, 2021

Conversation

chengjoey
Copy link
Contributor

@chengjoey chengjoey commented Nov 19, 2021

What type of this PR

Add one of the following kinds:
/kind bugfix

What this PR does / why we need it:

cron compensator judge cron start time with trigger time

Which issue(s) this PR fixes:

Specified Reviewers:

/assign @your-reviewer

ChangeLog

Language Changelog
🇺🇸 English Fix the bug that cron compensator stiill create pipeine
🇨🇳 中文 修复了在执行时间大于触发时间的情况下,pipeline定时补偿仍然创建流水线的问题

Need cherry-pick to release versions?

Add comment like /cherry-pick release/1.0 when this PR is merged.

For details on the cherry pick process, see the cherry pick requests section under CONTRIBUTING.md.

@chengjoey chengjoey added bugfix pipeline pipeline service labels Nov 19, 2021
@codecov
Copy link

codecov bot commented Nov 19, 2021

Codecov Report

Merging #3119 (bb43b5e) into master (e9ffe30) will decrease coverage by 0.00%.
The diff coverage is 35.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3119      +/-   ##
==========================================
- Coverage   17.37%   17.37%   -0.01%     
==========================================
  Files        1361     1361              
  Lines      140447   140430      -17     
==========================================
- Hits        24401    24397       -4     
- Misses     113500   113537      +37     
+ Partials     2546     2496      -50     
Impacted Files Coverage Δ
modules/pipeline/services/pipelinesvc/cron.go 0.00% <0.00%> (ø)
...s/pipeline/services/pipelinesvc/cron_compensate.go 13.49% <38.46%> (+1.50%) ⬆️
...components/cmp-dashboard-pods/podsCharts/render.go 38.77% <0.00%> (-3.23%) ⬇️
modules/actionagent/file_watch_collector.go 46.15% <0.00%> (-1.54%) ⬇️
modules/cmp/component-protocol/cputil/util.go 18.28% <0.00%> (-1.49%) ⬇️
modules/actionagent/file_watch.go 32.92% <0.00%> (-0.81%) ⬇️
...ents/cmp-dashboard-workloads-list/filter/render.go 12.76% <0.00%> (-0.43%) ⬇️
.../cmp-dashboard-workload-detail/podsTable/render.go 23.47% <0.00%> (-0.15%) ⬇️
modules/actionagent/execute.go 0.00% <0.00%> (ø)
modules/actionagent/prestop.go 100.00% <0.00%> (ø)
... and 5 more

@chengjoey chengjoey force-pushed the fix/pipeline-cron-compensate branch from 1909618 to 98f3c6d Compare November 19, 2021 09:13
@chengjoey
Copy link
Contributor Author

chengjoey commented Nov 19, 2021

image

@@ -57,9 +57,13 @@ func (s *PipelineSvc) RunCronPipelineFunc(id uint64) {
}

// 如果当前触发时间小于定时开始时间,return
Copy link
Contributor

Choose a reason for hiding this comment

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

translate into english, pls

Copy link
Contributor Author

Choose a reason for hiding this comment

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

adjusted

@chengjoey chengjoey force-pushed the fix/pipeline-cron-compensate branch from 98f3c6d to bb43b5e Compare November 22, 2021 05:43
@sfwn
Copy link
Member

sfwn commented Nov 22, 2021

Adjust your Chinese changelog.

@chengjoey
Copy link
Contributor Author

Adjust your Chinese changelog.

adjusted

@sfwn sfwn merged commit c87a1f8 into erda-project:master Nov 22, 2021
@sfwn
Copy link
Member

sfwn commented Dec 2, 2021

/cherry-pick release/1.4 release/1.3

erda-bot pushed a commit to erda-bot/erda that referenced this pull request Dec 2, 2021
erda-bot pushed a commit to erda-bot/erda that referenced this pull request Dec 2, 2021
erda-bot added a commit that referenced this pull request Dec 2, 2021
Co-authored-by: chengjoey <30427474+chengjoey@users.noreply.github.com>
erda-bot added a commit that referenced this pull request Dec 2, 2021
Co-authored-by: chengjoey <30427474+chengjoey@users.noreply.github.com>
@chengjoey chengjoey deleted the fix/pipeline-cron-compensate branch April 18, 2022 02:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix pipeline pipeline service
Development

Successfully merging this pull request may close these issues.

3 participants