SONARCLOUD-115 do not cancel CE tasks when starting blue/green node

diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/queue/CeQueueCleaner.java b/server/sonar-ce/src/main/java/org/sonar/ce/queue/CeQueueCleaner.java
index d456423fd24fd364852d8e9b637815c2d8dba3db..73a033c86c4ff0b66803240be5ed3206eb8afc5a 100644 (file)
--- a/server/sonar-ce/src/main/java/org/sonar/ce/queue/CeQueueCleaner.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/queue/CeQueueCleaner.java
@@ -22,14 +22,16 @@ package org.sonar.ce.queue;
 import java.util.List;
 import org.picocontainer.Startable;
 import org.sonar.api.ce.ComputeEngineSide;
+import org.sonar.api.config.Configuration;
 import org.sonar.api.platform.ServerUpgradeStatus;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
+import org.sonar.process.ProcessProperties;
 
 /**
- * Cleans-up the Compute Engine queue and resets the JMX counters.
+ * Cleans-up the Compute Engine queue.
  * CE workers must not be started before execution of this class.
  */
 @ComputeEngineSide
@@ -40,24 +42,28 @@ public class CeQueueCleaner implements Startable {
   private final DbClient dbClient;
   private final ServerUpgradeStatus serverUpgradeStatus;
   private final InternalCeQueue queue;
+  private final Configuration configuration;
 
-  public CeQueueCleaner(DbClient dbClient, ServerUpgradeStatus serverUpgradeStatus, InternalCeQueue queue) {
+  public CeQueueCleaner(DbClient dbClient, ServerUpgradeStatus serverUpgradeStatus, InternalCeQueue queue, Configuration configuration) {
     this.dbClient = dbClient;
     this.serverUpgradeStatus = serverUpgradeStatus;
     this.queue = queue;
+    this.configuration = configuration;
   }
 
   @Override
   public void start() {
-    if (serverUpgradeStatus.isUpgraded()) {
+    if (serverUpgradeStatus.isUpgraded() && !isBlueGreenDeployment()) {
       cleanOnUpgrade();
     } else {
-      try (DbSession dbSession = dbClient.openSession(false)) {
-        verifyConsistency(dbSession);
-      }
+      cleanUpTaskInputOrphans();
     }
   }
 
+  private boolean isBlueGreenDeployment() {
+    return configuration.getBoolean(ProcessProperties.Property.BLUE_GREEN_ENABLED.getKey()).orElse(false);
+  }
+
   private void cleanOnUpgrade() {
     // we assume that pending tasks are not compatible with the new version
     // and can't be processed
@@ -65,13 +71,15 @@ public class CeQueueCleaner implements Startable {
     queue.clear();
   }
 
-  private void verifyConsistency(DbSession dbSession) {
-    // Reports that have been processed are not kept in database yet.
-    // They are supposed to be systematically dropped.
-    // Let's clean-up orphans if any.
-    List<String> uuids = dbClient.ceTaskInputDao().selectUuidsNotInQueue(dbSession);
-    dbClient.ceTaskInputDao().deleteByUuids(dbSession, uuids);
-    dbSession.commit();
+  private void cleanUpTaskInputOrphans() {
+    try (DbSession dbSession = dbClient.openSession(false)) {
+      // Reports that have been processed are not kept in database yet.
+      // They are supposed to be systematically dropped.
+      // Let's clean-up orphans if any.
+      List<String> uuids = dbClient.ceTaskInputDao().selectUuidsNotInQueue(dbSession);
+      dbClient.ceTaskInputDao().deleteByUuids(dbSession, uuids);
+      dbSession.commit();
+    }
   }
 
   @Override

diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueCleanerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueCleanerTest.java
index a9bbcbe8177f1ed392cea441762448e5a3eb7e88..ad454d6c2482381c1b19a9b7a7189785aeff5740 100644 (file)
--- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueCleanerTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueCleanerTest.java
@@ -19,20 +19,22 @@
  */
 package org.sonar.ce.queue;
 
-import java.io.IOException;
 import java.util.Optional;
 import org.apache.commons.io.IOUtils;
 import org.junit.Rule;
 import org.junit.Test;
+import org.sonar.api.config.internal.MapSettings;
 import org.sonar.api.platform.ServerUpgradeStatus;
 import org.sonar.api.utils.System2;
 import org.sonar.db.DbTester;
 import org.sonar.db.ce.CeQueueDto;
 import org.sonar.db.ce.CeTaskInputDao;
 import org.sonar.db.ce.CeTaskTypes;
+import org.sonar.process.ProcessProperties;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -43,14 +45,14 @@ public class CeQueueCleanerTest {
 
   private ServerUpgradeStatus serverUpgradeStatus = mock(ServerUpgradeStatus.class);
   private InternalCeQueue queue = mock(InternalCeQueue.class);
-  private CeQueueCleaner underTest = new CeQueueCleaner(dbTester.getDbClient(), serverUpgradeStatus, queue);
+  private MapSettings settings = new MapSettings();
 
   @Test
-  public void start_does_not_reset_in_progress_tasks_to_pending() throws IOException {
+  public void start_does_not_reset_in_progress_tasks_to_pending() {
     insertInQueue("TASK_1", CeQueueDto.Status.PENDING);
     insertInQueue("TASK_2", CeQueueDto.Status.IN_PROGRESS);
 
-    underTest.start();
+    runCleaner();
 
     assertThat(dbTester.getDbClient().ceQueueDao().countByStatus(dbTester.getSession(), CeQueueDto.Status.PENDING)).isEqualTo(1);
     assertThat(dbTester.getDbClient().ceQueueDao().countByStatus(dbTester.getSession(), CeQueueDto.Status.IN_PROGRESS)).isEqualTo(1);
@@ -60,20 +62,30 @@ public class CeQueueCleanerTest {
   public void start_clears_queue_if_version_upgrade() {
     when(serverUpgradeStatus.isUpgraded()).thenReturn(true);
 
-    underTest.start();
+    runCleaner();
 
     verify(queue).clear();
   }
 
   @Test
-  public void start_deletes_orphan_report_files() throws Exception {
+  public void start_does_not_clear_queue_if_version_upgrade_but_blue_green_deployment() {
+    when(serverUpgradeStatus.isUpgraded()).thenReturn(true);
+    settings.setProperty(ProcessProperties.Property.BLUE_GREEN_ENABLED.getKey(), true);
+
+    runCleaner();
+
+    verify(queue, never()).clear();
+  }
+
+  @Test
+  public void start_deletes_orphan_report_files() {
     // analysis reports are persisted but the associated
     // task is not in the queue
     insertInQueue("TASK_1", CeQueueDto.Status.PENDING);
     insertTaskData("TASK_1");
     insertTaskData("TASK_2");
 
-    underTest.start();
+    runCleaner();
 
     CeTaskInputDao dataDao = dbTester.getDbClient().ceTaskInputDao();
     Optional<CeTaskInputDao.DataStream> task1Data = dataDao.selectData(dbTester.getSession(), "TASK_1");
@@ -98,4 +110,9 @@ public class CeQueueCleanerTest {
     dbTester.getDbClient().ceTaskInputDao().insert(dbTester.getSession(), taskUuid, IOUtils.toInputStream("{binary}"));
     dbTester.getSession().commit();
   }
+
+  private void runCleaner() {
+    CeQueueCleaner cleaner = new CeQueueCleaner(dbTester.getDbClient(), serverUpgradeStatus, queue, settings.asConfig());
+    cleaner.start();
+  }
 }