From c98857962b32056da0858a3286ac634b2b52dc66 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Fri, 24 Mar 2017 18:23:23 +0100 Subject: [PATCH] SONAR-8435 status is STARTING if migration is done but SQ isn't up --- .../java/org/sonar/server/platform/ws/StatusAction.java | 7 ++----- .../org/sonar/server/platform/ws/StatusActionTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java index 04c14b5abbf..e2a60680eab 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java @@ -135,7 +135,7 @@ public class StatusAction implements SystemWsAction { return Status.DOWN; case SUCCEEDED: // DB migration can be finished while we haven't yet finished SQ's initialization - return Status.DB_MIGRATION_RUNNING; + return Status.STARTING; default: throw new IllegalArgumentException("Unsupported DatabaseMigration.Status " + databaseMigrationStatus); } @@ -151,10 +151,7 @@ public class StatusAction implements SystemWsAction { case FAILED: return Status.DOWN; case SUCCEEDED: - // status of Platform will change to STARTING _before_ DatabaseMigration status becomes SUCCEEDED - // (see DatabaseMigrationImpl#doDatabaseMigration, platform's restart is requested _before_ DatabaseMigration status is updated) - // so, in theory, this case can not happen - return Status.DB_MIGRATION_RUNNING; + return Status.STARTING; default: throw new IllegalArgumentException("Unsupported DatabaseMigration.Status " + databaseMigrationStatus); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java index be782670828..c2f9deb26fc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java @@ -144,8 +144,8 @@ public class StatusActionTest { } @Test - public void status_is_MIGRATION_RUNNING_if_platform_is_SAFEMODE_and_databaseMigration_is_SUCCEEDED() throws Exception { - verifyStatus(Platform.Status.SAFEMODE, DatabaseMigrationState.Status.SUCCEEDED, STATUS_MIGRATION_RUNNING); + public void status_is_STATUS_STARTING_if_platform_is_SAFEMODE_and_databaseMigration_is_SUCCEEDED() throws Exception { + verifyStatus(Platform.Status.SAFEMODE, DatabaseMigrationState.Status.SUCCEEDED, STATUS_STARTING); } @Test @@ -164,8 +164,8 @@ public class StatusActionTest { } @Test - public void status_is_MIGRATION_RUNNING_if_platform_is_STARTING_and_databaseMigration_is_SUCCEEDED() throws Exception { - verifyStatus(Platform.Status.STARTING, DatabaseMigrationState.Status.SUCCEEDED, STATUS_MIGRATION_RUNNING); + public void status_is_STARTING_if_platform_is_STARTING_and_databaseMigration_is_SUCCEEDED() throws Exception { + verifyStatus(Platform.Status.STARTING, DatabaseMigrationState.Status.SUCCEEDED, STATUS_STARTING); } @Test -- 2.39.5