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

[5.x] Don't overlap git commits #11327

Closed
wants to merge 5 commits into from

Conversation

edalzell
Copy link
Contributor

@edalzell edalzell commented Jan 7, 2025

Closes #11322

@edalzell edalzell requested a review from jesseleite January 7, 2025 21:42
@edalzell edalzell changed the title Don't overlap git commits [5.x] Don't overlap git commits Jan 7, 2025
src/Git/CommitJob.php Outdated Show resolved Hide resolved
@edalzell edalzell marked this pull request as draft January 7, 2025 23:00
@edalzell
Copy link
Contributor Author

@jesseleite I rolled this out to production and got this error:

Request URL: https://www.zakat.org/
Request data: []
Statamic\Git\CommitJob has been attempted too many times.
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/MaxAttemptsExceededException.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/MaxAttemptsExceededException.php) (24)
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php) (794)
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php) (528)
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php) (431)
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php) (392)
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Worker.php) (178)
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php) (149)
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php) (132)
/home/forge/[www.zakat.org/vendor/laravel/horizon/src/Console/WorkCommand.php](http://www.zakat.org/vendor/laravel/horizon/src/Console/WorkCommand.php) (51)
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php) (36)
/home/forge/[www.zakat.org/vendor/laravel/framework/src/Illuminate/Container/Util.php](http://www.zakat.org/vendor/laravel/framework/src/Illuminate/Container/Util.php) (43)

So I guess it tried 3 times, failed, then threw an exception?

Suggestions on best way to handle? Like if the lock goes away on its own later those commits will be handled, but there's no guarantee that there's another content change, so I'd rather ensure these actually get committed.

Let's discuss.

@edalzell
Copy link
Contributor Author

Not worth it right now, will leave the issue open and switch to scheduled commits.

@edalzell edalzell closed this Jan 14, 2025
@edalzell edalzell deleted the fix/no-overlapping-git branch January 14, 2025 21:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auto-commit throwing many errors
2 participants