V1.28.0 stage #2032
Merged
V1.28.0 stage #2032
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A high level workflow to for this is as follow: 1. An ACS handler, AttachInstanceENIHandler receives an AttachNetworkInterfacesMessage from ACS which contains the information of the trunk ENI. upon receiving this message the handler adds the trunk eni attachment to the attachment table in Agent's state; 2. Udev Watcher is periodically scanning through attached network devices on the instances and also listens to network device's attached event. Once it found that the trunk ENI is attached (it knows a device is the trunk ENI from information in attachment table added in step 1), it sends an AttachmentStateChange event to the global state change event channel; 3. An event handler, AttachmentEventHandler handles the AttachmentStateChange event from the event channel by sending it to backend.
Merge branch 'dev' into eni-trunking
Changes involve: 1. Add capability "task-eni-trunking" to indicate eni trunking support 2. Add branch plugin capability verification 3. Add branch plugin version attribute 4. Add agent config ECS_ENABLE_HIGH_DENSITY_ENI for enabling eni trunking 5. Integrate with plugin packaging changes
For an AWSVPC task using trunk ENI "vpc-branch-eni" CNI plugin will be used(for ADD and DEL) instead of "ecs-cni" plugin when setting up pause container namespace. - "InterfaceVlanProperties" struct added. It will contain mac address and ID of the trunk ENI. - "ENI" struct extended to add "ENIType" field and "InterfaceVlanProperties" field. ENI type indicates the type of ENI. It could be either "standard" or "vlan-tagged". "InterfaceVlanProperties" field points to InterfaceVlanProperties struct which will contain trunk ENI information. - "BranchENIConfig" struct added. This will be used to invoke the "vpc-branch-eni" plugin in the similar fashion as "ENIConfig" is used for invoking "ecs-cni" plugin. - A "Config" object contains all the information required for invoking the CNI plugin which sets up the pause container's network namespace. The config object is extended to include trunk ENI information which will be needed to construct "BranchENIConfig" object.
* Build with Go 1.12 * Test with Go 1.12 * Build test images with Go 1.12
…eter. This is needed becasue microsoft/windowsservercore only supports 2016, it does not run on WS2019 machines. We need to pass in a different base image for functional tests to run on WS2019 machines. The change includes: 1. Allow integ test functional test to pass base image as parameter 2. Tag amazon-ecs-ftest-windows-base:make from base image parameter 3. Change all existing microsoft/windowsservercore to use amazon-ecs-ftest-windows-base:make
Use Golang 1.12
add noiseDelta to telemetry test
Increase timeout for integ tests
In TestPullImageInactivityTimeout and TestStatsInactivityTimeout, sometimes the inactivity handling gorouting has some delay and isn't able to trigger inactivity timeout before the reader finishes reading. Reducing the timeout to 1ms helps reduce flakiness.
Revise telemetry tests to use average across normalized datapoints
Conflicts:
agent/ecscni/plugin.go (only changed by eni-trunking branch, keeps the changes)
agent/functional_tests/tests/generated/simpletests_windows/simpletests_generated_windows_test.go (regenerated simple tests)
agent/statemanager/state_manager.go (only changed by eni-trunking branch, keeps the changes)
The test verifies that when ENI trunking is enabled, the Trunk ENI is attached when container instance reaches ACTIVE status, and it's detached when the container instance is deregistered.
also cleanup of 'dangling' images that have no tags or names associated with them (ie, they show as <none> in 'docker images') closes aws#1684 unit tests dont touch dangling images -- for now skip containers that don't have a finished time
Related issue: aws#1575 Related PR: aws#1730 PR 1730 adds the Public IP Address of the host to the container metadata file, however the EC2 host may be configured without a public address. In this case, the EC2 metadata API returns a 404 response, and the host IP is not available to containers. Example ECS Agent Log ``` [ERROR] Unable to retrieve Host Instance PublicIPv4 Address: EC2MetadataError: failed to make EC2Metadata request caused by: <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>404 - Not Found</title> </head> <body> <h1>404 - Not Found</h1> </body> </html> ``` This commit adds an extra field to the container metadata json, `HostPrivateIPv4Address` which is available on EC2 hosts without a public address.
Merge branch 'eni-trunking' into dev
Adds an option (ENIPauseContainerCleanupDelaySeconds) to delay the
cleanup of the pause container that owns the network namespace for
AWSVPC network mode tasks. In practice, this won't be used unless
other applications on host are making use of the AWSVPC ENI.
The option can be used by setting ecs.config.json:
```
{
"ENIPauseContainerCleanupDelaySeconds": 10
}
```
tommyhahn
approved these changes
May 9, 2019
fenxiong
added
staging
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Stage agent 1.28.0. Changelog:
ECS_CGROUP_CPU_PERIODto make cgroup cpu period configurable @boynux #1941Implementation details
Testing
New tests cover the changes:
Description for the changelog
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.