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

Sanitize 8.10.tikv branch #372

Merged
merged 2 commits into from
Sep 20, 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
4 changes: 3 additions & 1 deletion .github/workflows/sanity_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- name: Fetch from upstream
run: |
git remote add upstream https://github.com/facebook/rocksdb.git && git fetch upstream
git remote add upstream https://github.com/tikv/rocksdb.git && git fetch upstream

- name: Where am I
run: |
Expand All @@ -37,6 +37,8 @@ jobs:

- name: Check format
run: VERBOSE_CHECK=1 make check-format
env:
FORMAT_UPSTREAM: upstream/8.10.tikv

- name: Compare buckify output
run: make check-buck-targets
Expand Down
10 changes: 9 additions & 1 deletion db/db_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2681,7 +2681,15 @@ TEST_F(DBTest, GetLiveBlobFiles) {
ASSERT_EQ(cfmd.blob_file_size, bmd.blob_file_size);
}

TEST_F(DBTest, PurgeInfoLogs) {
// Disable this test, since it fails with current tikv/rocksdb CI setup.
// This test fails if it run as ./db_test, since previous test cases create
// a dir under dbname causing the assertion in line 2722 to fail. It passes
// when run as `make check -j x`, since test case is executed in separate
// directory.
// TiKV CI cannot migrate to `make check -j x` because the sub-steps require
// python3, which is not available in TiKV CI centos7.
// TODO: Fix this test by using `make check -j x` when TiKV CI has python3
TEST_F(DBTest, DISABLED_PurgeInfoLogs) {
Options options = CurrentOptions();
options.keep_log_file_num = 5;
options.create_if_missing = true;
Expand Down
Loading