Calculate s3 storage #8789
Draft
Calculate s3 storage #8789
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the ✨ Finishing Touches🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. CodeRabbit Commands (Invoked using PR/Issue comments)Type Other keywords and placeholders
CodeRabbit Configuration File (
|
…culate-s3-storage
…culate-s3-storage
…culate-s3-storage
Comment on lines
+38
to
+39
| // Left for mags, right for attachments | ||
| _artifactId: Either[ObjectId, ObjectId], |
There was a problem hiding this comment.
This was a design decision I initially made. It is also possible to split this into two options. What do you prefer?
I mean
Suggested change
| // Left for mags, right for attachments | |
| _artifactId: Either[ObjectId, ObjectId], | |
| _magId: Option[ObjectId], | |
| _attachmentId: Option[ObjectId], |
as an alternative
| fetchUsedStorage { | ||
| rescanInterval = 24 hours # do not scan organizations whose last scan is more recent than this | ||
| tickerInterval = 10 minutes # scan some organizations at each tick | ||
| fetchUsedStorage { # TODOM: undo these changes |
Comment on lines
+27
to
+52
| -- ObjectId generation function taken and modified from https://thinhdanggroup.github.io/mongo-id-in-postgresql/ | ||
| CREATE SEQUENCE webknossos.objectid_sequence; | ||
|
|
||
| CREATE FUNCTION webknossos.generate_object_id() RETURNS TEXT AS $$ | ||
| DECLARE | ||
| time_component TEXT; | ||
| machine_id TEXT; | ||
| process_id TEXT; | ||
| counter TEXT; | ||
| result TEXT; | ||
| BEGIN | ||
| -- Extract the current timestamp in seconds since the Unix epoch (4 bytes, 8 hex chars) | ||
| SELECT LPAD(TO_HEX(FLOOR(EXTRACT(EPOCH FROM clock_timestamp()))::BIGINT), 8, '0') INTO time_component; | ||
| -- Generate a machine identifier using the hash of the server IP (3 bytes, 6 hex chars) | ||
| SELECT SUBSTRING(md5(CAST(inet_server_addr() AS TEXT)) FROM 1 FOR 6) INTO machine_id; | ||
| -- Retrieve the current backend process ID, limited to 2 bytes (4 hex chars) | ||
| SELECT LPAD(TO_HEX(pg_backend_pid() % 65536), 4, '0') INTO process_id; | ||
| -- Generate a counter using a sequence, ensuring it's 3 bytes (6 hex chars) | ||
| SELECT LPAD(TO_HEX(nextval('webknossos.objectid_sequence')::BIGINT % 16777216), 6, '0') INTO counter; | ||
| -- Concatenate all parts to form a 24-character ObjectId | ||
| result := time_component || machine_id || process_id || counter; | ||
|
|
||
| RETURN result; | ||
| END; | ||
| $$ LANGUAGE plpgsql; | ||
|
|
There was a problem hiding this comment.
Moved to have the type available earlier in the file / schema to use it in e.g. organization_usedStorage
Comment on lines
+146
to
+150
| DataStore(conf.Datastore.name, | ||
| conf.Http.uri, | ||
| conf.Datastore.publicUri.getOrElse(conf.Http.uri), | ||
| conf.Datastore.key, | ||
| reportUsedStorageEnabled = true) // TODOM: Undo this |
Comment on lines
186
to
212
| r._artifactId match { | ||
| case Left(magId) => | ||
| q""" | ||
| INSERT INTO webknossos.organization_usedStorage ( | ||
| _organization, _dataset, _dataset_mag, _layer_attachment, path, usedStorageBytes, lastUpdated | ||
| ) | ||
| VALUES (${organizationId}, ${r._datasetId}, ${magId}, NULL, ${r.path}, ${r.usedStorageBytes}, NOW()) | ||
| ON CONFLICT ON CONSTRAINT unique_dataset_mag | ||
| DO UPDATE SET | ||
| path = EXCLUDED.path, | ||
| usedStorageBytes = EXCLUDED.usedStorageBytes, | ||
| lastUpdated = EXCLUDED.lastUpdated; | ||
| """.asUpdate | ||
| case Right(attachmentId) => | ||
| q""" | ||
| INSERT INTO webknossos.organization_usedStorage ( | ||
| _organization, _dataset, _dataset_mag, _layer_attachment, path, usedStorageBytes, lastUpdated | ||
| ) -- TODO: test why no s3 test dataset is included | ||
| VALUES (${organizationId}, ${r._datasetId}, NULL, ${attachmentId}, ${r.path}, ${r.usedStorageBytes}, NOW()) | ||
| ON CONFLICT ON CONSTRAINT unique_layer_attachment | ||
| DO UPDATE SET | ||
| path = EXCLUDED.path, | ||
| usedStorageBytes = EXCLUDED.usedStorageBytes, | ||
| lastUpdated = EXCLUDED.lastUpdated; | ||
| """.asUpdate | ||
| } | ||
| } |
There was a problem hiding this comment.
TODO @me Make DRYer
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
URL of deployed dev instance (used for testing):
Steps to test:
TODOs:
Issues:
(Please delete unneeded items, merge only when none are left open)
$PR_NUMBER.mdfile inunreleased_changesor use./tools/create-changelog-entry.py)