Skip to content

Add force readonly param to RESTful API #4129

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

Open
labuladong wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add force readonly param to RESTful API #4129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ded0489
force readonly
labuladong Nov 10, 2023
a310145
fix npe
labuladong Nov 17, 2023
50e29bd
fix style
labuladong Nov 20, 2023
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
8 changes: 8 additions & 0 deletions ...r/src/main/java/org/apache/bookkeeper/server/http/service/BookieStateReadOnlyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import static com.google.common.base.Preconditions.checkNotNull;

import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
Expand Down Expand Up @@ -62,6 +63,13 @@ public HttpServiceResponse handle(HttpServiceRequest request) throws Exception {
} else if (!stateManager.isReadOnly() && inState.isReadOnly()) {
stateManager.transitionToReadOnlyMode().get();
}
Map<String, String> params = request.getParams();
if (params != null) {
boolean isForce = params.getOrDefault("force", "false").equals("true");
if (stateManager.isReadOnly() && isForce) {
stateManager.forceToReadOnly();
}
}
} else if (!HttpServer.Method.GET.equals(request.getMethod())) {
response.setCode(HttpServer.StatusCode.NOT_FOUND);
response.setBody("Unsupported method. Should be GET or PUT method");
Expand Down
11 changes: 11 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,6 +1022,17 @@ public void testBookieReadOnlyState() throws Exception {
readOnlyState = JsonUtil.fromJson(response.getBody(), ReadOnlyState.class);
assertFalse(readOnlyState.isReadOnly());

// force=true force the bookie to readonly
Map<String, String> params = new HashMap<>();
params.put("force", "true");
request = new HttpServiceRequest(JsonUtil.toJson(new ReadOnlyState(true)), HttpServer.Method.PUT, params);
response = bookieReadOnlyService.handle(request);
readOnlyState = JsonUtil.fromJson(response.getBody(), ReadOnlyState.class);
assertTrue(readOnlyState.isReadOnly());
request = new HttpServiceRequest(JsonUtil.toJson(new ReadOnlyState(false)), HttpServer.Method.PUT, null);
response = bookieReadOnlyService.handle(request);
assertEquals(400, response.getStatusCode());

//forceReadonly to writable
baseConf.setForceReadOnlyBookie(true);
baseConf.setReadOnlyModeEnabled(true);
Expand Down