This commit is contained in:
Chris Lu
2026-01-28 14:34:07 -08:00
parent 4d4af0589b
commit dffe038efa
2 changed files with 14 additions and 14 deletions

View File

@@ -32,17 +32,17 @@ func NewLockClient(grpcDialOption grpc.DialOption, seedFiler pb.ServerAddress) *
} }
type LiveLock struct { type LiveLock struct {
key string key string
renewToken string renewToken string
expireAtNs int64 expireAtNs int64
hostFiler pb.ServerAddress hostFiler pb.ServerAddress
cancelCh chan struct{} cancelCh chan struct{}
grpcDialOption grpc.DialOption grpcDialOption grpc.DialOption
isLocked int32 // 0 = unlocked, 1 = locked; use atomic operations isLocked int32 // 0 = unlocked, 1 = locked; use atomic operations
self string self string
lc *LockClient lc *LockClient
owner string owner string
lockTTL time.Duration lockTTL time.Duration
consecutiveFailures int // Track connection failures to trigger fallback consecutiveFailures int // Track connection failures to trigger fallback
} }

View File

@@ -453,7 +453,7 @@ func TestMiddlewareVaryHeader(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
// Setup mocks // Setup mocks
bucketChecker := &mockBucketChecker{bucketExists: true} bucketChecker := &mockBucketChecker{bucketExists: true}
var errCode s3err.ErrorCode var errCode s3err.ErrorCode
if tt.bucketConfig == nil { if tt.bucketConfig == nil {
errCode = s3err.ErrNoSuchCORSConfiguration errCode = s3err.ErrNoSuchCORSConfiguration
@@ -503,7 +503,7 @@ func TestMiddlewareVaryHeader(t *testing.T) {
func TestHandleOptionsRequestVaryHeader(t *testing.T) { func TestHandleOptionsRequestVaryHeader(t *testing.T) {
// Setup mocks // Setup mocks
bucketChecker := &mockBucketChecker{bucketExists: true} bucketChecker := &mockBucketChecker{bucketExists: true}
config := &CORSConfiguration{ config := &CORSConfiguration{
CORSRules: []CORSRule{ CORSRules: []CORSRule{
{ {
@@ -528,7 +528,7 @@ func TestHandleOptionsRequestVaryHeader(t *testing.T) {
"bucket": "testbucket", "bucket": "testbucket",
"object": "testobject", "object": "testobject",
}) })
// Set valid CORS headers // Set valid CORS headers
req.Header.Set("Origin", "https://example.com") req.Header.Set("Origin", "https://example.com")
req.Header.Set("Access-Control-Request-Method", "GET") req.Header.Set("Access-Control-Request-Method", "GET")