@ -252,6 +252,7 @@ func (xl xlObjects) ListBucketsHeal() ([]BucketInfo, error) {
if err != nil {
if err != nil {
return listBuckets , err
return listBuckets , err
}
}
// Iterate over all buckets
// Iterate over all buckets
for _ , currBucket := range buckets {
for _ , currBucket := range buckets {
// Check the status of bucket metadata
// Check the status of bucket metadata
@ -275,6 +276,7 @@ func (xl xlObjects) ListBucketsHeal() ([]BucketInfo, error) {
}
}
}
}
// Sort found buckets
// Sort found buckets
sort . Sort ( byBucketName ( listBuckets ) )
sort . Sort ( byBucketName ( listBuckets ) )
return listBuckets , nil
return listBuckets , nil
@ -284,19 +286,18 @@ func (xl xlObjects) ListBucketsHeal() ([]BucketInfo, error) {
// during startup i.e healing of buckets, bucket metadata (policy.json,
// during startup i.e healing of buckets, bucket metadata (policy.json,
// notification.xml, listeners.json) etc. Currently this function
// notification.xml, listeners.json) etc. Currently this function
// supports quick healing of buckets, bucket metadata.
// supports quick healing of buckets, bucket metadata.
//
// TODO :-
// - add support for healing dangling `uploads.json`.
// - add support for healing dangling `xl.json`.
func quickHeal ( storageDisks [ ] StorageAPI , writeQuorum int , readQuorum int ) error {
func quickHeal ( storageDisks [ ] StorageAPI , writeQuorum int , readQuorum int ) error {
// List all bucket names from all disks.
// List all bucket name occurrence from all disks.
bucketNames , _ , err := listAllBuckets ( storageDisks )
_ , bucketOcc , err := listAllBuckets ( storageDisks )
if err != nil {
if err != nil {
return err
return err
}
}
// All bucket names and bucket metadata should be healed.
for bucketName := range bucketNames {
// All bucket names and bucket metadata that should be healed.
// Heal bucket and then proceed to heal bucket metadata.
for bucketName , occCount := range bucketOcc {
// Heal bucket only if healing is needed.
if occCount != len ( storageDisks ) {
// Heal bucket and then proceed to heal bucket metadata if any.
if err = healBucket ( storageDisks , bucketName , writeQuorum ) ; err == nil {
if err = healBucket ( storageDisks , bucketName , writeQuorum ) ; err == nil {
if err = healBucketMetadata ( storageDisks , bucketName , readQuorum ) ; err == nil {
if err = healBucketMetadata ( storageDisks , bucketName , readQuorum ) ; err == nil {
continue
continue
@ -305,6 +306,9 @@ func quickHeal(storageDisks []StorageAPI, writeQuorum int, readQuorum int) error
}
}
return err
return err
}
}
}
// Success.
return nil
return nil
}
}