From 0d269e7f858f855e7738ed7ea040c76221c50025 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 28 Sep 2024 21:16:56 +0200
Subject: [PATCH] give borgstore.Store a complete levels configuration, fixes
 #8432

also:
- add BORG_STORE_DATA_LEVELS=2 env var
- use BORG_STORE_DATA_LEVELS=0 to speed up tests
---
 src/borg/repository.py             | 13 +++++++++++--
 src/borg/testsuite/conftest.py     |  1 +
 src/borg/testsuite/storelocking.py |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/borg/repository.py b/src/borg/repository.py
index d2e6fac69..82a049d7a 100644
--- a/src/borg/repository.py
+++ b/src/borg/repository.py
@@ -116,9 +116,18 @@ class Repository:
             url = "file://%s" % os.path.abspath(path_or_location)
             location = Location(url)
         self._location = location
-        # use a Store with flat config storage and 2-levels-nested data storage
+        # lots of stuff in data: use 2 levels by default (data/00/00/ .. data/ff/ff/ dirs)!
+        data_levels = int(os.environ.get("BORG_STORE_DATA_LEVELS", "2"))
+        levels_config = {
+            "archives/": [0],
+            "cache/": [0],
+            "config/": [0],
+            "data/": [data_levels],
+            "keys/": [0],
+            "locks/": [0],
+        }
         try:
-            self.store = Store(url, levels={"config/": [0], "data/": [2]})
+            self.store = Store(url, levels=levels_config)
         except StoreBackendError as e:
             raise Error(str(e))
         self.version = None
diff --git a/src/borg/testsuite/conftest.py b/src/borg/testsuite/conftest.py
index 000df1b92..fc3862688 100644
--- a/src/borg/testsuite/conftest.py
+++ b/src/borg/testsuite/conftest.py
@@ -30,6 +30,7 @@ def clean_env(tmpdir_factory, monkeypatch):
     monkeypatch.setenv("BORG_BASE_DIR", str(tmpdir_factory.mktemp("borg-base-dir")))
     # Speed up tests
     monkeypatch.setenv("BORG_TESTONLY_WEAKEN_KDF", "1")
+    monkeypatch.setenv("BORG_STORE_DATA_LEVELS", "0")  # flat storage for few objects
 
 
 def pytest_report_header(config, start_path):
diff --git a/src/borg/testsuite/storelocking.py b/src/borg/testsuite/storelocking.py
index 4fbf0be34..3b584c48d 100644
--- a/src/borg/testsuite/storelocking.py
+++ b/src/borg/testsuite/storelocking.py
@@ -12,7 +12,7 @@ ID2 = "bar", 2, 2
 
 @pytest.fixture()
 def lockstore(tmpdir):
-    store = Store("file://" + str(tmpdir / "lockstore"))
+    store = Store("file://" + str(tmpdir / "lockstore"), levels={"locks/": [0]})
     store.create()
     with store:
         yield store