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

Archive: mark the daily archive as successful, only after it was really successful #12720

Merged
merged 1 commit into from Apr 12, 2018

Conversation

mattab
Copy link
Member

@mattab mattab commented Apr 12, 2018

and simplify and fix some related logic

This PR is based on #12702 and this PR should be merged before #12702

@mattab mattab added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Apr 12, 2018
@mattab mattab added this to the 3.5.0 milestone Apr 12, 2018
// Also reprocess when day has ended since last run
if ($dayHasEndedMustReprocess
// it might have reprocessed for that day by another cron
&& !$this->hasBeenProcessedSinceMidnight($idSite, $lastTimestampWebsiteProcessedDay)
Copy link
Member Author

Choose a reason for hiding this comment

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

the logic was actually wrong in this code! It should have been || in this line and below, instead of &&. so it was fixed on purpose

@mattab mattab merged commit 20b8425 into archivenottwice Apr 12, 2018
@mattab mattab deleted the archivedtwice_fix_state_when_failed_archive branch April 12, 2018 05:42
mattab pushed a commit that referenced this pull request Apr 23, 2018
* Do not run the same archive command twice

* simplify

*  During core:archive when a day or period archiving fails for a website, abort the website archiving (#12708)

* If one of the period archiving fails, we now cancel the remaining archiving processes
* Increment the skipped counter

* also exit when a day period is already active

* undo last commit

* if day archive fails, then do not proceed archiving periods

* Minor changes

* Archive: mark the daily archive as successful, only after it was really successful (#12720)

+ Simplify & fix some logic

* do not archive a period when a sub period is processing (#12719)
InfinityVoid pushed a commit to InfinityVoid/matomo that referenced this pull request Oct 11, 2018
* Do not run the same archive command twice

* simplify

*  During core:archive when a day or period archiving fails for a website, abort the website archiving (matomo-org#12708)

* If one of the period archiving fails, we now cancel the remaining archiving processes
* Increment the skipped counter

* also exit when a day period is already active

* undo last commit

* if day archive fails, then do not proceed archiving periods

* Minor changes

* Archive: mark the daily archive as successful, only after it was really successful (matomo-org#12720)

+ Simplify & fix some logic

* do not archive a period when a sub period is processing (matomo-org#12719)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant