MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 15:03:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove comments relating to deprecated MINIO_DEBUG envvar (#2797)

Browse Source
This commit is contained in:
Aditya Manthramurthy 2016-09-27 18:28:46 -07:00 committed by Harshavardhana
parent 8ea571c7f7
commit 10d2ef5449
6 changed files with 30 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/fs-v1-multipart.go
View File

@ -58,8 +58,7 @@ func (fs fsObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
var err error var err error
var eof bool var eof bool
if uploadIDMarker != "" { if uploadIDMarker != "" {
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.RLock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, keyMarker), opsID) nsMutex.RLock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, keyMarker), opsID)
uploads, _, err = listMultipartUploadIDs(bucket, keyMarker, uploadIDMarker, maxUploads, fs.storage) uploads, _, err = listMultipartUploadIDs(bucket, keyMarker, uploadIDMarker, maxUploads, fs.storage)
@ -114,8 +113,7 @@ func (fs fsObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
var end bool var end bool
uploadIDMarker = "" uploadIDMarker = ""
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.RLock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, entry), opsID) nsMutex.RLock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, entry), opsID)
@ -233,8 +231,7 @@ func (fs fsObjects) newMultipartUpload(bucket string, object string, meta map[st
fsMeta.Meta = meta fsMeta.Meta = meta
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// This lock needs to be held for any changes to the directory contents of ".minio.sys/multipart/object/" // This lock needs to be held for any changes to the directory contents of ".minio.sys/multipart/object/"
@ -410,8 +407,7 @@ func (fs fsObjects) PutObjectPart(bucket, object, uploadID string, partID int, s
uploadIDPath := path.Join(mpartMetaPrefix, bucket, object, uploadID) uploadIDPath := path.Join(mpartMetaPrefix, bucket, object, uploadID)
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.RLock(minioMetaBucket, uploadIDPath, opsID) nsMutex.RLock(minioMetaBucket, uploadIDPath, opsID)
@ -476,8 +472,7 @@ func (fs fsObjects) PutObjectPart(bucket, object, uploadID string, partID int, s
} }
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID = getOpsID() opsID = getOpsID()
// Hold write lock as we are updating fs.json // Hold write lock as we are updating fs.json
@ -583,8 +578,7 @@ func (fs fsObjects) ListObjectParts(bucket, object, uploadID string, partNumberM
return ListPartsInfo{}, traceError(ObjectNameInvalid{Bucket: bucket, Object: object}) return ListPartsInfo{}, traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Hold lock so that there is no competing abort-multipart-upload or complete-multipart-upload. // Hold lock so that there is no competing abort-multipart-upload or complete-multipart-upload.
@ -620,8 +614,7 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload
} }
uploadIDPath := path.Join(mpartMetaPrefix, bucket, object, uploadID) uploadIDPath := path.Join(mpartMetaPrefix, bucket, object, uploadID)
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Hold lock so that // Hold lock so that
@ -748,8 +741,7 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload
return "", toObjectErr(err, bucket, object) return "", toObjectErr(err, bucket, object)
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID = getOpsID() opsID = getOpsID()
// Hold the lock so that two parallel complete-multipart-uploads do not // Hold the lock so that two parallel complete-multipart-uploads do not
@ -844,8 +836,7 @@ func (fs fsObjects) AbortMultipartUpload(bucket, object, uploadID string) error
return traceError(ObjectNameInvalid{Bucket: bucket, Object: object}) return traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Hold lock so that there is no competing complete-multipart-upload or put-object-part. // Hold lock so that there is no competing complete-multipart-upload or put-object-part.

9
cmd/xl-v1-bucket.go
View File

@ -31,8 +31,7 @@ func (xl xlObjects) MakeBucket(bucket string) error {
return traceError(BucketNameInvalid{Bucket: bucket}) return traceError(BucketNameInvalid{Bucket: bucket})
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.Lock(bucket, "", opsID) nsMutex.Lock(bucket, "", opsID)
@ -175,8 +174,7 @@ func (xl xlObjects) GetBucketInfo(bucket string) (BucketInfo, error) {
if !IsValidBucketName(bucket) { if !IsValidBucketName(bucket) {
return BucketInfo{}, BucketNameInvalid{Bucket: bucket} return BucketInfo{}, BucketNameInvalid{Bucket: bucket}
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.RLock(bucket, "", opsID) nsMutex.RLock(bucket, "", opsID)
@ -251,8 +249,7 @@ func (xl xlObjects) DeleteBucket(bucket string) error {
return BucketNameInvalid{Bucket: bucket} return BucketNameInvalid{Bucket: bucket}
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.Lock(bucket, "", opsID) nsMutex.Lock(bucket, "", opsID)

3
cmd/xl-v1-list-objects-heal.go
View File

@ -138,8 +138,7 @@ func (xl xlObjects) listObjectsHeal(bucket, prefix, marker, delimiter string, ma
continue continue
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Check if the current object needs healing // Check if the current object needs healing

33
cmd/xl-v1-multipart.go
View File

@ -62,8 +62,7 @@ func (xl xlObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
// List all upload ids for the keyMarker starting from // List all upload ids for the keyMarker starting from
// uploadIDMarker first. // uploadIDMarker first.
if uploadIDMarker != "" { if uploadIDMarker != "" {
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.RLock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, keyMarker), opsID) nsMutex.RLock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, keyMarker), opsID)
@ -132,8 +131,7 @@ func (xl xlObjects) listMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
var end bool var end bool
uploadIDMarker = "" uploadIDMarker = ""
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// For the new object entry we get all its pending uploadIDs. // For the new object entry we get all its pending uploadIDs.
@ -278,8 +276,7 @@ func (xl xlObjects) newMultipartUpload(bucket string, object string, meta map[st
xlMeta.Stat.ModTime = time.Now().UTC() xlMeta.Stat.ModTime = time.Now().UTC()
xlMeta.Meta = meta xlMeta.Meta = meta
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// This lock needs to be held for any changes to the directory contents of ".minio.sys/multipart/object/" // This lock needs to be held for any changes to the directory contents of ".minio.sys/multipart/object/"
@ -353,8 +350,7 @@ func (xl xlObjects) PutObjectPart(bucket, object, uploadID string, partID int, s
var errs []error var errs []error
uploadIDPath := pathJoin(mpartMetaPrefix, bucket, object, uploadID) uploadIDPath := pathJoin(mpartMetaPrefix, bucket, object, uploadID)
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.RLock(minioMetaBucket, uploadIDPath, opsID) nsMutex.RLock(minioMetaBucket, uploadIDPath, opsID)
@ -439,8 +435,7 @@ func (xl xlObjects) PutObjectPart(bucket, object, uploadID string, partID int, s
} }
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID = getOpsID() opsID = getOpsID()
nsMutex.Lock(minioMetaBucket, uploadIDPath, opsID) nsMutex.Lock(minioMetaBucket, uploadIDPath, opsID)
@ -588,8 +583,7 @@ func (xl xlObjects) ListObjectParts(bucket, object, uploadID string, partNumberM
return ListPartsInfo{}, traceError(ObjectNameInvalid{Bucket: bucket, Object: object}) return ListPartsInfo{}, traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Hold lock so that there is no competing abort-multipart-upload or complete-multipart-upload. // Hold lock so that there is no competing abort-multipart-upload or complete-multipart-upload.
@ -625,8 +619,7 @@ func (xl xlObjects) CompleteMultipartUpload(bucket string, object string, upload
}) })
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Hold lock so that // Hold lock so that
@ -745,8 +738,7 @@ func (xl xlObjects) CompleteMultipartUpload(bucket string, object string, upload
return "", toObjectErr(rErr, minioMetaBucket, uploadIDPath) return "", toObjectErr(rErr, minioMetaBucket, uploadIDPath)
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID = getOpsID() opsID = getOpsID()
// Hold write lock on the destination before rename. // Hold write lock on the destination before rename.
@ -798,8 +790,7 @@ func (xl xlObjects) CompleteMultipartUpload(bucket string, object string, upload
// Delete the previously successfully renamed object. // Delete the previously successfully renamed object.
xl.deleteObject(minioMetaBucket, path.Join(tmpMetaPrefix, uniqueID)) xl.deleteObject(minioMetaBucket, path.Join(tmpMetaPrefix, uniqueID))
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID = getOpsID() opsID = getOpsID()
// Hold the lock so that two parallel complete-multipart-uploads do not // Hold the lock so that two parallel complete-multipart-uploads do not
@ -845,8 +836,7 @@ func (xl xlObjects) abortMultipartUpload(bucket, object, uploadID string) (err e
return toObjectErr(err, bucket, object) return toObjectErr(err, bucket, object)
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.Lock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object), opsID) nsMutex.Lock(minioMetaBucket, pathJoin(mpartMetaPrefix, bucket, object), opsID)
@ -902,8 +892,7 @@ func (xl xlObjects) AbortMultipartUpload(bucket, object, uploadID string) error
return traceError(ObjectNameInvalid{Bucket: bucket, Object: object}) return traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Hold lock so that there is no competing complete-multipart-upload or put-object-part. // Hold lock so that there is no competing complete-multipart-upload or put-object-part.

15
cmd/xl-v1-object.go
View File

@ -57,8 +57,7 @@ func (xl xlObjects) GetObject(bucket, object string, startOffset int64, length i
return traceError(errUnexpected) return traceError(errUnexpected)
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Lock the object before reading. // Lock the object before reading.
@ -231,8 +230,7 @@ func (xl xlObjects) HealObject(bucket, object string) error {
return traceError(ObjectNameInvalid{Bucket: bucket, Object: object}) return traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Lock the object before healing. // Lock the object before healing.
@ -360,8 +358,7 @@ func (xl xlObjects) GetObjectInfo(bucket, object string) (ObjectInfo, error) {
return ObjectInfo{}, ObjectNameInvalid{Bucket: bucket, Object: object} return ObjectInfo{}, ObjectNameInvalid{Bucket: bucket, Object: object}
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.RLock(bucket, object, opsID) nsMutex.RLock(bucket, object, opsID)
@ -624,8 +621,7 @@ func (xl xlObjects) PutObject(bucket string, object string, size int64, data io.
} }
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
// Lock the object. // Lock the object.
@ -754,8 +750,7 @@ func (xl xlObjects) DeleteObject(bucket, object string) (err error) {
return traceError(ObjectNameInvalid{Bucket: bucket, Object: object}) return traceError(ObjectNameInvalid{Bucket: bucket, Object: object})
} }
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.Lock(bucket, object, opsID) nsMutex.Lock(bucket, object, opsID)

3
cmd/xl-v1.go
View File

@ -187,8 +187,7 @@ func (xl xlObjects) Shutdown() error {
// HealDiskMetadata function for object storage interface. // HealDiskMetadata function for object storage interface.
func (xl xlObjects) HealDiskMetadata() error { func (xl xlObjects) HealDiskMetadata() error {
// generates random string on setting MINIO_DEBUG=lock, else returns empty string. // get a random ID for lock instrumentation.
// used for instrumentation on locks.
opsID := getOpsID() opsID := getOpsID()
nsMutex.Lock(minioMetaBucket, formatConfigFile, opsID) nsMutex.Lock(minioMetaBucket, formatConfigFile, opsID)