[CASSANDRA-18805] Upgrade caffeine to 3.1.8 and fix CIDR permissions cache invalidation - ASF JIRA

XML

Word

Printable

JSON

Details

Type: Task
Status: Resolved
Priority: Normal
Resolution: Fixed
Fix Version/s: 5.0-alpha2, 5.0, 5.1
Component/s: Dependencies
Labels:
None

Epic Link:
Support Java 17
Change Category:
Operability
Complexity:
Normal
Platform:

All
Impacts:

None
Source Control Link:

https://github.com/apache/cassandra/commit/eb30005251cd8c10732ecab8365ebaa45f5fcbde https://github.com/apache/cassandra/commit/210a59b1948f467a652024badc8c7d6b81d543c1
Test and Documentation Plan:

Hide

Version 3 comes with some breaking API changes, which I fixed - https://github.com/ben-manes/caffeine/releases/tag/v3.0.0

The respective commits which introduced those:

https://github.com/ben-manes/caffeine/commit/91eec88be93f16549ce82dd2f17959fd8eba75dd

https://github.com/ben-manes/caffeine/commit/e45837248905d752d7fbd7c8df3ed1a439d7af89

https://github.com/ben-manes/caffeine/commit/bfec59c146cf10ffe9b937563bf0d13beb5e1759

This is also the full list of release notes - https://github.com/ben-manes/caffeine/releases?page=2

CIDRPermissionsCache failed to compile as it seems some type safety was introduced in the newer caffeine version, which caused a compilation failure because we do a null check for String instead of RoleResource here. Even in the current 5.0 code with the old version of caffeine I could compile when I switched to RoleResource.role(roleName).

That change also makes sense when I look into the following line where we invalidate using the key provided as RoleResource.role(roleName) - https://github.com/apache/cassandra/blob/cassandra-5.0/src/java/org/apache/cassandra/auth/CIDRPermissionsCache.java#L60.

Patch: https://github.com/apache/cassandra/pull/2648

CI: https://app.circleci.com/pipelines/github/ekaterinadimitrova2/cassandra?branch=caffeine-upgrade

This is the 5.0 patch. When we confirm it, I can propagate it to the trunk, too and test it.

Show
Version 3 comes with some breaking API changes, which I fixed - https://github.com/ben-manes/caffeine/releases/tag/v3.0.0 The respective commits which introduced those: https://github.com/ben-manes/caffeine/commit/91eec88be93f16549ce82dd2f17959fd8eba75dd https://github.com/ben-manes/caffeine/commit/e45837248905d752d7fbd7c8df3ed1a439d7af89 https://github.com/ben-manes/caffeine/commit/bfec59c146cf10ffe9b937563bf0d13beb5e1759 This is also the full list of release notes - https://github.com/ben-manes/caffeine/releases?page=2 CIDRPermissionsCache failed to compile as it seems some type safety was introduced in the newer caffeine version, which caused a compilation failure because we do a null check for String instead of RoleResource here . Even in the current 5.0 code with the old version of caffeine I could compile when I switched to RoleResource.role(roleName). That change also makes sense when I look into the following line where we invalidate using the key provided as RoleResource.role(roleName) - https://github.com/apache/cassandra/blob/cassandra-5.0/src/java/org/apache/cassandra/auth/CIDRPermissionsCache.java#L60 . Patch: https://github.com/apache/cassandra/pull/2648 CI: https://app.circleci.com/pipelines/github/ekaterinadimitrova2/cassandra?branch=caffeine-upgrade This is the 5.0 patch. When we confirm it, I can propagate it to the trunk, too and test it.

Description

3.1.8 is based on Java 11. This version is testing with newer JDK versions, while 2.x versions are based on JDK8, and as I understand, only bug-fix releases are expected.

Attachments

Issue Links

is duplicated by

CASSANDRA-18864 CIDR permission cache probably does not work

Resolved

Activity

People

Assignee:: Ekaterina Dimitrova

Reporter:: Ekaterina Dimitrova

Authors:: Ekaterina Dimitrova

Reviewers:: Ben Manes, Jacek Lewandowski, Shailaja Koppu, Yifan Cai

Votes:: 0 Vote for this issue

Watchers:: 4 Start watching this issue

Dates

Created:: 29/Aug/23 18:55

Updated:: 01/Nov/23 08:54

Resolved:: 03/Oct/23 20:26