@@ -73,13 +73,15 @@ location /t {
7373 local config_util = require("apisix.core.config_util")
7474 ngx.sleep(0.1) -- make sure the sync happened when admin starts is already finished
7575
76+ local before_reload = true
7677 local plugins_conf, err
7778 plugins_conf, err = core.config.new("/plugins", {
7879 automatic = true,
7980 single_item = true,
8081 filter = function()
8182 -- called twice, one for readir, another for waitdir
82- ngx.log(ngx.WARN, "reload plugins on node ")
83+ ngx.log(ngx.WARN, "reload plugins on node ",
84+ before_reload and "before reload" or "after reload")
8385 local plugins = {}
8486 for _, conf_value in config_util.iterate_values(plugins_conf.values) do
8587 core.table.insert_tail(plugins, unpack(conf_value.value))
@@ -91,6 +93,7 @@ location /t {
9193 error("failed to create etcd instance for fetching /plugins : "
9294 .. err)
9395 end
96+ ngx.sleep(0.5)
9497
9598 local data = [[
9699apisix:
@@ -103,6 +106,7 @@ stream_plugins:
103106 ]]
104107 require("lib.test_admin").set_config_yaml(data)
105108
109+ before_reload = false
106110 local t = require("lib.test_admin").test
107111 local code, _, org_body = t('/apisix/admin/plugins/reload',
108112 ngx.HTTP_PUT)
@@ -117,10 +121,10 @@ GET /t
117121--- response_body
118122done
119123--- grep_error_log eval
120- qr/reload plugins on node/
124+ qr/reload plugins on node \w+ reload /
121125--- grep_error_log_out
122- reload plugins on node
123- reload plugins on node
126+ reload plugins on node before reload
127+ reload plugins on node after reload
124128--- error_log
125129filter(): [{"name":"jwt-auth"},{"name":"mqtt-proxy","stream":true}]
126130
0 commit comments