Converge repeated code to common deleteBucketMetadata() (#5508)

cmd/fs-v1.go

@@ -346,22 +346,10 @@ func (fs *fsObjects) DeleteBucket(bucket string) error {
 	if err = fsRemoveAll(minioMetadataBucketDir); err != nil {
 		return toObjectErr(err, bucket)
 	}
-	// Delete bucket access policy, if present - ignore any errors.
-	_ = removeBucketPolicy(bucket, fs)
 
-	// Notify all peers (including self) to update in-memory state
+	// Delete all bucket metadata.
-	S3PeersUpdateBucketPolicy(bucket)
+	deleteBucketMetadata(bucket, fs)
 
-	// Delete notification config, if present - ignore any errors.
-	_ = removeNotificationConfig(bucket, fs)
-
-	// Notify all peers (including self) to update in-memory state
-	S3PeersUpdateBucketNotification(bucket, nil)
-	// Delete listener config, if present - ignore any errors.
-	_ = removeListenerConfig(bucket, fs)
-
-	// Notify all peers (including self) to update in-memory state
-	S3PeersUpdateBucketListener(bucket, []listenerConfig{})
 	return nil
 }
 

cmd/object-api-common.go

@@ -85,6 +85,25 @@ func dirObjectInfo(bucket, object string, size int64, metadata map[string]string
 	}
 }
 
+func deleteBucketMetadata(bucket string, objAPI ObjectLayer) {
+	// Delete bucket access policy, if present - ignore any errors.
+	_ = removeBucketPolicy(bucket, objAPI)
+
+	// Notify all peers (including self) to update in-memory state
+	S3PeersUpdateBucketPolicy(bucket)
+
+	// Delete notification config, if present - ignore any errors.
+	_ = removeNotificationConfig(bucket, objAPI)
+
+	// Notify all peers (including self) to update in-memory state
+	S3PeersUpdateBucketNotification(bucket, nil)
+	// Delete listener config, if present - ignore any errors.
+	_ = removeListenerConfig(bucket, objAPI)
+
+	// Notify all peers (including self) to update in-memory state
+	S3PeersUpdateBucketListener(bucket, []listenerConfig{})
+}
+
 // House keeping code for FS/XL and distributed Minio setup.
 func houseKeeping(storageDisks []StorageAPI) error {
 	var wg = &sync.WaitGroup{}

cmd/xl-v1-bucket.go

@@ -281,22 +281,9 @@ func (xl xlObjects) DeleteBucket(bucket string) error {
 	if err != nil {
 		return toObjectErr(err, bucket)
 	}
-	// Delete bucket access policy, if present - ignore any errors.
-	_ = removeBucketPolicy(bucket, xl)
 
-	// Notify all peers (including self) to update in-memory state
+	// Delete all bucket metadata.
-	S3PeersUpdateBucketPolicy(bucket)
+	deleteBucketMetadata(bucket, xl)
-
-	// Delete notification config, if present - ignore any errors.
-	_ = removeNotificationConfig(bucket, xl)
-
-	// Notify all peers (including self) to update in-memory state
-	S3PeersUpdateBucketNotification(bucket, nil)
-	// Delete listener config, if present - ignore any errors.
-	_ = removeListenerConfig(bucket, xl)
-
-	// Notify all peers (including self) to update in-memory state
-	S3PeersUpdateBucketListener(bucket, []listenerConfig{})
 
 	return nil
 }