Page MenuHomePhabricator

If git_repo isn't set, lock scap sync*
ClosedPublic

Authored by thcipriani on Sep 5 2017, 7:59 PM.

Details

Maniphest Tasks
T175041: scap sync failed on i18n
Reviewers
demon
mmodell
Group Reviewers
Release-Engineering-Team
Commits
rMSCA3955f36fe41a: If git_repo isn't set, lock scap sync*
Patch without arc
git checkout -b D767 && curl -L https://phabricator.wikimedia.org/D767?download=true | git apply
Summary

Since deployments for non-mediawiki repos require git_repo to be set, if
git_repo isn't set when creating a lock file, that lock file is to
prevent the deployment of the mediawiki repo.

This caused problems when the git_repo was set in
/srv/mediawiki-staging/scap/scap.cfg. Since scap only looks for
configuration files in /etc/scap.cfg and ./scap/scap.cfg when
deploying from /srv/mediawiki-staging git_repo was set creating the
lockfile /var/lock/scap.operations_mediawiki-config.lock; however,
when running scap sync from /srv/ (or anywhere other than
/srv/mediawiki-staging) scap looked for the lockfile
/var/lock/scap.unknown-but-probably-mediawiki.lock. This allowed
parallel deploys of mediawiki to happen under certain circumstances
which causes unforeseeable issues.

Fixes T175041

Diff Detail

Repository
rMSCA Scap
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

thcipriani created this revision.Sep 5 2017, 7:59 PM
Restricted Application added a reviewer: mmodell. · View Herald TranscriptSep 5 2017, 7:59 PM
Restricted Application added a reviewer: Release-Engineering-Team. · View Herald Transcript
Restricted Application added a project: Release-Engineering-Team. · View Herald Transcript
demon accepted this revision.Sep 5 2017, 9:30 PM
This revision is now accepted and ready to land.Sep 5 2017, 9:30 PM
mmodell accepted this revision.Sep 22 2017, 8:26 PM

@thcipriani: Wanna merge this one?

In D767#15753, @mmodell wrote:

@thcipriani: Wanna merge this one?

Yep. Didn't realize I was sitting on it :)

This revision was automatically updated to reflect the committed changes.