Resolve #1211 | Changes after code review; admin endpoint accepts Rea…

…dOnlyAdmin flag as well
allegro · Jun 15, 2020 · 002db3d · 002db3d
1 parent d54d18a
commit 002db3d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java
@@ -48,10 +48,11 @@ public Response setMode(@QueryParam("mode") String mode) {
         }
         switch (mode) {
             case ModeService.READ_WRITE:
-                modeService.setMode(READ_WRITE);
+                modeService.setModeByAdmin(READ_WRITE);
                 break;
             case ModeService.READ_ONLY:
-                modeService.setMode(READ_ONLY_ADMIN);
+            case ModeService.READ_ONLY_ADMIN:
+                modeService.setModeByAdmin(READ_ONLY_ADMIN);
                 break;
             default:
                 return Response.status(Response.Status.BAD_REQUEST).build();

diff --git a/...gement/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckTask.java b/...gement/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckTask.java
@@ -58,9 +58,9 @@ private HealthCheckResult doHealthCheck(ZookeeperClient zookeeperClient) {
 
     private void updateMode(List<HealthCheckResult> healthCheckResults) {
         if (healthCheckResults.contains(HealthCheckResult.UNHEALTHY)) {
-            modeService.compareAndSwapMode(ModeService.ManagementMode.READ_WRITE, ModeService.ManagementMode.READ_ONLY);
+            modeService.setMode(ModeService.ManagementMode.READ_ONLY);
         } else {
-            modeService.compareAndSwapMode(ModeService.ManagementMode.READ_ONLY, ModeService.ManagementMode.READ_WRITE);
+            modeService.setMode(ModeService.ManagementMode.READ_WRITE);
         }
     }
 

diff --git a/...s-management/src/main/java/pl/allegro/tech/hermes/management/domain/mode/ModeService.java b/...s-management/src/main/java/pl/allegro/tech/hermes/management/domain/mode/ModeService.java
@@ -32,17 +32,18 @@ public ManagementMode getMode() {
         return mode;
     }
 
-    public synchronized void setMode(ManagementMode mode) {
+    public synchronized void setModeByAdmin(ManagementMode mode) {
         this.mode = mode;
     }
 
     public boolean isReadOnlyEnabled() {
         return mode == ManagementMode.READ_ONLY || mode == ManagementMode.READ_ONLY_ADMIN;
     }
 
-    public synchronized void compareAndSwapMode(ManagementMode expectedMode, ManagementMode newMode) {
-        if (mode.equals(expectedMode)) {
-            setMode(newMode);
+    public synchronized void setMode(ManagementMode newMode) {
+        /* READ_ONLY_ADMIN is a flag that can be changed only by admin */
+        if (!mode.equals(ManagementMode.READ_ONLY_ADMIN)) {
+            this.mode = newMode;
         }
     }
 }
diff --git a/...rc/test/groovy/pl/allegro/tech/hermes/management/domain/health/HealthCheckTaskTest.groovy b/...rc/test/groovy/pl/allegro/tech/hermes/management/domain/health/HealthCheckTaskTest.groovy
@@ -92,10 +92,9 @@ class HealthCheckTaskTest extends MultiZookeeperIntegrationTest {
 
     def "should not change status to READ_WRITE if READ_ONLY is set by admin"() {
         given:
-        modeService.setMode(ModeService.ManagementMode.READ_ONLY_ADMIN)
+        modeService.setModeByAdmin(ModeService.ManagementMode.READ_ONLY_ADMIN)
 
         when:
-        zookeeper1.start()
         healthCheckTask.run()
 
         then:
@@ -107,17 +106,16 @@ class HealthCheckTaskTest extends MultiZookeeperIntegrationTest {
 
     def "should change status from READ_ONLY_ADMIN to READ_WRITE only by admin"() {
         given:
-        modeService.setMode(ModeService.ManagementMode.READ_ONLY_ADMIN)
+        modeService.setModeByAdmin(ModeService.ManagementMode.READ_ONLY_ADMIN)
 
         when:
-        zookeeper1.start()
         healthCheckTask.run()
 
         then:
         modeService.readOnlyEnabled
 
         when:
-        modeService.setMode(ModeService.ManagementMode.READ_WRITE)
+        modeService.setModeByAdmin(ModeService.ManagementMode.READ_WRITE)
 
         then:
         !modeService.readOnlyEnabled