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.

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

HDDS-8489. Refactor GET request to POST for OM DB snapshot #4695

Merged
merged 15 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ public final class OzoneConsts {
public static final String RANGER_OZONE_SERVICE_VERSION_KEY =
"#RANGEROZONESERVICEVERSION";

public static final String MULTIPART_FORM_DATA_BOUNDARY = "---XXX";

/**
* Supports Bucket Versioning.
*/
Expand Down
5 changes: 5 additions & 0 deletions hadoop-hdds/framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons-fileupload.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
import java.util.Objects;
import java.util.stream.Collectors;

import org.apache.commons.fileupload.FileItemIterator;
import org.apache.commons.fileupload.FileItemStream;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.util.Streams;
import org.apache.hadoop.hdds.server.OzoneAdmins;
import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.hdds.utils.db.DBStore;
Expand All @@ -53,6 +57,8 @@
*/
public class DBCheckpointServlet extends HttpServlet {

private static final String FIELD_NAME =
OZONE_DB_CHECKPOINT_REQUEST_TO_EXCLUDE_SST + "[]";
private static final Logger LOG =
LoggerFactory.getLogger(DBCheckpointServlet.class);
private static final long serialVersionUID = 1L;
Expand Down Expand Up @@ -94,15 +100,13 @@ private boolean hasPermission(UserGroupInformation user) {
}

/**
* Process a GET request for the DB checkpoint snapshot.
*
* @param request The servlet request we are processing
* @param response The servlet response we are creating
* Generates Snapshot checkpoint as tar ball.
* @param request the HTTP servlet request
* @param response the HTTP servlet response
* @param isFormData indicator whether request is form data
*/
@Override
public void doGet(HttpServletRequest request, HttpServletResponse response) {

LOG.info("Received request to obtain DB checkpoint snapshot");
private void generateSnapshotCheckpoint(HttpServletRequest request,
HttpServletResponse response, boolean isFormData) {
if (dbStore == null) {
LOG.error(
"Unable to process metadata snapshot request. DB Store is null");
Expand Down Expand Up @@ -151,7 +155,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) {

List<String> receivedSstList = new ArrayList<>();
List<String> excludedSstList = new ArrayList<>();
String[] sstParam = request.getParameterValues(
String[] sstParam = isFormData ?
parseFormDataParameters(request) : request.getParameterValues(
OZONE_DB_CHECKPOINT_REQUEST_TO_EXCLUDE_SST);
if (sstParam != null) {
receivedSstList.addAll(
Expand Down Expand Up @@ -216,6 +221,63 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) {
}
}

/**
* Parses request form data parameters.
* @param request the HTTP servlet request
* @return array of parsed sst form data parameters for exclusion
*/
private static String[] parseFormDataParameters(HttpServletRequest request) {
ServletFileUpload upload = new ServletFileUpload();
List<String> sstParam = new ArrayList<>();

try {
FileItemIterator iter = upload.getItemIterator(request);
while (iter.hasNext()) {
FileItemStream item = iter.next();
if (!item.isFormField() || !FIELD_NAME.equals(item.getFieldName())) {
continue;
}

sstParam.add(Streams.asString(item.openStream()));
}
} catch (Exception e) {
LOG.warn("Exception occured during form data parsing {}", e.getMessage());
}

return sstParam.size() == 0 ? null : sstParam.toArray(new String[0]);
}

/**
* Process a GET request for the DB checkpoint snapshot.
*
* @param request The servlet request we are processing
* @param response The servlet response we are creating
*/
@Override
public void doGet(HttpServletRequest request, HttpServletResponse response) {
LOG.info("Received GET request to obtain DB checkpoint snapshot");

generateSnapshotCheckpoint(request, response, false);
}

/**
* Process a POST request for the DB checkpoint snapshot.
*
* @param request The servlet request we are processing
* @param response The servlet response we are creating
*/
@Override
public void doPost(HttpServletRequest request, HttpServletResponse response) {
LOG.info("Received POST request to obtain DB checkpoint snapshot");

if (!ServletFileUpload.isMultipartContent(request)) {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
return;
}

generateSnapshotCheckpoint(request, response, true);
}

/**
* Write checkpoint to the stream.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.List;

import static org.apache.hadoop.ozone.OzoneConsts.OZONE_DB_CHECKPOINT_INCLUDE_SNAPSHOT_DATA;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_DB_CHECKPOINT_REQUEST_FLUSH;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_DB_CHECKPOINT_HTTP_ENDPOINT;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_DB_CHECKPOINT_REQUEST_TO_EXCLUDE_SST;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_PORT_DEFAULT;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_PORT_KEY;
Expand Down Expand Up @@ -164,8 +162,8 @@ public OMNodeDetails build() {
}
}

public URL getOMDBCheckpointEndpointUrl(boolean isHttp, boolean flush,
List<String> sstList) throws IOException {
public URL getOMDBCheckpointEndpointUrl(boolean isHttp, boolean flush)
throws IOException {
URL url;
try {
URIBuilder urlBuilder = new URIBuilder().
Expand All @@ -175,12 +173,7 @@ public URL getOMDBCheckpointEndpointUrl(boolean isHttp, boolean flush,
addParameter(OZONE_DB_CHECKPOINT_INCLUDE_SNAPSHOT_DATA, "true").
addParameter(OZONE_DB_CHECKPOINT_REQUEST_FLUSH,
flush ? "true" : "false");
if (sstList != null && !sstList.isEmpty()) {
for (String s: sstList) {
urlBuilder.addParameter(
OZONE_DB_CHECKPOINT_REQUEST_TO_EXCLUDE_SST, s);
}
}

url = urlBuilder.build().toURL();
} catch (URISyntaxException | MalformedURLException e) {
throw new IOException("Could not get OM DB Checkpoint Endpoint Url", e);
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ Apache License 2.0
commons-logging:commons-logging
commons-net:commons-net
commons-validator:commons-validator
commons-fileupload:commons-fileupload
info.picocli:picocli
io.dropwizard.metrics:metrics-core
io.grpc:grpc-api
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/dist/src/main/license/jar-report.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ share/ozone/lib/commons-net.jar
share/ozone/lib/commons-pool2.jar
share/ozone/lib/commons-text.jar
share/ozone/lib/commons-validator.jar
share/ozone/lib/commons-fileupload.jar
share/ozone/lib/curator-client.jar
share/ozone/lib/curator-framework.jar
share/ozone/lib/derby.jar
Expand Down