This is an automated email from the ASF dual-hosted git repository. grag pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 59ba377616d10c248e4f0607a71ecf6658084e59 Author: Greg Mann <[email protected]> AuthorDate: Tue Mar 3 06:03:58 2020 -0800 Cleaned up agent capability validation and associated docs. Review: https://reviews.apache.org/r/72087/ --- docs/configuration/agent.md | 4 +++- src/slave/flags.cpp | 20 +++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/docs/configuration/agent.md b/docs/configuration/agent.md index 1498df4..01ffa38 100644 --- a/docs/configuration/agent.md +++ b/docs/configuration/agent.md @@ -93,7 +93,8 @@ Example: <td> JSON representation of agent features to whitelist. We always require 'MULTI_ROLE', 'HIERARCHICAL_ROLE', 'RESERVATION_REFINEMENT', -'AGENT_OPERATION_FEEDBACK', 'AGENT_DRAINING', and 'TASK_RESOURCE_LIMITS'. +'AGENT_OPERATION_FEEDBACK', 'RESOURCE_PROVIDER', 'AGENT_DRAINING', and +'TASK_RESOURCE_LIMITS'. <p/> Example: <pre><code> @@ -103,6 +104,7 @@ Example: {"type": "HIERARCHICAL_ROLE"}, {"type": "RESERVATION_REFINEMENT"}, {"type": "AGENT_OPERATION_FEEDBACK"}, + {"type": "RESOURCE_PROVIDER"}, {"type": "AGENT_DRAINING"}, {"type": "TASK_RESOURCE_LIMITS"} ] diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp index 5966436..2f88b90 100644 --- a/src/slave/flags.cpp +++ b/src/slave/flags.cpp @@ -812,7 +812,7 @@ mesos::internal::slave::Flags::Flags() "agent_features", "JSON representation of agent features to whitelist. We always require\n" "'MULTI_ROLE', 'HIERARCHICAL_ROLE', 'RESERVATION_REFINEMENT',\n" - "'AGENT_OPERATION_FEEDBACK', 'AGENT_DRAINING', and\n" + "'AGENT_OPERATION_FEEDBACK', 'RESOURCE_PROVIDER', 'AGENT_DRAINING', and\n" "'TASK_RESOURCE_LIMITS'.\n" "\n" "Example:\n" @@ -822,6 +822,7 @@ mesos::internal::slave::Flags::Flags() " {\"type\": \"HIERARCHICAL_ROLE\"},\n" " {\"type\": \"RESERVATION_REFINEMENT\"},\n" " {\"type\": \"AGENT_OPERATION_FEEDBACK\"},\n" + " {\"type\": \"RESOURCE_PROVIDER\"},\n" " {\"type\": \"AGENT_DRAINING\"},\n" " {\"type\": \"TASK_RESOURCE_LIMITS\"}\n" " ]\n" @@ -836,25 +837,14 @@ mesos::internal::slave::Flags::Flags() !capabilities.hierarchicalRole || !capabilities.reservationRefinement || !capabilities.agentOperationFeedback || + !capabilities.resourceProvider || !capabilities.agentDraining || !capabilities.taskResourceLimits) { return Error( "At least the following agent features need to be enabled:" " MULTI_ROLE, HIERARCHICAL_ROLE, RESERVATION_REFINEMENT," - " AGENT_OPERATION_FEEDBACK, AGENT_DRAINING, and" - " TASK_RESOURCE_LIMITS"); - } - - if (capabilities.resizeVolume && !capabilities.resourceProvider) { - return Error( - "RESIZE_VOLUME feature requires RESOURCE_PROVIDER feature"); - } - - if (capabilities.agentOperationFeedback && - !capabilities.resourceProvider) { - return Error( - "AGENT_OPERATION_FEEDBACK feature" - " requires RESOURCE_PROVIDER feature"); + " AGENT_OPERATION_FEEDBACK, RESOURCE_PROVIDER, AGENT_DRAINING," + " and TASK_RESOURCE_LIMITS"); } }
