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

Jump to bottom

FISH-791 Update Hazelcast to 4.1, no tenant control #5014

Merged
merged 1 commit into from
Dec 8, 2020
Merged

FISH-791 Update Hazelcast to 4.1, no tenant control #5014

merged 1 commit into from
Dec 8, 2020

Conversation

lprimak
Copy link
Contributor

@lprimak lprimak commented Nov 28, 2020 •
edited
Loading

Description

Do what's necessary to upgrade to Hazelcast 4.1
Some APIs changed significantly and some code needs to be reworked to take advantage

Important Info

Blockers

#5010
#5012

Testing

New tests

Existing tests

Testing Performed

manual testing, all test suites pass

Testing Environment

JDK 8, mac

Documentation

Notes for Reviewers

This one seems big, but most changes are actually class renames
This PR does include the blocker PRs currently, because otherwise the tests don't pass.
However, once the blocker PRs are merged, this will be rebased on master

@lprimak
Copy link
Contributor Author

lprimak commented Nov 28, 2020

jenkins test

1 similar comment
@lprimak
Copy link
Contributor Author

lprimak commented Nov 28, 2020

jenkins test

@lprimak
Copy link
Contributor Author

lprimak commented Nov 28, 2020

Jenkins test

@lprimak
Copy link
Contributor Author

lprimak commented Nov 28, 2020

jenkins test

2 similar comments
@lprimak
Copy link
Contributor Author

lprimak commented Nov 28, 2020

jenkins test

@lprimak
Copy link
Contributor Author

lprimak commented Nov 28, 2020

jenkins test

@lprimak lprimak mentioned this pull request Nov 29, 2020
Merged
@lprimak lprimak changed the title Hz upgr no tc FISH-791 Update Hazelcast to 4.1, no tenant control Nov 29, 2020
@lprimak lprimak marked this pull request as ready for review November 29, 2020 04:32
@lprimak
Copy link
Contributor Author

lprimak commented Nov 30, 2020

jenkins test

2 similar comments
@lprimak
Copy link
Contributor Author

lprimak commented Nov 30, 2020

jenkins test

@lprimak
Copy link
Contributor Author

lprimak commented Nov 30, 2020

jenkins test

@smillidge
Copy link
Contributor

Can we check all Hazelcast 4.1 pieces we use are under the Apache license before this is merged.

@lprimak
Copy link
Contributor Author

lprimak commented Dec 2, 2020

@smillidge not sure what you mean. There are no new hazelcast dependencies in this PR

@rdebusscher
Copy link

Seems Hazelcast 4.x changed license so that they can avoid 'service wrapping' https://hazelcast.com/community-license-faq

So we need to investigate this in more detail to be sure we can still embed Hazelcast within Payara.

@rdebusscher
Copy link

But it seems we can still include it

“Excluded Purpose” is making available any software-as-a-service, platform-as-a-service, infrastructure-as-a-service or other similar online services that compete with Hazelcast products or services that provide the Software.

Since we do not have a product that compete with Hazelcast.

@smillidge
Copy link
Contributor

Yeah it's more about whether that is acceptable to ship Payara in general with that license. Needs to go to the lawyers.

@smillidge
Copy link
Contributor

Is that license applied to the 4.x binaries in maven central?

@rdebusscher
Copy link

Both Hazelcast core and Kubernetes indicate Apache license at maven central.

https://mvnrepository.com/artifact/com.hazelcast/hazelcast/4.1
https://mvnrepository.com/artifact/com.hazelcast/hazelcast-kubernetes/2.2

@pdudits
Copy link
Contributor

pdudits commented Dec 3, 2020

Core modules remain ASL, see picture in the linked FAQ.

@MarkWareham MarkWareham removed their request for review December 3, 2020 11:04
@lprimak
Copy link
Contributor Author

lprimak commented Dec 3, 2020

jenkins test

@lprimak
Copy link
Contributor Author

lprimak commented Dec 3, 2020

jenkins test

@lprimak
Copy link
Contributor Author

lprimak commented Dec 4, 2020

jenkins test

@lprimak lprimak requested a review from MattGill98 December 4, 2020 22:53
@lprimak lprimak force-pushed the Hz-Upgr-No-TC branch 2 times, most recently from c6ef8fa to fb81c7c Compare December 5, 2020 05:44
@lprimak
Copy link
Contributor Author

lprimak commented Dec 5, 2020

jenkins test

MattGill98
MattGill98 approved these changes Dec 8, 2020
View reviewed changes
Copy link
Contributor

@MattGill98 MattGill98 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM, just needs that rebase. I'm recommending merging this early so that testing can catch issues prior to the release. CCing @cubastanley to be aware

@lprimak
Copy link
Contributor Author

lprimak commented Dec 8, 2020

jenkins test

@lprimak
Copy link
Contributor Author

lprimak commented Dec 8, 2020

jenkins test

dmatej
dmatej approved these changes Dec 8, 2020
View reviewed changes
Copy link
Contributor

@dmatej dmatej left a comment

Choose a reason for hiding this comment

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

Passed all my tests, I will yet run some TCK for sure, but it looks good!

...tore/src/main/java/fish/payara/jbatch/persistence/hazelcast/HazelcastPersistenceService.java
private IdGenerator jobInstanceIdGenerator;
private IdGenerator checkpointIdGenerator;
private FlakeIdGenerator jobInstanceIdGenerator;
private FlakeIdGenerator checkpointIdGenerator;
Copy link
Contributor

Choose a reason for hiding this comment

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

Btw, could you kill all these comments?
//To change body of generated methods, choose Tools | Templates.

...tore/src/main/java/fish/payara/jbatch/persistence/hazelcast/HazelcastPersistenceService.java Show resolved Hide resolved
...ain/java/com/sun/enterprise/container/common/impl/util/ClusteredSingletonLookupImplBase.java Show resolved Hide resolved
...ayara-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/cluster/MemberEvent.java Show resolved Hide resolved
...a-modules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/hazelcast/HazelcastCore.java Show resolved Hide resolved
@lprimak lprimak merged commit efb512e into payara:master Dec 8, 2020
@lprimak lprimak deleted the Hz-Upgr-No-TC branch December 24, 2020 18:10
@rdebusscher rdebusscher mentioned this pull request Mar 21, 2021
Merged
aubi pushed a commit to aubi/Payara that referenced this pull request Jan 3, 2022
@lprimak @Pandrex247
FISH-791 Upgrade Payara to Hazelcast 4.1 (payara#5014)
f79336d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmatej dmatej dmatej approved these changes

@MattGill98 MattGill98 MattGill98 approved these changes

@Cousjava Cousjava Awaiting requested review from Cousjava

@jbee jbee Awaiting requested review from jbee

@AlanRoth AlanRoth Awaiting requested review from AlanRoth

@cubastanley cubastanley Awaiting requested review from cubastanley

@jGauravGupta jGauravGupta Awaiting requested review from jGauravGupta

@OndroMih OndroMih Awaiting requested review from OndroMih

@Pandrex247 Pandrex247 Awaiting requested review from Pandrex247

@pdudits pdudits Awaiting requested review from pdudits

@rdebusscher rdebusscher Awaiting requested review from rdebusscher

@smillidge smillidge Awaiting requested review from smillidge

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@lprimak @smillidge @rdebusscher @pdudits @dmatej @MattGill98