-
Notifications
You must be signed in to change notification settings - Fork 918
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.
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
Adds the bookie cookie service for http api #4541
Open
SongOf
wants to merge
1
commit into
apache:master
Choose a base branch
from
SongOf:cookie_http_api
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
...r-server/src/main/java/org/apache/bookkeeper/server/http/service/BookieCookieService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.bookkeeper.server.http.service; | ||
|
||
import static java.nio.charset.StandardCharsets.UTF_8; | ||
|
||
import java.net.UnknownHostException; | ||
import java.util.Map; | ||
import org.apache.bookkeeper.bookie.BookieException; | ||
import org.apache.bookkeeper.bookie.Cookie; | ||
import org.apache.bookkeeper.conf.ServerConfiguration; | ||
import org.apache.bookkeeper.http.HttpServer; | ||
import org.apache.bookkeeper.http.service.HttpEndpointService; | ||
import org.apache.bookkeeper.http.service.HttpServiceRequest; | ||
import org.apache.bookkeeper.http.service.HttpServiceResponse; | ||
import org.apache.bookkeeper.meta.MetadataDrivers; | ||
import org.apache.bookkeeper.net.BookieId; | ||
import org.apache.bookkeeper.net.BookieSocketAddress; | ||
import org.apache.bookkeeper.versioning.LongVersion; | ||
import org.apache.bookkeeper.versioning.Version; | ||
import org.apache.bookkeeper.versioning.Versioned; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
public class BookieCookieService implements HttpEndpointService { | ||
static final Logger LOG = LoggerFactory.getLogger(BookieCookieService.class); | ||
private final ServerConfiguration conf; | ||
|
||
public BookieCookieService(ServerConfiguration conf) { | ||
this.conf = conf; | ||
} | ||
|
||
@Override | ||
public HttpServiceResponse handle(HttpServiceRequest request) throws Exception { | ||
Map<String, String> params = request.getParams(); | ||
if (params == null || !params.containsKey("bookie_id")) { | ||
return new HttpServiceResponse("Not found bookie id. Should provide bookie_id=<ip:port>", | ||
HttpServer.StatusCode.BAD_REQUEST); | ||
} | ||
if (request.getMethod() == HttpServer.Method.PUT && !params.containsKey("cookie")) { | ||
return new HttpServiceResponse("Not found cookie. " | ||
+ "Should provide cookie=<cookie string>", HttpServer.StatusCode.BAD_REQUEST); | ||
} | ||
|
||
String bookieIdStr = params.get("bookie_id"); | ||
try { | ||
new BookieSocketAddress(bookieIdStr); | ||
} catch (UnknownHostException nhe) { | ||
return new HttpServiceResponse("Illegal bookie id. Should provide bookie_id=<ip:port>", | ||
HttpServer.StatusCode.BAD_REQUEST); | ||
} | ||
|
||
BookieId bookieId = BookieId.parse(bookieIdStr); | ||
return MetadataDrivers.runFunctionWithRegistrationManager(conf, registrationManager -> { | ||
try { | ||
switch (request.getMethod()) { | ||
case PUT: | ||
Versioned<byte[]> newCookieWithVersion = new Versioned<>(params.get("cookie").getBytes(UTF_8), | ||
Version.NEW); | ||
registrationManager.writeCookie(bookieId, newCookieWithVersion); | ||
return new HttpServiceResponse("Added cookie: " + bookieId, HttpServer.StatusCode.OK); | ||
case GET: | ||
Versioned<Cookie> cookie = Cookie.readFromRegistrationManager(registrationManager, bookieId); | ||
return new HttpServiceResponse(cookie.getValue().toString(), HttpServer.StatusCode.OK); | ||
case DELETE: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not add a method to add a cookie while we have a method to delete a cookie. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Already added |
||
registrationManager.removeCookie(bookieId, new LongVersion(-1)); | ||
return new HttpServiceResponse("Deleted cookie: " + bookieId, HttpServer.StatusCode.OK); | ||
default: | ||
return new HttpServiceResponse("Method not allowed. Should be GET or DELETE method", | ||
HttpServer.StatusCode.METHOD_NOT_ALLOWED); | ||
} | ||
} catch (BookieException.CookieNotFoundException e) { | ||
return new HttpServiceResponse("Not found cookie: " + bookieId, HttpServer.StatusCode.NOT_FOUND); | ||
} catch (BookieException.CookieExistException e) { | ||
return new HttpServiceResponse("Cookie exist for bookieId: " + bookieId, HttpServer.StatusCode.OK); | ||
} catch (BookieException e) { | ||
LOG.error("Failed to op bookie cookie: ", e); | ||
return new HttpServiceResponse("Request failed, e:" + e.getMessage(), | ||
HttpServer.StatusCode.INTERNAL_ERROR); | ||
} | ||
}); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is nothing wrong with adding new interfaces,
but I think deleting cookies is a bit risky and does not comply with data integrity specifications. Although this is available in the old Command command, I suggest you still go through the node offline process
./bin/bookkeeper shell decommissionbookie [-bookieid <bookieaddress>]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed, the caller should call this api only after bookie decommission is completed.