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.

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

[Tiered Caching] Add a memory-efficient key lookup store for use in tiered cache #10874

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3afcb42
[Tiered caching] Integrating ehcache disk cache
sgup432 Jan 12, 2024
00f4545
Adding suppressForbidden for File.io used by ehcache
sgup432 Jan 16, 2024
1a026a8
Implements a memory-efficient roaring bitmap-based keystore for use i…
Sep 22, 2023
f25a2dc
Addressed Sagar's comments besides new counter/arraylist setup for re…
Nov 2, 2023
1cf743b
Implemented/tested counter+removal list setup to allow more removals
Nov 6, 2023
cccbdb7
removed exceptions from interface signatures
Nov 6, 2023
1446103
Simplified RBM size estimator
Nov 11, 2023
0c44af6
Optimized modulo calculation with bitmask
Nov 22, 2023
88b40d8
Changed memory size estimator to reflect optimized modulo
Nov 27, 2023
8534489
Optimized size estimation, cleanup
Jan 9, 2024
65d2955
Addressed Kiran's comments
Jan 9, 2024
9790c16
Fixed static variable warning
Jan 17, 2024
30ad4e9
Fixing gradle build failure
sgup432 Jan 22, 2024
6bcf2f4
Adding changelog
sgup432 Jan 22, 2024
6c18a82
Merge branch 'main' into ehcache_disk_integ
sgup432 Jan 22, 2024
a5e5afd
Exposing ehcache disk cache variant as a plugin
sgup432 Jan 25, 2024
c74992f
Fixing gradle failures
sgup432 Jan 25, 2024
06386b0
Making ICache extend Closeable
sgup432 Jan 25, 2024
48185f8
Change keystore implementation to live in a module
Jan 26, 2024
cdea52d
Simplified interface
Jan 26, 2024
62b80ca
SHAs, spotlessApply
Jan 26, 2024
6be8c6c
removed commented-out line
Jan 26, 2024
61cb54d
javadoc complaints
Jan 26, 2024
ce88ee8
fixed name of plugin in build.gradle
Jan 27, 2024
8201696
Seeing if applying plugins removes javadoc requirement
Jan 29, 2024
04cd84a
attempt 2
Jan 29, 2024
f4e73b9
Attempt 3
Jan 29, 2024
5261cdf
attempt 10,000
Jan 29, 2024
651e1aa
Merge remote-tracking branch 'sgup432/ehcache_disk_integ' into keysto…
Feb 1, 2024
c700142
Moved keystore to the ehcache plugin
Feb 1, 2024
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@ testfixtures_shared/
.ci/jobs/

# build files generated
doc-tools/missing-doclet/bin/
doc-tools/missing-doclet/bin/
server/src/main/java/org/opensearch/indices/KLSPerformanceTest.java
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Add match_only_text field that is optimized for storage by trading off positional queries performance ([#6836](https://github.com/opensearch-project/OpenSearch/pull/11039))
- Add copy ingest processor ([#11870](https://github.com/opensearch-project/OpenSearch/pull/11870))
- Introduce new feature flag "WRITEABLE_REMOTE_INDEX" to gate the writeable remote index functionality ([#11717](https://github.com/opensearch-project/OpenSearch/pull/11170))
- [Tiered caching] Integrating ehcache as a disk cache option ([#11874](https://github.com/opensearch-project/OpenSearch/pull/11874))
- Bump OpenTelemetry from 1.32.0 to 1.34.1 ([#11891](https://github.com/opensearch-project/OpenSearch/pull/11891))
- Support index level allocation filtering for searchable snapshot index ([#11563](https://github.com/opensearch-project/OpenSearch/pull/11563))
- Add `org.opensearch.rest.MethodHandlers` and `RestController#getAllHandlers` ([11876](https://github.com/opensearch-project/OpenSearch/pull/11876))
Expand Down
1 change: 1 addition & 0 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,4 @@ resteasy = 6.2.4.Final
# opentelemetry dependencies
opentelemetry = 1.34.1
opentelemetrysemconv = 1.23.1-alpha
ehcache = 3.10.8
86 changes: 86 additions & 0 deletions plugins/cache-ehcache/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

import org.apache.tools.ant.taskdefs.condition.Os
import org.opensearch.gradle.Architecture
import org.opensearch.gradle.OS
import org.opensearch.gradle.info.BuildParams

opensearchplugin {
description 'Ehcache based cache implementation.'
classname 'org.opensearch.cache.EhcacheCachePlugin'
hasClientJar = true
}

dependencies {
// for ehcache
api "org.ehcache:ehcache:${versions.ehcache}"

// For roaring bitmaps
api 'org.roaringbitmap:RoaringBitmap:0.9.49'
runtimeOnly 'org.roaringbitmap:shims:0.9.49'
}

thirdPartyAudit {
ignoreViolations(
'org.ehcache.impl.internal.concurrent.ConcurrentHashMap',
'org.ehcache.impl.internal.concurrent.ConcurrentHashMap$CounterCell',
'org.ehcache.impl.internal.concurrent.ConcurrentHashMap$TreeBin',
'org.ehcache.impl.internal.concurrent.ThreadLocalRandomUtil',
'org.ehcache.sizeof.impl.UnsafeSizeOf'
)

ignoreMissingClasses(
'javax.cache.Cache',
'javax.cache.Cache$Entry',
'javax.cache.CacheException',
'javax.cache.CacheManager',
'javax.cache.configuration.CacheEntryListenerConfiguration',
'javax.cache.configuration.CompleteConfiguration',
'javax.cache.configuration.Configuration',
'javax.cache.configuration.Factory',
'javax.cache.configuration.OptionalFeature',
'javax.cache.event.CacheEntryCreatedListener',
'javax.cache.event.CacheEntryEvent',
'javax.cache.event.CacheEntryEventFilter',
'javax.cache.event.CacheEntryExpiredListener',
'javax.cache.event.CacheEntryListener',
'javax.cache.event.CacheEntryRemovedListener',
'javax.cache.event.CacheEntryUpdatedListener',
'javax.cache.event.EventType',
'javax.cache.expiry.Duration',
'javax.cache.expiry.EternalExpiryPolicy',
'javax.cache.expiry.ExpiryPolicy',
'javax.cache.integration.CacheLoader',
'javax.cache.integration.CacheLoaderException',
'javax.cache.integration.CacheWriter',
'javax.cache.integration.CacheWriterException',
'javax.cache.integration.CompletionListener',
'javax.cache.management.CacheMXBean',
'javax.cache.management.CacheStatisticsMXBean',
'javax.cache.processor.EntryProcessor',
'javax.cache.processor.EntryProcessorResult',
'javax.cache.processor.MutableEntry',
'javax.cache.spi.CachingProvider',
'javax.xml.bind.JAXBContext',
'javax.xml.bind.JAXBElement',
'javax.xml.bind.Marshaller',
'javax.xml.bind.Unmarshaller',
'javax.xml.bind.annotation.XmlElement',
'javax.xml.bind.annotation.XmlRootElement',
'javax.xml.bind.annotation.XmlSchema',
'javax.xml.bind.annotation.adapters.XmlAdapter',
'org.osgi.framework.BundleActivator',
'org.osgi.framework.BundleContext',
'org.osgi.framework.ServiceReference',
'org.slf4j.Logger',
'org.slf4j.LoggerFactory',
'org.slf4j.Marker',
'org.slf4j.event.Level'
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b45b49c1ec5c5fc48580412d0ca635e1833110ea
191 changes: 191 additions & 0 deletions plugins/cache-ehcache/licenses/RoaringBitmap-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction, and
distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by the copyright
owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all other entities
that control, are controlled by, or are under common control with that entity.
For the purposes of this definition, "control" means (i) the power, direct or
indirect, to cause the direction or management of such entity, whether by
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity exercising
permissions granted by this License.

"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.

"Object" form shall mean any form resulting from mechanical transformation or
translation of a Source form, including but not limited to compiled object code,
generated documentation, and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or Object form, made
available under the License, as indicated by a copyright notice that is included
in or attached to the work (an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object form, that
is based on (or derived from) the Work and for which the editorial revisions,
annotations, elaborations, or other modifications represent, as a whole, an
original work of authorship. For the purposes of this License, Derivative Works
shall not include works that remain separable from, or merely link (or bind by
name) to the interfaces of, the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including the original version
of the Work and any modifications or additions to that Work or Derivative Works
thereof, that is intentionally submitted to Licensor for inclusion in the Work
by the copyright owner or by an individual or Legal Entity authorized to submit
on behalf of the copyright owner. For the purposes of this definition,
"submitted" means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems, and
issue tracking systems that are managed by, or on behalf of, the Licensor for
the purpose of discussing and improving the Work, but excluding communication
that is conspicuously marked or otherwise designated in writing by the copyright
owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
of whom a Contribution has been received by Licensor and subsequently
incorporated within the Work.

2. Grant of Copyright License.

Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the Work and such
Derivative Works in Source or Object form.

3. Grant of Patent License.

Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable (except as stated in this section) patent license to make, have
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
such license applies only to those patent claims licensable by such Contributor
that are necessarily infringed by their Contribution(s) alone or by combination
of their Contribution(s) with the Work to which such Contribution(s) was
submitted. If You institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
Contribution incorporated within the Work constitutes direct or contributory
patent infringement, then any patent licenses granted to You under this License
for that Work shall terminate as of the date such litigation is filed.

4. Redistribution.

You may reproduce and distribute copies of the Work or Derivative Works thereof
in any medium, with or without modifications, and in Source or Object form,
provided that You meet the following conditions:

You must give any other recipients of the Work or Derivative Works a copy of
this License; and
You must cause any modified files to carry prominent notices stating that You
changed the files; and
You must retain, in the Source form of any Derivative Works that You distribute,
all copyright, patent, trademark, and attribution notices from the Source form
of the Work, excluding those notices that do not pertain to any part of the
Derivative Works; and
If the Work includes a "NOTICE" text file as part of its distribution, then any
Derivative Works that You distribute must include a readable copy of the
attribution notices contained within such NOTICE file, excluding those notices
that do not pertain to any part of the Derivative Works, in at least one of the
following places: within a NOTICE text file distributed as part of the
Derivative Works; within the Source form or documentation, if provided along
with the Derivative Works; or, within a display generated by the Derivative
Works, if and wherever such third-party notices normally appear. The contents of
the NOTICE file are for informational purposes only and do not modify the
License. You may add Your own attribution notices within Derivative Works that
You distribute, alongside or as an addendum to the NOTICE text from the Work,
provided that such additional attribution notices cannot be construed as
modifying the License.
You may add Your own copyright statement to Your modifications and may provide
additional or different license terms and conditions for use, reproduction, or
distribution of Your modifications, or for any such Derivative Works as a whole,
provided Your use, reproduction, and distribution of the Work otherwise complies
with the conditions stated in this License.

5. Submission of Contributions.

Unless You explicitly state otherwise, any Contribution intentionally submitted
for inclusion in the Work by You to the Licensor shall be under the terms and
conditions of this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify the terms of
any separate license agreement you may have executed with Licensor regarding
such Contributions.

6. Trademarks.

This License does not grant permission to use the trade names, trademarks,
service marks, or product names of the Licensor, except as required for
reasonable and customary use in describing the origin of the Work and
reproducing the content of the NOTICE file.

7. Disclaimer of Warranty.

Unless required by applicable law or agreed to in writing, Licensor provides the
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
including, without limitation, any warranties or conditions of TITLE,
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
solely responsible for determining the appropriateness of using or
redistributing the Work and assume any risks associated with Your exercise of
permissions under this License.

8. Limitation of Liability.

In no event and under no legal theory, whether in tort (including negligence),
contract, or otherwise, unless required by applicable law (such as deliberate
and grossly negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special, incidental,
or consequential damages of any character arising as a result of this License or
out of the use or inability to use the Work (including but not limited to
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
any and all other commercial damages or losses), even if such Contributor has
been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability.

While redistributing the Work or Derivative Works thereof, You may choose to
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
other liability obligations and/or rights consistent with this License. However,
in accepting such obligations, You may act only on Your own behalf and on Your
sole responsibility, not on behalf of any other Contributor, and only if You
agree to indemnify, defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason of your
accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work

To apply the Apache License to your work, attach the following boilerplate
notice, with the fields enclosed by brackets "[]" replaced with your own
identifying information. (Don't include the brackets!) The text should be
enclosed in the appropriate comment syntax for the file format. We also
recommend that a file or class name and description of purpose be included on
the same "printed page" as the copyright notice for easier identification within
third-party archives.

Copyright 2013-2016 the RoaringBitmap authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Empty file.
1 change: 1 addition & 0 deletions plugins/cache-ehcache/licenses/ehcache-3.10.8.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f0d50ede46609db78413ca7f4250d348a597b101
Loading
Loading