Merge pull request #22605 from kbrock/vps_purging

VimPerformanceState#purge_timer for old records

app/models/mixins/purging_mixin.rb

@@ -39,6 +39,18 @@
 #     :miq_report_id
 #   end
 #
+#   example purge_mode_and_value
+#   @return [Array<2>] the mode (i.e.: :remaining) and the number of records to keep
+#   def purge_mode_and_value
+#     [:remaining, ::Settings.drift_states.history.keep_drift_states]
+#   end
+#
+# For purge_by_orphan, the mixee must provide the following methods:
+#
+#   @return [Array<2>] the mode (i.e.: :orphan) and the column_name to check for orphans
+#   def purge_mode_and_value
+#     %w[orphan resource]
+#   end
 module PurgingMixin
   extend ActiveSupport::Concern
 

app/models/vim_performance_state/purging.rb

@@ -8,9 +8,28 @@ def purge_mode_and_value
         %w(orphaned resource)
       end
 
+      # remove anything where the resource no longer exists AND
+      # remove anything older than a certain date
+      def purge_timer
+        purge_queue(:orphaned, "resource")
+        purge_queue(:date, purge_date)
+      end
+
       def purge_window_size
         ::Settings.vim_performance_states.history.purge_window_size
       end
+
+      #
+      # By Date
+      #
+
+      def purge_date
+        ::Settings.vim_performance_states.history.keep_states.to_i_with_method.seconds.ago.utc
+      end
+
+      def purge_scope(older_than)
+        where(arel_table[:timestamp].lt(older_than))
+      end
     end
   end
 end

config/settings.yml

@@ -1042,6 +1042,7 @@
   :url:
 :vim_performance_states:
   :history:
+    :keep_states: 6.months
     :purge_window_size: 1000
 :webservices:
   :consume_protocol: https

spec/models/vim_performance_state/purging_spec.rb

@@ -28,9 +28,14 @@
     describe ".purge_timer" do
       it "queues the correct purge method" do
         EvmSpecHelper.local_miq_server
+        stub_settings_merge(:vim_performance_states => {:history => {:keep_states => "6.months"}})
         described_class.purge_timer
-        q = MiqQueue.first
-        expect(q).to have_attributes(:class_name => described_class.name, :method_name => "purge_by_orphaned", :args => ["resource"])
+
+        expect(MiqQueue.count).to eq(2)
+        q1, q2 = MiqQueue.order(:id).to_a
+        expect(q1).to have_attributes(:class_name => described_class.name, :method_name => "purge_by_orphaned", :args => ["resource"])
+        expect(q2).to have_attributes(:class_name => described_class.name, :method_name => "purge_by_date")
+        expect(q2.args.first).to be_within(2.days).of 6.months.ago.utc
       end
     end
   end