util: add file system cache
This commit introduces a new utility module called `fscache`. It
implements a cache module that stores data on the file system. It
supports parallel access and protects data with file-system locks. It
provides three basic functions:
FsCache.load("<name>"):
Loads the cache entry with the specified name, acquires a
read-lock and yields control to the caller to use the entry.
Once control returns, the entry is unlocked again.
If the entry cannot be found, a cache miss is signalled via
FsCache.MissError.
FsCache.store("<name>"):
Creates a new anonymous cache entry and yields control to the
caller to fill in. Once control returns, the entry is renamed
to the specified name, thus committing it to the object store.
FsCache.stage():
Create a new anonymous staging entry and yield control to the
caller. Once control returns, the entry is completely
discarded.
This is primarily used to create a working directory for osbuild
pipeline operations. The entries are volatile and automatic
cleanup is provided.
To commit a staging entry, you would eventually use
FsCache.store() and rename the entire data directory into the
non-volatile entry. If the staging area and store are on
different file-systems, or if the data is to be retained for
further operations, then the data directory needs to be copied.
Additionally, the cache maintains a size limit and discards any entries
if the limit is exceeded. Future extensions will implement cache pruning
if a configured watermark is reached, based on last-recently-used
logics.
Many more cache extensions are possible. This module introduces a first
draft of the most basic cache and hopefully lays ground for a new cache
infrastructure.
Lastly, note that this only introduces the utility helper. Further work
is required to hook it up with osbuild/objectstore.py.
This commit is contained in:
parent
efe4ad4b92
commit
4df05b8509
2 changed files with 1343 additions and 0 deletions
1011
osbuild/util/fscache.py
Normal file
1011
osbuild/util/fscache.py
Normal file
File diff suppressed because it is too large
Load diff
332
test/mod/test_util_fscache.py
Normal file
332
test/mod/test_util_fscache.py
Normal file
|
|
@ -0,0 +1,332 @@
|
|||
#
|
||||
# Tests for the 'osbuild.util.fscache' module.
|
||||
#
|
||||
|
||||
# pylint: disable=protected-access
|
||||
|
||||
import os
|
||||
import tempfile
|
||||
|
||||
import pytest
|
||||
|
||||
from osbuild.util import fscache
|
||||
|
||||
|
||||
@pytest.fixture(name="tmpdir")
|
||||
def tmpdir_fixture():
|
||||
with tempfile.TemporaryDirectory(dir="/var/tmp") as tmp:
|
||||
yield tmp
|
||||
|
||||
|
||||
def test_calculate_size(tmpdir):
|
||||
#
|
||||
# Test the `_calculate_size()` helper and verify it only includes file
|
||||
# content in its calculation.
|
||||
#
|
||||
|
||||
os.mkdir(os.path.join(tmpdir, "dir"))
|
||||
|
||||
assert fscache.FsCache._calculate_size(os.path.join(tmpdir, "dir")) == 0
|
||||
|
||||
with open(os.path.join(tmpdir, "dir", "file"), "x", encoding="utf8") as f:
|
||||
pass
|
||||
|
||||
assert fscache.FsCache._calculate_size(os.path.join(tmpdir, "dir")) == 0
|
||||
|
||||
with open(os.path.join(tmpdir, "dir", "file"), "w", encoding="utf8") as f:
|
||||
f.write("foobar")
|
||||
|
||||
assert fscache.FsCache._calculate_size(os.path.join(tmpdir, "dir")) == 6
|
||||
|
||||
|
||||
def test_pathlike(tmpdir: os.PathLike[str]):
|
||||
#
|
||||
# Verify behavior of `__fspath__()`.
|
||||
#
|
||||
|
||||
class Wrapper:
|
||||
def __init__(self, path: str):
|
||||
self._path = path
|
||||
|
||||
def __fspath__(self) -> str:
|
||||
return self._path
|
||||
|
||||
# Test with a plain string as argument
|
||||
dir_str: str = os.fspath(tmpdir)
|
||||
cache1 = fscache.FsCache("osbuild-test-appid", dir_str)
|
||||
assert os.fspath(cache1) == tmpdir
|
||||
assert os.path.join(cache1, "foobar") == os.path.join(tmpdir, "foobar")
|
||||
|
||||
# Test with a wrapper-type as argument
|
||||
dir_pathlike: Wrapper = Wrapper(os.fspath(tmpdir))
|
||||
cache2 = fscache.FsCache("osbuild-test-appid", dir_pathlike)
|
||||
assert os.fspath(cache2) == tmpdir
|
||||
assert os.path.join(cache2, "foobar") == os.path.join(tmpdir, "foobar")
|
||||
|
||||
|
||||
def test_path(tmpdir):
|
||||
#
|
||||
# Verify behavior of `_path()`.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
with cache:
|
||||
assert cache._path() == cache._path_cache
|
||||
assert cache._path("dir") == os.path.join(cache._path_cache, "dir")
|
||||
assert cache._path("dir", "file") == os.path.join(cache._path_cache, "dir", "file")
|
||||
|
||||
|
||||
def test_atomic_open(tmpdir):
|
||||
#
|
||||
# Verify the `_atomic_open()` helper correctly opens existing files and
|
||||
# takes a lock.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
with cache:
|
||||
# Must never create files.
|
||||
with pytest.raises(OSError):
|
||||
with cache._atomic_open("file", write=False, wait=False) as f:
|
||||
pass
|
||||
|
||||
# Create the file with "foo" as content.
|
||||
with open(os.path.join(tmpdir, "file"), "x", encoding="utf8") as f:
|
||||
f.write("foo")
|
||||
|
||||
# Open and acquire a write-lock. Then verify a read-lock fails.
|
||||
with cache._atomic_open("file", write=True, wait=False):
|
||||
with pytest.raises(BlockingIOError):
|
||||
with cache._atomic_open("file", write=False, wait=False):
|
||||
pass
|
||||
|
||||
|
||||
def test_atomic_file(tmpdir):
|
||||
#
|
||||
# Verify behavior of `_atomic_file()` as replacement for `O_TMPFILE`.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
with cache:
|
||||
rpath_store = cache._dirname_objects
|
||||
path_store = os.path.join(cache._path_cache, rpath_store)
|
||||
|
||||
# Initially the store is empty.
|
||||
assert len(list(os.scandir(path_store))) == 0
|
||||
|
||||
# Create a file and verify there is almost exactly 1 file in the store.
|
||||
with cache._atomic_file(os.path.join(rpath_store, "file"), rpath_store) as f:
|
||||
assert len(list(os.scandir(path_store))) == 1
|
||||
f.write("foo")
|
||||
assert len(list(os.scandir(path_store))) == 1
|
||||
|
||||
# Verify `ignore_exist=False` works as expected.
|
||||
with pytest.raises(OSError):
|
||||
with cache._atomic_file(os.path.join(rpath_store, "file"), rpath_store) as f:
|
||||
# Temporarily, there will be 2 files.
|
||||
assert len(list(os.scandir(path_store))) == 2
|
||||
f.write("bar")
|
||||
assert len(list(os.scandir(path_store))) == 1
|
||||
with open(os.path.join(path_store, "file"), "r", encoding="utf8") as f:
|
||||
assert f.read() == "foo"
|
||||
|
||||
# Verify `ignore_exist=True` works as expected.
|
||||
with cache._atomic_file(os.path.join(rpath_store, "file"), rpath_store, ignore_exist=True) as f:
|
||||
f.write("bar")
|
||||
assert len(list(os.scandir(path_store))) == 1
|
||||
with open(os.path.join(path_store, "file"), "r", encoding="utf8") as f:
|
||||
assert f.read() == "foo"
|
||||
|
||||
# Verify `replace=True`.
|
||||
with cache._atomic_file(os.path.join(rpath_store, "file"), rpath_store, replace=True) as f:
|
||||
f.write("bar")
|
||||
assert len(list(os.scandir(path_store))) == 1
|
||||
with open(os.path.join(path_store, "file"), "r", encoding="utf8") as f:
|
||||
assert f.read() == "bar"
|
||||
|
||||
# Combining `replace` and `ignore_exist` is not allowed.
|
||||
with pytest.raises(AssertionError):
|
||||
with cache._atomic_file(
|
||||
os.path.join(rpath_store, "file"),
|
||||
rpath_store,
|
||||
replace=True,
|
||||
ignore_exist=True,
|
||||
) as f:
|
||||
pass
|
||||
|
||||
|
||||
def test_atomic_dir(tmpdir):
|
||||
#
|
||||
# Verify the `_atomic_dir()` helper correctly creates anonymous files
|
||||
# and yields the name and lock-file.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
with cache:
|
||||
# The relative-path must exist, so expect an error if it does not.
|
||||
with pytest.raises(OSError):
|
||||
cache._atomic_dir("dir")
|
||||
|
||||
assert len(list(os.scandir(os.path.join(tmpdir, cache._dirname_objects)))) == 0
|
||||
|
||||
(name, lockfd) = cache._atomic_dir(cache._dirname_objects)
|
||||
assert name.startswith("uuid-")
|
||||
assert len(name) == 37
|
||||
assert lockfd >= 0
|
||||
os.close(lockfd)
|
||||
|
||||
assert len(list(os.scandir(os.path.join(tmpdir, cache._dirname_objects)))) == 1
|
||||
|
||||
|
||||
def test_scaffolding(tmpdir):
|
||||
#
|
||||
# Verify that the cache creates scaffolding when entered.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
|
||||
assert len(list(os.scandir(tmpdir))) == 0
|
||||
|
||||
with cache:
|
||||
pass
|
||||
|
||||
assert len(list(os.scandir(tmpdir))) == 5
|
||||
assert len(list(os.scandir(os.path.join(tmpdir, cache._dirname_objects)))) == 0
|
||||
assert len(list(os.scandir(os.path.join(tmpdir, cache._dirname_stage)))) == 0
|
||||
|
||||
with open(os.path.join(tmpdir, cache._filename_cache_info), "r", encoding="utf8") as f:
|
||||
assert f.read() == "{}"
|
||||
with open(os.path.join(tmpdir, cache._filename_cache_lock), "r", encoding="utf8") as f:
|
||||
assert f.read() == ""
|
||||
with open(os.path.join(tmpdir, cache._filename_cache_size), "r", encoding="utf8") as f:
|
||||
assert f.read() == "0"
|
||||
|
||||
|
||||
def test_cache_info(tmpdir):
|
||||
#
|
||||
# Verify that the cache reads and augments cache information. Also verify
|
||||
# the default values.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
|
||||
with cache:
|
||||
assert cache._info == fscache.FsCacheInfo()
|
||||
assert cache.info == cache._info
|
||||
|
||||
assert cache.info.maximum_size is None
|
||||
assert cache.info.creation_boot_id is None
|
||||
cache.info = fscache.FsCacheInfo(maximum_size=1024)
|
||||
assert cache.info.maximum_size == 1024
|
||||
assert cache.info.creation_boot_id is None
|
||||
cache.info = fscache.FsCacheInfo(creation_boot_id="0"*32)
|
||||
assert cache.info.maximum_size == 1024
|
||||
assert cache.info.creation_boot_id == "0"*32
|
||||
cache.info = fscache.FsCacheInfo(maximum_size=2048, creation_boot_id="1"*32)
|
||||
assert cache.info.maximum_size == 2048
|
||||
assert cache.info.creation_boot_id == "1"*32
|
||||
|
||||
assert not fscache.FsCacheInfo().to_json()
|
||||
assert fscache.FsCacheInfo(creation_boot_id="0"*32).to_json() == {
|
||||
"creation-boot-id": "0"*32,
|
||||
}
|
||||
assert fscache.FsCacheInfo(creation_boot_id="0"*32, maximum_size=1024).to_json() == {
|
||||
"creation-boot-id": "0"*32,
|
||||
"maximum-size": 1024,
|
||||
}
|
||||
|
||||
assert fscache.FsCacheInfo.from_json({}) == fscache.FsCacheInfo()
|
||||
assert fscache.FsCacheInfo.from_json(None) == fscache.FsCacheInfo()
|
||||
assert fscache.FsCacheInfo.from_json("foobar") == fscache.FsCacheInfo()
|
||||
assert fscache.FsCacheInfo.from_json({
|
||||
"creation-boot-id": "0"*32,
|
||||
}) == fscache.FsCacheInfo(creation_boot_id="0"*32)
|
||||
assert fscache.FsCacheInfo.from_json({
|
||||
"creation-boot-id": "0"*32,
|
||||
"maximum-size": 1024,
|
||||
}) == fscache.FsCacheInfo(creation_boot_id="0"*32, maximum_size=1024)
|
||||
assert fscache.FsCacheInfo.from_json({
|
||||
"creation-boot-id": "0"*32,
|
||||
"maximum-size": 1024,
|
||||
}) == fscache.FsCacheInfo(creation_boot_id="0"*32, maximum_size=1024)
|
||||
assert fscache.FsCacheInfo.from_json({
|
||||
"creation-boot-id": "0"*32,
|
||||
"unknown0": "foobar",
|
||||
"unknown1": ["foo", "bar"],
|
||||
}) == fscache.FsCacheInfo(creation_boot_id="0"*32)
|
||||
|
||||
|
||||
def test_store(tmpdir):
|
||||
#
|
||||
# API tests for the `store()` method.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
|
||||
with pytest.raises(AssertionError):
|
||||
with cache.store("foobar"):
|
||||
pass
|
||||
|
||||
with cache:
|
||||
with pytest.raises(ValueError):
|
||||
with cache.store(""):
|
||||
pass
|
||||
|
||||
|
||||
def test_load(tmpdir):
|
||||
#
|
||||
# API tests for the `load()` method.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
|
||||
with pytest.raises(AssertionError):
|
||||
with cache.load("foobar"):
|
||||
pass
|
||||
|
||||
with cache:
|
||||
with pytest.raises(ValueError):
|
||||
with cache.load(""):
|
||||
pass
|
||||
|
||||
|
||||
def test_basic(tmpdir):
|
||||
#
|
||||
# A basic cache store+load test.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
with cache:
|
||||
cache.info = cache.info._replace(maximum_size=1024)
|
||||
|
||||
with cache.stage() as rpath:
|
||||
with open(os.path.join(tmpdir, rpath, "bar"), "x", encoding="utf8") as f:
|
||||
f.write("foobar")
|
||||
|
||||
with pytest.raises(fscache.FsCache.MissError):
|
||||
with cache.load("foo") as rpath:
|
||||
pass
|
||||
|
||||
with cache.store("foo") as rpath:
|
||||
with open(os.path.join(tmpdir, rpath, "bar"), "x", encoding="utf8") as f:
|
||||
f.write("foobar")
|
||||
|
||||
with cache.load("foo") as rpath:
|
||||
with open(os.path.join(tmpdir, rpath, "bar"), "r", encoding="utf8") as f:
|
||||
assert f.read() == "foobar"
|
||||
|
||||
|
||||
def test_size_discard(tmpdir):
|
||||
#
|
||||
# Verify that a cache with no maximum-size configured can never store any
|
||||
# entries, but discards them immediately.
|
||||
#
|
||||
|
||||
cache = fscache.FsCache("osbuild-test-appid", tmpdir)
|
||||
with cache:
|
||||
with cache.store("foo") as rpath:
|
||||
with open(os.path.join(tmpdir, rpath, "bar"), "x", encoding="utf8") as f:
|
||||
f.write("foobar")
|
||||
|
||||
with pytest.raises(fscache.FsCache.MissError):
|
||||
with cache.load("foo") as rpath:
|
||||
pass
|
||||
Loading…
Add table
Add a link
Reference in a new issue