Merge c11ae24 into 2928a8d

mesos · Jul 19, 2018 · 4870b68 · 4870b68
2 parents 2928a8d + c11ae24
commit 4870b68
Show file tree

Hide file tree

Showing 23 changed files with 9,393 additions and 2,816 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
@@ -75,6 +75,9 @@ message Call {
     // Retrieves the information about known executors.
     GET_EXECUTORS = 12;
 
+    // Retrieves the information about known operations.
+    GET_OPERATIONS = 31;
+
     // Retrieves the information about known tasks.
     GET_TASKS = 13;
 
@@ -207,6 +210,7 @@ message Call {
       UNKNOWN = 0;
       CONTAINER_ID = 1;
       PROCESS_IO = 2;
+
       option (gogoproto.goproto_enum_prefix) = true;
     }
 
@@ -442,6 +446,7 @@ message Response {
     GET_CONTAINERS = 9;
     GET_FRAMEWORKS = 10;           // See 'GetFrameworks' below.
     GET_EXECUTORS = 11;            // See 'GetExecutors' below.
+    GET_OPERATIONS = 17;           // See 'GetOperations' below.
     GET_TASKS = 12;                // See 'GetTasks' below.
     GET_AGENT = 14;                // See 'GetAgent' below.
     GET_RESOURCE_PROVIDERS = 16;   // See 'GetResourceProviders' below.
@@ -537,6 +542,12 @@ message Response {
     repeated Executor completed_executors = 2 [(gogoproto.nullable) = false];
   }
 
+  // Lists information about all operations known to the agent at the
+  // current time.
+  message GetOperations {
+    repeated Operation operations = 1 [(gogoproto.nullable) = false];
+  }
+
   // Lists information about all the tasks known to the agent at the current
   // time.
   message GetTasks {
@@ -568,6 +579,7 @@ message Response {
   message GetResourceProviders {
     message ResourceProvider {
       required ResourceProviderInfo resource_provider_info = 1 [(gogoproto.nullable) = false];
+      repeated Resource total_resources = 2 [(gogoproto.nullable) = false];
     }
 
     repeated ResourceProvider resource_providers = 1 [(gogoproto.nullable) = false];
@@ -630,6 +642,7 @@ message Response {
   optional GetContainers get_containers = 10;
   optional GetFrameworks get_frameworks = 11;
   optional GetExecutors get_executors = 12;
+  optional GetOperations get_operations = 18;
   optional GetTasks get_tasks = 13;
   optional GetAgent get_agent = 15;
   optional GetResourceProviders get_resource_providers = 17;
@@ -650,6 +663,7 @@ message ProcessIO {
     UNKNOWN = 0;
     DATA = 1;
     CONTROL = 2;
+
     option (gogoproto.goproto_enum_prefix) = true;
   }
 
@@ -659,6 +673,7 @@ message ProcessIO {
       STDIN = 1;
       STDOUT = 2;
       STDERR = 3;
+
       option (gogoproto.goproto_enum_prefix) = true;
     }
 
@@ -672,6 +687,7 @@ message ProcessIO {
       UNKNOWN = 0;
       TTY_INFO = 1;
       HEARTBEAT = 2;
+
       option (gogoproto.goproto_enum_prefix) = true;
     }
 

diff --git a/api/v1/lib/agent/agentpb_test.go b/api/v1/lib/agent/agentpb_test.go
diff --git a/api/v1/lib/agent/calls/calls.go b/api/v1/lib/agent/calls/calls.go
@@ -71,6 +71,8 @@ func GetFrameworks() *agent.Call { return &agent.Call{Type: agent.Call_GET_FRAME
 
 func GetExecutors() *agent.Call { return &agent.Call{Type: agent.Call_GET_EXECUTORS} }
 
+func GetOperations() *agent.Call { return &agent.Call{Type: agent.Call_GET_OPERATIONS} }
+
 func GetTasks() *agent.Call { return &agent.Call{Type: agent.Call_GET_TASKS} }
 
 func GetAgent() *agent.Call { return &agent.Call{Type: agent.Call_GET_AGENT} }

diff --git a/api/v1/lib/agent/calls/calls_test.go b/api/v1/lib/agent/calls/calls_test.go
@@ -42,6 +42,7 @@ func Example() {
 		GetContainers(),
 		GetFrameworks(),
 		GetExecutors(),
+		GetOperations(),
 		GetTasks(),
 		GetAgent(),
 		GetResourceProviders(),

diff --git a/api/v1/lib/httpcli/httpagent/util.go b/api/v1/lib/httpcli/httpagent/util.go
@@ -27,6 +27,7 @@ func classifyResponse(c *agent.Call) (rc client.ResponseClass, err error) {
 		agent.Call_GET_CONTAINERS,
 		agent.Call_GET_FRAMEWORKS,
 		agent.Call_GET_EXECUTORS,
+		agent.Call_GET_OPERATIONS,
 		agent.Call_GET_TASKS,
 		agent.Call_GET_AGENT,
 		agent.Call_GET_RESOURCE_PROVIDERS,

diff --git a/api/v1/lib/httpcli/httpmaster/util.go b/api/v1/lib/httpcli/httpmaster/util.go
@@ -27,6 +27,7 @@ func classifyResponse(c *master.Call) (rc client.ResponseClass, err error) {
 		master.Call_GET_AGENTS,
 		master.Call_GET_FRAMEWORKS,
 		master.Call_GET_EXECUTORS,
+		master.Call_GET_OPERATIONS,
 		master.Call_GET_TASKS,
 		master.Call_GET_ROLES,
 		master.Call_GET_WEIGHTS,
@@ -49,6 +50,8 @@ func classifyResponse(c *master.Call) (rc client.ResponseClass, err error) {
 		master.Call_UNRESERVE_RESOURCES,
 		master.Call_CREATE_VOLUMES,
 		master.Call_DESTROY_VOLUMES,
+		master.Call_GROW_VOLUME,
+		master.Call_SHRINK_VOLUME,
 		master.Call_UPDATE_MAINTENANCE_SCHEDULE,
 		master.Call_START_MAINTENANCE,
 		master.Call_STOP_MAINTENANCE,