pushed data cleanup outside the size limit loop

OpenQueryStore · Mar 6, 2018 · 5f17f55 · 5f17f55
1 parent 3251a06
commit 5f17f55
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/setup/install_gather_statistics.sql b/setup/install_gather_statistics.sql
@@ -570,23 +570,6 @@ AS
                             WHERE (   [waiting_tasks_count] = 0
                                       AND [interval_id] = ( SELECT MAX( [interval_id] ) - 1 FROM [oqs].[intervals] ));
 
-                            -- Run regular OQS store cleanup if activated
-                            IF @data_cleanup_active = 1
-                                BEGIN
-                                    IF @logmode = 1
-                                        BEGIN
-                                            INSERT INTO [oqs].[activity_log] ( [log_run_id],
-                                                                               [log_timestamp],
-                                                                               [log_message] )
-                                            VALUES ( @log_logrunid, GETDATE(), 'OpenQueryStore data cleanup process executed.' );
-                                        END;
-
-								    -- Tidy up time!
-                                    EXEC [oqs].[data_cleanup] @data_cleanup_threshold = @data_cleanup_threshold,
-                                                              @data_cleanup_throttle = @data_cleanup_throttle;
-
-                                END;
-
                             -- And we are done!
                             IF @logmode = 1
                                 BEGIN
@@ -618,4 +601,21 @@ AS
                                                    [log_message] )
                 VALUES ( @log_logrunid, GETDATE(), 'OpenQueryStore data capture not activated. Collection skipped' );
             END;
+
+        -- Run regular OQS store cleanup if activated
+        IF @data_cleanup_active = 1
+            BEGIN
+                IF @logmode = 1
+                    BEGIN
+                        INSERT INTO [oqs].[activity_log] ( [log_run_id],
+                                                            [log_timestamp],
+                                                            [log_message] )
+                        VALUES ( @log_logrunid, GETDATE(), 'OpenQueryStore data cleanup process executed.' );
+                    END;
+
+                -- Tidy up time!
+                EXEC [oqs].[data_cleanup] @data_cleanup_threshold = @data_cleanup_threshold,
+                                            @data_cleanup_throttle = @data_cleanup_throttle;
+
+            END;
     END;