Skip to content

Commit 818dd47

Browse files
committed
feat: add global storage capacity limit
1 parent 93ff291 commit 818dd47

12 files changed

Lines changed: 496 additions & 95 deletions

File tree

‎apps/admin/services.py‎

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import hashlib
22
import os
33
import time
4+
import uuid
45
from datetime import datetime, timedelta
56
from typing import Any, Optional
67

@@ -15,6 +16,7 @@
1516
from core.security import INTERNAL_CONFIG_KEYS, generate_jwt_secret
1617
from apps.base.models import FileCodes, KeyValue
1718
from apps.base.utils import get_expire_info, get_file_path_name
19+
from apps.base.quota import release_storage, reserve_storage
1820
from fastapi import HTTPException
1921
from core.settings import data_root
2022
from core.utils import get_now, hash_password, is_password_hashed
@@ -1472,25 +1474,36 @@ async def share_local_file(self, item):
14721474
if not await local_file.exists():
14731475
raise HTTPException(status_code=404, detail="文件不存在")
14741476

1475-
text = await local_file.read()
1476-
expired_at, expired_count, used_count, code = await get_expire_info(
1477-
item.expire_value, item.expire_style
1478-
)
1479-
path, suffix, prefix, uuid_file_name, save_path = await get_file_path_name(item)
1480-
1481-
await self.file_storage.save_file(text, save_path)
1482-
1483-
await FileCodes.create(
1484-
code=code,
1485-
prefix=prefix,
1486-
suffix=suffix,
1487-
uuid_file_name=uuid_file_name,
1488-
file_path=path,
1489-
size=local_file.size,
1490-
expired_at=expired_at,
1491-
expired_count=expired_count,
1492-
used_count=used_count,
1493-
)
1477+
reservation_token = f"local:{uuid.uuid4().hex}"
1478+
await reserve_storage(reservation_token, local_file.size, ttl_seconds=3600)
1479+
try:
1480+
text = await local_file.read()
1481+
expired_at, expired_count, used_count, code = await get_expire_info(
1482+
item.expire_value, item.expire_style
1483+
)
1484+
path, suffix, prefix, uuid_file_name, save_path = await get_file_path_name(
1485+
item
1486+
)
1487+
await self.file_storage.save_file(text, save_path)
1488+
try:
1489+
await FileCodes.create(
1490+
code=code,
1491+
prefix=prefix,
1492+
suffix=suffix,
1493+
uuid_file_name=uuid_file_name,
1494+
file_path=path,
1495+
size=local_file.size,
1496+
expired_at=expired_at,
1497+
expired_count=expired_count,
1498+
used_count=used_count,
1499+
)
1500+
except Exception:
1501+
await self.file_storage.delete_file(
1502+
FileCodes(file_path=path, uuid_file_name=uuid_file_name)
1503+
)
1504+
raise
1505+
finally:
1506+
await release_storage(reservation_token)
14941507

14951508
return {
14961509
"code": code,
@@ -1512,6 +1525,7 @@ class ConfigService:
15121525
"serverPort",
15131526
"serverWorkers",
15141527
"showAdminAddr",
1528+
"storageLimit",
15151529
"uploadCount",
15161530
"uploadMinute",
15171531
"uploadSize",
@@ -1576,6 +1590,12 @@ async def update_config(self, data: dict):
15761590
)
15771591
next_config["adminSessionExpire"] = session_expire
15781592

1593+
if int(next_config.get("storageLimit", 0)) < 0:
1594+
raise HTTPException(
1595+
status_code=400,
1596+
detail="storageLimit 不能小于 0",
1597+
)
1598+
15791599
if admin_password_changed:
15801600
next_config["jwt_secret"] = generate_jwt_secret()
15811601

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
from tortoise import connections
2+
3+
4+
async def migrate():
5+
conn = connections.get("default")
6+
await conn.execute_script(
7+
"""
8+
CREATE TABLE IF NOT EXISTS storagereservation (
9+
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
10+
token VARCHAR(64) NOT NULL UNIQUE,
11+
size BIGINT NOT NULL,
12+
expires_at TIMESTAMP NOT NULL
13+
);
14+
CREATE UNIQUE INDEX IF NOT EXISTS idx_storagereservation_token
15+
ON storagereservation (token);
16+
CREATE INDEX IF NOT EXISTS idx_storagereservation_expires_at
17+
ON storagereservation (expires_at);
18+
"""
19+
)

‎apps/base/models.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,15 @@ async def is_expired(self):
8484
return self.expires_at < await get_now()
8585

8686

87+
class StorageReservation(models.Model):
88+
"""尚未写入 FileCodes 的上传容量预留。"""
89+
90+
id = fields.IntField(pk=True)
91+
token = fields.CharField(max_length=64, unique=True, index=True)
92+
size = fields.BigIntField()
93+
expires_at = fields.DatetimeField(index=True)
94+
95+
8796
file_codes_pydantic = pydantic_model_creator(FileCodes, name="FileCodes")
8897
upload_chunk_pydantic = pydantic_model_creator(UploadChunk, name="UploadChunk")
8998
key_value_pydantic = pydantic_model_creator(KeyValue, name="KeyValue")

‎apps/base/quota.py‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
import datetime
2+
3+
from fastapi import HTTPException
4+
from tortoise import connections
5+
6+
from apps.base.models import FileCodes, StorageReservation
7+
from core.settings import settings
8+
from core.utils import get_now
9+
10+
11+
def get_storage_limit() -> int:
12+
try:
13+
return max(0, int(getattr(settings, "storageLimit", 0)))
14+
except (TypeError, ValueError):
15+
return 0
16+
17+
18+
async def get_storage_usage() -> dict[str, int | None]:
19+
now = await get_now()
20+
used = await FileCodes.all().values_list("size", flat=True)
21+
reserved = await StorageReservation.filter(expires_at__gt=now).values_list(
22+
"size", flat=True
23+
)
24+
limit = get_storage_limit()
25+
used_bytes = sum(used)
26+
reserved_bytes = sum(reserved)
27+
return {
28+
"limit": limit,
29+
"used": used_bytes,
30+
"reserved": reserved_bytes,
31+
"available": max(0, limit - used_bytes - reserved_bytes) if limit else None,
32+
}
33+
34+
35+
async def reserve_storage(token: str, size: int, ttl_seconds: int) -> None:
36+
requested_size = max(0, int(size))
37+
limit = get_storage_limit()
38+
if not limit or requested_size == 0:
39+
return
40+
41+
now = await get_now()
42+
expires_at = now + datetime.timedelta(seconds=ttl_seconds)
43+
conn = connections.get("default")
44+
await StorageReservation.filter(token=token, expires_at__lte=now).delete()
45+
existing = await StorageReservation.filter(token=token, expires_at__gt=now).first()
46+
if existing:
47+
if existing.size == requested_size:
48+
return
49+
raise HTTPException(status_code=409, detail="上传容量预留信息不一致")
50+
51+
try:
52+
affected, _ = await conn.execute_query(
53+
"""
54+
INSERT INTO storagereservation (token, size, expires_at)
55+
SELECT ?, ?, ?
56+
WHERE (
57+
COALESCE((SELECT SUM(size) FROM filecodes), 0)
58+
+ COALESCE((SELECT SUM(size) FROM storagereservation WHERE expires_at > ?), 0)
59+
+ ?
60+
) <= ?
61+
""",
62+
[token, requested_size, expires_at, now, requested_size, limit],
63+
)
64+
except Exception:
65+
concurrent = await StorageReservation.filter(
66+
token=token, size=requested_size, expires_at__gt=now
67+
).exists()
68+
if concurrent:
69+
return
70+
raise
71+
if affected != 1:
72+
concurrent = await StorageReservation.filter(
73+
token=token, size=requested_size, expires_at__gt=now
74+
).exists()
75+
if concurrent:
76+
return
77+
raise HTTPException(status_code=507, detail="存储空间已达到管理员设置的容量上限")
78+
79+
80+
async def release_storage(token: str) -> None:
81+
await StorageReservation.filter(token=token).delete()

0 commit comments

Comments
 (0)