@@ -553,7 +553,51 @@ def test_zero_effective_quota_reads_without_retaining(tmp_path):
553553 assert carrier_path .read_bytes () == before
554554
555555
556- def test_customer_quota_reduces_the_proxy_cache_limit (monkeypatch ):
556+ @pytest .mark .parametrize ("limit" , [None , 1_000_000 ])
557+ def test_read_only_cache_reuses_warm_chunks_and_does_not_retain_misses (tmp_path , limit ):
558+ proxy , data , path = _server_proxy (tmp_path , "readonly-cache" , max_cache_bytes = limit )
559+ proxy .get_chunk (0 )
560+ before = path .read_bytes ()
561+ mtime = path .stat ().st_mtime_ns
562+ proxy .src .traffic .reset ()
563+ np .testing .assert_array_equal (proxy .read (slice (0 , 10 ), cache_limit = 0 ), data [:10 ])
564+ proxy .get_chunk (0 , cache_limit = 0 )
565+ assert proxy .src .traffic .requests == 0
566+ np .testing .assert_array_equal (proxy .read (slice (10 , 20 ), cache_limit = 0 ), data [10 :20 ])
567+ assert proxy .src .traffic .requests > 0
568+ proxy .src .traffic .reset ()
569+ proxy .get_chunk (1 , cache_limit = 0 )
570+ assert proxy .src .traffic .requests > 0
571+ assert path .read_bytes () == before
572+ assert path .stat ().st_mtime_ns == mtime
573+
574+
575+ def test_concurrent_quota_reads_do_not_grow_distinct_carriers (tmp_path , monkeypatch ):
576+ monkeypatch .setenv ("CATERVA2_SECRET" , "remote-proxy-test-secret" )
577+ from caterva2 .services import server
578+
579+ monkeypatch .setattr (server .settings , "quota" , 1 )
580+ entries = [_server_proxy (tmp_path , name , max_cache_bytes = None ) for name in ("left" , "right" )]
581+ before = [path .read_bytes () for _ , _ , path in entries ]
582+ with concurrent .futures .ThreadPoolExecutor (max_workers = 2 ) as pool :
583+ futures = [
584+ pool .submit (proxy .read , (), cache_limit = server .remote_proxy_cache_limit (proxy ))
585+ for proxy , _ , _ in entries
586+ ]
587+ for future , (_ , data , _ ) in zip (futures , entries , strict = True ):
588+ np .testing .assert_array_equal (future .result (timeout = 10 ), data )
589+ assert [path .read_bytes () for _ , _ , path in entries ] == before
590+
591+
592+ def test_cache_accounting_ignores_stale_size_table (tmp_path ):
593+ proxy , _ , path = _server_proxy (tmp_path , "stale-table" , max_cache_bytes = None )
594+ proxy .read (())
595+ carrier = remote_proxy .raw_carrier (path , mode = "a" )
596+ carrier .schunk .vlmeta ["proxy-cache-sizes" ] = {"0" : 1 }
597+ assert proxy .current_cache_bytes () == carrier .schunk .cbytes
598+
599+
600+ def test_customer_quota_disables_cache_growth (monkeypatch ):
557601 monkeypatch .setenv ("CATERVA2_SECRET" , "remote-proxy-test-secret" )
558602 from caterva2 .services import server
559603
@@ -567,10 +611,10 @@ def current_cache_bytes():
567611
568612 monkeypatch .setattr (server .settings , "quota" , 1_000 )
569613 monkeypatch .setattr (server , "get_disk_usage_written" , lambda pending : 900 )
570- assert server .remote_proxy_cache_limit (Proxy ()) == 300
614+ assert server .remote_proxy_cache_limit (Proxy ()) == 0
571615
572616 monkeypatch .setattr (server , "get_disk_usage_written" , lambda pending : 1_000 )
573- assert server .remote_proxy_cache_limit (Proxy ()) == 200
617+ assert server .remote_proxy_cache_limit (Proxy ()) == 0
574618
575619 class UnlimitedProxy :
576620 cache_policy = "disk"
@@ -580,13 +624,13 @@ class UnlimitedProxy:
580624 def current_cache_bytes ():
581625 return 200
582626
583- # Under quota, unlimited disk cache is bounded by available quota (200 + 100 = 300)
627+ # Any configured quota disables automatic growth, regardless of remaining space.
584628 monkeypatch .setattr (server , "get_disk_usage_written" , lambda pending : 900 )
585- assert server .remote_proxy_cache_limit (UnlimitedProxy ()) == 300
629+ assert server .remote_proxy_cache_limit (UnlimitedProxy ()) == 0
586630
587- # When quota is exhausted, bounded by retained bytes (200 + 0 = 200)
631+ # Exhausted quota also leaves the carrier read-only.
588632 monkeypatch .setattr (server , "get_disk_usage_written" , lambda pending : 1_000 )
589- assert server .remote_proxy_cache_limit (UnlimitedProxy ()) == 200
633+ assert server .remote_proxy_cache_limit (UnlimitedProxy ()) == 0
590634
591635 # Without quota, unlimited disk cache returns None
592636 monkeypatch .setattr (server .settings , "quota" , 0 )
0 commit comments