Skip to content

Add a prefix to the path of multipart uploads #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: gv/69
Choose a base branch
from
+11 −10
Open

Add a prefix to the path of multipart uploads #101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e9f23d
Add a prefix to the path of multipart uploads
Dramelac Apr 18, 2025
74075ed
Change multi-part upload path prefix and fix _catalog route
Dramelac Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/registry/r2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ export class R2Registry implements Registry {
// <path>/<'blobs' | 'manifests'>/<name>
const parts = object.key.split("/");
// maybe an upload.
if (parts.length === 1) {
if (parts.length === 1 || parts[0] === "_uploads") {
return;
}

Expand Down Expand Up @@ -513,7 +513,7 @@ export class R2Registry implements Registry {
// Generate a unique ID for this upload
const uuid = crypto.randomUUID();

const upload = await this.env.REGISTRY.createMultipartUpload(uuid, {
const upload = await this.env.REGISTRY.createMultipartUpload("_uploads/"+uuid, {
customMetadata: { [registryUploadKey]: "true" },
});
const state = {
Expand Down Expand Up @@ -596,7 +596,7 @@ export class R2Registry implements Registry {
return { response: new InternalError() };
}

const upload = this.env.REGISTRY.resumeMultipartUpload(state.registryUploadId, state.uploadId);
const upload = this.env.REGISTRY.resumeMultipartUpload("_uploads/"+state.registryUploadId, state.uploadId);
const uuid = state.registryUploadId;
const env = this.env;

Expand Down Expand Up @@ -819,10 +819,11 @@ export class R2Registry implements Registry {
sha256: (expectedSha as string).slice(SHA256_PREFIX_LEN),
});
} else {
const upload = this.env.REGISTRY.resumeMultipartUpload(uuid, state.uploadId);
const upload_path = "_uploads/"+uuid;
const upload = this.env.REGISTRY.resumeMultipartUpload(upload_path, state.uploadId);
// TODO: Handle one last buffer here
await upload.complete(state.parts);
const obj = await this.env.REGISTRY.get(uuid);
const obj = await this.env.REGISTRY.get(upload_path);
if (obj === null) {
console.error("unreachable, obj is null when we just created upload");
return {
Expand Down Expand Up @@ -853,16 +854,16 @@ export class R2Registry implements Registry {
}

const [, err] = await wrap(
this.env.REGISTRY.put(target, uuid, {
this.env.REGISTRY.put(target, upload_path, {
customMetadata: {
[referenceHeader]: uuid,
[referenceHeader]: upload_path,
[digestHeaderInReference]: digest,
},
}),
);
if (err !== null) {
console.error("error uploading reference blob", errorString(err));
await this.env.REGISTRY.delete(uuid);
await this.env.REGISTRY.delete(upload_path);
return {
response: new InternalError(),
};
Expand All @@ -872,7 +873,7 @@ export class R2Registry implements Registry {
sha256: (expectedSha as string).slice(SHA256_PREFIX_LEN),
});
const [, err] = await wrap(put);
await this.env.REGISTRY.delete(uuid);
await this.env.REGISTRY.delete(upload_path);
if (err !== null) {
console.error("error uploading blob", errorString(err));
return {
Expand Down Expand Up @@ -900,7 +901,7 @@ export class R2Registry implements Registry {
}
const state = hashedState.state;

const upload = this.env.REGISTRY.resumeMultipartUpload(state.registryUploadId, state.uploadId);
const upload = this.env.REGISTRY.resumeMultipartUpload("_uploads/"+state.registryUploadId, state.uploadId);
await upload.abort();
return true;
}
Expand Down