-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
initial draft
- Loading branch information
Showing
1 changed file
with
160 additions
and
0 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
|
|
||
| # ADR-001: Project Locks | ||
|
|
||
| - Date: 2023-04-18 | ||
| - Status: Draft | ||
|
|
||
| ## Context and Problem Statement | ||
|
|
||
| ### Problem | ||
|
|
||
| We will be focusing on the latter two in this document. There is a long-standing regression introduced by a PR to allow parallel plans to happen for projects within the same repository that also belongs in the same workspace. The error prompting users when attempting to plan is: | ||
| ``` | ||
| The default workspace at path . is currently locked by another command that is running for this pull request. | ||
| Wait until the previous command is complete and try again. | ||
| ``` | ||
| ### Context | ||
|
|
||
| There are multiple locks that occur during the lifecycle of a Pull Request event in Atlantis. The two main locks that pertain to this are: | ||
|
|
||
| - Project locks (overall project lock - stored in DB) | ||
| - Working Dir locks (file operations - not stored in DB) | ||
|
|
||
| #### Project Locks + Atlantis Models | ||
| There are four main model classes that pertain to this issue: | ||
|
|
||
| - [Repo](https://github.com/runatlantis/atlantis/blob/main/server/events/models/models.go#L40-L62) | ||
| - [PullRequest](https://github.com/runatlantis/atlantis/blob/main/server/events/models/models.go#L155-L180) | ||
| - [Project](https://github.com/runatlantis/atlantis/blob/main/server/events/models/models.go#L245-L255) | ||
| - Project represents a Terraform project. Since there may be multiple Terraform projects in a single repo we also include Path to the project root relative to the repo root. | ||
| - [ProjectLock](https://github.com/runatlantis/atlantis/blob/main/server/events/models/models.go#L225-L240) | ||
| - ProjectLock represents a lock on a project. | ||
|
|
||
| Each Repo can have many Pull Requests (One to Many) | ||
| Each Pull Request can have many Projects (Many to Many) | ||
| Each ProjectLock has one Project (One to One) | ||
|
|
||
| #### Working Dir Loccks | ||
| [Working Dir locks](https://github.com/runatlantis/atlantis/blob/main/server/events/working_dir_locker.go#L29-L52) are not part of the backend DB and thus do not have a model, instead its in-memory in `working_dir_locker` | ||
|
|
||
| Currently can lock the entire PR or per workspace + path | ||
| - T[ryLockPull](https://github.com/runatlantis/atlantis/blob/f4fa3138d7a9dfdb494105597dce88366effff9e/server/events/working_dir_locker.go#L59-L75): Repo + PR + workspace | ||
| - [TryLock](https://github.com/runatlantis/atlantis/blob/f4fa3138d7a9dfdb494105597dce88366effff9e/server/events/working_dir_locker.go#L77-L94): Repo + PR + workspace + path | ||
|
|
||
| #### Stack Walk Overview | ||
|
|
||
| Here is a high-level view of what happens when a Pull Request is opened with an auto-plan: | ||
|
|
||
| 1. Events Controller accepts POST webhook and determines which VCS client to handle the request | ||
| 2. VCSEventsController determines what type of VCS event (opened) and calls RunPlanCommand in CommandRunner | ||
| 3. CommandRunner validates the context and runs pre-hooks (if they exist) | ||
| 1. WorkingDirLocker locks - `w.WorkingDirLocker.TryLock(baseRepo.FullName, pull.Num, DefaultWorkspace, DefaultRepoRelDir)` | ||
| 2. Git Repo is cloned - `w.WorkingDir.Clone(log, headRepo, pull, DefaultWorkspace)` | ||
| 3. run hooks | ||
| 4. WorkingDir lock is released when the pre-hook function returns | ||
| 4. CommandRunner determines which command runner to use (Plan) | ||
| 5. PlanCommandRunner determines projects affected by the Pull Request by calling projectCmdBuilder | ||
| 1. VCS client returns modified files | ||
| 2. returns here/skips cloning in some cases `--skip-clone-no-changes` | ||
| 3. WorkingDirLocker locks - `p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, workspace, DefaultRepoRelDir)` | ||
| 4. Git Repo is cloned - `p.WorkingDir.Clone(ctx.Log, ctx.HeadRepo, ctx.Pull, workspace)` | ||
| 5. parses server and repo configs | ||
| 6. determines projects and returns them | ||
| 7. WorkingDir lock is released | ||
| 6. PlanCommandRunner cleans up previous plans and Project locks | ||
| 7. PlanCommandRunner passes ProjectCommandRunner and a list of projects to ProjectCommandPoolExecutor which executes `ProjectCommandRunner.doPlan` | ||
| 8. ProjectCommandRunner.doPlan | ||
| 1. acquires Project lock - `p.Locker.TryLock(ctx.Log, ctx.Pull, ctx.User, ctx.Workspace, models.NewProject(ctx.Pull.BaseRepo.FullName, ctx.RepoRelDir), ctx.RepoLocking)` | ||
| 2. acquires Working Dir lock - `p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, ctx.Workspace, ctx.RepoRelDir)` | ||
| 3. Git Repo is cloned - `p.WorkingDir.Clone(ctx.Log, ctx.HeadRepo, ctx.Pull, ctx.Workspace)` | ||
| 4. Validates Plan Requirements (if any) | ||
| 5. runs project plan steps (runtime.<step>) | ||
| 6. return Plan output | ||
| 9. update Pull Request w/ comment, update backend DB and update commit status | ||
| 10. fin | ||
|
|
||
| Note: This skips over and summarizes some function calls, it's a rough high-level stack walk. | ||
|
|
||
| We call Working Dir lock at least `Θ(n) + 2` as well as Project locks `Θ(n)`. Originally, Atlantis only locked based on BaseRepo name, Pull Request number, and workspace. This was introduced in v0.13.0. | ||
|
|
||
| #### Previous attempts to fix | ||
|
|
||
| To allow parallel plans for projects in the same TF workspace, PR [#2131](https://github.com/runatlantis/atlantis/pull/2131) introduced `path` to the `working_dir_locker` and `locks_controller`. | ||
|
|
||
| An additional PR was made PR [#2180](https://github.com/runatlantis/atlantis/pull/2180) because the original PR unblocked `working_dir` that had directory locks at different paths, causing collision because `working_dir` was unaware of different project paths within the same repository. The attempt was to clone even more times at different paths inside each workspace by appending a base32 encoded string of the project path. This was reverted due to another issue [#2239](https://github.com/runatlantis/atlantis/issues/2239). | ||
|
|
||
| This is due to a combination of different directories passed to Working Dir when cloning the repository during the pre-workflow hook and during a plan. | ||
|
|
||
| ## Goals & Non-Goals | ||
|
|
||
| ### Goals | ||
| - Alignment on what Atlantis should or shouldn't be locking | ||
| - Focus on small scope changes related only to locking | ||
| - Supports all workflow use-cases | ||
| - Terraform w/o workspaces | ||
| - Terraform w/ workspaces | ||
| - Terragrunt monorepo | ||
|
|
||
| ### Non-Goals | ||
| - Making changes/improvements to other packages/sub-systems | ||
| - Avoid massive refactor if possible | ||
| - Focus on a singular workflow | ||
|
|
||
| ## Solutions | ||
|
|
||
| ### Previous attempts | ||
| There have been a couple of PRs submitted that have either been reverted, or grown stale: | ||
|
|
||
| - add path to WorkingDir [#2180](https://github.com/runatlantis/atlantis/pull/2180) | ||
| - base32 encodes the path provided | ||
| - Uses the unique base32 string to additional clone the repo to unique directories to avoid plan file overlap per project + workspace | ||
| - add non-default workspaces to workflow hooks [#2882](https://github.com/runatlantis/atlantis/pull/2882) | ||
| - reintroduces #2180 changes to working_dir | ||
| - run hooks on the default workspace | ||
| - also run hooks on every project found | ||
| - significant increase in execution time, especially for Terragrunt users relying on terragrunt-atlantis-config | ||
| - reduce the amount of git clone operations [#2921](https://github.com/runatlantis/atlantis/pull/2921) | ||
| - started to try to reduce execution time on #2882 implementation | ||
| - attempts to utilize [TF_DATA_DIR](https://developer.hashicorp.com/terraform/cli/config/environment-variables#tf_data_dir) for workspaces and remove the workspace for the lock. | ||
| - Clones only at BaseRepo/PR# and moves workspaces from Atlantis clones to TF workspace managed | ||
|
|
||
| This is not to suggest the revival of these PRs in their current state but to act as a reference for additional focused solutions. | ||
|
|
||
| ### Possible Solutions | ||
| **Note**: Some of these solutions will purposely be contradictory to the ADR Goals or Non-Goals in an effort to flesh out alternatives and to assist in the decision-making process. | ||
|
|
||
|
|
||
|
|
||
| ### Solution 1: Clone once + TF_DATA_DIR | ||
|
|
||
| Take PR #2921 and re-implement locks on the DATA_DIR only for plans and the entire base repo + PR for git clones. | ||
|
|
||
| **TO-DO**: flesh out | ||
|
|
||
| ### Solution 2: Clone once + move plans into state/backend | ||
|
|
||
| Take PR #2921 and remove the concept of locking on workspace/path. Clone only once during Pull Request events (commit updates) and not during Atlantis commands (plan/apply). | ||
|
|
||
| **TO-DO**: figure out how to process plan files/and where to output other than disk. | ||
|
|
||
| ### Solution 3: Revert #2131 | ||
|
|
||
| The original change that introduced `path` to the WorkingDirLocker could be reverted and fall back on known behavior. | ||
|
|
||
| ... | ||
|
|
||
| ## Decision | ||
|
|
||
| TBD | ||
|
|
||
| ## Links | ||
|
|
||
| https://github.com/runatlantis/atlantis/issues/1914 | ||
| https://github.com/runatlantis/atlantis/pull/2131 | ||
| https://github.com/runatlantis/atlantis/pull/2180 | ||
| https://github.com/runatlantis/atlantis/pull/2882 | ||
| https://github.com/runatlantis/atlantis/pull/2921 | ||
| https://developer.hashicorp.com/terraform/cli/config/environment-variables#tf_data_dir | ||
| https://github.com/runatlantis/atlantis/blob/main/server/events/models/models.go | ||
| https://github.com/runatlantis/atlantis/blob/main/server/events/working_dir.go | ||
| https://github.com/runatlantis/atlantis/blob/main/server/events/working_dir_locker.go |