Skip to content

Commit

Permalink
Update Envoy to ecbd64d (May 20, 2024) (#1172)
Browse files Browse the repository at this point in the history
- Synced `tools/code_format/config.yaml` from Envoy's version.
- No changes in `.bazelrc`, `.bazelversion`, `ci/run_envoy_docker.sh`, `tools/gen_compilation_database.py`.
- Updated `source/server/README.md` by executing `tools/update_cli_readme_documentation.sh --mode fix`.

Signed-off-by: jiajunye <jiajunye@google.com>
  • Loading branch information
jiajunye committed May 21, 2024
1 parent 35446ca commit 3eb9b1b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

ENVOY_COMMIT = "c3dd81da68af54844c85da0942bddb4787bd5624"
ENVOY_SHA = "5b032091d056a3693fb02b52cd88848f1f502575caa353034793375c5d367f65"
ENVOY_COMMIT = "ecbd64de59315f990ed7b1861a19aa96061de39d"
ENVOY_SHA = "764f8036b14baf190af26a9ed3510a7305e9c2b76cf9c96c736eeddf82aa4d91"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
7 changes: 7 additions & 0 deletions source/server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ bazel-bin/nighthawk_test_server [--stats-tag <string>] ...
[--allow-unknown-fields] [--config-yaml
<string>] [-c <string>] [--concurrency
<uint32_t>] [--base-id-path <string>]
[--skip-hot-restart-parent-stats]
[--skip-hot-restart-on-no-parent]
[--use-dynamic-base-id] [--base-id
<uint32_t>] [--] [--version] [-h]
Expand Down Expand Up @@ -325,6 +326,12 @@ Path to configuration file
--base-id-path <string>
Path to which the base ID is written

--skip-hot-restart-parent-stats
When hot restarting, by default the child instance copies stats from
the parent instance periodically during the draining period. This can
potentially be an expensive operation; set this to true to reset all
stats in child process.

--skip-hot-restart-on-no-parent
When hot restarting with epoch>0, the default behavior is for the
child to crash if the connection to the parent cannot be established.
Expand Down
15 changes: 5 additions & 10 deletions tools/code_format/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ paths:
- source/common/listener_manager/listener_impl.cc
- source/common/listener_manager/listener_manager_impl.cc
- source/common/listener_manager/filter_chain_manager_impl.cc
- source/common/upstream/subset_lb_config.cc
- source/common/upstream/cluster_manager_impl.cc
- source/common/upstream/upstream_impl.cc
- source/common/upstream/default_local_address_selector_factory.cc
- source/common/network/listen_socket_impl.cc
- source/common/network/io_socket_handle_base_impl.cc
- source/common/network/address_impl.cc
Expand All @@ -117,12 +115,10 @@ paths:
- source/common/formatter/substitution_format_string.h
- source/common/stats/tag_extractor_impl.cc
- source/common/http/http2/codec_impl.cc
- source/common/http/hash_policy.cc
- source/common/http/conn_manager_utility.cc
- source/common/protobuf/yaml_utility.cc
- source/common/protobuf/utility.cc
- source/common/quic/quic_server_transport_socket_factory.cc
- source/common/secret/secret_manager_impl.cc
- source/common/grpc/google_grpc_utils.cc
- source/common/tcp_proxy/tcp_proxy.cc
- source/common/config/subscription_factory_impl.cc
Expand All @@ -134,12 +130,9 @@ paths:
- source/common/router/scoped_config_impl.cc
- source/common/router/header_parser.cc
- source/common/filesystem/posix/directory_iterator_impl.cc
- source/common/filesystem/inotify/watcher_impl.cc
- source/common/filesystem/kqueue/watcher_impl.cc
- source/common/filesystem/win32/directory_iterator_impl.cc
- source/common/common/utility.cc
- source/common/common/regex.cc
- source/common/common/matchers.cc
- source/common/common/regex.h
- source/exe/stripped_main_base.cc
- source/server/options_impl.cc
- source/server/overload_manager_impl.cc
Expand All @@ -149,7 +142,6 @@ paths:
- source/server/server.cc
- source/server/hot_restarting_base.cc
- source/server/hot_restart_impl.cc
- source/server/ssl_context_manager.cc
- source/server/config_validation/cluster_manager.cc
- source/common/upstream/health_discovery_service.cc
- source/common/secret/sds_api.h
Expand All @@ -164,11 +156,13 @@ paths:
- source/common/grpc/google_grpc_creds_impl.cc
- source/common/local_reply/local_reply.cc
- source/common/tls/context_impl.cc
- source/common/tls/server_context_impl.cc
- source/common/tls/context_config_impl.cc
- source/common/tls/ocsp/ocsp.cc
- source/common/config/watched_directory.cc
- source/server/drain_manager_impl.cc
- source/common/router/rds_impl.cc
- source/common/io/io_uring_worker_impl.cc
- source/common/event/file_event_impl.cc

# Only one C++ file should instantiate grpc_init
grpc_init:
Expand Down Expand Up @@ -427,3 +421,4 @@ visibility_excludes:
- source/extensions/load_balancing_policies/random/
- source/extensions/load_balancing_policies/cluster_provided/
- source/extensions/filters/http/match_delegate/
- source/extensions/transport_sockets/tls/

0 comments on commit 3eb9b1b

Please sign in to comment.