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

[FLINK-35579] update frocksdb version to v8.10.0 #25253

Merged
merged 8 commits into from
Aug 29, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flink-dist/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This project bundles the following dependencies under the Apache Software Licens

- com.google.code.findbugs:jsr305:1.3.9
- com.twitter:chill-java:0.7.6
- com.ververica:frocksdbjni:6.20.3-ververica-2.0
- com.ververica:frocksdbjni:8.10.0-ververica-beta-1.0
- commons-cli:commons-cli:1.5.0
- commons-collections:commons-collections:3.2.2
- commons-io:commons-io:2.15.1
Expand Down
12 changes: 6 additions & 6 deletions flink-end-to-end-tests/test-scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,11 @@ function wait_rest_endpoint_up {
exit 1
}

function relocate_rocksdb_logs {
# After FLINK-24785, RocksDB's log would be created under Flink's log directory by default,
# this would make e2e tests' artifacts containing too many log files.
# As RocksDB's log would not help much in e2e tests, move the location back to its own folder.
set_config_key "state.backend.rocksdb.log.dir" "/dev/null"
function reset_rocksdb_log_level {
# After upgrading RocksDB to 8.10 in FLINK-35573, the log dir of RocksDB cannot be set to/dev/null.
# To avoid the problem of large logs, we can set the log level of rocksdb to HEADER_LOG in e2e test,
# and then continue to keep it under tm's log dir
set_config_key "state.backend.rocksdb.log.level" "HEADER_LEVEL"
}

function wait_dispatcher_running {
Expand All @@ -305,7 +305,7 @@ function wait_dispatcher_running {
}

function start_cluster {
relocate_rocksdb_logs
reset_rocksdb_log_level
"$FLINK_DIR"/bin/start-cluster.sh
wait_dispatcher_running
}
Expand Down
2 changes: 1 addition & 1 deletion flink-state-backends/flink-statebackend-rocksdb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ under the License.
<dependency>
<groupId>com.ververica</groupId>
<artifactId>frocksdbjni</artifactId>
<version>6.20.3-ververica-2.0</version>
<version>8.10.0-ververica-beta-1.0</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import java.util.HashSet;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
Expand Down Expand Up @@ -317,7 +316,7 @@ public ColumnFamilyOptions createColumnOptions(
assertThat(actual.indexType(), is(IndexType.kTwoLevelIndexSearch));
assertThat(actual.partitionFilters(), is(true));
assertThat(actual.pinTopLevelIndexAndFilter(), is(true));
assertThat(actual.filterPolicy(), not(blockBasedFilter));
assertFalse(actual.filterPolicy() == blockBasedFilter);
}
assertFalse("Block based filter is left unclosed.", blockBasedFilter.isOwningHandle());
}
Expand Down