Add ability to set CPU limits/requests on the plugin containers #15977

mshaposhnik · 2020-02-10T15:47:25Z

What does this PR do?

Add ability to set CPU limits/requests as well on the plugin containers. Alwo memory request is added. Example of plugin configuration:

containers:
   - name: che-machine-exec
     image: "mshaposh/exec:latest"
     ports:
       - exposedPort: 4444
     memoryLimit: "444M"  
     memoryRequest: "117M"  
     cpuRequest: "0.117"
     cpuLimit: "444m"

Note that CPU resources may be set both in cores (as 0.117) and millicores (as 117m)

Here is demo screenshot where all WS machines has different limit (mixed from default and explicitly set values):

What issues does this PR fix or reference?

#13709

Docs PR

Pending..

che-bot · 2020-02-10T15:47:27Z

Can one of the admins verify this patch?

assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties

che-bot · 2020-02-11T06:51:38Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: maxura/che-server:15977

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

⚠️ https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

ℹ️ Use comment "crw-ci-test" to rerun happy path E2E test.

sleshchenko · 2020-02-19T09:47:20Z

@mshaposhnik It is possible to configure CPU for plugin's init containers as well? Like for theia https://github.com/eclipse/che-plugin-registry/blob/master/v3/plugins/eclipse/che-theia/7.8.0/meta.yaml#L70

che-bot · 2020-02-20T09:32:10Z

✅ E2E Happy path tests succeed 🎉

See Details

Jenkins job
logs and configs
Happy path tests DevFile
image: maxura/che-server:15977

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

metlos

Minor wording nitpick, otherwise LGTM.

...va/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/MachineResolverBuilder.java

che-bot · 2020-02-25T08:13:16Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: maxura/che-server:15977

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

⚠️ https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

ℹ️ Use comment "crw-ci-test" to rerun happy path E2E test.

che-bot · 2020-02-25T12:14:14Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: maxura/che-server:15977

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

⚠️ https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

ℹ️ Use comment "crw-ci-test" to rerun happy path E2E test.

mshaposhnik · 2020-02-25T16:43:50Z

crw-ci-test

che-bot · 2020-02-25T17:08:23Z

✅ E2E Happy path tests succeed 🎉

See Details

Jenkins job
logs and configs
Happy path tests DevFile
image: maxura/che-server:15977

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

mshaposhnik · 2020-02-25T17:08:44Z

ci-test

mshaposhnik · 2020-02-25T17:45:52Z

ci-test

mshaposhnik · 2020-02-26T07:30:54Z

ci-test-please

mshaposhnik · 2020-02-26T13:21:23Z

[ci-test]

che-bot · 2020-02-26T14:57:00Z

E2E tests of Eclipse Che Multiuser on OCP has failed:

Use command [ci-test] to rerun the test.

che-bot · 2020-02-26T15:04:53Z

E2E tests of Eclipse Che Multiuser on OCP has failed:

Use command [ci-test] to rerun the test.

che-bot · 2020-02-26T15:53:58Z

✅ E2E Happy path tests succeed 🎉

See Details

Jenkins job
logs and configs
Happy path tests DevFile
image: maxura/che-server:15977

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

mshaposhnik · 2020-02-27T08:06:33Z

[ci-test]

mshaposhnik · 2020-02-27T08:14:12Z

[ci-build]

che-bot · 2020-02-27T09:43:23Z

E2E tests of Eclipse Che Multiuser on OCP has failed:

Use command [ci-test] to rerun the test.

mshaposhnik · 2020-03-02T08:09:50Z

ci-test

mshaposhnik · 2020-03-02T08:10:21Z

[ci-test]

che-bot · 2020-03-02T09:20:08Z

E2E tests of Eclipse Che Multiuser on OCP has been successful:

mshaposhnik added 7 commits February 5, 2020 17:02

Add CPU limits part 1;

a0cdf3f

Add CPU limits part 2;

21e0bec

Merge master

f20b30a

Added tests on workspace api

7eefdbb

Tests, tests...

a168e41

Merge branch 'master' into cpuLimit

d5733e6

Code & tests fixups

5e42d6f

mshaposhnik requested review from amisevsk, ibuziuk, l0rd, metlos, nickboldt, rhopp, skabashnyuk and sleshchenko as code owners February 10, 2020 15:47

che-bot added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. kind/enhancement A feature request - must adhere to the feature request template. labels Feb 10, 2020

mshaposhnik commented Feb 10, 2020

View reviewed changes

assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties Show resolved Hide resolved

mshaposhnik added 2 commits February 10, 2020 18:07

fixup! Code & tests fixups

c5fabfe

Remove commented code

e43e0f7

Javadoc fixes

c04b049

eclipse-che deleted a comment from che-bot Feb 11, 2020

mshaposhnik removed request for nickboldt, l0rd, rhopp and ibuziuk February 11, 2020 07:09

sleshchenko mentioned this pull request Feb 17, 2020

add cpu limits to che-plugin-broker #15543

Closed

Merge branch 'master' into cpuLimit

05fbc58

metlos approved these changes Feb 24, 2020

View reviewed changes

...va/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/MachineResolverBuilder.java Outdated Show resolved Hide resolved

Fixup messsage

8f3e650

skabashnyuk approved these changes Feb 25, 2020

View reviewed changes

Format fix

f28ab37

Merge branch 'master' into cpuLimit

a0248da

mshaposhnik merged commit 9732139 into master Mar 2, 2020

mshaposhnik deleted the cpuLimit branch March 2, 2020 10:35

che-bot removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Mar 2, 2020

che-bot added this to the 7.10.0 milestone Mar 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ability to set CPU limits/requests on the plugin containers #15977

Add ability to set CPU limits/requests on the plugin containers #15977

mshaposhnik commented Feb 10, 2020 •

edited

Loading

che-bot commented Feb 10, 2020

che-bot commented Feb 11, 2020

sleshchenko commented Feb 19, 2020

che-bot commented Feb 20, 2020

metlos left a comment

che-bot commented Feb 25, 2020

che-bot commented Feb 25, 2020

mshaposhnik commented Feb 25, 2020

che-bot commented Feb 25, 2020

mshaposhnik commented Feb 25, 2020

mshaposhnik commented Feb 25, 2020

mshaposhnik commented Feb 26, 2020

mshaposhnik commented Feb 26, 2020

che-bot commented Feb 26, 2020

che-bot commented Feb 26, 2020

che-bot commented Feb 26, 2020

mshaposhnik commented Feb 27, 2020

mshaposhnik commented Feb 27, 2020

che-bot commented Feb 27, 2020

mshaposhnik commented Mar 2, 2020

mshaposhnik commented Mar 2, 2020

che-bot commented Mar 2, 2020

Add ability to set CPU limits/requests on the plugin containers #15977

Add ability to set CPU limits/requests on the plugin containers #15977

Conversation

mshaposhnik commented Feb 10, 2020 • edited Loading

What does this PR do?

What issues does this PR fix or reference?

Docs PR

che-bot commented Feb 10, 2020

che-bot commented Feb 11, 2020

sleshchenko commented Feb 19, 2020

che-bot commented Feb 20, 2020

metlos left a comment

Choose a reason for hiding this comment

che-bot commented Feb 25, 2020

che-bot commented Feb 25, 2020

mshaposhnik commented Feb 25, 2020

che-bot commented Feb 25, 2020

mshaposhnik commented Feb 25, 2020

mshaposhnik commented Feb 25, 2020

mshaposhnik commented Feb 26, 2020

mshaposhnik commented Feb 26, 2020

che-bot commented Feb 26, 2020

che-bot commented Feb 26, 2020

che-bot commented Feb 26, 2020

mshaposhnik commented Feb 27, 2020

mshaposhnik commented Feb 27, 2020

che-bot commented Feb 27, 2020

mshaposhnik commented Mar 2, 2020

mshaposhnik commented Mar 2, 2020

che-bot commented Mar 2, 2020

mshaposhnik commented Feb 10, 2020 •

edited

Loading