Skip to content
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

Jump to bottom

(GH-30) Update repack logging to separate files #43

Merged
merged 1 commit into from
Aug 7, 2020
Merged

(GH-30) Update repack logging to separate files #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions manifests/maintenance/pg_repack.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
$reports_table = '-t reports"'
$resource_events_table = '-t resource_events"'

$logging = "> ${logging_directory}/output.log 2>&1"

Cron {
ensure => $ensure_cron,
user => 'root',
Expand All @@ -43,29 +41,29 @@
weekday => [2,6],
hour => 4,
minute => 30,
command => "${repack} ${repack_jobs} ${facts_tables} ${logging}",
command => "${repack} ${repack_jobs} ${facts_tables} > ${logging_directory}/facts_repack.log 2>&1",
}

cron { 'pg_repack catalogs tables' :
weekday => [0,4],
hour => 4,
minute => 30,
command => "${repack} ${repack_jobs} ${catalogs_tables} ${logging}",
command => "${repack} ${repack_jobs} ${catalogs_tables} > ${logging_directory}/catalogs_repack.log 2>&1",
}

cron { 'pg_repack other tables' :
monthday => 20,
hour => 5,
minute => 30,
command => "${repack} ${repack_jobs} ${other_tables} ${logging}",
command => "${repack} ${repack_jobs} ${other_tables} > ${logging_directory}/other_repack.log 2>&1",
}

if versioncmp($facts['pe_server_version'], '2019.7.0') < 0 {
cron { 'pg_repack reports tables' :
monthday => 10,
hour => 5,
minute => 30,
command => "${repack} ${repack_jobs} ${reports_table} ${logging}",
command => "${repack} ${repack_jobs} ${reports_table} > ${logging_directory}/reports_repack.log 2>&1",
}
}
else {
Expand All @@ -79,12 +77,16 @@
monthday => 15,
hour => 5,
minute => 30,
command => "${repack} ${repack_jobs} ${resource_events_table} ${logging}",
command => "${repack} ${repack_jobs} ${resource_events_table} > ${logging_directory}/resource_events_repack.log 2>&1",
}
}
else {
cron { 'pg_repack resource_events tables' :
ensure => 'absent',
}
}

file { "${logging_directory}/output.log" :
ensure => absent,
}
}
16 changes: 8 additions & 8 deletions spec/classes/maintenance/pg_repack_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
it {
is_expected.to contain_cron('pg_repack resource_events tables')
.with_command('su - pe-postgres -s /bin/bash -c "/opt/puppetlabs/server/apps/postgresql/9.6/bin/pg_repack'\
' -d pe-puppetdb --jobs 2 -t resource_events" > /var/log/puppetlabs/pe_databases_cron/output.log 2>&1')
' -d pe-puppetdb --jobs 2 -t resource_events" > /var/log/puppetlabs/pe_databases_cron/resource_events_repack.log 2>&1')
}
it {
is_expected.to contain_cron('pg_repack reports tables')
.with_command('su - pe-postgres -s /bin/bash -c "/opt/puppetlabs/server/apps/postgresql/9.6/bin/pg_repack'\
' -d pe-puppetdb --jobs 2 -t reports" > /var/log/puppetlabs/pe_databases_cron/output.log 2>&1')
' -d pe-puppetdb --jobs 2 -t reports" > /var/log/puppetlabs/pe_databases_cron/reports_repack.log 2>&1')
}
end
context 'on < PE 2019.3.0 with postgresql 11' do
Expand All @@ -31,12 +31,12 @@
it {
is_expected.to contain_cron('pg_repack resource_events tables')
.with_command('su - pe-postgres -s /bin/bash -c "/opt/puppetlabs/server/apps/postgresql/11/bin/pg_repack'\
' -d pe-puppetdb --jobs 2 -t resource_events" > /var/log/puppetlabs/pe_databases_cron/output.log 2>&1')
' -d pe-puppetdb --jobs 2 -t resource_events" > /var/log/puppetlabs/pe_databases_cron/resource_events_repack.log 2>&1')
}
it {
is_expected.to contain_cron('pg_repack reports tables')
.with_command('su - pe-postgres -s /bin/bash -c "/opt/puppetlabs/server/apps/postgresql/11/bin/pg_repack'\
' -d pe-puppetdb --jobs 2 -t reports" > /var/log/puppetlabs/pe_databases_cron/output.log 2>&1')
' -d pe-puppetdb --jobs 2 -t reports" > /var/log/puppetlabs/pe_databases_cron/reports_repack.log 2>&1')
}
end
context 'on < PE 2019.7.0' do
Expand All @@ -47,12 +47,12 @@
it {
is_expected.to contain_cron('pg_repack reports tables')
.with_command('su - pe-postgres -s /bin/bash -c "/opt/puppetlabs/server/apps/postgresql/11/bin/pg_repack'\
' -d pe-puppetdb --jobs 2 -t reports" > /var/log/puppetlabs/pe_databases_cron/output.log 2>&1')
' -d pe-puppetdb --jobs 2 -t reports" > /var/log/puppetlabs/pe_databases_cron/reports_repack.log 2>&1')
}
it {
is_expected.not_to contain_cron('pg_repack resource_events tables')
.with_command('su - pe-postgres -s /bin/bash -c "/opt/puppetlabs/server/apps/postgresql/11/bin/pg_repack'\
' -d pe-puppetdb --jobs 2 -t resource_events" > /var/log/puppetlabs/pe_databases_cron/output.log 2>&1')
' -d pe-puppetdb --jobs 2 -t resource_events" > /var/log/puppetlabs/pe_databases_cron/resource_events_repack.log 2>&1')
}
end
context 'on >= PE 2019.7.0' do
Expand All @@ -63,12 +63,12 @@
it {
is_expected.not_to contain_cron('pg_repack reports tables')
.with_command('su - pe-postgres -s /bin/bash -c "/opt/puppetlabs/server/apps/postgresql/11/bin/pg_repack'\
' -d pe-puppetdb --jobs 2 -t reports" > /var/log/puppetlabs/pe_databases_cron/output.log 2>&1')
' -d pe-puppetdb --jobs 2 -t reports" > /var/log/puppetlabs/pe_databases_cron/reports_repack.log 2>&1')
}
it {
is_expected.not_to contain_cron('pg_repack resource_events tables')
.with_command('su - pe-postgres -s /bin/bash -c "/opt/puppetlabs/server/apps/postgresql/11/bin/pg_repack'\
' -d pe-puppetdb --jobs 2 -t resource_events" > /var/log/puppetlabs/pe_databases_cron/output.log 2>&1')
' -d pe-puppetdb --jobs 2 -t resource_events" > /var/log/puppetlabs/pe_databases_cron/resource_events_repack.log 2>&1')
}
end
end
Expand Down