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

KAFKA-15319: Upgrade rocksdb to fix CVE-2022-37434 #14216

Merged
merged 3 commits into from Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE-binary
Expand Up @@ -253,7 +253,7 @@ netty-transport-native-unix-common-4.1.94.Final
plexus-utils-3.3.0
reflections-0.10.2
reload4j-1.2.25
rocksdbjni-7.1.2
rocksdbjni-7.9.2
scala-collection-compat_2.13-2.10.0
scala-library-2.13.11
scala-logging_2.13-3.9.4
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Expand Up @@ -133,7 +133,7 @@ versions += [
powermock: "2.0.9",
reflections: "0.10.2",
reload4j: "1.2.25",
rocksDB: "7.1.2",
rocksDB: "7.9.2",
scalaCollectionCompat: "2.10.0",
// When updating the scalafmt version please also update the version field in checkstyle/.scalafmt.conf. scalafmt now
// has the version field as mandatory in its configuration, see
Expand Down
Expand Up @@ -40,6 +40,7 @@
import org.rocksdb.MemTableConfig;
import org.rocksdb.MergeOperator;
import org.rocksdb.Options;
import org.rocksdb.PrepopulateBlobCache;
import org.rocksdb.RateLimiter;
import org.rocksdb.SstFileManager;
import org.rocksdb.SstPartitionerFactory;
Expand Down Expand Up @@ -1728,6 +1729,17 @@ public Options setMemtableWholeKeyFiltering(final boolean memtableWholeKeyFilter
public boolean memtableWholeKeyFiltering() {
return columnFamilyOptions.memtableWholeKeyFiltering();
}

@Override
public Options setExperimentalMempurgeThreshold(final double experimentalMempurgeThreshold) {
columnFamilyOptions.setExperimentalMempurgeThreshold(experimentalMempurgeThreshold);
return this;
}

@Override
public double experimentalMempurgeThreshold() {
return columnFamilyOptions.experimentalMempurgeThreshold();
}

//
// BEGIN options for blobs (integrated BlobDB)
Expand Down Expand Up @@ -1810,6 +1822,29 @@ public double blobGarbageCollectionForceThreshold() {
return columnFamilyOptions.blobGarbageCollectionForceThreshold();
}


@Override
public Options setPrepopulateBlobCache(final PrepopulateBlobCache prepopulateBlobCache) {
columnFamilyOptions.setPrepopulateBlobCache(prepopulateBlobCache);
return this;
}

@Override
public PrepopulateBlobCache prepopulateBlobCache() {
return columnFamilyOptions.prepopulateBlobCache();
}

@Override
public Options setBlobFileStartingLevel(final int blobFileStartingLevel) {
columnFamilyOptions.setBlobFileStartingLevel(blobFileStartingLevel);
return this;
}

@Override
public int blobFileStartingLevel() {
return columnFamilyOptions.blobFileStartingLevel();
}

//
// END options for blobs (integrated BlobDB)
//
Expand Down
2 changes: 1 addition & 1 deletion tests/setup.py
Expand Up @@ -51,7 +51,7 @@ def run_tests(self):
license="apache2.0",
packages=find_packages(),
include_package_data=True,
install_requires=["ducktape<0.9", "requests==2.31.0"],
install_requires=["ducktape==0.8.14", "requests==2.24.0"],
tests_require=["pytest", "mock"],
cmdclass={'test': PyTest},
zip_safe=False
Expand Down