Skip to content

Commit

Permalink
fix: define destroy() to close protos (#8557)
Browse files Browse the repository at this point in the history
Fixes #8519
  • Loading branch information
kingluo authored Dec 27, 2022
1 parent 053c53a commit 0f13916
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 0 deletions.
5 changes: 5 additions & 0 deletions apisix/plugins/grpc-transcode.lua
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ function _M.init()
end


function _M.destroy()
proto.destroy()
end


function _M.check_schema(conf)
local ok, err = core.schema.check(schema, conf)
if not ok then
Expand Down
5 changes: 5 additions & 0 deletions apisix/plugins/grpc-transcode/proto.lua
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,10 @@ function _M.init()
end
end

function _M.destroy()
if protos then
protos:close()
end
end

return _M
75 changes: 75 additions & 0 deletions t/plugin/grpc-transcode-reload-bugfix.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#
# 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';

log_level('warn');
repeat_each(1);
no_long_string();
no_root_location();

add_block_preprocessor(sub {
my ($block) = @_;

if (!$block->request) {
$block->set_value("request", "GET /t");
}

my $extra_init_by_lua = <<_EOC_;
local core = require("apisix.core")
local orig_new = core.config.new
close_cnt = 0
core.config.new = function(key, opts)
local obj, err = orig_new(key, opts)
if key == "/protos" then
local orig_close = obj.close
obj.close = function(...)
core.log.warn("call config close")
close_cnt = close_cnt + 1
return orig_close(...)
end
end
return obj, err
end
_EOC_

$block->set_value("extra_init_by_lua", $extra_init_by_lua);
});

run_tests;

__DATA__
=== TEST 1: close protos when grpc-transcode plugin reload
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code = t('/apisix/admin/plugins/reload',
ngx.HTTP_PUT)
if code >= 300 then
ngx.status = code
return
end
ngx.sleep(2)
if close_cnt ~= 1 then
ngx.status = 500
end
}
}
--- error_log
call config close

0 comments on commit 0f13916

Please sign in to comment.