Skip to content

Trying to stop a paused instance now yields 400 Bad Request #89

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

Merged
merged 1 commit into from
Jan 20, 2019
Merged

Trying to stop a paused instance now yields 400 Bad Request #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/main/scala/de/upb/cs/swt/delphi/instanceregistry/RequestHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ class RequestHandler(configuration: Configuration, instanceDao: InstanceDAO, con
handleDeregister(id)
OperationResult.Ok
}
} else {
} else if(instanceDao.getInstance(id).get.instanceState != InstanceState.Paused){
log.info(s"Handling /stop for instance with id $id...")

val instance = instanceDao.getInstance(id).get
Expand All @@ -531,6 +531,9 @@ class RequestHandler(configuration: Configuration, instanceDao: InstanceDAO, con
}

OperationResult.Ok
} else {
log.warning(s"Cannot stop paused docker container for instance with id $id")
OperationResult.InvalidStateForOperation
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/main/scala/de/upb/cs/swt/delphi/instanceregistry/connection/Server.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,9 @@ class Server (handler: RequestHandler) extends HttpApp
case handler.OperationResult.InvalidTypeForOperation =>
log.warning(s"Cannot stop id $id, this component type cannot be stopped.")
complete{HttpResponse(StatusCodes.BadRequest, entity = s"Cannot stop instance of this type.")}
case handler.OperationResult.InvalidStateForOperation =>
log.warning(s"Cannot stop id $id, the associated container is paused.")
complete{HttpResponse(StatusCodes.BadRequest, entity = s"Cannot stop instance while it is paused.")}
case handler.OperationResult.Ok =>
complete{HttpResponse(StatusCodes.Accepted, entity = "Operation accepted.")}
case r =>
Expand Down