Skip to content

Commit

Permalink
hotrestart: remove dynamic_resources from server config used by hotre…
Browse files Browse the repository at this point in the history
…start_test (#8162)

In the server config file `test/config/integration/server.yaml` used by
//test/integration:hotrestart_test, `dynamic_resources` includes `lds_config`
and `cds_config` definitions, which use HTTP API to fetch config, but CDS and
LDS service do not exist, so the initial fetch will be failed with a
connection failure, then Envoy server continue startup.

Envoy server shouldn't continue startup because connection failure, see
issue #8046.

For this test, `dynamic_resources` is not needed, this change clean it up.

Signed-off-by: lhuang8 <lhuang8@ebay.com>
  • Loading branch information
l8huang authored and htuch committed Sep 6, 2019
1 parent e7f0b71 commit c6f0ee2
Showing 1 changed file with 1 addition and 34 deletions.
35 changes: 1 addition & 34 deletions test/config/integration/server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,27 +79,6 @@ static_resources:
catch_all_route:
cluster: redis
clusters:
- name: cds
connect_timeout: 5s
hosts:
- socket_address:
address: {{ ip_loopback_address }}
port_value: 4
dns_lookup_family: "{{ dns_lookup_family }}"
- name: rds
connect_timeout: 5s
hosts:
- socket_address:
address: {{ ip_loopback_address }}
port_value: 4
dns_lookup_family: "{{ dns_lookup_family }}"
- name: lds
connect_timeout: 5s
hosts:
- socket_address:
address: {{ ip_loopback_address }}
port_value: 4
dns_lookup_family: "{{ dns_lookup_family }}"
- name: cluster_1
connect_timeout: 5s
hosts:
Expand Down Expand Up @@ -141,19 +120,7 @@ static_resources:
port_value: 4
dns_lookup_family: "{{ dns_lookup_family }}"
outlier_detection: {}
dynamic_resources:
lds_config:
api_config_source:
api_type: REST
cluster_names:
- lds
refresh_delay: 30s
cds_config:
api_config_source:
api_type: REST
cluster_names:
- cds
refresh_delay: 30s
dynamic_resources: {}
cluster_manager: {}
flags_path: "/invalid_flags"
stats_sinks:
Expand Down

0 comments on commit c6f0ee2

Please sign in to comment.