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.

Sign up for GitHub

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

Use newer version of Jgroups and EclipseLink to prevent PKIX errors on OCP 4.x #14920

Merged
merged 10 commits into from
Oct 21, 2019
Merged

Use newer version of Jgroups and EclipseLink to prevent PKIX errors on OCP 4.x #14920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e8e4706
Move to jgroups4 as a session replication provider
mshaposhnik Aug 2, 2019
a44ba58
Revert "Devfile validation via message entity provider"
mshaposhnik Oct 8, 2019
b0f3707
Merge branch 'master' of github.com:eclipse/che
mshaposhnik Oct 9, 2019
5737236
Merge branch 'master' of github.com:eclipse/che
mshaposhnik Oct 10, 2019
37d7bbd
Merge branch 'master' of github.com:eclipse/che
mshaposhnik Oct 15, 2019
a816078
Merge branch 'master' into jgroups4
mshaposhnik Oct 15, 2019
3c26d21
Update to JGroups4 and minor configuration changes;
mshaposhnik Oct 17, 2019
45f6671
Fixup discard mesgs
mshaposhnik Oct 17, 2019
a7f5a76
Merge branch 'master' of github.com:eclipse/che
mshaposhnik Oct 18, 2019
07e91bb
Merge branch 'master' into jgroups4
mshaposhnik Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assembly/assembly-wsmaster-war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
</dependency>
<dependency>
<groupId>org.jgroups.kubernetes</groupId>
<artifactId>kubernetes</artifactId>
<artifactId>jgroups-kubernetes</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand Down Expand Up @@ -440,7 +440,7 @@
<dep>org.eclipse.che.multiuser:che-multiuser-keycloak-token-provider</dep>
<dep>org.eclipse.persistence:org.eclipse.persistence.extension</dep>
<dep>org.eclipse.persistence:org.eclipse.persistence.jpa</dep>
<dep>org.jgroups.kubernetes:kubernetes</dep>
<dep>org.jgroups.kubernetes:jgroups-kubernetes</dep>
<dep>org.postgresql:postgresql</dep>
<dep>com.google.guava:guava</dep>
<dep>org.everrest:everrest-core</dep>
Expand Down
15 changes: 8 additions & 7 deletions assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,30 @@
send_buf_size="1M"
max_bundle_size="64K"
enable_diagnostics="true"
log_discard_msgs="false"
thread_naming_pattern="cl"

thread_pool.min_threads="0"
thread_pool.max_threads="500"
thread_pool.keep_alive_time="30000" />

<kubernetes.KUBE_PING
labels="app=che" />
<org.jgroups.protocols.kubernetes.KUBE_PING
Copy link
Contributor

Choose a reason for hiding this comment

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

What the source of this file? Does it come from documentation

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes that's exacly as in doc on https://github.com/jgroups-extras/jgroups-kubernetes

port_range="3"
namespace="${KUBERNETES_NAMESPACE:che}"
labels="${KUBERNETES_LABEL:app=che,component=che}"
/>

<MERGE2 min_interval="10000"
<MERGE3 min_interval="10000"
max_interval="30000"/>
<FD_SOCK/>
<FD timeout="3000" max_tries="3"/>
<VERIFY_SUSPECT timeout="1500"/>
<BARRIER/>
<pbcast.NAKACK2 use_mcast_xmit="false"
discard_delivered_msgs="true"/>
<UNICAST/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="4M"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"

view_bundling="true"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000" />
<MFC max_credits="2M"
min_threshold="0.4"/>
<FRAG2 frag_size="60K"/>
Expand Down
3 changes: 1 addition & 2 deletions ...ain/java/org/eclipse/che/multiuser/api/distributed/cache/JGroupsWorkspaceStatusCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ public class JGroupsWorkspaceStatusCache implements WorkspaceStatusCache {
@Inject
public JGroupsWorkspaceStatusCache(@Named("jgroups.config.file") String confFile) {
try {
JChannel channel = new JChannel(confFile);
channel.connect(CHANNEL_NAME);
JChannel channel = new JChannel(confFile).connect(CHANNEL_NAME);
delegate = new ReplicatedHashMap<>(channel);
delegate.setBlockingUpdates(true);
delegate.start(5000);
Expand Down