Merge pull request IQSS#190 from GlobalDataverseCommunityConsortium/1…

…79_pg_log_statements

pg log statements

defaults/main.yml

@@ -190,6 +190,7 @@ db:
     pass: dvnsecret
     jdbcurl: 
     log_lock_waits: true
+    log_statements: none
     version: 13
     port: 5432
   backups:

ec2/ec2-create-instance.sh

@@ -255,6 +255,8 @@ if [ ! -z "$LOCAL_LOG_PATH" ]; then
    rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/src $LOCAL_LOG_PATH/
    # 5 server.log*
    rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/usr/local/payara5/glassfish/domains/domain1/logs/server.log* $LOCAL_LOG_PATH/
+   # 6 query_count.out
+   rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/query_count.out $LOCAL_LOG_PATH/
 fi
 
 # Port 8080 has been added because Ansible puts a redirect in place

tasks/dataverse-api-testsuite.yml

@@ -6,6 +6,12 @@
 
 - include: maven.yml
 
+- include: postgresql_statements.yml
+  when:
+   - ansible_os_family == "RedHat"
+   - db.postgres.log_statements != 'none'
+   - not db.use_rds
+
 - name: do we have a pom.xml
   stat:
     path: '{{ dataverse.srcdir }}/pom.xml'
@@ -105,3 +111,9 @@
   args:
     chdir: '{{ dataverse.srcdir }}'
   when: maven.version != 'default'
+
+- include: postgresql_perl_party.yml
+  when:
+   - ansible_os_family == "RedHat"
+   - db.postgres.log_statements != 'none'
+   - not db.use_rds

tasks/postgres.yml

@@ -56,7 +56,6 @@
   when: ansible_os_family == "Debian" and
         db.use_rds == false
 
-
 - name: install postgres client on RedHat / CentOS for RDS
   yum:
     name: 'postgresql{{ dataverse_pg_version_short }}'

tasks/postgresql_perl_party.yml

@@ -0,0 +1,32 @@
+---
+
+- name: "Leonid's Postgres PERL Party requires PERL"
+  ansible.builtin.package:
+    name: perl
+    state: latest
+
+# use Leonid's branch until merged into develop
+- name: "place Leonid's PERL scripts"
+  ansible.builtin.get_url:
+    url: '{{ item }}'
+    dest: '/var/lib/pgsql/{{ db.postgres.version }}/data/log/'
+    mode: '0755'
+  loop:
+    - https://raw.githubusercontent.com/IQSS/dataverse/develop/scripts/database/querycount/parse.pl
+    - https://raw.githubusercontent.com/IQSS/dataverse/develop/scripts/database/querycount/count.pl
+
+- name: get name of Postgres logfile
+  ansible.builtin.find:
+    paths: '/var/lib/pgsql/{{ db.postgres.version }}/data/log/'
+    file_type: file
+    patterns: '*.log'
+  register: postgres_logs
+
+- name: there should be only one
+  set_fact:
+    postgres_log: "{{ postgres_logs.files | map(attribute='path') | list }}"
+
+- name: fire at will
+  ansible.builtin.shell:
+    cmd: '/usr/bin/perl count.pl --non-interactive {{ postgres_log[0] }} > /tmp/query_count.out'
+    chdir: '/var/lib/pgsql/{{ db.postgres.version }}/data/log/'

tasks/postgresql_statements.yml

@@ -0,0 +1,12 @@
+---
+
+- name: log_statements for testing
+  lineinfile:
+    path: '/var/lib/pgsql/{{ db.postgres.version }}/data/postgresql.conf'
+    regexp: '^#log_statement\ '
+    line: 'log_statement = {{ db.postgres.log_statements }}'
+
+- name: reload Postgres
+  ansible.builtin.systemd:
+    name: 'postgresql-{{ db.postgres.version }}'
+    state: reloaded

tests/group_vars/jenkins.yml

@@ -181,6 +181,7 @@ db:
     pass: dvnsecret
     jdbcurl:
     log_lock_waits: true
+    log_statements: all
     version: 13
     port: 5432
   backups:

tests/group_vars/memorytests.yml

@@ -184,6 +184,7 @@ db:
     pass: dvnsecret
     jdbcurl: 
     log_lock_waits: true
+    log_statements: none
     version: 13
     port: 5432
   backups:

tests/group_vars/vagrant.yml

@@ -186,6 +186,7 @@ db:
     pass: vagrantsekret
     jdbcurl:
     log_lock_waits: true
+    log_statements: none
     version: 13
     port: 5432
   backups: