fix: exclude ShareUpdateExclusiveLock from observer warnings

anatolystansler · anatolystansler · commit ce93a5ee7b4c · 2020-07-30T14:48:30.000Z
diff --git a/cmd/cli/commands/clone/actions.go b/cmd/cli/commands/clone/actions.go
@@ -245,6 +245,7 @@ func observeSummary() func(*cli.Context) error {
 		}
 
 		if err := obs.CheckPerformanceRequirements(); err != nil {
+			log.Err("Performance check error:", err)
 			// Exit with error status without printing additional error logs.
 			os.Exit(errorExitStatus)
 		}
diff --git a/pkg/observer/observer.go b/pkg/observer/observer.go
@@ -184,7 +184,7 @@ func (obs *Observer) PrintSummary() error {
 
 // CheckPerformanceRequirements checks monitoring data and returns an error if any of performance requires was not satisfied.
 func (obs *Observer) CheckPerformanceRequirements() error {
-	if obs.CheckDuration() || obs.CheckLocks() {
+	if !obs.CheckDuration() || !obs.CheckLocks() {
 		return errors.New("performance requirements not satisfied")
 	}
 
diff --git a/pkg/observer/queries.go b/pkg/observer/queries.go
@@ -30,8 +30,8 @@ const queryLocks = `with lock_data as (
     clock_timestamp() - a.state_change as state_changed_ago,
     a.pid
   from pg_stat_activity a
-  join pg_locks l ON l.pid = a.pid
-  where l.mode ~* 'exclusive'
+  join pg_locks l on l.pid = a.pid
+  where l.mode = 'AccessExclusiveLock' and l.locktype = 'relation'
 )
 select row_to_json(lock_data)
 from lock_data

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,7 @@ func observeSummary() func(*cli.Context) error {`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`if err := obs.CheckPerformanceRequirements(); err != nil {`
	`248`	`+ log.Err("Performance check error:", err)`
`248`	`249`	`// Exit with error status without printing additional error logs.`
`249`	`250`	`os.Exit(errorExitStatus)`
`250`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func (obs *Observer) PrintSummary() error {`
`184`	`184`
`185`	`185`	`// CheckPerformanceRequirements checks monitoring data and returns an error if any of performance requires was not satisfied.`
`186`	`186`	`func (obs *Observer) CheckPerformanceRequirements() error {`
`187`		`- if obs.CheckDuration() \|\| obs.CheckLocks() {`
	`187`	`+ if !obs.CheckDuration() \|\| !obs.CheckLocks() {`
`188`	`188`	`return errors.New("performance requirements not satisfied")`
`189`	`189`	`}`
`190`	`190`