Skip to content

Update c-ares to 1.17.2#17704

Merged
yanavlasov merged 5 commits intoenvoyproxy:mainfrom
yanavlasov:ares-update
Aug 17, 2021
Merged

Update c-ares to 1.17.2#17704
yanavlasov merged 5 commits intoenvoyproxy:mainfrom
yanavlasov:ares-update

Conversation

@yanavlasov
Copy link
Copy Markdown
Contributor

@yanavlasov yanavlasov commented Aug 13, 2021

Risk Level: Low
Testing: All tests
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A

Note: needs backporting to stable branches.

Signed-off-by: Yan Avlasov yavlasov@google.com

@yanavlasov
Update c-ares to 1.17.2
c6e4d27 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Aug 13, 2021
@repokitteh-read-only
Copy link
Copy Markdown

repokitteh-read-only bot commented Aug 13, 2021

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).

🐱

Caused by: #17704 was opened by yanavlasov.

see: more, trace.

@moderation
Copy link
Copy Markdown
Contributor

moderation commented Aug 13, 2021 •
edited
Loading

I think this is the issue with CI - c-ares/c-ares@d5146a6. Via c-ares/c-ares@cares-1_17_1...cares-1_17_2

@ggreenway
Copy link
Copy Markdown
Member

ggreenway commented Aug 13, 2021

Windows break is a real failure.

/wait

@yanavlasov
Correct Windows header name
da02d48 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
moderation
moderation suggested changes Aug 13, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@moderation moderation left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Wondering if the Windows specific if then statement at https://github.com/envoyproxy/envoy/blob/main/test/common/network/dns_impl_test.cc#L34-L39 can now be removed due to this commit which is part of the release - c-ares/c-ares@c2f3235 ?

You'd end up with just

#include "ares_nameser.h"

@yanavlasov
Fix envoy_cmake_external for c-ares
66ce575 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
@yanavlasov
Copy link
Copy Markdown
Contributor Author

yanavlasov commented Aug 13, 2021 •
edited
Loading

We will then have to define HAVE_ARPA_NAMESER_H and push the problem into the BUILD file. Maybe having it in the BUILD file better. I will leave it as is for now though.

Wondering if the Windows specific if then statement at https://github.com/envoyproxy/envoy/blob/main/test/common/network/dns_impl_test.cc#L34-L39 can now be removed due to this commit which is part of the release - c-ares/c-ares@c2f3235 ?

@yanavlasov
Copy link
Copy Markdown
Contributor Author

yanavlasov commented Aug 14, 2021

/retest

@repokitteh-read-only
Copy link
Copy Markdown

repokitteh-read-only bot commented Aug 14, 2021

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #17704 (comment) was created by @yanavlasov.

see: more, trace.

@yanavlasov
Merge branch 'main' into ares-update
22b8c6c
@yanavlasov
Fix merge error
98bc4a9 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
@wrowe
Copy link
Copy Markdown
Contributor

wrowe commented Aug 17, 2021

Leaving it as-is seems better from a backporting perspective, the cleanup can live exclusively on main.

We will then have to define HAVE_ARPA_NAMESER_H and push the problem into the BUILD file. Maybe having it in the BUILD file better. I will leave it as is for now though.

Wondering if the Windows specific if then statement at https://github.com/envoyproxy/envoy/blob/main/test/common/network/dns_impl_test.cc#L34-L39 can now be removed due to this commit which is part of the release - c-ares/c-ares@c2f3235 ?

@moderation
Copy link
Copy Markdown
Contributor

moderation commented Aug 17, 2021

/lgtm deps

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Aug 17, 2021
@yanavlasov yanavlasov merged commit 5789537 into envoyproxy:main Aug 17, 2021
yanavlasov added a commit to yanavlasov/envoy that referenced this pull request Aug 18, 2021
@yanavlasov
Update c-ares to 1.17.2 (envoyproxy#17704)
df2a7e1 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
mpuncel added a commit to mpuncel/envoy that referenced this pull request Aug 19, 2021
@mpuncel
Merge branch 'main' into mpuncel/sds-hc-sequence-2
24e4b74 
* main:
  Fix for fuzz tests failing due to invalid corpus paths (envoyproxy#17767)
  kafka: fix integration test (envoyproxy#17764)
  Fix typo in cluster.proto (envoyproxy#17755)
  cluster manager: add drainConnections() API (envoyproxy#17747)
  kafka broker filter: move to contrib (envoyproxy#17750)
  quiche: switch external dependency to github (envoyproxy#17732)
  quiche: implement stream idle timeout in codec (envoyproxy#17674)
  Update c-ares to 1.17.2 (envoyproxy#17704)
  Fix dns resolve fuzz bug (envoyproxy#17107)
  Remove members that shadow members of the base class (envoyproxy#17713)
  thrift proxy: missing parts from the previous PR (envoyproxy#17668)
  thrift-proxy: cleanup ConnectionManager::ActiveRpc (envoyproxy#17734)
  listener: extra warning for deprecated use_proxy_proto field (envoyproxy#17736)
  kafka: add support for metadata request in mesh-filter (envoyproxy#17597)
  upstream: add all host map to priority set for fast host searching (envoyproxy#17290)
  Remove the support for `hidden_envoy_deprecated_per_filter_config` (envoyproxy#17725)
  tls: SDS support for private key providers (envoyproxy#16737)
  bazel: update rules_foreign_cc (envoyproxy#17445)

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
yanavlasov added a commit to yanavlasov/envoy that referenced this pull request Aug 19, 2021
@yanavlasov
Update c-ares to 1.17.2 (envoyproxy#17704)
149b8c3 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
yanavlasov added a commit to yanavlasov/envoy that referenced this pull request Aug 19, 2021
@yanavlasov
Update c-ares to 1.17.2 (envoyproxy#17704)
91d0ba3 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
yanavlasov added a commit to yanavlasov/envoy that referenced this pull request Aug 19, 2021
@yanavlasov
Update c-ares to 1.17.2 (envoyproxy#17704)
54ab159 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
ggreenway pushed a commit that referenced this pull request Aug 20, 2021
@yanavlasov
Update c-ares to 1.17.2 (#17704) (#17751)
693c44e 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
ggreenway pushed a commit that referenced this pull request Aug 20, 2021
@yanavlasov
v1.16: Update c-ares to 1.17.2 (#17704) (#17779)
d503dd5 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
ggreenway pushed a commit that referenced this pull request Aug 20, 2021
@yanavlasov
v1.17: Update c-ares to 1.17.2 (#17704) (#17778)
6f25edd 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
ggreenway pushed a commit that referenced this pull request Aug 20, 2021
@yanavlasov
v1.18: Update c-ares to 1.17.2 (#17704) (#17776)
896127b 
Signed-off-by: Yan Avlasov <yavlasov@google.com>
@yanavlasov yanavlasov deleted the ares-update branch February 11, 2022 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ggreenway ggreenway ggreenway approved these changes

+1 more reviewer

@moderation moderation moderation requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

@moderation moderation

@ggreenway ggreenway

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@yanavlasov @moderation @ggreenway @wrowe