-
Notifications
You must be signed in to change notification settings - Fork 73
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: lock shared cache directory (#1888)
Locks the shared cache directory to prevent concurrency issues. Fixes #1845 CRAFT-3313
- Loading branch information
Showing
8 changed files
with
311 additions
and
49 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 |
---|---|---|
|
@@ -80,6 +80,9 @@ jobs: | |
run: | | ||
sudo apt update | ||
sudo apt install -y python3-pip python3-setuptools python3-wheel python3-venv libapt-pkg-dev | ||
- name: Setup LXD | ||
uses: canonical/[email protected] | ||
if: ${{ runner.os == 'Linux' }} | ||
- name: Install skopeo (mac) | ||
# This is only necessary for Linux until skopeo >= 1.11 is in repos. | ||
# Once we're running on Noble, we can get skopeo from apt. | ||
|
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
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
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
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
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
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,103 @@ | ||
# Copyright 2024 Canonical Ltd. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
# For further info, check https://github.com/canonical/charmcraft | ||
"""Integration tests for the provider service.""" | ||
|
||
import pathlib | ||
import shutil | ||
import subprocess | ||
import sys | ||
|
||
import pytest | ||
from craft_application.models import BuildInfo | ||
from craft_cli.pytest_plugin import RecordingEmitter | ||
|
||
from charmcraft import services | ||
from charmcraft.services.provider import _maybe_lock_cache | ||
|
||
|
||
@pytest.mark.skipif(sys.platform == "win32", reason="no cache on windows") | ||
def test_lock_cache( | ||
service_factory: services.CharmcraftServiceFactory, | ||
tmp_path: pathlib.Path, | ||
default_build_info: BuildInfo, | ||
emitter: RecordingEmitter, | ||
): | ||
cache_path = tmp_path / "cache" | ||
cache_path.mkdir() | ||
lock_file = cache_path / "charmcraft.lock" | ||
bash_lock_cmd = ["bash", "-c", f"flock -n {lock_file} true"] if shutil.which("flock") else None | ||
provider = service_factory.provider | ||
provider_kwargs = { | ||
"build_info": default_build_info, | ||
"work_dir": pathlib.Path(__file__).parent, | ||
"cache_path": cache_path, | ||
} | ||
assert not lock_file.exists() | ||
|
||
with provider.instance(**provider_kwargs): | ||
# Test that the cache lock gets created | ||
assert lock_file.is_file() | ||
if bash_lock_cmd: | ||
with pytest.raises(subprocess.CalledProcessError): | ||
# Another process should not be able to lock the file. | ||
subprocess.run(bash_lock_cmd, check=True) | ||
|
||
# After exiting we should be able to lock the file. | ||
if bash_lock_cmd: | ||
subprocess.run(bash_lock_cmd, check=True) | ||
|
||
|
||
@pytest.mark.skipif(sys.platform == "win32", reason="no cache on windows") | ||
def test_locked_cache_no_cache( | ||
service_factory: services.CharmcraftServiceFactory, | ||
tmp_path: pathlib.Path, | ||
default_build_info: BuildInfo, | ||
emitter: RecordingEmitter, | ||
): | ||
cache_path = tmp_path / "cache" | ||
cache_path.mkdir() | ||
lock_file = cache_path / "charmcraft.lock" | ||
|
||
bash_lock_cmd = ["bash", "-c", f"flock -n {lock_file} true"] if shutil.which("flock") else None | ||
# Check that we can lock the file from another process. | ||
if bash_lock_cmd: | ||
subprocess.run(bash_lock_cmd, check=True) | ||
_ = _maybe_lock_cache(cache_path) | ||
# And now we can't. | ||
if bash_lock_cmd: | ||
with pytest.raises(subprocess.CalledProcessError): | ||
subprocess.run(bash_lock_cmd, check=True) | ||
|
||
provider = service_factory.provider | ||
provider_kwargs = { | ||
"build_info": default_build_info, | ||
"work_dir": pathlib.Path(__file__).parent, | ||
"cache_path": cache_path, | ||
} | ||
|
||
with provider.instance(**provider_kwargs) as instance: | ||
# Create a file in the cache and ensure it's not visible in the outer fs | ||
instance.execute_run(["touch", "/root/.cache/cache_cached"]) | ||
|
||
# Because we've already locked the cache, we don't get a subdirectory in | ||
# the cache, and thus the touch command inside there only affected the | ||
# instance cache and not the shared cache. | ||
assert list(cache_path.iterdir()) == [cache_path / "charmcraft.lock"] | ||
emitter.assert_progress( | ||
"Shared cache locked by another process; running without cache.", permanent=True | ||
) | ||
|
||
assert not (tmp_path / "cache_cached").exists() |
Oops, something went wrong.