Sanitize 8.10.tikv branch (#372)

* Sanitize 8.10.tikv branch Signed-off-by: Yang Zhang <[email protected]> * Fix test Signed-off-by: Yang Zhang <[email protected]> --------- Signed-off-by: Yang Zhang <[email protected]>
tikv · Sep 20, 2024 · 49a8021 · 49a8021
1 parent a66daec
commit 49a8021
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/sanity_check.yml b/.github/workflows/sanity_check.yml
@@ -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: |
@@ -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

diff --git a/db/db_test.cc b/db/db_test.cc
@@ -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;