Remove duration field from lock instrumentation (#4111)

Duration for which a lock was held can be computed from the `Since`
field of `OpsLockState`. It is the difference between current time and
time at which the namespace lock was held. This change avoids
superfluous instrumentation.

cmd/lock-instrument_test.go

@@ -141,7 +141,6 @@ func getSystemLockState() (SystemLockState, error) {
 				LockType:    lockInfo.lType,
 				Status:      lockInfo.status,
 				Since:       lockInfo.since,
-				Duration:    UTCNow().Sub(lockInfo.since),
 			})
 		}
 		lockState.LocksInfoPerObject = append(lockState.LocksInfoPerObject, volLockInfo)

cmd/lockinfo-handlers.go

@@ -57,12 +57,11 @@ type VolumeLockInfo struct {
 // OpsLockState - structure to fill in state information of the lock.
 // structure to fill in status information for each operation with given operation ID.
 type OpsLockState struct {
-	OperationID string        `json:"id"`       // String containing operation ID.
-	LockSource  string        `json:"source"`   // Operation type (GetObject, PutObject...)
-	LockType    lockType      `json:"type"`     // Lock type (RLock, WLock)
-	Status      statusType    `json:"status"`   // Status can be Running/Ready/Blocked.
-	Since       time.Time     `json:"since"`    // Time when the lock was initially held.
-	Duration    time.Duration `json:"duration"` // Duration since the lock was held.
+	OperationID string     `json:"id"`     // String containing operation ID.
+	LockSource  string     `json:"source"` // Operation type (GetObject, PutObject...)
+	LockType    lockType   `json:"type"`   // Lock type (RLock, WLock)
+	Status      statusType `json:"status"` // Status can be Running/Ready/Blocked.
+	Since       time.Time  `json:"since"`  // Time when the lock was initially held.
 }
 
 // listLocksInfo - Fetches locks held on bucket, matching prefix held for longer than duration.
@@ -105,7 +104,6 @@ func listLocksInfo(bucket, prefix string, duration time.Duration) []VolumeLockIn
 					LockType:    lockInfo.lType,
 					Status:      lockInfo.status,
 					Since:       lockInfo.since,
-					Duration:    elapsed,
 				})
 			volumeLocks = append(volumeLocks, volLockInfo)
 		}

pkg/madmin/lock-commands.go

@@ -42,12 +42,11 @@ const (
 
 // OpsLockState - represents lock specific details.
 type OpsLockState struct {
-	OperationID string        `json:"id"`       // String containing operation ID.
-	LockSource  string        `json:"source"`   // Operation type (GetObject, PutObject...)
-	LockType    lockType      `json:"type"`     // Lock type (RLock, WLock)
-	Status      statusType    `json:"status"`   // Status can be Running/Ready/Blocked.
-	Since       time.Time     `json:"since"`    // Time when the lock was initially held.
-	Duration    time.Duration `json:"duration"` // Duration since the lock was held.
+	OperationID string     `json:"id"`     // String containing operation ID.
+	LockSource  string     `json:"source"` // Operation type (GetObject, PutObject...)
+	LockType    lockType   `json:"type"`   // Lock type (RLock, WLock)
+	Status      statusType `json:"status"` // Status can be Running/Ready/Blocked.
+	Since       time.Time  `json:"since"`  // Time when the lock was initially held.
 }
 
 // VolumeLockInfo - represents summary and individual lock details of all