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

Re-throw certain specific OOM errors as 507 for SageMaker MME + repo path enhancement #4392

Merged
merged 7 commits into from
May 23, 2022
Merged

Re-throw certain specific OOM errors as 507 for SageMaker MME + repo path enhancement #4392

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65698a0
Re-throw certain specific OOM errors as 507 for SageMaker MME
nskool May 17, 2022
d6b41c4
Handle subdir case within another model/
nskool May 19, 2022
24adc03
Typo fix
nskool May 19, 2022
5e9b947
Handle nested subdir within repo
nskool May 19, 2022
7896767
Add text about hidden folders
nskool May 19, 2022
35ce601
Add more generic OOM
nskool May 19, 2022
c4b3d33
Address comment
nskool May 20, 2022
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
58 changes: 53 additions & 5 deletions src/sagemaker_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,37 @@ SagemakerAPIServer::SageMakerMMEListModel(evhtp_request_t* req)
evhtp_send_reply(req, EVHTP_RES_OK);
}

void
SagemakerAPIServer::SageMakerMMEHandleLoadError(
evhtp_request_t* req, TRITONSERVER_Error* load_err)
{
const char* message = TRITONSERVER_ErrorMessage(load_err);
std::string error_string(message);

const std::vector<std::string> error_messages{
"CUDA out of memory", /* pytorch */
"CUDA_OUT_OF_MEMORY", /* tensorflow */
"Out of memory", /* generic */
"out of memory", "MemoryError"};

EVBufferAddErrorJson(req->buffer_out, load_err);

for (long unsigned int i = 0; i < error_messages.size(); i++) {
if (error_string.find(error_messages[i]) != std::string::npos) {
/* Return a 507*/
evhtp_send_reply(req, 507);
LOG_VERBOSE(1)
<< "Received an OOM error during LOAD MODEL. Returning a 507.";
return;
} else {
/* Return a 400*/
evhtp_send_reply(req, EVHTP_RES_BADREQ);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this should be done outside the for loop, so it checks if any messages are matched before returning 400 early

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nskool let me know when it is ready for a CI run

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, fixed - request you to run the CI

return;
}
}
}


void
SagemakerAPIServer::SageMakerMMELoadModel(
evhtp_request_t* req,
Expand All @@ -455,18 +486,22 @@ SagemakerAPIServer::SageMakerMMELoadModel(
DIR* dir;
struct dirent* ent;
int dir_count = 0;
std::string model_subdir;

if ((dir = opendir(repo_path.c_str())) != NULL) {
while ((ent = readdir(dir)) != NULL) {
if ((ent->d_type == DT_DIR) && (strcmp(ent->d_name, ".") == 0) &&
(strcmp(ent->d_name, "..") == 0)) {
if ((ent->d_type == DT_DIR) && (!strcmp(ent->d_name, ".") == 0) &&
(!strcmp(ent->d_name, "..") == 0)) {
dir_count += 1;
model_subdir = std::string(ent->d_name);
}
if (dir_count > 1) {
HTTP_RESPOND_IF_ERR(
req,
TRITONSERVER_ErrorNew(
TRITONSERVER_ERROR_INTERNAL,
"More than one version or model directories found. Note that "
"hidden folders are not allowed and "
"Ensemble models are not supported in SageMaker MME mode."));
closedir(dir);
return;
Expand All @@ -489,8 +524,22 @@ SagemakerAPIServer::SageMakerMMELoadModel(
repo_path, model_path_regex_, &repo_parent_path, &subdir,
&customer_subdir);

std::string config_path = repo_path + "/config.pbtxt";
struct stat buffer;

/* If config.pbtxt is at repo root,
* then repo_parent_path = /opt/ml/models/<hash>/, and model_subdir = model
* else repo_parent_path = /opt/ml/models/<hash>/model and
* model_subdir = dir under model/
*/
if (stat(config_path.c_str(), &buffer) == 0) {
model_subdir = subdir;
} else {
repo_parent_path = repo_path;
}

auto param = TRITONSERVER_ParameterNew(
subdir.c_str(), TRITONSERVER_PARAMETER_STRING, model_name.c_str());
model_subdir.c_str(), TRITONSERVER_PARAMETER_STRING, model_name.c_str());

if (param != nullptr) {
subdir_modelname_map.emplace_back(param);
Expand Down Expand Up @@ -534,8 +583,7 @@ SagemakerAPIServer::SageMakerMMELoadModel(
TRITONSERVER_ErrorDelete(err);
return;
} else if (err != nullptr) {
EVBufferAddErrorJson(req->buffer_out, err);
evhtp_send_reply(req, EVHTP_RES_BADREQ);
SageMakerMMEHandleLoadError(req, err);
} else {
std::lock_guard<std::mutex> lock(mutex_);

Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#pragma once

#include <mutex>
#include <sys/stat.h>

#include "common.h"
#include "dirent.h"
Expand Down Expand Up @@ -86,6 +87,9 @@ class SagemakerAPIServer : public HTTPAPIServer {
evhtp_request_t* req,
const std::unordered_map<std::string, std::string> parse_map);

void SageMakerMMEHandleLoadError(
evhtp_request_t* req, TRITONSERVER_Error* load_err);

void SageMakerMMEUnloadModel(evhtp_request_t* req, const char* model_name);

void SageMakerMMEListModel(evhtp_request_t* req);
Expand Down