-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support reading configuration form xds(mvp) (#6614)
- Loading branch information
1 parent
d5bfbae
commit 555140a
Showing
9 changed files
with
338 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
-- | ||
-- 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. | ||
-- | ||
|
||
--- Get configuration form ngx.shared.DICT. | ||
-- | ||
-- @module core.config_xds | ||
|
||
local base = require("resty.core.base") | ||
local config_local = require("apisix.core.config_local") | ||
local table = table | ||
local error = error | ||
local is_http = ngx.config.subsystem == "http" | ||
local io = io | ||
local io_open = io.open | ||
local io_close = io.close | ||
local package = package | ||
local new_tab = base.new_tab | ||
local ffi = require ("ffi") | ||
local C = ffi.C | ||
local route_config = ngx.shared["xds-route-config"] | ||
local ngx_re_match = ngx.re.match | ||
local ngx_re_gmatch = ngx.re.gmatch | ||
|
||
local xds_lib_name = "libxds.so" | ||
|
||
|
||
local process | ||
if is_http then | ||
process = require("ngx.process") | ||
end | ||
|
||
|
||
ffi.cdef[[ | ||
extern void initial(void* route_zone_ptr); | ||
]] | ||
|
||
|
||
local _M = { | ||
version = 0.1, | ||
local_conf = config_local.local_conf, | ||
} | ||
|
||
|
||
-- todo: refactor this function in chash.lua and radixtree.lua | ||
local function load_shared_lib(lib_name) | ||
local cpath = package.cpath | ||
local tried_paths = new_tab(32, 0) | ||
local i = 1 | ||
|
||
local iter, err = ngx_re_gmatch(cpath, "[^;]+", "jo") | ||
if not iter then | ||
error("failed to gmatch: " .. err) | ||
end | ||
|
||
while true do | ||
local it = iter() | ||
local fpath | ||
fpath, err = ngx_re_match(it[0], "(.*/)", "jo") | ||
if err then | ||
error("failed to match: " .. err) | ||
end | ||
local spath = fpath[0] .. lib_name | ||
|
||
local f = io_open(spath) | ||
if f ~= nil then | ||
io_close(f) | ||
return ffi.load(spath) | ||
end | ||
tried_paths[i] = spath | ||
i = i + 1 | ||
|
||
if not it then | ||
break | ||
end | ||
end | ||
|
||
return nil, tried_paths | ||
end | ||
|
||
|
||
local function load_libxds(lib_name) | ||
local xdsagent, tried_paths = load_shared_lib(lib_name) | ||
|
||
if not xdsagent then | ||
tried_paths[#tried_paths + 1] = 'tried above paths but can not load ' .. lib_name | ||
error("can not load xds library, tried paths: " .. | ||
table.concat(tried_paths, '\r\n', 1, #tried_paths)) | ||
end | ||
|
||
local route_zone = C.ngx_http_lua_ffi_shdict_udata_to_zone(route_config[1]) | ||
local route_shd_cdata = ffi.cast("void*", route_zone) | ||
xdsagent.initial(route_shd_cdata) | ||
end | ||
|
||
|
||
|
||
function _M.init_worker() | ||
if process.type() == "privileged agent" then | ||
load_libxds(xds_lib_name) | ||
end | ||
|
||
return true | ||
end | ||
|
||
|
||
return _M |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
# | ||
# 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'; | ||
|
||
use Cwd qw(cwd); | ||
my $apisix_home = $ENV{APISIX_HOME} || cwd(); | ||
|
||
repeat_each(1); | ||
no_long_string(); | ||
no_root_location(); | ||
log_level("info"); | ||
|
||
add_block_preprocessor(sub { | ||
my ($block) = @_; | ||
|
||
if (!$block->request) { | ||
$block->set_value("request", "GET /t"); | ||
} | ||
|
||
if (!$block->no_error_log) { | ||
$block->set_value("no_error_log", "[error]\n[alert]"); | ||
} | ||
|
||
my $lua_deps_path = $block->lua_deps_path // <<_EOC_; | ||
lua_package_path "$apisix_home/?.lua;$apisix_home/?/init.lua;$apisix_home/deps/share/lua/5.1/?/init.lua;$apisix_home/deps/share/lua/5.1/?.lua;$apisix_home/apisix/?.lua;$apisix_home/t/?.lua;;"; | ||
lua_package_cpath "$apisix_home/?.so;$apisix_home/t/xds-library/?.so;$apisix_home/deps/lib/lua/5.1/?.so;$apisix_home/deps/lib64/lua/5.1/?.so;;"; | ||
_EOC_ | ||
|
||
$block->set_value("lua_deps_path", $lua_deps_path); | ||
|
||
my $extra_init_by_lua = <<_EOC_; | ||
-- | ||
local config_xds = require("apisix.core.config_xds") | ||
local inject = function(mod, name) | ||
local old_f = mod[name] | ||
mod[name] = function (...) | ||
ngx.log(ngx.WARN, "config_xds run ", name) | ||
return { true } | ||
end | ||
end | ||
inject(config_xds, "new") | ||
_EOC_ | ||
|
||
$block->set_value("extra_init_by_lua", $extra_init_by_lua); | ||
|
||
if (!$block->yaml_config) { | ||
my $yaml_config = <<_EOC_; | ||
apisix: | ||
node_listen: 1984 | ||
config_center: xds | ||
enable_admin: false | ||
_EOC_ | ||
|
||
$block->set_value("yaml_config", $yaml_config); | ||
} | ||
}); | ||
|
||
run_tests; | ||
|
||
__DATA__ | ||
=== TEST 1: load xDS library successfully | ||
--- config | ||
location /t { | ||
content_by_lua_block { | ||
ngx.say("ok") | ||
} | ||
} | ||
--- no_error_log eval | ||
qr/can not load xDS library/ | ||
=== TEST 2: read data form shdict that wirted by xDS library | ||
--- config | ||
location /t { | ||
content_by_lua_block { | ||
-- wait for xds library sync data | ||
ngx.sleep(1.5) | ||
local core = require("apisix.core") | ||
local value = ngx.shared["xds-route-config"]:get("/apisix/routes/1") | ||
local route_conf, err = core.json.decode(value) | ||
local json_encode = require("toolkit.json").encode | ||
ngx.say(json_encode(route_conf)) | ||
} | ||
} | ||
--- response_body | ||
{"create_time":1646972532,"id":"1","priority":0,"status":1,"update_time":1647250524,"upstream":{"hash_on":"vars","nodes":[{"host":"127.0.0.1","port":80,"priority":0,"weight":1}],"pass_host":"pass","scheme":"http","type":"roundrobin"},"uri":"/hello"} |
Oops, something went wrong.