Merge pull request #125 from nikolaev-rd/patch-2

Exclude replication sessions from activity statistics

Author: casperr0

mamonsu/plugins/pgsql/oldest.py

@@ -17,9 +17,17 @@ class Oldest(Plugin):
 """
 
     OldestQuerySql = """
-select
-    extract(epoch from max(now() - xact_start))
-from pg_catalog.pg_stat_activity;
+SELECT 
+  CASE WHEN extract(epoch from max(now() - xact_start)) IS NOT null 
+        AND extract(epoch from max(now() - xact_start))>0
+    THEN extract(epoch from max(now() - xact_start)) 
+    ELSE 0 
+  END 
+FROM pg_catalog.pg_stat_activity 
+WHERE 
+  pid NOT IN(select pid from pg_stat_replication) AND 
+  pid <> pg_backend_pid() AND 
+  query NOT ilike '%%VACUUM%%';
 """
 
     OldestQuerySql_bootstrap = """

mamonsu/tools/bootstrap/sql.py

@@ -67,9 +67,17 @@
 
 CREATE or REPLACE FUNCTION public.mamonsu_get_oldest_query()
 RETURNS DOUBLE PRECISION AS $$
-    SELECT
-        extract(epoch from max(now() - xact_start))
-    FROM pg_catalog.pg_stat_activity
+    SELECT 
+        CASE WHEN extract(epoch from max(now() - xact_start)) IS NOT null 
+              AND extract(epoch from max(now() - xact_start))>0
+            THEN extract(epoch from max(now() - xact_start)) 
+            ELSE 0 
+        END 
+    FROM pg_catalog.pg_stat_activity 
+    WHERE 
+        pid NOT IN(select pid from pg_stat_replication) AND 
+        pid <> pg_backend_pid() AND 
+        query NOT ilike '%%VACUUM%%'
 $$ LANGUAGE SQL SECURITY DEFINER;
 
 CREATE OR REPLACE FUNCTION public.mamonsu_count_{3}_files()