Skip to content

PMM-9630 Use status, status_code only for some versions. #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JiriCtvrtka merged 16 commits into from
Aug 26, 2022
Merged

PMM-9630 Use status, status_code only for some versions. #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3ac854a
PMM-9630 Remove status code usage.
Jun 3, 2022
4ff36c4
Merge branch 'main' into PMM-9630-status-code-usage
JiriCtvrtka Jun 16, 2022
801ce30
Merge branch 'main' into PMM-9630-status-code-usage
Jul 26, 2022
85183ce
Merge branch 'main' into PMM-9630-status-code-usage
Jul 27, 2022
dfbc797
Merge branch 'main' into PMM-9630-status-code-usage
JiriCtvrtka Aug 11, 2022
ee020fd
Merge branch 'main' into PMM-9630-status-code-usage
Aug 16, 2022
afbc284
PMM-9630 Support for PGSM 1.1.
Aug 16, 2022
e41a13a
Merge branch 'main' into PMM-9630-status-code-usage
JiriCtvrtka Aug 17, 2022
15ed8b9
Merge branch 'main' into PMM-9630-status-code-usage
JiriCtvrtka Aug 18, 2022
7a972ff
Merge branch 'main' into PMM-9630-status-code-usage
JiriCtvrtka Aug 22, 2022
f4062de
PMM-9630 Add support for 2.0
Aug 22, 2022
a3a2119
Merge branch 'main' into PMM-9630-status-code-usage
JiriCtvrtka Aug 24, 2022
666a236
PMM-9630 Required changes.
Aug 24, 2022
e4769af
Merge branch 'main' into PMM-9630-status-code-usage
JiriCtvrtka Aug 25, 2022
fb205ba
Merge branch 'main' into PMM-9630-status-code-usage
JiriCtvrtka Aug 25, 2022
8292912
Merge branch 'main' into PMM-9630-status-code-usage
JiriCtvrtka Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions agent/agents/postgres/pgstatmonitor/pgstatmonitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ const (
pgStatMonitorVersion10PG12
pgStatMonitorVersion10PG13
pgStatMonitorVersion10PG14
pgStatMonitorVersion11PG12

@github-actions github-actions Bot Aug 16, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [golangci-lint] reported by reviewdog 🐶
pgStatMonitorVersion11PG12 is unused (deadcode)

@BupycHuk BupycHuk Aug 22, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new variables are not added to this function https://github.com/percona/pmm/pull/912/files#diff-ae12be77883993fc7d2b5ebc501e2fb0b0078ea1d4645c2f9327095ae0661d30R153

@JiriCtvrtka JiriCtvrtka Aug 26, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added.

pgStatMonitorVersion11PG13

@github-actions github-actions Bot Aug 16, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [golangci-lint] reported by reviewdog 🐶
pgStatMonitorVersion11PG13 is unused (deadcode)

pgStatMonitorVersion11PG14
pgStatMonitorVersion20PG12
pgStatMonitorVersion20PG13
pgStatMonitorVersion20PG14
)

const (
Expand Down Expand Up @@ -165,6 +171,26 @@ func getPGMonitorVersion(q *reform.Querier) (pgStatMonitorVersion, pgStatMonitor

version := pgStatMonitorVersion06
switch {
case pgsmVersion.Core().GreaterThanOrEqual(v20):
if pgVersion >= 14 {
version = pgStatMonitorVersion20PG14
break
}
if pgVersion >= 13 {
version = pgStatMonitorVersion20PG13
break
}
version = pgStatMonitorVersion20PG12
case pgsmVersion.Core().GreaterThanOrEqual(v11):
if pgVersion >= 14 {
version = pgStatMonitorVersion11PG14
break
}
if pgVersion >= 13 {
version = pgStatMonitorVersion11PG13
break
}
version = pgStatMonitorVersion11PG12
case pgsmVersion.Core().GreaterThanOrEqual(v10):
if pgVersion >= 14 {
version = pgStatMonitorVersion10PG14
Expand Down
19 changes: 5 additions & 14 deletions agent/agents/postgres/pgstatmonitor/pgstatmonitor_models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ import (
)

var (
v10 = version.Must(version.NewVersion("1.0.0-beta-2"))
v20 = version.Must(version.NewVersion("2.0.0"))
v11 = version.Must(version.NewVersion("1.1.0"))
v10 = version.Must(version.NewVersion("1.0.0"))
v09 = version.Must(version.NewVersion("0.9"))
v08 = version.Must(version.NewVersion("0.8"))
)
Expand Down Expand Up @@ -82,13 +84,6 @@ type pgStatMonitor struct {
WalRecords int64
WalFpi int64
WalBytes int64
// state_code = 0 state 'PARSING'
// state_code = 1 state 'PLANNING'
// state_code = 2 state 'ACTIVE'
// state_code = 3 state 'FINISHED'
// state_code = 4 state 'FINISHED WITH ERROR'
StateCode int64
State string

// < pg0.6

Expand Down Expand Up @@ -179,9 +174,7 @@ func NewPgStatMonitorStructs(v pgStatMonitorVersion) (*pgStatMonitor, reform.Vie
field{info: parse.FieldInfo{Name: "Message", Type: "*string", Column: "message"}, pointer: &s.Message},
field{info: parse.FieldInfo{Name: "WalRecords", Type: "int64", Column: "wal_records"}, pointer: &s.WalRecords},
field{info: parse.FieldInfo{Name: "WalFpi", Type: "int64", Column: "wal_fpi"}, pointer: &s.WalFpi},
field{info: parse.FieldInfo{Name: "WalBytes", Type: "int64", Column: "wal_bytes"}, pointer: &s.WalBytes},
field{info: parse.FieldInfo{Name: "StateCode", Type: "int64", Column: "state_code"}, pointer: &s.StateCode},
field{info: parse.FieldInfo{Name: "State", Type: "string", Column: "state"}, pointer: &s.State})
field{info: parse.FieldInfo{Name: "WalBytes", Type: "int64", Column: "wal_bytes"}, pointer: &s.WalBytes})
}

if v <= pgStatMonitorVersion10PG12 {
Expand Down Expand Up @@ -257,7 +250,7 @@ func (v *pgStatMonitorAllViewType) NewStruct() reform.Struct {

// String returns a string representation of this struct or record.
func (s pgStatMonitor) String() string {
res := make([]string, 51)
res := make([]string, 49)

@github-actions github-actions Bot Jun 3, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [golangci-lint] reported by reviewdog 🐶
mnd: Magic number: 49, in detected (gomnd)

res[0] = "Bucket: " + reform.Inspect(s.Bucket, true)
res[1] = "BucketStartTime: " + reform.Inspect(s.BucketStartTime, true)
res[2] = "UserID: " + reform.Inspect(s.UserID, true)
Expand Down Expand Up @@ -307,8 +300,6 @@ func (s pgStatMonitor) String() string {
res[46] = "WalRecords: " + reform.Inspect(s.WalRecords, true)
res[47] = "WalFpi: " + reform.Inspect(s.WalFpi, true)
res[48] = "WalBytes: " + reform.Inspect(s.WalBytes, true)
res[49] = "StateCode: " + reform.Inspect(s.StateCode, true)
res[50] = "State: " + reform.Inspect(s.State, true)
return strings.Join(res, ", ")
}

Expand Down
2 changes: 1 addition & 1 deletion agent/agents/postgres/pgstatmonitor/pgstatmonitor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func filter(mb []*agentpb.MetricsBucket) []*agentpb.MetricsBucket {
func TestVersion(t *testing.T) {
pgsmVersion, err := ver.NewVersion("1.0.0-beta-2")
require.NoError(t, err)
require.True(t, pgsmVersion.GreaterThanOrEqual(v10))
require.True(t, pgsmVersion.LessThan(v10))
}

func TestPGStatMonitorSchema(t *testing.T) {
Expand Down
5 changes: 3 additions & 2 deletions agent/agents/postgres/pgstatmonitor/stat_monitor_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,11 @@ func (ssc *statMonitorCache) getStatMonitorExtended(ctx context.Context, q *refo

row, view := NewPgStatMonitorStructs(pgMonitorVersion)
conditions := "WHERE queryid IS NOT NULL AND query IS NOT NULL"
if pgMonitorVersion >= pgStatMonitorVersion09 {
// only pg_stat_monitor 0.9.0 and above supports state_code. It tells what is the query's current state.
if pgMonitorVersion >= pgStatMonitorVersion09 && pgMonitorVersion < pgStatMonitorVersion20PG12 {
// only pg_stat_monitor from 0.9.0 until 2.0.0 supports state_code. It tells what is the query's current state.
// To have correct data in QAN, we have to get only queries that are either 'FINISHED' or 'FINISHED WITH ERROR'.
conditions += " AND (state_code = 3 OR state_code = 4)"
ssc.l.Debug("PGSM version with state and state_code")
}
rows, e := q.SelectRows(view, conditions)
if e != nil {
Expand Down