Add support for checking a sentinel file for the cache #1157
Conversation
This file contains 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
haoming29
added
enhancement
turetske
reviewed
Apr 24, 2024
turetske
reviewed
Apr 24, 2024
turetske
requested changes
Apr 24, 2024
| @@ -492,7 +492,8 @@ from S3 service URL. In this configuration, objects can be accessed at /federati | |||
| return originExports, nil | |||
| } | |||
|
|
|||
| func CheckSentinelLocation(exports []OriginExport) (ok bool, err error) { | |||
| // Check the sentinel files from Origin.Exports | |||
| func CheckOriginSentinelLocations(exports []OriginExport) (ok bool, err error) { | |||
There was a problem hiding this comment.
Suggested change
| func CheckOriginSentinelLocations(exports []OriginExport) (ok bool, err error) { | |
| func CheckOriginSentinelLocation(exports []OriginExport) (ok bool, err error) { |
There was a problem hiding this comment.
The s was intentional as we are checking multiple locations for different prefixes
launchers/cache_serve.go
Outdated
| @@ -51,6 +54,21 @@ func CacheServe(ctx context.Context, engine *gin.Engine, egrp *errgroup.Group, m | |||
| return nil, err | |||
| } | |||
|
|
|||
| // Check for the sentinel file | |||
| if param.Cache_SentinelLocation.IsSet() { | |||
| sentinelPath := param.Cache_SentinelLocation.GetString() | |||
There was a problem hiding this comment.
This seems redundant. Can the server_utils function be made more general to check both the cache and origin sentinel locations?
There was a problem hiding this comment.
The first draft (not published) was to take advantage of the server_utils function and make them share the same core logic, but I figured the real "core" logic is just a os.Stat call. Given that the error messages have different format for cache and origin, and that origin and cache reads from different parameters, I figured I'd be ok to have a separate function to handle them
turetske
approved these changes
Apr 24, 2024
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.
Closes #1056