Fix purge issue because events persistence was done after switch of snapshot

1 files changed, 7 insertions, 2 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java
index 4ad3a7b5fb3..81cdeea9eda 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java
@@ -37,13 +37,18 @@ public class ComputationSteps {
    */
   public static List<Class<? extends ComputationStep>> orderedStepClasses() {
     return Arrays.asList(
+      // Read report
       ParseReportStep.class,
+
+      // Persist data
       PersistIssuesStep.class,
+      PersistComponentLinksStep.class,
+      PersistEventsStep.class,
+
+      // Switch snapshot and purge
       SwitchSnapshotStep.class,
       IndexComponentsStep.class,
       PurgeDatastoresStep.class,
-      PersistComponentLinksStep.class,
-      PersistEventsStep.class,
 
       // ES indexing is done after all db changes
       ApplyPermissionsStep.class,