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

optimize: local cache global variable and avoid single lines over 80 #4591

Merged
merged 1 commit into from
Sep 24, 2019

Conversation

membphis
Copy link
Contributor

if this commit is fine, I'll submit more later.

@k8s-ci-robot
Copy link
Contributor

Welcome @membphis!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
  • Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 24, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @membphis. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 24, 2019
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Sep 24, 2019
@ElvinEfendi
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 24, 2019
@codecov-io
Copy link

codecov-io commented Sep 24, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@f6c2f5f). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #4591   +/-   ##
=========================================
  Coverage          ?   58.53%           
=========================================
  Files             ?       88           
  Lines             ?     6699           
  Branches          ?        0           
=========================================
  Hits              ?     3921           
  Misses            ?     2341           
  Partials          ?      437

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f6c2f5f...1ce68c8. Read the comment docs.

local string_format = string.format
local pairs = pairs
local tonumber = tonumber
local ngx = ngx
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will require us to adjust some unit tests as they mock some ngx APIs before loading the modules: https://prow.k8s.io/view/gcs/kubernetes-jenkins/pr-logs/pull/ingress-nginx/4591/pull-ingress-nginx-test-lua/1176327555209236481

@ElvinEfendi
Copy link
Member

if this commit is fine, I'll submit more later.

@membphis thanks for the PR! Such PRs are always welcome.

I'm thinking of adding linter to force these best practices.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 24, 2019
@membphis
Copy link
Contributor Author

it's not easy to do these local cache optimize, all of the test case was run in standard Lua which is very different for openresty or nginx+lua, that is why we have to mock something before run test cases.

the new code should be fine under openresty or nginx+lua.

Do we have any plan to run those test case in openresty or nginx+lua?

@ElvinEfendi
Copy link
Member

@membphis we use resty to run the Lua tests. All the tests run in timer phase.

We already have e2e tests for the type of test you are describing. These Lua tests are unit tests.

@membphis membphis force-pushed the change/lua-code-style branch from c9d7b26 to 193b40b Compare September 24, 2019 12:39
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 24, 2019
@membphis
Copy link
Contributor Author

@ElvinEfendi Thanks for your explanation, we run the test case with resty command.

I'll continue to fix it.

@membphis membphis force-pushed the change/lua-code-style branch from fa1eacb to 1cd3b3d Compare September 24, 2019 13:00
@aledbf
Copy link
Member

aledbf commented Sep 24, 2019

@membphis you can run the test locally executing the command ./build/run-in-docker.sh make lua-test

@aledbf
Copy link
Member

aledbf commented Sep 24, 2019

@membphis also, please squash the commits

local getmetatable = getmetatable
local type = type
local next = next
-- local table = table
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please delete instead of leaving commented

@membphis membphis force-pushed the change/lua-code-style branch from 1cd3b3d to 1ce68c8 Compare September 24, 2019 14:08
@membphis
Copy link
Contributor Author

@membphis you can run the test locally executing the command ./build/run-in-docker.sh make lua-test

thanks for this, I do not know this before :(

@membphis
Copy link
Contributor Author

@aledbf all fixed, please take a look.

@ElvinEfendi
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 24, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ElvinEfendi, membphis

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 24, 2019
@k8s-ci-robot k8s-ci-robot merged commit 0f37815 into kubernetes:master Sep 24, 2019
@membphis membphis deleted the change/lua-code-style branch September 25, 2019 02:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants