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

bugfix(radixtree_host_uri): set route priority. #2447

Merged
merged 1 commit into from
Oct 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apisix/http/router/radixtree_host_uri.lua
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ local function push_host_router(route, host_routes, only_uri_routes)
local radixtree_route = {
paths = route.value.uris or route.value.uri,
methods = route.value.methods,
priority = route.value.priority,
remote_addrs = route.value.remote_addrs
or route.value.remote_addr,
vars = route.value.vars,
Expand Down
173 changes: 173 additions & 0 deletions t/router/radixtree-host-uri-priority.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
use t::APISIX 'no_plan';

repeat_each(1);
log_level('info');
worker_connections(256);
no_root_location();
no_shuffle();

our $yaml_config = <<_EOC_;
apisix:
node_listen: 1984
config_center: yaml
enable_admin: false
router:
http: 'radixtree_host_uri'
admin_key: null
_EOC_

run_tests();

__DATA__

=== TEST 1: hit routes(priority: 1 + priority: 2)
--- yaml_config eval: $::yaml_config
--- apisix_yaml
routes:
-
uri: /server_port
host: test.com
upstream:
nodes:
"127.0.0.1:1981": 1
type: roundrobin
priority: 1
-
uri: /server_port
host: test.com
upstream:
nodes:
"127.0.0.1:1980": 1
type: roundrobin
priority: 2
#END

--- request
GET /server_port
--- more_headers
Host: test.com
--- response_body eval
qr/1980/
--- error_log
use config_center: yaml
--- no_error_log
[error]



=== TEST 2: hit routes(priority: 2 + priority: 1)
--- yaml_config eval: $::yaml_config
--- apisix_yaml
routes:
-
uri: /server_port
host: test.com
upstream:
nodes:
"127.0.0.1:1981": 1
type: roundrobin
priority: 2
-
uri: /server_port
host: test.com
upstream:
nodes:
"127.0.0.1:1980": 1
type: roundrobin
priority: 1
#END

--- request
GET /server_port
--- more_headers
Host: test.com
--- response_body eval
qr/1981/
--- error_log
use config_center: yaml
--- no_error_log
[error]



=== TEST 3: hit routes(priority: default_value + priority: 1)
--- yaml_config eval: $::yaml_config
--- apisix_yaml
routes:
-
uri: /server_port
host: test.com
upstream:
nodes:
"127.0.0.1:1981": 1
type: roundrobin
-
uri: /server_port
host: test.com
upstream:
nodes:
"127.0.0.1:1980": 1
type: roundrobin
priority: 1
#END

--- request
GET /server_port
--- more_headers
Host: test.com
--- response_body eval
qr/1980/
--- error_log
use config_center: yaml
--- no_error_log
[error]



=== TEST 4: hit routes(priority: 1 + priority: default_value)
--- yaml_config eval: $::yaml_config
--- apisix_yaml
routes:
-
uri: /server_port
host: test.com
upstream:
nodes:
"127.0.0.1:1981": 1
type: roundrobin
priority: 1
-
uri: /server_port
host: test.com
upstream:
nodes:
"127.0.0.1:1980": 1
type: roundrobin
#END

--- request
GET /server_port
--- more_headers
Host: test.com
--- response_body eval
qr/1981/
--- error_log
use config_center: yaml
--- no_error_log
[error]