Merge d4f22c6 into b6a3797

mesos · Sep 14, 2017 · 5689a51 · 5689a51
2 parents b6a3797 + d4f22c6
commit 5689a51
Show file tree

Hide file tree

Showing 23 changed files with 18,902 additions and 7,153 deletions.
diff --git a/api/v1/lib/agent/agent.pb.go b/api/v1/lib/agent/agent.pb.go
diff --git a/api/v1/lib/agent/agent.pb_ffjson.go b/api/v1/lib/agent/agent.pb_ffjson.go
diff --git a/api/v1/lib/agent/agent.proto b/api/v1/lib/agent/agent.proto
@@ -71,11 +71,13 @@ message Call {
     GET_FRAMEWORKS = 11;    // Retrieves the information about known frameworks.
     GET_EXECUTORS = 12;     // Retrieves the information about known executors.
     GET_TASKS = 13;         // Retrieves the information about known tasks.
+    GET_AGENT = 20;         // Retrieves the agent information.
 
     // Calls for managing nested containers underneath an executor's container.
     LAUNCH_NESTED_CONTAINER = 14;  // See 'LaunchNestedContainer' below.
     WAIT_NESTED_CONTAINER = 15;    // See 'WaitNestedContainer' below.
     KILL_NESTED_CONTAINER = 16;    // See 'KillNestedContainer' below.
+    REMOVE_NESTED_CONTAINER = 21;  // See 'RemoveNestedContainer' below.
 
     // See 'LaunchNestedContainerSession' below.
     LAUNCH_NESTED_CONTAINER_SESSION = 17;
@@ -141,6 +143,12 @@ message Call {
     required ContainerID container_id = 1 [(gogoproto.customname) = "ContainerID", (gogoproto.nullable) = false];
   }
 
+  // Removes a nested container and its artifacts (runtime and sandbox
+  // directories).
+  message RemoveNestedContainer {
+    required ContainerID container_id = 1 [(gogoproto.customname) = "ContainerID", (gogoproto.nullable) = false];
+  }
+
   // Launches a nested container within an executor's tree of containers.
   // The differences between this call and `LaunchNestedContainer` are:
   // 1) The container's life-cycle is tied to the lifetime of the
@@ -191,6 +199,7 @@ message Call {
   optional LaunchNestedContainer launch_nested_container = 6;
   optional WaitNestedContainer wait_nested_container = 7;
   optional KillNestedContainer kill_nested_container = 8;
+  optional RemoveNestedContainer remove_nested_container = 12;
   optional LaunchNestedContainerSession launch_nested_container_session = 9;
   optional AttachContainerInput attach_container_input = 10;
   optional AttachContainerOutput attach_container_output = 11;
@@ -221,6 +230,7 @@ message Response {
     GET_FRAMEWORKS = 10;           // See 'GetFrameworks' below.
     GET_EXECUTORS = 11;            // See 'GetExecutors' below.
     GET_TASKS = 12;                // See 'GetTasks' below.
+    GET_AGENT = 14;                // See 'GetAgent' below.
 
     WAIT_NESTED_CONTAINER = 13;    // See 'WaitNestedContainer' below.
     option (gogoproto.goproto_enum_prefix) = true;
@@ -332,6 +342,11 @@ message Response {
     repeated Task completed_tasks = 5 [(gogoproto.nullable) = false];
   }
 
+  // Contains the agent's information.
+  message GetAgent {
+    optional AgentInfo agent_info = 1;
+  }
+
   // Returns termination information about the nested container.
   message WaitNestedContainer {
     optional int32 exit_status = 1;
@@ -351,6 +366,7 @@ message Response {
   optional GetFrameworks get_frameworks = 11;
   optional GetExecutors get_executors = 12;
   optional GetTasks get_tasks = 13;
+  optional GetAgent get_agent = 15;
   optional WaitNestedContainer wait_nested_container = 14;
 }