Skip to content

Commit bf7e7cf

Browse files
author
Andres D. Molins
committed
Fix: Remove IPFS Garbage collection call and force the daemon to have it enabled.
1 parent fadca0f commit bf7e7cf

File tree

7 files changed

+14
-17
lines changed

7 files changed

+14
-17
lines changed

deployment/docker-build/dev/docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ services:
115115

116116
ipfs:
117117
restart: always
118-
image: ipfs/kubo:v0.15.0
118+
image: ipfs/kubo:v0.34.1
119119
ports:
120120
- "4001:4001"
121121
- "4001:4001/udp"
@@ -126,7 +126,7 @@ services:
126126
- IPFS_PROFILE=server
127127
networks:
128128
- pyaleph
129-
command: ["daemon", "--enable-pubsub-experiment", "--migrate"]
129+
command: ["daemon", "--enable-pubsub-experiment", "--enable-gc", "--migrate"]
130130

131131

132132
networks:

deployment/docker-build/docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ services:
4747

4848
ipfs:
4949
restart: always
50-
image: ipfs/kubo:v0.15.0
50+
image: ipfs/kubo:v0.34.1
5151
ports:
5252
- "4001:4001"
5353
- "4001:4001/udp"
@@ -59,7 +59,7 @@ services:
5959
- IPFS_PROFILE=server
6060
networks:
6161
- pyaleph
62-
command: ["daemon", "--enable-pubsub-experiment", "--migrate"]
62+
command: ["daemon", "--enable-pubsub-experiment", "--enable-gc", "--migrate"]
6363

6464
postgres:
6565
restart: always

deployment/samples/docker-compose/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ services:
105105

106106
ipfs:
107107
restart: always
108-
image: ipfs/kubo:v0.15.0
108+
image: ipfs/kubo:v0.34.1
109109
ports:
110110
- "4001:4001"
111111
- "4001:4001/udp"

deployment/samples/docker-monitoring/docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ services:
107107

108108
ipfs:
109109
restart: always
110-
image: ipfs/kubo:v0.15.0
110+
image: ipfs/kubo:v0.34.1
111111
ports:
112112
- "4001:4001"
113113
- "4001:4001/udp"
@@ -118,7 +118,7 @@ services:
118118
- IPFS_PROFILE=server
119119
networks:
120120
- pyaleph
121-
command: ["daemon", "--enable-pubsub-experiment", "--migrate"]
121+
command: ["daemon", "--enable-pubsub-experiment", "--enable-gc", "--migrate"]
122122

123123
prometheus:
124124
restart: always

src/aleph/db/accessors/messages.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,9 @@ def ensure_serializable(obj):
460460

461461
except Exception:
462462
# If any conversion fails, create a new dict with a message
463-
serializable_details = {"error": "Details contained non-serializable values"}
463+
serializable_details = {
464+
"error": "Details contained non-serializable values"
465+
}
464466

465467
insert_rejected_message_stmt = insert(RejectedMessageDb).values(
466468
item_hash=item_hash,

src/aleph/services/storage/garbage_collector.py

+3-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import logging
44

55
from aioipfs import NotPinnedError
6-
from aioipfs.api import RepoAPI
76
from aleph_message.models import ItemHash, ItemType
87
from configmanager import Config
98

@@ -69,12 +68,6 @@ async def collect(self, datetime: dt.datetime):
6968

7069
LOGGER.info("Deleted %s", file_hash)
7170

72-
# After unpinned all files call the ipfs garbage collector
73-
ipfs_client = self.storage_service.ipfs_service.ipfs_client
74-
# Launch the IPFS garbage collector (`ipfs repo gc`)
75-
async for _ in RepoAPI(driver=ipfs_client).gc():
76-
pass
77-
7871

7972
async def garbage_collector_task(
8073
config: Config, garbage_collector: GarbageCollector
@@ -96,4 +89,6 @@ async def garbage_collector_task(
9689
await garbage_collector.collect(datetime=utc_now())
9790
LOGGER.info("Garbage collector ran successfully.")
9891
except Exception as err:
99-
LOGGER.exception("An unexpected error occurred during garbage collection.", exc_info=err)
92+
LOGGER.exception(
93+
"An unexpected error occurred during garbage collection.", exc_info=err
94+
)

src/aleph/types/message_status.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def details(self) -> Optional[Dict[str, Any]]:
9090
try:
9191
# Test if the error is JSON serializable by attempting to convert to dict
9292
# This will fail for custom objects
93-
if hasattr(err, '__dict__'):
93+
if hasattr(err, "__dict__"):
9494
serializable_errors.append(str(err))
9595
else:
9696
serializable_errors.append(err)

0 commit comments

Comments
 (0)