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

Return 400 on failed training request #168

Merged
merged 3 commits into from
Nov 1, 2021
Merged

Return 400 on failed training request #168

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
94c190e
Dont throw 500s on null
jmazanec15 Oct 31, 2021
b3027a1
Throw illegal state exception training rejection
jmazanec15 Oct 31, 2021
5b62017
Throw validation exception on train reject
jmazanec15 Oct 31, 2021
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
6 changes: 3 additions & 3 deletions src/main/java/org/opensearch/knn/plugin/rest/RestTrainModelHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ private TrainingModelRequest createTransportRequest(RestRequest restRequest) thr
parser.nextToken();

if (TRAIN_INDEX_PARAMETER.equals(fieldName) && ensureNotSet(fieldName, trainingIndex)) {
trainingIndex = parser.text();
trainingIndex = parser.textOrNull();
} else if (TRAIN_FIELD_PARAMETER.equals(fieldName) && ensureNotSet(fieldName, trainingField)) {
trainingField = parser.text();
trainingField = parser.textOrNull();
} else if (KNN_METHOD.equals(fieldName) && ensureNotSet(fieldName, knnMethodContext)) {
knnMethodContext = KNNMethodContext.parse(parser.map());
} else if (DIMENSION.equals(fieldName) && ensureNotSet(fieldName, dimension)) {
Expand All @@ -112,7 +112,7 @@ private TrainingModelRequest createTransportRequest(RestRequest restRequest) thr
} else if (SEARCH_SIZE_PARAMETER.equals(fieldName) && ensureNotSet(fieldName, searchSize)) {
searchSize = (Integer) NumberFieldMapper.NumberType.INTEGER.parse(parser.objectBytes(), false);
} else if (MODEL_DESCRIPTION.equals(fieldName) && ensureNotSet(fieldName, description)) {
description = parser.text();
description = parser.textOrNull();
} else {
throw new IllegalArgumentException("Unable to parse token. \"" + fieldName + "\" is not a valid " +
"parameter.");
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/opensearch/knn/plugin/transport/TrainingJobRouterTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.Strings;
import org.opensearch.common.ValidationException;
import org.opensearch.common.collect.ImmutableOpenMap;
import org.opensearch.common.inject.Inject;
import org.opensearch.search.builder.SearchSourceBuilder;
Expand Down Expand Up @@ -70,7 +71,9 @@ protected void routeRequest(TrainingModelRequest request, ActionListener<Trainin
DiscoveryNode node = selectNode(request.getPreferredNodeId(), response);

if (node == null) {
listener.onFailure(new RejectedExecutionException("Cluster does not have capacity to train"));
ValidationException exception = new ValidationException();
exception.addValidationError("Cluster does not have capacity to train");
listener.onFailure(exception);
return;
}

Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/opensearch/knn/training/TrainingJobRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.apache.logging.log4j.Logger;
import org.opensearch.action.ActionListener;
import org.opensearch.action.index.IndexResponse;
import org.opensearch.common.ValidationException;
import org.opensearch.knn.indices.ModelDao;
import org.opensearch.knn.indices.ModelMetadata;
import org.opensearch.knn.indices.ModelState;
Expand Down Expand Up @@ -82,7 +83,9 @@ public void execute(TrainingJob trainingJob, ActionListener<IndexResponse> liste
// the number of training jobs that enter this function. Although the training threadpool size will also prevent
// this, we want to prevent this before we perform any serialization.
if (!semaphore.tryAcquire()) {
throw new RejectedExecutionException("Unable to run training job: No training capacity on node.");
ValidationException exception = new ValidationException();
exception.addValidationError("Unable to run training job: No training capacity on node.");
Copy link
Member

Choose a reason for hiding this comment

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

Is it possible to print node name?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, that information is not readily available.

Copy link
Member

Choose a reason for hiding this comment

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

Should we log the error as log.info?

throw exception;
}

jobCount.incrementAndGet();
Expand Down