jiuker
2 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
13 additions and
2 deletions
-
cmd/object-api-listobjects_test.go
-
cmd/server-main.go
|
|
@ -1938,6 +1938,10 @@ func TestListObjectsWithILM(t *testing.T) { |
|
|
|
} |
|
|
|
|
|
|
|
func testListObjectsWithILM(obj ObjectLayer, instanceType string, t1 TestErrHandler) { |
|
|
|
// Prepare lifecycle expiration workers
|
|
|
|
es := newExpiryState(t1.Context(), obj, 0) |
|
|
|
globalExpiryState = es |
|
|
|
|
|
|
|
t, _ := t1.(*testing.T) |
|
|
|
|
|
|
|
objContent := "test-content" |
|
|
@ -1977,7 +1981,12 @@ func testListObjectsWithILM(obj ObjectLayer, instanceType string, t1 TestErrHand |
|
|
|
t.Fatalf("%s : %s", instanceType, err.Error()) |
|
|
|
} |
|
|
|
|
|
|
|
globalBucketMetadataSys.Set(upload.bucket, BucketMetadata{lifecycleConfig: lifecycleConfig}) |
|
|
|
metadata, err := globalBucketMetadataSys.Get(upload.bucket) |
|
|
|
if err != nil { |
|
|
|
t.Fatal(err) |
|
|
|
} |
|
|
|
metadata.lifecycleConfig = lifecycleConfig |
|
|
|
globalBucketMetadataSys.Set(upload.bucket, metadata) |
|
|
|
defer globalBucketMetadataSys.Remove(upload.bucket) |
|
|
|
|
|
|
|
// Upload objects which modtime as one week ago, supposed to be expired by ILM
|
|
|
|
|
|
@ -452,7 +452,9 @@ func initAllSubsystems(ctx context.Context) { |
|
|
|
globalNotificationSys = NewNotificationSys(globalEndpoints) |
|
|
|
|
|
|
|
// Create new notification system
|
|
|
|
globalEventNotifier = NewEventNotifier(GlobalContext) |
|
|
|
if globalEventNotifier == nil { |
|
|
|
globalEventNotifier = NewEventNotifier(GlobalContext) |
|
|
|
} |
|
|
|
|
|
|
|
// Create new bucket metadata system.
|
|
|
|
if globalBucketMetadataSys == nil { |
|
|
|