You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2016/12/01 06:43:36 UTC
[3/7] mesos git commit: Added validation for the attach container
input call on the agent.
Added validation for the attach container input call on the agent.
Review: https://reviews.apache.org/r/54219/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/15b2fd99
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/15b2fd99
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/15b2fd99
Branch: refs/heads/master
Commit: 15b2fd995e4eccd666a48c6ebca9c53f11210f53
Parents: 2c2abd7
Author: Anand Mazumdar <an...@apache.org>
Authored: Wed Nov 30 22:41:42 2016 -0800
Committer: Anand Mazumdar <an...@apache.org>
Committed: Wed Nov 30 22:41:42 2016 -0800
----------------------------------------------------------------------
src/slave/validation.cpp | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/15b2fd99/src/slave/validation.cpp
----------------------------------------------------------------------
diff --git a/src/slave/validation.cpp b/src/slave/validation.cpp
index 46e8436..4005cfc 100644
--- a/src/slave/validation.cpp
+++ b/src/slave/validation.cpp
@@ -223,9 +223,24 @@ Option<Error> validate(
}
case mesos::agent::Call::LAUNCH_NESTED_CONTAINER_SESSION:
- case mesos::agent::Call::ATTACH_CONTAINER_INPUT:
return Error("Unsupported");
+ case mesos::agent::Call::ATTACH_CONTAINER_INPUT: {
+ if (!call.has_attach_container_input()) {
+ return Error("Expecting 'attach_container_input' to be present");
+ }
+
+ Option<Error> error = validation::container::validateContainerId(
+ call.attach_container_input().container_id());
+
+ if (error.isSome()) {
+ return Error("'attach_container_input.container_id' is invalid"
+ ": " + error->message);
+ }
+
+ return None();
+ }
+
case mesos::agent::Call::ATTACH_CONTAINER_OUTPUT: {
if (!call.has_attach_container_output()) {
return Error("Expecting 'attach_container_output' to be present");