Introduced two web-socket endpoints for workspace master to split JSON-RPC messages #12673

skabashnyuk · 2019-02-15T08:51:36Z

What does this PR do?

Add the ability to have several JSON-RPC endpoints in a single J2EE container.
Each endpoint configured with individual RequestProcessorConfigurator.Configuration component.
RequestProcessorConfigurator.Configuration for each endpoint supplied by Provider. To be able to override provider implementation.
ExecutorService that is constructed for RequestProcessorConfigurator.Configuration is monitored with Prometheus metrics.
Noticed that even tiny queue (~100) significantly increase throughput and reduce the possibility of rejected messages.

Rework of #12252

Test1

Major endpoint

che.core.jsonrpc.processor_max_pool_size=50
che.core.jsonrpc.processor_core_pool_size=3
che.core.jsonrpc.processor_queue_capacity=10000000

test
docker run ksmster/json-rpc-loader -cheurl ws://che-eclipse-che.192.168.64.31.nip.io/api/websocket -token=t1 -mnum=100000 -tnum=200

Test2

Minor endpoint

che.core.jsonrpc.minor_processor_max_pool_size=100
che.core.jsonrpc.minor_processor_core_pool_size=5
che.core.jsonrpc.minor_processor_queue_capacity=100

test
docker run ksmster/json-rpc-loader -cheurl ws://che-eclipse-che.192.168.64.31.nip.io/api/websocket-minor -token=t1 -mnum=100000 -tnum=200

What issues does this PR fix or reference?

Related to #11961

Release Notes

n/a

Docs PR

n/a

skabashnyuk · 2019-02-15T08:51:58Z

ci-test

skabashnyuk · 2019-02-15T08:57:25Z

ci-build

che-bot · 2019-02-15T12:42:24Z

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:12673
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

skabashnyuk · 2019-02-20T14:55:18Z

ci-test

…N-RPC messages Based on Dmytro's Kulieshov work #12252 Signed-off-by: Sergii Kabashniuk <[email protected]>

che-bot · 2019-02-20T18:50:32Z

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:12673
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

Signed-off-by: Sergii Kabashniuk <[email protected]>

...y/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MetricsOverrideBinding.java

...ore/src/main/java/org/eclipse/che/api/core/jsonrpc/commons/RequestProcessorConfigurator.java

...org/eclipse/che/workspace/infrastructure/kubernetes/bootstrapper/KubernetesBootstrapper.java

wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/CheWebSocketEndpoint.java

wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentModule.java

...y/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MetricsOverrideBinding.java

...ava/org/eclipse/che/api/deploy/jsonrpc/CheMajorWebSocketEndpointExecutorServiceProvider.java

...ava/org/eclipse/che/api/deploy/jsonrpc/CheMinorWebSocketEndpointExecutorServiceProvider.java

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

assembly/assembly-wsmaster-war/src/test/resources/logback-test.xml

...ore/src/main/java/org/eclipse/che/api/core/jsonrpc/commons/RequestProcessorConfigurator.java

...che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/ExecutorServiceMetrics.java

wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/CheWebSocketEndpoint.java

...he-wsagent-core/src/main/webapp/WEB-INF/classes/codenvy/che-machine-configuration.properties

Signed-off-by: Sergii Kabashniuk <[email protected]>

...mmons-lang/src/main/java/org/eclipse/che/commons/lang/execution/ExecutorServiceProvider.java

Signed-off-by: Sergii Kabashniuk <[email protected]>

skabashnyuk · 2019-02-25T12:56:19Z

ci-test

che-bot · 2019-02-25T16:48:00Z

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:12673
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

…961v2 Signed-off-by: Sergii Kabashniuk <[email protected]>

Signed-off-by: Sergii Kabashniuk <[email protected]>

sleshchenko

LGTM
Please take a look my inlined comments

...y/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MetricsOverrideBinding.java

...mmons-lang/src/main/java/org/eclipse/che/commons/lang/execution/ExecutorServiceProvider.java

Signed-off-by: Sergii Kabashniuk <[email protected]>

…961v2 Signed-off-by: Sergii Kabashniuk <[email protected]>

skabashnyuk · 2019-02-26T07:36:51Z

ci-test

che-bot · 2019-02-26T11:46:39Z

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:12673
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

skabashnyuk · 2019-02-26T11:48:57Z

@eclipse/eclipse-che-qa can you take a look?

garagatyi

Looks good!
@ibuziuk since this PR changes configuration of thread pools and JSON RPC messages processing we will need to change our configuration of limits in RhChe at the same time as moving to upstream version that will contain this code

ibuziuk · 2019-02-26T13:57:42Z

@garagatyi good catch, could you please create an issue in rh-che and add it to our prio doc ?

garagatyi · 2019-02-26T14:37:31Z

@ibuziuk sure

SkorikSergey · 2019-02-27T08:25:17Z

Selenium tests execution on Eclipse Che Multiuser on OCP (https://ci.codenvycorp.com/job/che-pullrequests-test-ocp/1583//Selenium_20tests_20report/) doesn't show any regression against this Pull Request.

This was referenced Feb 15, 2019

Adding tracing tags to workspace related operations #12652

Merged

[WIP]Introduced two web-socket endpoints for workspace master to split JSON-RPC messages #12252

Closed

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/bug Outline of a bug - must adhere to the bug report template. labels Feb 15, 2019

skabashnyuk changed the title ~~[WIP]V2 Introduced two web-socket endpoints for workspace master to split JSON-RPC messages~~ Introduced two web-socket endpoints for workspace master to split JSON-RPC messages Feb 18, 2019

skabashnyuk force-pushed the che11961v2 branch 2 times, most recently from bb9b422 to 689614c Compare February 20, 2019 14:53

skabashnyuk marked this pull request as ready for review February 20, 2019 14:53

skabashnyuk requested a review from a user February 20, 2019 14:53

skabashnyuk requested review from garagatyi, l0rd, riuvshin, sleshchenko and vparfonov as code owners February 20, 2019 14:53

skabashnyuk requested review from mshaposhnik and metlos February 20, 2019 14:54

Introduced two web-socket endpoints for workspace master to split JSO…

dc91a64

…N-RPC messages Based on Dmytro's Kulieshov work #12252 Signed-off-by: Sergii Kabashniuk <[email protected]>

skabashnyuk force-pushed the che11961v2 branch from 689614c to dc91a64 Compare February 20, 2019 14:58

Merge branch 'master' of github.com:eclipse/che into che11961v2

cd73a1d

Signed-off-by: Sergii Kabashniuk <[email protected]>

sleshchenko reviewed Feb 21, 2019

View reviewed changes

metlos reviewed Feb 21, 2019

View reviewed changes

skabashnyuk added 4 commits February 21, 2019 17:31

Fixes in MetricsOverrideBinding

5b171b3

Signed-off-by: Sergii Kabashniuk <[email protected]>

Fixed review comments in CheJsonRpcWebSocketConfigurationModule

b1afdaf

Signed-off-by: Sergii Kabashniuk <[email protected]>

cleanup javadoc

8ce25d4

Signed-off-by: Sergii Kabashniuk <[email protected]>

fixup! cleanup javadoc

c13beb6

Signed-off-by: Sergii Kabashniuk <[email protected]>

skabashnyuk requested review from sleshchenko and metlos and removed request for metlos February 24, 2019 13:03

Merge remote-tracking branch 'origin/master' into che11961v2

93a6bb4

Signed-off-by: Sergii Kabashniuk <[email protected]>

metlos reviewed Feb 25, 2019

View reviewed changes

...mmons-lang/src/main/java/org/eclipse/che/commons/lang/execution/ExecutorServiceProvider.java Outdated Show resolved Hide resolved

vparfonov approved these changes Feb 25, 2019

View reviewed changes

fixup! Merge remote-tracking branch 'origin/master' into che11961v2

89b4277

Signed-off-by: Sergii Kabashniuk <[email protected]>

metlos self-requested a review February 25, 2019 14:04

metlos approved these changes Feb 25, 2019

View reviewed changes

skabashnyuk added 2 commits February 26, 2019 09:12

fixup! fixup! Merge remote-tracking branch 'origin/master' into che11…

6797539

…961v2 Signed-off-by: Sergii Kabashniuk <[email protected]>

Merge remote-tracking branch 'origin/master' into che11961v2

0ea644d

Signed-off-by: Sergii Kabashniuk <[email protected]>

sleshchenko approved these changes Feb 26, 2019

View reviewed changes

...y/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MetricsOverrideBinding.java Outdated Show resolved Hide resolved

...mmons-lang/src/main/java/org/eclipse/che/commons/lang/execution/ExecutorServiceProvider.java Outdated Show resolved Hide resolved

skabashnyuk added 2 commits February 26, 2019 09:27

fixup! Merge remote-tracking branch 'origin/master' into che11961v2

7f5b3d9

Signed-off-by: Sergii Kabashniuk <[email protected]>

fixup! fixup! Merge remote-tracking branch 'origin/master' into che11…

f10dc51

…961v2 Signed-off-by: Sergii Kabashniuk <[email protected]>

garagatyi approved these changes Feb 26, 2019

View reviewed changes

garagatyi mentioned this pull request Feb 26, 2019

Update RhChe to 7 beta 2 and adapt configuration redhat-developer/rh-che#1261

Closed

skabashnyuk merged commit a5b06d4 into master Feb 27, 2019

skabashnyuk deleted the che11961v2 branch February 27, 2019 11:29

skabashnyuk mentioned this pull request Mar 2, 2019

Provide more informative error message #12814

Merged

ibuziuk mentioned this pull request Mar 22, 2019

Adding 'CHE_WEBSOCKET_ENDPOINT__MINOR' env var that was introduced in 7 beta 2 version redhat-developer/rh-che#1326

Merged

This was referenced Apr 8, 2019

Added new che metrics redhat-developer/osd-monitor-poc#46

Merged

Updated to latest list of gaugeified aliases of rhche prometheus couters openshiftio/saas-openshiftio#1244

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Introduced two web-socket endpoints for workspace master to split JSON-RPC messages #12673

Introduced two web-socket endpoints for workspace master to split JSON-RPC messages #12673

skabashnyuk commented Feb 15, 2019 •

edited

Loading

skabashnyuk commented Feb 15, 2019

skabashnyuk commented Feb 15, 2019

che-bot commented Feb 15, 2019

skabashnyuk commented Feb 20, 2019

che-bot commented Feb 20, 2019

skabashnyuk commented Feb 25, 2019

che-bot commented Feb 25, 2019

sleshchenko left a comment

skabashnyuk commented Feb 26, 2019

che-bot commented Feb 26, 2019

skabashnyuk commented Feb 26, 2019

garagatyi left a comment

ibuziuk commented Feb 26, 2019

garagatyi commented Feb 26, 2019

SkorikSergey commented Feb 27, 2019

Introduced two web-socket endpoints for workspace master to split JSON-RPC messages #12673

Introduced two web-socket endpoints for workspace master to split JSON-RPC messages #12673

Conversation

skabashnyuk commented Feb 15, 2019 • edited Loading

What does this PR do?

Test1

Test2

What issues does this PR fix or reference?

Release Notes

Docs PR

skabashnyuk commented Feb 15, 2019

skabashnyuk commented Feb 15, 2019

che-bot commented Feb 15, 2019

skabashnyuk commented Feb 20, 2019

che-bot commented Feb 20, 2019

skabashnyuk commented Feb 25, 2019

che-bot commented Feb 25, 2019

sleshchenko left a comment

Choose a reason for hiding this comment

skabashnyuk commented Feb 26, 2019

che-bot commented Feb 26, 2019

skabashnyuk commented Feb 26, 2019

garagatyi left a comment

Choose a reason for hiding this comment

ibuziuk commented Feb 26, 2019

garagatyi commented Feb 26, 2019

SkorikSergey commented Feb 27, 2019

skabashnyuk commented Feb 15, 2019 •

edited

Loading