NIFI-7549 Adding Hazelcast based DistributedMapCacheClient support#4510
NIFI-7549 Adding Hazelcast based DistributedMapCacheClient support#4510simonbence wants to merge 8 commits intoapache:mainfrom
Conversation
|
Thanks @simonbence! At a glance, looks very well thought out and designed. Will review... |
nifi-api/src/main/java/org/apache/nifi/controller/NodeTypeProvider.java
Outdated
Show resolved
Hide resolved
nifi-api/src/main/java/org/apache/nifi/controller/NodeTypeProvider.java
Outdated
Show resolved
Hide resolved
.../nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/util/LongUtil.java
Outdated
Show resolved
Hide resolved
...lcast-services/src/test/java/org/apache/nifi/hazelcast/services/DummyStringDeserializer.java
Outdated
Show resolved
Hide resolved
...cast-services-api/src/main/java/org/apache/nifi/hazelcast/services/cache/HazelcastCache.java
Outdated
Show resolved
Hide resolved
...cast-services-api/src/main/java/org/apache/nifi/hazelcast/services/cache/HazelcastCache.java
Outdated
Show resolved
Hide resolved
...cast-services-api/src/main/java/org/apache/nifi/hazelcast/services/cache/HazelcastCache.java
Outdated
Show resolved
Hide resolved
...cast-services-api/src/main/java/org/apache/nifi/hazelcast/services/cache/HazelcastCache.java
Outdated
Show resolved
Hide resolved
...cast-services-api/src/main/java/org/apache/nifi/hazelcast/services/cache/HazelcastCache.java
Outdated
Show resolved
Hide resolved
...api/src/main/java/org/apache/nifi/hazelcast/services/cachemanager/HazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...services/src/main/java/org/apache/nifi/hazelcast/services/cache/IMapBasedHazelcastCache.java
Outdated
Show resolved
Hide resolved
...services/src/main/java/org/apache/nifi/hazelcast/services/cache/IMapBasedHazelcastCache.java
Outdated
Show resolved
Hide resolved
...es/src/main/java/org/apache/nifi/hazelcast/services/cacheclient/HazelcastMapCacheClient.java
Outdated
Show resolved
Hide resolved
...es/src/main/java/org/apache/nifi/hazelcast/services/cacheclient/HazelcastMapCacheClient.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...ain/java/org/apache/nifi/hazelcast/services/cachemanager/IMapBasedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...ain/java/org/apache/nifi/hazelcast/services/cachemanager/IMapBasedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/nifi/hazelcast/services/cachemanager/StandaloneHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/nifi/hazelcast/services/cachemanager/StandaloneHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/nifi/hazelcast/services/cachemanager/StandaloneHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/nifi/hazelcast/services/cachemanager/StandaloneHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/nifi/hazelcast/services/cachemanager/StandaloneHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...he.nifi.hazelcast.services.cachemanager.EmbeddedHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
...he.nifi.hazelcast.services.cachemanager.EmbeddedHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
...he.nifi.hazelcast.services.cachemanager.EmbeddedHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
....nifi.hazelcast.services.cachemanager.StandaloneHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
....nifi.hazelcast.services.cachemanager.StandaloneHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
|
Licensing info is missing from the nar modules. |
nifi-nar-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/pom.xml
Outdated
Show resolved
Hide resolved
...rg.apache.nifi.hazelcast.services.cacheclient.HazelcastMapCacheClient/additionalDetails.html
Show resolved
Hide resolved
...he.nifi.hazelcast.services.cachemanager.EmbeddedHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...he.nifi.hazelcast.services.cachemanager.EmbeddedHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
...in/java/org/apache/nifi/hazelcast/services/cachemanager/StandaloneHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...es/src/main/java/org/apache/nifi/hazelcast/services/cacheclient/HazelcastMapCacheClient.java
Outdated
Show resolved
Hide resolved
...es/src/main/java/org/apache/nifi/hazelcast/services/cacheclient/HazelcastMapCacheClient.java
Outdated
Show resolved
Hide resolved
...es/src/main/java/org/apache/nifi/hazelcast/services/cacheclient/HazelcastMapCacheClient.java
Outdated
Show resolved
Hide resolved
...services/src/main/java/org/apache/nifi/hazelcast/services/cache/IMapBasedHazelcastCache.java
Outdated
Show resolved
Hide resolved
tpalfy
left a comment
There was a problem hiding this comment.
Looks good, I'd just add a test for serialization/deserialization in HazelcastMapCacheClientTest:
@Test
public void testSerialization() throws Exception {
// GIVEN
Long key = 1L;
Double value = 1.2;
Serializer<Long> keySerializer = (x, output) -> output.write(x.toString().getBytes(StandardCharsets.UTF_8));
Serializer<Double> valueSerializer = (x, output) -> output.write(x.toString().getBytes(StandardCharsets.UTF_8));
Deserializer<Double> valueDeserializer = input -> Double.valueOf(new String(input, StandardCharsets.UTF_8));
testSubject.put(key, value, keySerializer, valueSerializer);
// WHEN
Double actual = testSubject.get(key, keySerializer, valueDeserializer);
// THEN
assertEquals(value, actual);
}
turcsanyip
left a comment
There was a problem hiding this comment.
@simonbence Thanks for the fixes so far!
I found some more (mostly minor) issues related to the property validation. Please check them too.
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
Outdated
Show resolved
Hide resolved
...he.nifi.hazelcast.services.cachemanager.EmbeddedHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
...he.nifi.hazelcast.services.cachemanager.EmbeddedHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
...he.nifi.hazelcast.services.cachemanager.EmbeddedHazelcastCacheManager/additionalDetails.html
Outdated
Show resolved
Hide resolved
kevdoran
left a comment
There was a problem hiding this comment.
Great work! The layered design which allows for both internal and external Hazelcast is really nice. For folks familiar with Hazelcast, this is very intuitive to use, and will be a nice additional option for NiFi distributed caches.
The only things I spotted would be perhaps exposing more configurability for the embedded HZ cluster, such as Split Brain Protection. Given that a reasonable alternative to this in the current PR is using an external HZ cluster which would provide complete control of the HZ config, I do not view this as a blocker by any means. There are however, a couple places that I think exception handling or retry logic could be added. I have called out one such example for IMap usage when split brain protection is enabled.
Overall, great design, implementation and documentation! Nice work! +1
| </head> | ||
|
|
||
| <body> | ||
| <h2>EmbeddedHazelcastCacheManager</h2> |
| } catch (final ReachedMaxSizeException e) { | ||
| LOGGER.error("Cache {} reached the maximum allowed size!", storage.getName()); | ||
| return false; | ||
| } |
There was a problem hiding this comment.
If Hazelcast 4 is similar to 3 in this regard, then I believe there are some other runtime-exceptions that IMap datastructures can throw. One in particular is a SplitBrainProtectionException, which can occur on an external HZ cluster if nodes lose connectivity to each other, such as unwanted network partitioning. It might be worth adding handling for that, usually the solution would be a configurable number of retries as the same operation can succeed if called to a HZ instance that is part of the majority/quorum above the split brain protection threshold.
turcsanyip
left a comment
There was a problem hiding this comment.
+1 LGTM
Tested with different cache configs on NiFi + Hazelcast clusters.
@simonbence Thanks for implementing this new component.
@tpalfy, @kevdoran Thanks for the reviews.
Merging to main...
NIFI-7549 Refining documentation; Changing explicit HA mode; Smaller review comments NIFI-7549 Code review responses about license, documentation and dependencies NIFI-7549 Fixing issue when explicit HA; Some further review based adjustments NIFI-7549 Response to code review comments NIFI-7549 Adding extra serialization test NIFI-7549 Minor changes based on review comments NIFI-7549 Adding hook point to the shutdown This closes apache#4510. Signed-off-by: Peter Turcsanyi <turcsanyi@apache.org>
NIFI-7549 Refining documentation; Changing explicit HA mode; Smaller review comments NIFI-7549 Code review responses about license, documentation and dependencies NIFI-7549 Fixing issue when explicit HA; Some further review based adjustments NIFI-7549 Response to code review comments NIFI-7549 Adding extra serialization test NIFI-7549 Minor changes based on review comments NIFI-7549 Adding hook point to the shutdown This closes apache#4510. Signed-off-by: Peter Turcsanyi <turcsanyi@apache.org> (cherry picked from commit b980a8e)
NIFI-7549 Refining documentation; Changing explicit HA mode; Smaller review comments NIFI-7549 Code review responses about license, documentation and dependencies NIFI-7549 Fixing issue when explicit HA; Some further review based adjustments NIFI-7549 Response to code review comments NIFI-7549 Adding extra serialization test NIFI-7549 Minor changes based on review comments NIFI-7549 Adding hook point to the shutdown This closes apache#4510. Signed-off-by: Peter Turcsanyi <turcsanyi@apache.org>
NIFI-7549
The PR contains my proposal of Hazelcast support for DistributedMapCacheClient. In general, I followed the patterns I found in the existing implementations, for the cases were not explicitly documented the behaviour follows them, mainly the ones were added with the feature itself (I considered them the most relevant and accurate implementations)
As for the organisation of the implementation, I did split the feature into three "layers". The package structure follows this as well. In the bottom, there is the HazelcastCache, and the implementation. This layer is responsible to directly communicate with the Hazelcast (via a provided connection) and hide the details of the used data structure. The current implementation is based on IMap, but there is the possibility to change or extend this. Also, the map-like data structure's interface is heavily changed between Hazelcast 3.x and 4.x. In case if the support would be needed for older implementations, wrapping the logic could help to avoid sprawl of the changes.
The layer above is the "cache manager" (HazelcastCacheManager). This is responsible to create the cache instances and maintain the connection. Currently there are two implementation: one which starts an embedded Hazelcast for easy usage and one which connects to a Hazelcast cluster running outside NiFi. The embedded provides a limited capability for configuration, but it could serve effectively as local cache. Also it supports clustering the embedded Hazelcast instances. The "standalone" could joint to any non-enterprise Hazelcast. Note: I looked after how to connect with secured Hazelcast, but as I found it is part of the enterprise package. For now, it was not part of my intent to support that. This layer should hide all Hazelcast specific interface or implementation.
The top layer is the actual DistributedMapCacheClient implementation. Depends on both the bottom ones, as the manager is needed for acquiring the cache which it works with. All the NiFi specific logic is within this. AtomicDistributedMapCacheClient methods are supported. The revision handling comes in with this is general for all the entries. A long-based version is attached to all the entries.
Thank you for submitting a contribution to Apache NiFi.
Please provide a short description of the PR here:
Description of PR
Enables X functionality; fixes bug NIFI-YYYY.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically
main)?Is your initial contribution a single, squashed commit? Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not
squashor use--forcewhen pushing to allow for clean monitoring of changes.For code changes:
mvn -Pcontrib-check clean installat the rootnififolder?LICENSEfile, including the mainLICENSEfile undernifi-assembly?NOTICEfile, including the mainNOTICEfile found undernifi-assembly?.displayNamein addition to .name (programmatic access) for each of the new properties?For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI for build issues and submit an update to your PR as soon as possible.