MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-21 19:14:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename peer S3 prefix to avoid collision in the future (#16473)

Browse Source
This commit is contained in:
Anis Elleuch 2023-01-25 15:46:30 +01:00 committed by GitHub
parent 1bf1fafc86
commit 441babdc41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/generic-handlers.go
View File

@ -306,6 +306,7 @@ func setHTTPStatsHandler(h http.Handler) http.Handler {
if strings.HasPrefix(r.URL.Path, storageRESTPrefix) || if strings.HasPrefix(r.URL.Path, storageRESTPrefix) ||
strings.HasPrefix(r.URL.Path, peerRESTPrefix) || strings.HasPrefix(r.URL.Path, peerRESTPrefix) ||
strings.HasPrefix(r.URL.Path, peerS3Prefix) ||
strings.HasPrefix(r.URL.Path, lockRESTPrefix) { strings.HasPrefix(r.URL.Path, lockRESTPrefix) {
globalConnStats.incInputBytes(meteredRequest.BytesRead()) globalConnStats.incInputBytes(meteredRequest.BytesRead())
globalConnStats.incOutputBytes(meteredResponse.BytesWritten()) globalConnStats.incOutputBytes(meteredResponse.BytesWritten())

6
cmd/handler-utils.go
View File

@ -403,6 +403,12 @@ func errorResponseHandler(w http.ResponseWriter, r *http.Request) {
} }
desc := "Do not upgrade one server at a time - please follow the recommended guidelines mentioned here https://github.com/minio/minio#upgrading-minio for your environment" desc := "Do not upgrade one server at a time - please follow the recommended guidelines mentioned here https://github.com/minio/minio#upgrading-minio for your environment"
switch { switch {
case strings.HasPrefix(r.URL.Path, peerS3Prefix):
writeErrorResponseString(r.Context(), w, APIError{
Code: "XMinioPeerS3VersionMismatch",
Description: desc,
HTTPStatusCode: http.StatusUpgradeRequired,
}, r.URL)
case strings.HasPrefix(r.URL.Path, peerRESTPrefix): case strings.HasPrefix(r.URL.Path, peerRESTPrefix):
writeErrorResponseString(r.Context(), w, APIError{ writeErrorResponseString(r.Context(), w, APIError{
Code: "XMinioPeerVersionMismatch", Code: "XMinioPeerVersionMismatch",

2
cmd/peer-s3-server.go
View File

@ -33,7 +33,7 @@ const (
peerS3Version = "v1" // First implementation peerS3Version = "v1" // First implementation
peerS3VersionPrefix = SlashSeparator + peerS3Version peerS3VersionPrefix = SlashSeparator + peerS3Version
peerS3Prefix = minioReservedBucketPath + "/peer" peerS3Prefix = minioReservedBucketPath + "/peer-s3"
peerS3Path = peerS3Prefix + peerS3VersionPrefix peerS3Path = peerS3Prefix + peerS3VersionPrefix
) )