Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DHPA] Rebase the feature branch against the dev branch #3590

Conversation

chienhanlin
Copy link
Contributor

@chienhanlin chienhanlin commented Feb 24, 2023

Summary

This PR is mainly to rebase the feature branch against the dev branch.

Commits/PRs will be merged into the feature branch include

  1. Remove fallback to Docker for host port ranges assignment #3569
  2. fix ecs-init logging #3577
  3. Remove set-output GitHub action command #3487
  4. Update CNI plugin versions #3581
  5. periodically disconnect from acs #3586
  6. Release 1.69.0 #3591
  7. fix TestMetricsDisabled unit test #3588
  8. make TestGetHostPortRange unit test deterministic #3587
  9. update go module dependencies #3593

Implementation details

Merge the dev branch into the feature branch, and resolve conflicts.

Testing

New tests cover the changes: no

Description for the changelog

N/A

Licensing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@chienhanlin chienhanlin force-pushed the dhpaRebaseDev branch 2 times, most recently from f6310d9 to 69495e9 Compare February 25, 2023 00:22
@chienhanlin chienhanlin marked this pull request as ready for review February 25, 2023 00:34
@chienhanlin chienhanlin requested a review from a team as a code owner February 25, 2023 00:34
// net.Listen announces on the local tcp network
ln, err := net.Listen(protocol, ":"+portStr)
if err != nil {
log.Debugf(portUnavailableMsg, portStr, protocol)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 252 to add a debug log entry is the main change make in this rebase PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about this before and I don't think its a good idea to add this log statement. Imagine a worst case scenario where the agent checks tens of thousands of ports and does not find any port available. The agent logs (if debug log enabled) will end up having log statements per port. And this would be per container.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point! I plan to keep it for now for the bug bash event, and have a follow up PR to remove it after the bug bash.

// net.ListenPacket announces on the local udp network
ln, err := net.ListenPacket(protocol, ":"+portStr)
if err != nil {
log.Debugf(portUnavailableMsg, portStr, protocol)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 265 to add a debug log entry is the main change make in this rebase PR.

singholt
singholt previously approved these changes Feb 27, 2023
prateekchaudhry
prateekchaudhry previously approved these changes Mar 1, 2023
Moves actions/checkout from v2 to v3 to resolve NodeJS 12 deprecation
warnings in CI workflows.

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
singholt
singholt previously approved these changes Mar 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants