mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-19 18:34:59 +00:00
PMM-9288 Changes after discussion.
This commit is contained in:
@@ -120,28 +120,41 @@ func (s *Stats) Add(doc proto.SystemProfile) error {
|
|||||||
qiac.LastSeen = doc.Ts
|
qiac.LastSeen = doc.Ts
|
||||||
}
|
}
|
||||||
|
|
||||||
if doc.Storage.Data.BytesRead > 0 {
|
|
||||||
qiac.StorageBytesRead = append(qiac.StorageBytesRead, float64(doc.Storage.Data.BytesRead))
|
|
||||||
}
|
|
||||||
if doc.Storage.Data.TimeReadingMicros > 0 {
|
|
||||||
qiac.StorageTimeReadingMicros = append(qiac.StorageTimeReadingMicros, float64(doc.Storage.Data.TimeReadingMicros))
|
|
||||||
}
|
|
||||||
|
|
||||||
qiac.LocksGlobalAcquireCountReadShared += doc.Locks.Global.AcquireCount.ReadShared
|
|
||||||
qiac.LocksGlobalAcquireCountWriteShared += doc.Locks.Global.AcquireCount.WriteShared
|
|
||||||
qiac.LocksDatabaseAcquireCountReadShared += doc.Locks.Database.AcquireCount.ReadShared
|
|
||||||
qiac.LocksDatabaseAcquireWaitCountReadShared += doc.Locks.Database.AcquireWaitCount.ReadShared
|
|
||||||
if doc.Locks.Database.TimeAcquiringMicros.ReadShared > 0 {
|
|
||||||
qiac.LocksDatabaseTimeAcquiringMicrosReadShared = append(qiac.LocksDatabaseTimeAcquiringMicrosReadShared, float64(doc.Locks.Database.TimeAcquiringMicros.ReadShared))
|
|
||||||
}
|
|
||||||
qiac.LocksCollectionAcquireCountReadShared += doc.Locks.Collection.AcquireCount.ReadShared
|
|
||||||
|
|
||||||
if doc.DocsExamined > 0 {
|
if doc.DocsExamined > 0 {
|
||||||
qiac.DocsExamined = append(qiac.DocsExamined, float64(doc.DocsExamined))
|
qiac.DocsExamined = append(qiac.DocsExamined, float64(doc.DocsExamined))
|
||||||
}
|
}
|
||||||
if doc.KeysExamined > 0 {
|
if doc.KeysExamined > 0 {
|
||||||
qiac.KeysExamined = append(qiac.KeysExamined, float64(doc.KeysExamined))
|
qiac.KeysExamined = append(qiac.KeysExamined, float64(doc.KeysExamined))
|
||||||
}
|
}
|
||||||
|
if doc.Locks.Global.AcquireCount.ReadShared > 0 {
|
||||||
|
qiac.LocksGlobalAcquireCountReadSharedCount++
|
||||||
|
qiac.LocksGlobalAcquireCountReadShared += doc.Locks.Global.AcquireCount.ReadShared
|
||||||
|
}
|
||||||
|
if doc.Locks.Global.AcquireCount.WriteShared > 0 {
|
||||||
|
qiac.LocksGlobalAcquireCountWriteSharedCount++
|
||||||
|
qiac.LocksGlobalAcquireCountWriteShared += doc.Locks.Global.AcquireCount.WriteShared
|
||||||
|
}
|
||||||
|
if doc.Locks.Database.AcquireCount.ReadShared > 0 {
|
||||||
|
qiac.LocksDatabaseAcquireCountReadSharedCount++
|
||||||
|
qiac.LocksDatabaseAcquireCountReadShared += doc.Locks.Database.AcquireCount.ReadShared
|
||||||
|
}
|
||||||
|
if doc.Locks.Database.AcquireWaitCount.ReadShared > 0 {
|
||||||
|
qiac.LocksDatabaseAcquireWaitCountReadSharedCount++
|
||||||
|
qiac.LocksDatabaseAcquireWaitCountReadShared += doc.Locks.Database.AcquireWaitCount.ReadShared
|
||||||
|
}
|
||||||
|
if doc.Locks.Database.TimeAcquiringMicros.ReadShared > 0 {
|
||||||
|
qiac.LocksDatabaseTimeAcquiringMicrosReadShared = append(qiac.LocksDatabaseTimeAcquiringMicrosReadShared, float64(doc.Locks.Database.TimeAcquiringMicros.ReadShared))
|
||||||
|
}
|
||||||
|
if doc.Locks.Collection.AcquireCount.ReadShared > 0 {
|
||||||
|
qiac.LocksCollectionAcquireCountReadSharedCount++
|
||||||
|
qiac.LocksCollectionAcquireCountReadShared += doc.Locks.Collection.AcquireCount.ReadShared
|
||||||
|
}
|
||||||
|
if doc.Storage.Data.BytesRead > 0 {
|
||||||
|
qiac.StorageBytesRead = append(qiac.StorageBytesRead, float64(doc.Storage.Data.BytesRead))
|
||||||
|
}
|
||||||
|
if doc.Storage.Data.TimeReadingMicros > 0 {
|
||||||
|
qiac.StorageTimeReadingMicros = append(qiac.StorageTimeReadingMicros, float64(doc.Storage.Data.TimeReadingMicros))
|
||||||
|
}
|
||||||
s.Unlock()
|
s.Unlock()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -234,11 +247,16 @@ type QueryInfoAndCounters struct {
|
|||||||
User string
|
User string
|
||||||
Comments string
|
Comments string
|
||||||
|
|
||||||
|
LocksGlobalAcquireCountReadSharedCount int
|
||||||
LocksGlobalAcquireCountReadShared int
|
LocksGlobalAcquireCountReadShared int
|
||||||
|
LocksGlobalAcquireCountWriteSharedCount int
|
||||||
LocksGlobalAcquireCountWriteShared int
|
LocksGlobalAcquireCountWriteShared int
|
||||||
|
LocksDatabaseAcquireCountReadSharedCount int
|
||||||
LocksDatabaseAcquireCountReadShared int
|
LocksDatabaseAcquireCountReadShared int
|
||||||
|
LocksDatabaseAcquireWaitCountReadSharedCount int
|
||||||
LocksDatabaseAcquireWaitCountReadShared int
|
LocksDatabaseAcquireWaitCountReadShared int
|
||||||
LocksDatabaseTimeAcquiringMicrosReadShared []float64 // in microseconds
|
LocksDatabaseTimeAcquiringMicrosReadShared []float64 // in microseconds
|
||||||
|
LocksCollectionAcquireCountReadSharedCount int
|
||||||
LocksCollectionAcquireCountReadShared int
|
LocksCollectionAcquireCountReadShared int
|
||||||
|
|
||||||
StorageBytesRead []float64
|
StorageBytesRead []float64
|
||||||
@@ -310,12 +328,17 @@ type QueryStats struct {
|
|||||||
User string
|
User string
|
||||||
Comments string
|
Comments string
|
||||||
|
|
||||||
|
LocksGlobalAcquireCountReadSharedCount int
|
||||||
LocksGlobalAcquireCountReadShared int
|
LocksGlobalAcquireCountReadShared int
|
||||||
|
LocksGlobalAcquireCountWriteSharedCount int
|
||||||
LocksGlobalAcquireCountWriteShared int
|
LocksGlobalAcquireCountWriteShared int
|
||||||
|
LocksDatabaseAcquireCountReadSharedCount int
|
||||||
LocksDatabaseAcquireCountReadShared int
|
LocksDatabaseAcquireCountReadShared int
|
||||||
|
LocksDatabaseAcquireWaitCountReadSharedCount int
|
||||||
LocksDatabaseAcquireWaitCountReadShared int
|
LocksDatabaseAcquireWaitCountReadShared int
|
||||||
LocksDatabaseTimeAcquiringMicrosReadSharedCount int
|
LocksDatabaseTimeAcquiringMicrosReadSharedCount int
|
||||||
LocksDatabaseTimeAcquiringMicrosReadShared Statistics // in microseconds
|
LocksDatabaseTimeAcquiringMicrosReadShared Statistics // in microseconds
|
||||||
|
LocksCollectionAcquireCountReadSharedCount int
|
||||||
LocksCollectionAcquireCountReadShared int
|
LocksCollectionAcquireCountReadShared int
|
||||||
|
|
||||||
StorageBytesReadCount int
|
StorageBytesReadCount int
|
||||||
@@ -362,12 +385,17 @@ func countersToStats(query QueryInfoAndCounters, uptime int64, tc totalCounters)
|
|||||||
Client: query.Client,
|
Client: query.Client,
|
||||||
User: query.User,
|
User: query.User,
|
||||||
Comments: query.Comments,
|
Comments: query.Comments,
|
||||||
|
LocksGlobalAcquireCountReadSharedCount: query.LocksGlobalAcquireCountReadSharedCount,
|
||||||
LocksGlobalAcquireCountReadShared: query.LocksGlobalAcquireCountReadShared,
|
LocksGlobalAcquireCountReadShared: query.LocksGlobalAcquireCountReadShared,
|
||||||
|
LocksGlobalAcquireCountWriteSharedCount: query.LocksGlobalAcquireCountWriteSharedCount,
|
||||||
LocksGlobalAcquireCountWriteShared: query.LocksGlobalAcquireCountWriteShared,
|
LocksGlobalAcquireCountWriteShared: query.LocksGlobalAcquireCountWriteShared,
|
||||||
|
LocksDatabaseAcquireCountReadSharedCount: query.LocksDatabaseAcquireCountReadSharedCount,
|
||||||
LocksDatabaseAcquireCountReadShared: query.LocksDatabaseAcquireCountReadShared,
|
LocksDatabaseAcquireCountReadShared: query.LocksDatabaseAcquireCountReadShared,
|
||||||
|
LocksDatabaseAcquireWaitCountReadSharedCount: query.LocksDatabaseAcquireWaitCountReadSharedCount,
|
||||||
LocksDatabaseAcquireWaitCountReadShared: query.LocksDatabaseAcquireWaitCountReadShared,
|
LocksDatabaseAcquireWaitCountReadShared: query.LocksDatabaseAcquireWaitCountReadShared,
|
||||||
LocksDatabaseTimeAcquiringMicrosReadSharedCount: len(query.LocksDatabaseTimeAcquiringMicrosReadShared),
|
LocksDatabaseTimeAcquiringMicrosReadSharedCount: len(query.LocksDatabaseTimeAcquiringMicrosReadShared),
|
||||||
LocksDatabaseTimeAcquiringMicrosReadShared: calcStats(query.LocksDatabaseTimeAcquiringMicrosReadShared),
|
LocksDatabaseTimeAcquiringMicrosReadShared: calcStats(query.LocksDatabaseTimeAcquiringMicrosReadShared),
|
||||||
|
LocksCollectionAcquireCountReadSharedCount: query.LocksCollectionAcquireCountReadSharedCount,
|
||||||
LocksCollectionAcquireCountReadShared: query.LocksCollectionAcquireCountReadShared,
|
LocksCollectionAcquireCountReadShared: query.LocksCollectionAcquireCountReadShared,
|
||||||
StorageBytesReadCount: len(query.StorageBytesRead),
|
StorageBytesReadCount: len(query.StorageBytesRead),
|
||||||
StorageBytesRead: calcStats(query.StorageBytesRead),
|
StorageBytesRead: calcStats(query.StorageBytesRead),
|
||||||
@@ -383,6 +411,9 @@ func countersToStats(query QueryInfoAndCounters, uptime int64, tc totalCounters)
|
|||||||
if tc.Bytes > 0 {
|
if tc.Bytes > 0 {
|
||||||
queryStats.ResponseLength.Pct = queryStats.ResponseLength.Total * 100 / tc.Bytes
|
queryStats.ResponseLength.Pct = queryStats.ResponseLength.Total * 100 / tc.Bytes
|
||||||
}
|
}
|
||||||
|
if queryStats.Returned.Total > 0 {
|
||||||
|
queryStats.Ratio = queryStats.DocsExamined.Total / queryStats.Returned.Total
|
||||||
|
}
|
||||||
if tc.DocsExamined > 0 {
|
if tc.DocsExamined > 0 {
|
||||||
queryStats.DocsExamined.Pct = queryStats.DocsExamined.Total * 100 / tc.DocsExamined
|
queryStats.DocsExamined.Pct = queryStats.DocsExamined.Total * 100 / tc.DocsExamined
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user