Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve #1211 | Read only mode persistence #1214

Merged
merged 4 commits into from
Jun 15, 2020
Merged

Resolve #1211 | Read only mode persistence #1214

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbd3949
Resolve #1211 | Read only admin flag added to Mode Service
Jun 9, 2020
23ebfaa
Resolve #1211 | Tests added for READ_ONLY_ADMIN flag
Jun 10, 2020
d54d18a
Resolve #1211 | Thread-safe version
Jun 10, 2020
002db3d
Resolve #1211 | Changes after code review; admin endpoint accepts Rea…
Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
import static pl.allegro.tech.hermes.management.domain.mode.ModeService.ManagementMode.READ_ONLY;
import static pl.allegro.tech.hermes.management.domain.mode.ModeService.ManagementMode.READ_WRITE;
import static pl.allegro.tech.hermes.management.domain.mode.ModeService.ManagementMode.READ_ONLY_ADMIN;

@Component
@Path("/mode")
Expand Down Expand Up @@ -51,7 +51,7 @@ public Response setMode(@QueryParam("mode") String mode) {
modeService.setMode(READ_WRITE);
break;
case ModeService.READ_ONLY:
modeService.setMode(READ_ONLY);
modeService.setMode(READ_ONLY_ADMIN);
break;
default:
return Response.status(Response.Status.BAD_REQUEST).build();
Expand Down
4 changes: 2 additions & 2 deletions ...gement/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ private HealthCheckResult doHealthCheck(ZookeeperClient zookeeperClient) {

private void updateMode(List<HealthCheckResult> healthCheckResults) {
if (healthCheckResults.contains(HealthCheckResult.UNHEALTHY)) {
modeService.setMode(ModeService.ManagementMode.READ_ONLY);
modeService.compareAndSwapMode(ModeService.ManagementMode.READ_WRITE, ModeService.ManagementMode.READ_ONLY);
} else {
modeService.setMode(ModeService.ManagementMode.READ_WRITE);
modeService.compareAndSwapMode(ModeService.ManagementMode.READ_ONLY, ModeService.ManagementMode.READ_WRITE);
}
}

Expand Down
14 changes: 11 additions & 3 deletions ...s-management/src/main/java/pl/allegro/tech/hermes/management/domain/mode/ModeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ public class ModeService {

public static final String READ_WRITE = "readWrite";
public static final String READ_ONLY = "readOnly";
public static final String READ_ONLY_ADMIN = "readOnlyAdmin";

public enum ManagementMode {
READ_WRITE(ModeService.READ_WRITE),
READ_ONLY(ModeService.READ_ONLY);
READ_ONLY(ModeService.READ_ONLY),
READ_ONLY_ADMIN(ModeService.READ_ONLY_ADMIN);

private final String text;

Expand All @@ -30,11 +32,17 @@ public ManagementMode getMode() {
return mode;
}

public void setMode(ManagementMode mode) {
public synchronized void setMode(ManagementMode mode) {
this.mode = mode;
}

public boolean isReadOnlyEnabled() {
return mode == ManagementMode.READ_ONLY;
return mode == ManagementMode.READ_ONLY || mode == ManagementMode.READ_ONLY_ADMIN;
}

public synchronized void compareAndSwapMode(ManagementMode expectedMode, ManagementMode newMode) {
if (mode.equals(expectedMode)) {
setMode(newMode);
}
}
}
33 changes: 33 additions & 0 deletions ...rc/test/groovy/pl/allegro/tech/hermes/management/domain/health/HealthCheckTaskTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,39 @@ class HealthCheckTaskTest extends MultiZookeeperIntegrationTest {
successfulCounter.count() == 3
}

def "should not change status to READ_WRITE if READ_ONLY is set by admin"() {
given:
modeService.setMode(ModeService.ManagementMode.READ_ONLY_ADMIN)

when:
zookeeper1.start()
milenakrawczyk marked this conversation as resolved.
Show resolved Hide resolved
healthCheckTask.run()

then:
modeService.readOnlyEnabled

and:
successfulCounter.count() == 2
}

def "should change status from READ_ONLY_ADMIN to READ_WRITE only by admin"() {
given:
modeService.setMode(ModeService.ManagementMode.READ_ONLY_ADMIN)

when:
zookeeper1.start()
milenakrawczyk marked this conversation as resolved.
Show resolved Hide resolved
healthCheckTask.run()

then:
modeService.readOnlyEnabled

when:
modeService.setMode(ModeService.ManagementMode.READ_WRITE)

then:
!modeService.readOnlyEnabled
}

static setupZookeeperPath(ZookeeperClient zookeeperClient, String path) {
def healthCheckPathExists = zookeeperClient.curatorFramework
.checkExists()
Expand Down