Compare commits

...

71 Commits

Author SHA1 Message Date
Inex Code e38b736b60 fix: Remove unnecessary jobs.update call 2024-05-01 14:31:05 +03:00
dettlaff 2024ff4865 tests: add fp mock
continuous-integration/drone/push Build is passing Details
2024-04-13 14:58:13 +04:00
dettlaff a4b1c058f7 style: fix black
continuous-integration/drone/push Build is passing Details
2024-04-10 19:07:33 +04:00
dettlaff d182e365d6 Merge remote-tracking branch 'origin/master' into def/nix-collect-garbage-endpoint
continuous-integration/drone/push Build is failing Details
2024-04-10 18:58:16 +04:00
dettlaff ebf577b83a Merge branch 'def/nix-collect-garbage-endpoint' of git.selfprivacy.org:SelfPrivacy/selfprivacy-rest-api into def/nix-collect-garbage-endpoint 2024-04-03 03:02:20 +04:00
Inex Code dd5acae98a style: rename ip6 addresses variable 2024-03-28 17:43:31 +04:00
Inex Code 467796b2ad refactor: use ipaddress library for ip validation 2024-03-28 17:43:31 +04:00
Inex Code 9399a3bdf3 fix(dns): Ignore link-local IPv6 address 2024-03-28 17:43:31 +04:00
Inex Code fbd0ae0494 chore: Bump version to 3.0.1 2024-03-28 17:43:31 +04:00
Houkime aa3dc5fb05 fix(backups): fix wrong typing in autobackups 2024-03-28 17:43:31 +04:00
def 40c961dbe2 Merge branch 'master' into def/nix-collect-garbage-endpoint
continuous-integration/drone/push Build is failing Details
2024-03-01 17:10:35 +02:00
dettlaff 8ce83f7b7e fix: GIT
continuous-integration/drone/push Build is failing Details
2024-03-01 19:09:39 +04:00
dettlaff fc60d55994 Merge branch 'def/nix-collect-garbage-endpoint' 2024-02-15 02:57:57 +04:00
dettlaff 567f094336 fix: frem review
continuous-integration/drone/push Build is failing Details
2024-02-08 18:40:12 +04:00
dettlaff 29596a4f47 docs: changed the description of the error class
continuous-integration/drone/push Build is failing Details
2024-02-05 13:46:38 +04:00
dettlaff b3127fb1b4 Merge branch 'def/nix-collect-garbage-endpoint' of git.selfprivacy.org:SelfPrivacy/selfprivacy-rest-api into def/nix-collect-garbage-endpoint
continuous-integration/drone/push Build is failing Details
2024-02-03 23:10:55 +04:00
dettlaff eb1bc9d730 fix: from review 2024-02-03 23:10:01 +04:00
def 44d43c92d9 Merge branch 'master' into def/nix-collect-garbage-endpoint
continuous-integration/drone/push Build is failing Details
2024-01-30 16:05:04 +02:00
dettlaff 045ad30ec3 fix: add mock for nix collect garbage
continuous-integration/drone/push Build is failing Details
2024-01-30 18:04:43 +04:00
dettlaff d923b04aef Merge branch 'master' into def/nix-collect-garbage-endpoint
continuous-integration/drone/push Build is failing Details
2024-01-23 21:01:08 +04:00
dettlaff bb1e1bcae0 fix: rename functions
continuous-integration/drone/push Build is failing Details
2024-01-17 19:26:10 +04:00
dettlaff 372eadd306 tests: fix test_parse_line
continuous-integration/drone/push Build is failing Details
2023-11-29 13:02:59 +04:00
dettlaff 03e6d45279 fix: final typos fix
continuous-integration/drone/push Build is failing Details
2023-11-15 16:47:04 +04:00
dettlaff 3be5816f51 fix: del unused return from parse line
continuous-integration/drone/push Build is failing Details
2023-11-12 01:38:31 +04:00
dettlaff d31ad487eb fix: corrected from comment from pr
continuous-integration/drone/push Build is failing Details
2023-11-12 01:16:04 +04:00
dettlaff 9114bc6ae0 fix: remove unused imports
continuous-integration/drone/push Build is failing Details
2023-11-12 01:13:14 +04:00
dettlaff c0f8b9026b fix: corrected from comment from pr
continuous-integration/drone/push Build is failing Details
2023-10-16 20:39:58 +04:00
dettlaff eda5923cc6 tests: fix query
continuous-integration/drone/push Build is failing Details
2023-10-12 02:59:31 +04:00
dettlaff 98eef8d08e fix: tests, jobs.error return
continuous-integration/drone/push Build is failing Details
2023-10-12 02:40:47 +04:00
dettlaff 70a498d0e5 fix: missclick with Job jobs
continuous-integration/drone/push Build is failing Details
2023-10-12 02:26:27 +04:00
dettlaff f2ead0c77d fix: typos
continuous-integration/drone/push Build is failing Details
2023-10-12 02:18:29 +04:00
dettlaff 0503db9856 Merge branch 'def/nix-collect-garbage-endpoint' of git.selfprivacy.org:SelfPrivacy/selfprivacy-rest-api into def/nix-collect-garbage-endpoint
continuous-integration/drone/push Build is failing Details
2023-10-12 02:09:46 +04:00
dettlaff 3fbc93c998 tests: fix rename 2023-10-12 02:09:13 +04:00
dettlaff 5c42d7a907 refactor: problems from pr 2023-10-12 02:01:31 +04:00
dettlaff ec404464d8 Merge branch 'master' into def/nix-collect-garbage-endpoint
continuous-integration/drone/push Build is failing Details
2023-09-01 19:21:31 +04:00
dettlaff 446220a9c5 fix: replace os to subprocess
continuous-integration/drone/push Build is failing Details
2023-08-07 17:38:44 +04:00
def aadf0cb1a3 Delete 'zsh-config.nix'
continuous-integration/drone/push Build is failing Details
2023-08-07 16:00:01 +03:00
def be821fe1e0 Delete 'dump.rdb'
continuous-integration/drone/push Build is failing Details
2023-08-07 15:58:45 +03:00
dettlaff a316f8b910 tests: fix
continuous-integration/drone/push Build is failing Details
2023-08-07 16:56:35 +04:00
dettlaff be8d249a04 fix: do a redis reset() 2023-08-07 16:41:42 +04:00
dettlaff 1640ed44f6 tests: add success check
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is failing Details
2023-08-07 06:24:48 +04:00
dettlaff 7c68f05040 tests: delete old, fix
continuous-integration/drone/push Build is failing Details
continuous-integration/drone/pr Build is failing Details
2023-08-03 05:47:57 +04:00
dettlaff 66970e6375 fix: stupid russian C
continuous-integration/drone/push Build is failing Details
continuous-integration/drone/pr Build is failing Details
2023-06-30 20:51:06 +04:00
dettlaff 19005158a8 fix: add timewait
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is failing Details
2023-06-26 23:33:41 +04:00
dettlaff 993ea93ee4 fix: delete old gen 2023-06-21 10:52:31 +04:00
dettlaff 3d4caaf4ce fix: encoding 2023-06-20 23:25:54 +04:00
dettlaff 79ef4c9310 fix: task registry 2023-06-20 01:25:04 +04:00
dettlaff aa85b6963b Merge branch 'def/nix-collect-garbage-endpoint' of git.selfprivacy.org:SelfPrivacy/selfprivacy-rest-api into def/nix-collect-garbage-endpoint 2023-06-18 08:44:53 +04:00
dettlaff 83cf7cbd6f fix: jobs 2023-06-18 08:37:27 +04:00
dettlaff d6c4d458f7 tests: fix some tests 2023-06-16 08:08:36 +04:00
dettlaff 28701e1608 fix: do a redis reset() 2023-06-16 08:08:36 +04:00
dettlaff 96c013c4e7 refactor: delete purest of nix_collect_garbage() 2023-06-16 08:08:36 +04:00
ВашÐdettlaff 03b5a6b5e4 fix: percentage 2023-06-16 08:08:36 +04:00
def af0129bdfe fix: types, add tests 2023-06-16 04:06:49 +00:00
def 7553202a69 test: fix nix collect garbage, add tests 2023-06-16 04:06:49 +00:00
def 7e3adffb68 refactor: nix-collect-garbage is now pure 2023-06-16 04:06:49 +00:00
def f42594f1fb refactor: delete unnecessary import 2023-06-16 04:06:49 +00:00
def 6ef9222e32 feat: loading percentage 2023-06-16 04:06:49 +00:00
def ba168fc92b fix: subprocess.check_output 2023-06-16 04:06:49 +00:00
def 57ec87bf43 feat: add nix-collect-garbage job 2023-06-16 04:06:49 +00:00
dettlaff f781b51a6f Merge branch 'master' into def/nix-collect-garbage-endpoint 2023-04-05 13:52:48 +03:00
dettlaff a67f3e822a fix: do a redis reset() 2023-04-05 13:49:56 +03:00
dettlaff cf06d4c8d5 refactor: delete purest of nix_collect_garbage() 2023-04-03 17:41:41 +03:00
ВашÐdettlaff 88d66fea8c fix: percentage 2023-03-23 20:49:30 +03:00
def fcdd61006b fix: types, add tests 2022-12-27 04:15:02 +04:00
def 2340a0f8e9 test: fix nix collect garbage, add tests 2022-12-19 06:27:44 +04:00
def 510b94039e refactor: nix-collect-garbage is now pure 2022-12-13 05:44:52 +04:00
def 3ecd522bd2 refactor: delete unnecessary import 2022-12-03 22:30:41 +04:00
def 4ce96c303d feat: loading percentage 2022-12-03 22:27:10 +04:00
def 6b93df9630 fix: subprocess.check_output 2022-11-24 06:32:37 +04:00
def 13d3261d36 feat: add nix-collect-garbage job 2022-11-24 06:08:58 +04:00
7 changed files with 394 additions and 2 deletions

0
.gitignore vendored Executable file → Normal file
View File

View File

@ -8,9 +8,12 @@ from selfprivacy_api.graphql.mutations.mutation_interface import (
GenericJobMutationReturn,
GenericMutationReturn,
MutationReturnInterface,
GenericJobMutationReturn,
)
import selfprivacy_api.actions.system as system_actions
from selfprivacy_api.graphql.common_types.jobs import job_to_api_job
from selfprivacy_api.jobs.nix_collect_garbage import start_nix_collect_garbage
import selfprivacy_api.actions.ssh as ssh_actions
@ -195,3 +198,14 @@ class SystemMutations:
message=f"Failed to pull repository changes:\n{result.data}",
code=500,
)
@strawberry.mutation(permission_classes=[IsAuthenticated])
def nix_collect_garbage(self) -> GenericJobMutationReturn:
job = start_nix_collect_garbage()
return GenericJobMutationReturn(
success=True,
code=200,
message="Garbage collector started...",
job=job_to_api_job(job),
)

View File

@ -67,8 +67,8 @@ def move_folder(
try:
data_path.mkdir(mode=0o750, parents=True, exist_ok=True)
except Exception as e:
print(f"Error creating data path: {e}")
except Exception as error:
print(f"Error creating data path: {error}")
return
try:

View File

@ -0,0 +1,147 @@
import re
import subprocess
from typing import Tuple, Iterable
from selfprivacy_api.utils.huey import huey
from selfprivacy_api.jobs import JobStatus, Jobs, Job
class ShellException(Exception):
"""Shell-related errors"""
COMPLETED_WITH_ERROR = "Error occurred, please report this to the support chat."
RESULT_WAS_NOT_FOUND_ERROR = (
"We are sorry, garbage collection result was not found. "
"Something went wrong, please report this to the support chat."
)
CLEAR_COMPLETED = "Garbage collection completed."
def delete_old_gens_and_return_dead_report() -> str:
subprocess.run(
["nix-env", "-p", "/nix/var/nix/profiles/system", "--delete-generations old"],
check=False,
)
result = subprocess.check_output(["nix-store", "--gc", "--print-dead"]).decode(
"utf-8"
)
return " " if result is None else result
def run_nix_collect_garbage() -> Iterable[bytes]:
process = subprocess.Popen(
["nix-store", "--gc"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
)
return process.stdout if process.stdout else iter([])
def parse_line(job: Job, line: str) -> Job:
"""
We parse the string for the presence of a final line,
with the final amount of space cleared.
Simply put, we're just looking for a similar string:
"1537 store paths deleted, 339.84 MiB freed".
"""
pattern = re.compile(r"[+-]?\d+\.\d+ \w+(?= freed)")
match = re.search(pattern, line)
if match is None:
raise ShellException("nix returned gibberish output")
else:
Jobs.update(
job=job,
status=JobStatus.FINISHED,
status_text=CLEAR_COMPLETED,
result=f"{match.group(0)} have been cleared",
)
return job
def process_stream(job: Job, stream: Iterable[bytes], total_dead_packages: int) -> None:
completed_packages = 0
prev_progress = 0
for line in stream:
line = line.decode("utf-8")
if "deleting '/nix/store/" in line:
completed_packages += 1
percent = int((completed_packages / total_dead_packages) * 100)
if percent - prev_progress >= 5:
Jobs.update(
job=job,
status=JobStatus.RUNNING,
progress=percent,
status_text="Cleaning...",
)
prev_progress = percent
elif "store paths deleted," in line:
parse_line(job, line)
def get_dead_packages(output) -> Tuple[int, float]:
dead = len(re.findall("/nix/store/", output))
percent = 0
if dead != 0:
percent = 100 / dead
return dead, percent
@huey.task()
def calculate_and_clear_dead_paths(job: Job):
Jobs.update(
job=job,
status=JobStatus.RUNNING,
progress=0,
status_text="Calculate the number of dead packages...",
)
dead_packages, package_equal_to_percent = get_dead_packages(
delete_old_gens_and_return_dead_report()
)
if dead_packages == 0:
Jobs.update(
job=job,
status=JobStatus.FINISHED,
status_text="Nothing to clear",
result="System is clear",
)
return True
Jobs.update(
job=job,
status=JobStatus.RUNNING,
progress=0,
status_text=f"Found {dead_packages} packages to remove!",
)
stream = run_nix_collect_garbage()
try:
process_stream(job, stream, dead_packages)
except ShellException as error:
Jobs.update(
job=job,
status=JobStatus.ERROR,
status_text=COMPLETED_WITH_ERROR,
error=RESULT_WAS_NOT_FOUND_ERROR,
)
def start_nix_collect_garbage() -> Job:
job = Jobs.add(
type_id="maintenance.collect_nix_garbage",
name="Collect garbage",
description="Cleaning up unused packages",
)
calculate_and_clear_dead_paths(job=job)
return job

View File

@ -7,6 +7,8 @@ from selfprivacy_api.services.tasks import move_service
from selfprivacy_api.jobs.upgrade_system import rebuild_system_task
from selfprivacy_api.jobs.test import test_job
from selfprivacy_api.jobs.nix_collect_garbage import calculate_and_clear_dead_paths
if environ.get("TEST_MODE"):
from tests.test_huey import sum

0
setup.py Executable file → Normal file
View File

View File

@ -0,0 +1,229 @@
# pylint: disable=redefined-outer-name
# pylint: disable=unused-argument
# pylint: disable=missing-function-docstring
import pytest
from selfprivacy_api.utils.huey import huey
from selfprivacy_api.jobs import JobStatus, Jobs
from tests.test_graphql.common import (
get_data,
assert_ok,
assert_empty,
)
from selfprivacy_api.jobs.nix_collect_garbage import (
get_dead_packages,
parse_line,
ShellException,
)
OUTPUT_PRINT_DEAD = """
finding garbage collector roots...
determining live/dead paths...
/nix/store/02k8pmw00p7p7mf2dg3n057771w7liia-python3.10-cchardet-2.1.7
/nix/store/03vc6dznx8njbvyd3gfhfa4n5j4lvhbl-python3.10-async-timeout-4.0.2
/nix/store/03ybv2dvfk7c3cpb527y5kzf6i35ch41-python3.10-pycparser-2.21
/nix/store/04dn9slfqwhqisn1j3jv531lms9w5wlj-python3.10-hypothesis-6.50.1.drv
/nix/store/04hhx2z1iyi3b48hxykiw1g03lp46jk7-python-remove-bin-bytecode-hook
"""
OUTPUT_COLLECT_GARBAGE = """
removing old generations of profile /nix/var/nix/profiles/per-user/def/channels
finding garbage collector roots...
deleting garbage...
deleting '/nix/store/02k8pmw00p7p7mf2dg3n057771w7liia-python3.10-cchardet-2.1.7'
deleting '/nix/store/03vc6dznx8njbvyd3gfhfa4n5j4lvhbl-python3.10-async-timeout-4.0.2'
deleting '/nix/store/03ybv2dvfk7c3cpb527y5kzf6i35ch41-python3.10-pycparser-2.21'
deleting '/nix/store/04dn9slfqwhqisn1j3jv531lms9w5wlj-python3.10-hypothesis-6.50.1.drv'
deleting '/nix/store/04hhx2z1iyi3b48hxykiw1g03lp46jk7-python-remove-bin-bytecode-hook'
deleting unused links...
note: currently hard linking saves -0.00 MiB
190 store paths deleted, 425.51 MiB freed
"""
OUTPUT_COLLECT_GARBAGE_ZERO_TRASH = """
removing old generations of profile /nix/var/nix/profiles/per-user/def/profile
removing old generations of profile /nix/var/nix/profiles/per-user/def/channels
finding garbage collector roots...
deleting garbage...
deleting unused links...
note: currently hard linking saves 0.00 MiB
0 store paths deleted, 0.00 MiB freed
"""
# ---
def test_parse_line():
txt = "note: currently hard linking saves -0.00 MiB 190 store paths deleted, 425.51 MiB freed"
job = Jobs.add(
name="name",
type_id="parse_line",
description="description",
)
output = parse_line(job, txt)
assert output.result == "425.51 MiB have been cleared"
assert output.status == JobStatus.FINISHED
assert output.error is None
def test_parse_line_with_blank_line():
txt = ""
job = Jobs.add(
name="name",
type_id="parse_line",
description="description",
)
with pytest.raises(ShellException):
output = parse_line(job, txt)
def test_get_dead_packages():
assert get_dead_packages(OUTPUT_PRINT_DEAD) == (5, 20.0)
def test_get_dead_packages_zero():
assert get_dead_packages("") == (0, 0)
RUN_NIX_COLLECT_GARBAGE_MUTATION = """
mutation CollectGarbage {
system {
nixCollectGarbage {
success
message
code
job {
uid,
typeId,
name,
description,
status,
statusText,
progress,
createdAt,
updatedAt,
finishedAt,
error,
result,
}
}
}
}
"""
def test_graphql_nix_collect_garbage(authorized_client, fp):
assert huey.immediate is True
fp.register(
["nix-env", "-p", "/nix/var/nix/profiles/system", "--delete-generations old"],
stdout="",
)
fp.register(["nix-store", "--gc", "--print-dead"], stdout=OUTPUT_PRINT_DEAD)
fp.register(["nix-store", "--gc"], stdout=OUTPUT_COLLECT_GARBAGE)
response = authorized_client.post(
"/graphql",
json={
"query": RUN_NIX_COLLECT_GARBAGE_MUTATION,
},
)
output = get_data(response)["system"]["nixCollectGarbage"]
assert_ok(output)
assert output["job"] is not None
assert output["job"]["status"] == "FINISHED"
assert output["job"]["error"] is None
assert (
fp.call_count(
[
"nix-env",
"-p",
"/nix/var/nix/profiles/system",
"--delete-generations old",
]
)
== 1
)
assert fp.call_count(["nix-store", "--gc", "--print-dead"]) == 1
assert fp.call_count(["nix-store", "--gc"]) == 1
def test_graphql_nix_collect_garbage_return_zero_trash(authorized_client, fp):
assert huey.immediate is True
fp.register(
["nix-env", "-p", "/nix/var/nix/profiles/system", "--delete-generations old"],
stdout="",
)
fp.register(["nix-store", "--gc", "--print-dead"], stdout=OUTPUT_PRINT_DEAD)
fp.register(["nix-store", "--gc"], stdout=OUTPUT_COLLECT_GARBAGE_ZERO_TRASH)
response = authorized_client.post(
"/graphql",
json={
"query": RUN_NIX_COLLECT_GARBAGE_MUTATION,
},
)
output = get_data(response)["system"]["nixCollectGarbage"]
assert_ok(output)
assert output["job"] is not None
assert output["job"]["status"] == "FINISHED"
assert output["job"]["error"] is None
assert (
fp.call_count(
[
"nix-env",
"-p",
"/nix/var/nix/profiles/system",
"--delete-generations old",
]
)
== 1
)
assert fp.call_count(["nix-store", "--gc", "--print-dead"]) == 1
assert fp.call_count(["nix-store", "--gc"]) == 1
def test_graphql_nix_collect_garbage_not_authorized_client(client, fp):
assert huey.immediate is True
fp.register(
["nix-env", "-p", "/nix/var/nix/profiles/system", "--delete-generations old"],
stdout="",
)
fp.register(["nix-store", "--gc", "--print-dead"], stdout=OUTPUT_PRINT_DEAD)
fp.register(["nix-store", "--gc"], stdout=OUTPUT_COLLECT_GARBAGE)
response = client.post(
"/graphql",
json={
"query": RUN_NIX_COLLECT_GARBAGE_MUTATION,
},
)
assert_empty(response)
assert (
fp.call_count(
[
"nix-env",
"-p",
"/nix/var/nix/profiles/system",
"--delete-generations old",
]
)
== 0
)
assert fp.call_count(["nix-store", "--gc", "--print-dead"]) == 0
assert fp.call_count(["nix-store", "--gc"]) == 0