mirror of
https://github.com/logos-storage/bittorrent-benchmarks.git
synced 2026-04-04 01:13:20 +00:00
fix: update binary name, API paths, and Docker image for logos-storage rename
Signed-off-by: Chrysostomos Nanakos <chris@include.gr>
This commit is contained in:
parent
8a834ecfee
commit
c222fe3bcf
2
Makefile
2
Makefile
@ -49,7 +49,7 @@ codex-image-minikube:
|
||||
fi
|
||||
eval $$(minikube docker-env) && \
|
||||
cd ${CODEX_REPO_PATH} && \
|
||||
docker build -t nim-codex:minikube -f ./docker/codex.Dockerfile .
|
||||
docker build -t logos-storage-nim:minikube -f ./docker/codex.Dockerfile .
|
||||
|
||||
harness-image-minikube:
|
||||
eval $$(minikube docker-env) && \
|
||||
|
||||
@ -58,7 +58,7 @@ async def fake_codex_api() -> AsyncIterator[Tuple[FakeCodex, Url]]:
|
||||
codex = FakeCodex()
|
||||
routes = web.RouteTableDef()
|
||||
|
||||
@routes.get("/api/codex/v1/data/{cid}/network/manifest")
|
||||
@routes.get("/api/storage/v1/data/{cid}/network/manifest")
|
||||
async def manifest(request):
|
||||
cid = request.match_info["cid"]
|
||||
assert cid in codex.storage
|
||||
@ -71,7 +71,7 @@ async def fake_codex_api() -> AsyncIterator[Tuple[FakeCodex, Url]]:
|
||||
}
|
||||
)
|
||||
|
||||
@routes.post("/api/codex/v1/data")
|
||||
@routes.post("/api/storage/v1/data")
|
||||
async def upload(request):
|
||||
await request.post()
|
||||
filename = re.findall(
|
||||
@ -84,7 +84,7 @@ async def fake_codex_api() -> AsyncIterator[Tuple[FakeCodex, Url]]:
|
||||
)
|
||||
return web.Response(text=cid)
|
||||
|
||||
@routes.get("/api/codex/v1/data/{cid}")
|
||||
@routes.get("/api/storage/v1/data/{cid}")
|
||||
async def download(request):
|
||||
cid = request.match_info["cid"]
|
||||
assert cid in codex.streams
|
||||
|
||||
@ -51,7 +51,7 @@ class AsyncCodexClientImpl(AsyncCodexClient):
|
||||
) -> Cid:
|
||||
async with aiohttp.ClientSession(timeout=ClientTimeout()) as session:
|
||||
response = await session.post(
|
||||
self.codex_api_url._replace(path="/api/codex/v1/data").url,
|
||||
self.codex_api_url._replace(path="/api/storage/v1/data").url,
|
||||
headers={
|
||||
aiohttp.hdrs.CONTENT_TYPE: mime_type,
|
||||
aiohttp.hdrs.CONTENT_DISPOSITION: f'attachment; filename="{name}"',
|
||||
@ -68,7 +68,7 @@ class AsyncCodexClientImpl(AsyncCodexClient):
|
||||
async with aiohttp.ClientSession() as session:
|
||||
response = await session.get(
|
||||
self.codex_api_url._replace(
|
||||
path=f"/api/codex/v1/data/{cid}/network/manifest"
|
||||
path=f"/api/storage/v1/data/{cid}/network/manifest"
|
||||
).url,
|
||||
)
|
||||
|
||||
@ -83,7 +83,7 @@ class AsyncCodexClientImpl(AsyncCodexClient):
|
||||
) -> AsyncIterator[BaseStreamReader]:
|
||||
async with aiohttp.ClientSession(timeout=ClientTimeout()) as session:
|
||||
response = await session.get(
|
||||
self.codex_api_url._replace(path=f"/api/codex/v1/data/{cid}").url,
|
||||
self.codex_api_url._replace(path=f"/api/storage/v1/data/{cid}").url,
|
||||
timeout=timeout,
|
||||
)
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ class CodexNode(Node[Cid, CodexMeta], ExperimentComponent):
|
||||
def is_ready(self) -> bool:
|
||||
try:
|
||||
requests.get(
|
||||
str(self.codex_api_url._replace(path="/api/codex/v1/debug/info"))
|
||||
str(self.codex_api_url._replace(path="/api/storage/v1/debug/info"))
|
||||
)
|
||||
return True
|
||||
except (ConnectionError, socket.gaierror):
|
||||
@ -75,7 +75,7 @@ class CodexNode(Node[Cid, CodexMeta], ExperimentComponent):
|
||||
def remove(self, handle: Cid) -> bool:
|
||||
if self.remove_data:
|
||||
response = requests.delete(
|
||||
str(self.codex_api_url._replace(path=f"/api/codex/v1/data/{handle}")),
|
||||
str(self.codex_api_url._replace(path=f"/api/storage/v1/data/{handle}")),
|
||||
timeout=DELETE_TIMEOUT,
|
||||
)
|
||||
|
||||
@ -86,7 +86,7 @@ class CodexNode(Node[Cid, CodexMeta], ExperimentComponent):
|
||||
def exists_local(self, handle: Cid) -> bool:
|
||||
"""Check if a dataset exists on the node."""
|
||||
response = requests.get(
|
||||
str(self.codex_api_url._replace(path=f"/api/codex/v1/data/{handle}"))
|
||||
str(self.codex_api_url._replace(path=f"/api/storage/v1/data/{handle}"))
|
||||
)
|
||||
|
||||
response.close()
|
||||
@ -105,7 +105,7 @@ class CodexNode(Node[Cid, CodexMeta], ExperimentComponent):
|
||||
"""Retrieves the contents of a locally available
|
||||
dataset from the node."""
|
||||
response = requests.get(
|
||||
str(self.codex_api_url._replace(path=f"/api/codex/v1/data/{handle}"))
|
||||
str(self.codex_api_url._replace(path=f"/api/storage/v1/data/{handle}"))
|
||||
)
|
||||
|
||||
response.raise_for_status()
|
||||
|
||||
@ -22,7 +22,7 @@ services:
|
||||
interval: 1s
|
||||
|
||||
codex-1:
|
||||
image: ${COMPOSE_CODEX_IMAGE:-codexstorage/nim-codex:latest}
|
||||
image: ${COMPOSE_CODEX_IMAGE:-logosstorage/logos-storage-nim:latest}
|
||||
container_name: codex-1
|
||||
environment:
|
||||
- CODEX_LOG_LEVEL=DEBUG
|
||||
@ -49,7 +49,7 @@ services:
|
||||
- "9000:9000"
|
||||
|
||||
codex-2:
|
||||
image: ${COMPOSE_CODEX_IMAGE:-codexstorage/nim-codex:latest}
|
||||
image: ${COMPOSE_CODEX_IMAGE:-logosstorage/logos-storage-nim:latest}
|
||||
container_name: codex-2
|
||||
environment:
|
||||
- CODEX_LOG_LEVEL=DEBUG
|
||||
@ -77,7 +77,7 @@ services:
|
||||
- "9001:9001"
|
||||
|
||||
codex-3:
|
||||
image: ${COMPOSE_CODEX_IMAGE:-codexstorage/nim-codex:latest}
|
||||
image: ${COMPOSE_CODEX_IMAGE:-logosstorage/logos-storage-nim:latest}
|
||||
container_name: codex-3
|
||||
environment:
|
||||
- CODEX_LOG_LEVEL=DEBUG
|
||||
|
||||
@ -78,7 +78,7 @@ cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
|
||||
{{- end -}}
|
||||
|
||||
{{- define "codex.image" -}}
|
||||
{{ .Values.deployment.minikubeEnv | ternary "nim-codex:minikube" (printf "codexstorage/nim-codex:%s" .Values.deployment.nodeTag) }}
|
||||
{{ .Values.deployment.minikubeEnv | ternary "logos-storage-nim:minikube" (printf "logosstorage/logos-storage-nim:%s" .Values.deployment.nodeTag) }}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "benchmark.harness.imagePullPolicy" -}}
|
||||
|
||||
@ -104,7 +104,7 @@ spec:
|
||||
|
||||
echo " -- Starting Codex node -- "
|
||||
echo "Running Docker entrypoint..."
|
||||
/docker-entrypoint.sh codex
|
||||
/docker-entrypoint.sh storage
|
||||
volumeMounts:
|
||||
- name: codex-node-storage
|
||||
mountPath: /var/lib/codex
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user