(SUP-2405) Changes to pg_repack.pp and pg_repack_spec.rb for catalog_inputs table

Author: coreymbe

manifests/maintenance/pg_repack.pp

@@ -26,11 +26,12 @@
   $repack_jobs     = "--jobs ${jobs}"
 
   $facts_tables    = '-t factsets -t fact_paths"'
-  $catalogs_tables = '-t catalogs -t catalog_resources -t edges -t certnames"'
+  $catalogs_tables = versioncmp($facts['pe_server_version'], '2019.8.1') ? {
+                      1       => '-t catalogs -t catalog_resources -t catalog_inputs -t edges -t certnames"',
+                      default => '-t catalogs -t catalog_resources -t edges -t certnames"' }
   $other_tables    = '-t producers -t resource_params -t resource_params_cache"'
   $reports_table   = '-t reports"'
   $resource_events_table = '-t resource_events"'
-  $catalog_inputs_table = '-t catalog_inputs"'
 
   Cron {
     ensure   => $ensure_cron,
@@ -59,20 +60,6 @@
     command  => "${repack} ${repack_jobs} ${other_tables} > ${logging_directory}/other_repack.log 2>&1",
   }
 
-  if versioncmp($facts['pe_server_version'], '2019.8.0') >= 0 {
-    cron { 'pg_repack catalog_inputs tables' :
-      monthday => 5,
-      hour     => 5,
-      minute   => 30,
-      command  => "${repack} ${repack_jobs} ${catalog_inputs_table} > ${logging_directory}/catalog_inputs_repack.log 2>&1",
-    }
-  }
-  else {
-    cron { 'pg_repack catalog_inputs tables' :
-      ensure   => 'absent',
-    }
-  }
-
   if versioncmp($facts['pe_server_version'], '2019.7.0') < 0 {
     cron { 'pg_repack reports tables' :
       monthday => 10,

spec/classes/maintenance/pg_repack_spec.rb

@@ -71,15 +71,15 @@
               ' -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.8.0' do
+      context 'on >= PE 2019.8.2' do
         before :each do
-          facts['pe_server_version'] = '2019.8.0'
+          facts['pe_server_version'] = '2019.8.2'
           facts['pe_postgresql_info']['installed_server_version'] = 11
         end
         it {
-          is_expected.to contain_cron('pg_repack catalog_inputs tables')
+          is_expected.to contain_cron('pg_repack catalogs 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 catalog_inputs" > /var/log/puppetlabs/pe_databases_cron/catalog_inputs_repack.log 2>&1')
+              ' -d pe-puppetdb --jobs 0 -t catalogs -t catalog_resources -t catalog_inputs -t edges -t certnames" > /var/log/puppetlabs/pe_databases_cron/catalogs_repack.log 2>&1')
         }
       end
     end