-
Notifications
You must be signed in to change notification settings - Fork 853
Add shutdown hook function for lua plugin #13045
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
Open
shukitchan
wants to merge
7
commits into
apache:master
Choose a base branch
from
shukitchan:luashutdown
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
481bdff
Add shutdown hook function for lua plugin
shukitchan b5593b6
Update lua function name
shukitchan 56d1d7f
update comments
shukitchan 6053213
Fix problem with calling the lua function
shukitchan 8919b13
Update plugins/lua/ts_lua.cc
shukitchan eb01f44
Apply suggestion from @Copilot
shukitchan 571fea0
Fix format
shukitchan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,23 @@ | ||
| -- 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. | ||
|
|
||
| function do_global_read_request() | ||
| ts.debug('do_global_read_request called') | ||
| end | ||
|
|
||
| function do_global_shutdown() | ||
| ts.debug('do_global_shutdown called') | ||
| end |
65 changes: 65 additions & 0 deletions
65
tests/gold_tests/pluginTest/lua/lua_global_shutdown.test.py
This file contains hidden or 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,65 @@ | ||
| ''' | ||
| Test do_global_shutdown lua global plugin hook. | ||
| ''' | ||
shukitchan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| # 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. | ||
|
|
||
| Test.Summary = ''' | ||
| Test do_global_shutdown lua global plugin hook | ||
| ''' | ||
shukitchan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| Test.SkipUnless(Condition.PluginExists('tslua.so'),) | ||
|
|
||
| Test.ContinueOnFail = True | ||
|
|
||
| server = Test.MakeOriginServer("server") | ||
| ts = Test.MakeATSProcess("ts") | ||
|
|
||
| Test.Setup.Copy("global_shutdown.lua") | ||
|
|
||
| request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""} | ||
| response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n", "timestamp": "1469733493.993", "body": ""} | ||
| server.addResponse("sessionfile.log", request_header, response_header) | ||
|
|
||
| ts.Disk.remap_config.AddLine('map / http://127.0.0.1:{}/'.format(server.Variables.Port)) | ||
|
|
||
| # Use 2 states so the shutdown handler is called a predictable number of times. | ||
| ts.Disk.plugin_config.AddLine('tslua.so --states=2 {}/global_shutdown.lua'.format(Test.RunDirectory)) | ||
|
|
||
shukitchan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ts.Disk.records_config.update({ | ||
| 'proxy.config.diags.debug.enabled': 1, | ||
| 'proxy.config.diags.debug.tags': 'ts_lua', | ||
| }) | ||
|
|
||
| curl_and_args = '-s -D /dev/stdout -o /dev/stderr -x localhost:{} '.format(ts.Variables.port) | ||
|
|
||
| # 0 Test - Send a request to confirm the global plugin is active. | ||
| tr = Test.AddTestRun("Lua global read request hook fires for HTTP requests") | ||
| ps = tr.Processes.Default | ||
| ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port)) | ||
| ps.StartBefore(Test.Processes.ts) | ||
| tr.MakeCurlCommand(curl_and_args + 'http://www.example.com/', ts=ts) | ||
| ps.ReturnCode = 0 | ||
| tr.StillRunningAfter = ts | ||
|
|
||
| # Verify do_global_read_request was invoked for the HTTP request above. | ||
| ts.Disk.traffic_out.Content = Testers.ContainsExpression( | ||
| r'do_global_read_request called', 'do_global_read_request should be called for HTTP requests') | ||
|
|
||
| # After all test runs complete AuTest stops ATS, which fires TS_LIFECYCLE_SHUTDOWN_HOOK. | ||
| # The shutdown handler calls do_global_shutdown once per Lua state (2 states configured). | ||
| ts.Disk.traffic_out.Content += Testers.ContainsExpression( | ||
| r'do_global_shutdown called', 'do_global_shutdown should be called on ATS shutdown') | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.