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

Add initial usage in GetBucketReplicationMetrics API (#11985)

Browse Source
This commit is contained in:
Poorna Krishnamoorthy 2021-04-06 11:32:52 -07:00 committed by GitHub
parent 4248b1bf6b
commit 40409437cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/bucket-handlers.go
View File

@ -1636,7 +1636,7 @@ func (api objectAPIHandlers) GetBucketReplicationMetricsHandler(w http.ResponseW
bucketStats := globalNotificationSys.GetClusterBucketStats(r.Context(), bucket) bucketStats := globalNotificationSys.GetClusterBucketStats(r.Context(), bucket)
bucketReplStats := BucketReplicationStats{} bucketReplStats := BucketReplicationStats{}
// sum up metrics from each node in the cluster
for _, bucketStat := range bucketStats { for _, bucketStat := range bucketStats {
bucketReplStats.FailedCount += bucketStat.ReplicationStats.FailedCount bucketReplStats.FailedCount += bucketStat.ReplicationStats.FailedCount
bucketReplStats.FailedSize += bucketStat.ReplicationStats.FailedSize bucketReplStats.FailedSize += bucketStat.ReplicationStats.FailedSize
@ -1645,6 +1645,14 @@ func (api objectAPIHandlers) GetBucketReplicationMetricsHandler(w http.ResponseW
bucketReplStats.ReplicaSize += bucketStat.ReplicationStats.ReplicaSize bucketReplStats.ReplicaSize += bucketStat.ReplicationStats.ReplicaSize
bucketReplStats.ReplicatedSize += bucketStat.ReplicationStats.ReplicatedSize bucketReplStats.ReplicatedSize += bucketStat.ReplicationStats.ReplicatedSize
} }
// add initial usage from the time of cluster up
usageStat := globalReplicationStats.GetInitialUsage(bucket)
bucketReplStats.FailedCount += usageStat.FailedCount
bucketReplStats.FailedSize += usageStat.FailedSize
bucketReplStats.PendingCount += usageStat.PendingCount
bucketReplStats.PendingSize += usageStat.PendingSize
bucketReplStats.ReplicaSize += usageStat.ReplicaSize
bucketReplStats.ReplicatedSize += usageStat.ReplicatedSize
if err := json.NewEncoder(w).Encode(&bucketReplStats); err != nil { if err := json.NewEncoder(w).Encode(&bucketReplStats); err != nil {
writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL, guessIsBrowserReq(r)) writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL, guessIsBrowserReq(r))

4
cmd/bucket-replication-stats.go
View File

@ -110,7 +110,7 @@ func (r *ReplicationStats) Update(bucket string, n int64, status, prevStatus rep
r.Unlock() r.Unlock()
} }
// GetInitialUsage gets initial usage from the time of cluster initialization // GetInitialUsage get replication metrics available at the time of cluster initialization
func (r *ReplicationStats) GetInitialUsage(bucket string) BucketReplicationStats { func (r *ReplicationStats) GetInitialUsage(bucket string) BucketReplicationStats {
if r == nil { if r == nil {
return BucketReplicationStats{} return BucketReplicationStats{}
@ -133,7 +133,7 @@ func (r *ReplicationStats) GetInitialUsage(bucket string) BucketReplicationStats
} }
} }
// Get total bytes pending replication for a bucket // Get replication metrics for a bucket from this node since this node came up.
func (r *ReplicationStats) Get(bucket string) BucketReplicationStats { func (r *ReplicationStats) Get(bucket string) BucketReplicationStats {
if r == nil { if r == nil {
return BucketReplicationStats{} return BucketReplicationStats{}