Update version and HISTORY for 6.16.5

Fix the sorting of KeyContexts for batched MultiGet (#8633 )
Summary: `CompareKeyContext::operator()` on the trunk has a bug: when comparing column family IDs, `lhs` is used for both sides of the comparison. This results in the `KeyContext`s getting sorted solely based on key, which in turn means that keys with the same column family do not necessarily form a single range in the sorted list. This violates an assumption of the batched `MultiGet` logic, leading to the same column family showing up multiple times in the list of `MultiGetColumnFamilyData`. The end result is the code attempting to check out the thread-local `SuperVersion` for the same CF multiple times, causing an assertion violation in debug builds and memory corruption/crash in release builds. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8633 Test Plan: `make check` Reviewed By: riversand963 Differential Revision: D30169182 Pulled By: ltamasi fbshipit-source-id: a47710652df7e95b14b40fb710924c11a8478023
2026-11-07 11:32:34 -05:00 · 2021-09-08 12:34:59 -07:00 · 2021-09-08 12:25:27 -07:00 · 2021-03-30 15:54:11 -07:00 · 2021-03-30 13:48:39 -07:00 · 2021-03-29 20:28:50 -07:00
216 changed files with 4792 additions and 6660 deletions
@@ -62,14 +62,6 @@ commands:
          path: /tmp/test-results
      - store_artifacts: # store LOG for debugging if there's any
          path: LOG
-      - run: # on fail, compress Test Logs for diagnosing the issue
-         name: Compress Test Logs
-         command: tar -cvzf t.tar.gz t
-         when: on_fail
-      - store_artifacts: # on fail, store Test Logs for diagnosing the issue
-          path: t.tar.gz
-          destination: test_logs
-          when: on_fail

  install-clang-10:
    steps:
@@ -177,13 +169,13 @@ jobs:
  build-linux-release:
    machine:
      image: ubuntu-1604:202007-01
-    resource_class: large
+    resource_class: 2xlarge
    steps:
      - checkout # check out the code in the project directory
-      - run: make V=1 -j8 release | .circleci/cat_ignore_eagain
+      - run: make V=1 -j32 release | .circleci/cat_ignore_eagain
      - run: if ./db_stress --version; then false; else true; fi # ensure without gflags
      - install-gflags
-      - run: make V=1 -j8 release | .circleci/cat_ignore_eagain
+      - run: make V=1 -j32 release | .circleci/cat_ignore_eagain
      - run: ./db_stress --version # ensure with gflags
      - post-steps

@@ -194,11 +186,11 @@ jobs:
    steps:
      - checkout # check out the code in the project directory
      - run: make clean
-      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j8 static_lib tools db_bench | .circleci/cat_ignore_eagain
+      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j16 static_lib tools db_bench | .circleci/cat_ignore_eagain
      - run: if ./db_stress --version; then false; else true; fi # ensure without gflags
      - run: sudo apt-get update -y && sudo apt-get install -y libgflags-dev
      - run: make clean
-      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j8 static_lib tools db_bench | .circleci/cat_ignore_eagain
+      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j16 static_lib tools db_bench | .circleci/cat_ignore_eagain
      - run: ./db_stress --version # ensure with gflags

  build-linux-lite:
@@ -217,21 +209,21 @@ jobs:
    resource_class: large
    steps:
      - checkout # check out the code in the project directory
-      - run: LITE=1 make V=1 -j8 release | .circleci/cat_ignore_eagain
+      - run: LITE=1 make V=1 -j32 release | .circleci/cat_ignore_eagain
      - run: if ./db_stress --version; then false; else true; fi # ensure without gflags
      - install-gflags
-      - run: LITE=1 make V=1 -j8 release | .circleci/cat_ignore_eagain
+      - run: LITE=1 make V=1 -j32 release | .circleci/cat_ignore_eagain
      - run: ./db_stress --version # ensure with gflags
      - post-steps

-  build-linux-clang-no_test_run:
+  build-linux-clang-no-test:
    machine:
      image: ubuntu-1604:202007-01
-    resource_class: xlarge
+    resource_class: 2xlarge
    steps:
      - checkout # check out the code in the project directory
      - run: sudo apt-get update -y && sudo apt-get install -y clang libgflags-dev
-      - run: CC=clang CXX=clang++ USE_CLANG=1 PORTABLE=1 make V=1 -j16 all | .circleci/cat_ignore_eagain
+      - run: CC=clang CXX=clang++ USE_CLANG=1 PORTABLE=1 make V=1 -j32 all | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-clang10-asan:
@@ -279,63 +271,33 @@ jobs:
      - run: CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 CLANG_ANALYZER="/usr/bin/clang++-10" CLANG_SCAN_BUILD=scan-build-10 USE_CLANG=1 make V=1 -j32 analyze | .circleci/cat_ignore_eagain # aligned new doesn't work for reason we haven't figured out. For unknown, reason passing "clang++-10" as CLANG_ANALYZER doesn't work, and we need a full path.
      - post-steps

-  build-linux-cmake-no_test_run:
+  build-linux-cmake:
    machine:
      image: ubuntu-1604:202007-01
-    resource_class: large
+    resource_class: 2xlarge
    steps:
      - checkout # check out the code in the project directory
-      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=0 .. && make V=1 -j8) | .circleci/cat_ignore_eagain
+      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=0 .. && make V=1 -j32) | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-unity:
    docker: # executor type
      - image: gcc:latest
-    resource_class: large
+    resource_class: xlarge
    steps:
      - checkout # check out the code in the project directory
      - run: apt-get update -y && apt-get install -y libgflags-dev
-      - run: TEST_TMPDIR=/dev/shm && make V=1 -j8 unity_test | .circleci/cat_ignore_eagain
+      - run: TEST_TMPDIR=/dev/shm && make V=1 -j16 unity_test | .circleci/cat_ignore_eagain
      - post-steps

-  build-linux-gcc-4_8-no_test_run:
+  build-linux-gcc-4-8:
    machine:
      image: ubuntu-1604:202007-01
    resource_class: large
    steps:
      - pre-steps
      - run: sudo apt-get update -y && sudo apt-get install gcc-4.8 g++-4.8 libgflags-dev
-      - run: CC=gcc-4.8 CXX=g++-4.8 V=1 SKIP_LINK=1 make -j8 all | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
-      - post-steps
-
-  build-linux-gcc-8-no_test_run:
-    machine:
-      image: ubuntu-2004:202010-01
-    resource_class: large
-    steps:
-      - pre-steps
-      - run: sudo apt-get update -y && sudo apt-get install gcc-8 g++-8 libgflags-dev
-      - run: CC=gcc-8 CXX=g++-8 V=1 SKIP_LINK=1 make -j8 all | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
-      - post-steps
-
-  build-linux-gcc-9-no_test_run:
-    machine:
-      image: ubuntu-2004:202010-01
-    resource_class: large
-    steps:
-      - pre-steps
-      - run: sudo apt-get update -y && sudo apt-get install gcc-9 g++-9 libgflags-dev
-      - run: CC=gcc-9 CXX=g++-9 V=1 SKIP_LINK=1 make -j8 all | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
-      - post-steps
-
-  build-linux-gcc-10-cxx20-no_test_run:
-    machine:
-      image: ubuntu-2004:202010-01
-    resource_class: xlarge
-    steps:
-      - pre-steps
-      - run: sudo apt-get update -y && sudo apt-get install gcc-10 g++-10 libgflags-dev
-      - run: CC=gcc-10 CXX=g++-10 V=1 SKIP_LINK=1 ROCKSDB_CXX_STANDARD=c++20 make -j16 all | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
+      - run: CC=gcc-4.8 CXX=g++-4.8 V=1 SKIP_LINK=1 make -j4 all | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
      - post-steps

  build-windows:
@@ -364,13 +326,9 @@ jobs:
      - run:
          name: "Setup VS"
          command: |
-            if [[ "${VS_YEAR}" == "2019" ]]; then
-              echo "VS2019 already present."
-            elif [[ "${VS_YEAR}" == "2017" ]]; then
-              echo "Installing VS2017..."
+            if [[ "${VS_YEAR}" == "2017" ]]; then
              powershell .circleci/vs2017_install.ps1
            elif [[ "${VS_YEAR}" == "2015" ]]; then
-              echo "Installing VS2015..."
              powershell .circleci/vs2015_install.ps1
            fi
      - run:
@@ -396,7 +354,6 @@ jobs:
            cd build
            ${CMAKE_BIN} -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 << parameters.extra_cmake_opt >> ..
            cd ..
-            echo "Building with VS version: ${CMAKE_GENERATOR}"
            msbuild.exe build/rocksdb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
      - run:
          name: "Test RocksDB"
@@ -590,6 +547,9 @@ workflows:
  build-linux-lite-release:
    jobs:
      - build-linux-lite-release
+  build-linux-clang-no-test:
+    jobs:
+      - build-linux-clang-no-test
  build-linux-clang10-asan:
    jobs:
      - build-linux-clang10-asan
@@ -602,30 +562,29 @@ workflows:
  build-linux-clang10-clang-analyze:
    jobs:
      - build-linux-clang10-clang-analyze
+  build-linux-cmake:
+    jobs:
+      - build-linux-cmake
  build-linux-unity:
    jobs:
      - build-linux-unity
-  build-windows-vs2019:
+  build-windows:
    jobs:
-      - build-windows:
-          name: "build-windows-vs2019"
-  build-windows-vs2019-cxx20:
-    jobs:
-      - build-windows:
-          name: "build-windows-vs2019-cxx20"
-          extra_cmake_opt: -DCMAKE_CXX_STANDARD=20
+      - build-windows
  build-windows-vs2017:
    jobs:
      - build-windows:
-          name: "build-windows-vs2017"
          vs_year: "2017"
          cmake_generator: "Visual Studio 15 Win64"
  build-windows-vs2015:
    jobs:
      - build-windows:
-          name: "build-windows-vs2015"
          vs_year: "2015"
          cmake_generator: "Visual Studio 14 Win64"
+  build-windows-cxx20:
+    jobs:
+      - build-windows:
+          extra_cmake_opt: -DCMAKE_CXX_STANDARD=20
  build-java:
    jobs:
      - build-linux-java
@@ -649,14 +608,9 @@ workflows:
      - build-linux-non-shm:
          start_test: "statistics_test" # make sure unique in src.mk
          end_test: ""
-  build-linux-compilers-no_test_run:
+  build-linux-gcc-4-8:
    jobs:
-      - build-linux-clang-no_test_run
-      - build-linux-cmake-no_test_run
-      - build-linux-gcc-4_8-no_test_run
-      - build-linux-gcc-8-no_test_run
-      - build-linux-gcc-9-no_test_run
-      - build-linux-gcc-10-cxx20-no_test_run
+      - build-linux-gcc-4-8
  build-macos:
    jobs:
      - build-macos
@@ -21,4 +21,3 @@ if (($exitCode -ne 0) -and ($exitCode -ne 3010)) {
    Copy-Item -Path "C:\Users\circleci\AppData\Local\Temp\vslogs.zip" -Destination "C:\w\build-results\"
    exit 1
 }
-echo "VS 2015 installed."
@@ -32,4 +32,3 @@ if (($exitCode -ne 0) -and ($exitCode -ne 3010)) {
    Copy-Item -Path "C:\Users\circleci\AppData\Local\Temp\vslogs.zip" -Destination "C:\w\build-results\"
    exit 1
 }
-echo "VS 2017 installed."
@@ -2,18 +2,20 @@ dist: xenial
 language: cpp
 os:
  - linux
+  - osx
 arch:
+  - amd64
  - arm64
  - ppc64le
 compiler:
  - clang
  - gcc
+osx_image: xcode9.4
 cache:
  - ccache

 addons:
  apt:
-    update: true
    sources:
      - ubuntu-toolchain-r-test
    packages:
@@ -24,6 +26,15 @@ addons:
      - liblzma-dev  # xv
      - libzstd-dev
      - zlib1g-dev
+  homebrew:
+    update: true
+    packages:
+      - ccache
+      - gflags
+      - lz4
+      - snappy
+      - xz
+      - zstd

 env:
  - TEST_GROUP=platform_dependent # 16-18 minutes
@@ -47,6 +58,20 @@ env:

 matrix:
  exclude:
+  - os: osx
+    env: JOB_NAME=cmake-gcc8
+  - os: osx
+    env: JOB_NAME=cmake-gcc9
+  - os: osx
+    env: JOB_NAME=cmake-gcc9-c++20
+  - os: osx
+    env: JOB_NAME=cmake-mingw
+  - os: osx
+    env: JOB_NAME=make-gcc4.8
+  - os: osx
+    arch: ppc64le
+  - os: osx
+    compiler: gcc
  - os : linux
    arch: arm64
    env: JOB_NAME=cmake-mingw
@@ -61,6 +86,36 @@ matrix:
    env: JOB_NAME=make-gcc4.8
  - os: linux
    compiler: clang
+  # Exclude all but most unique cmake variants for pull requests, but build all in branches
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os : linux
+    arch: amd64
+    env: JOB_NAME=cmake
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os : linux
+    arch: amd64
+    env: JOB_NAME=cmake-gcc8
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os : linux
+    arch: amd64
+    env: JOB_NAME=cmake-gcc9
+  # Exclude most osx, arm64 and ppc64le tests for pull requests, but build in branches
+  # Temporarily disable ppc64le cmake test while snapd is broken
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: linux
+    arch: ppc64le
+    env: JOB_NAME=cmake
+  # Exclude all osx since it should be covered by CircleCI
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: osx
+    env: TEST_GROUP=platform_dependent
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: osx
+    env: JOB_NAME=cmake
+  # NB: the cmake build is a partial java test
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: osx
+    env: TEST_GROUP=1
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -69,6 +124,9 @@ matrix:
    os: linux
    arch: ppc64le
    env: TEST_GROUP=1
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: osx
+    env: TEST_GROUP=2
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -77,6 +135,9 @@ matrix:
    os: linux
    arch: ppc64le
    env: TEST_GROUP=2
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: osx
+    env: TEST_GROUP=3
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -85,6 +146,9 @@ matrix:
    os: linux
    arch: ppc64le
    env: TEST_GROUP=3
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: osx
+    env: TEST_GROUP=4
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -93,6 +157,9 @@ matrix:
    os: linux
    arch: ppc64le
    env: TEST_GROUP=4
+  - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/
+    os : osx
+    env: JOB_NAME=java_test
  - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/
    os : linux
    arch: arm64
@@ -101,6 +168,9 @@ matrix:
    os: linux
    arch: ppc64le
    env: JOB_NAME=java_test
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os : osx
+    env: JOB_NAME=lite_build
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -109,6 +179,9 @@ matrix:
    os: linux
    arch: ppc64le
    env: JOB_NAME=lite_build
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os : osx
+    env: JOB_NAME=examples
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -141,6 +214,9 @@ matrix:
    os: linux
    arch: ppc64le
    env: JOB_NAME=cmake-gcc9-c++20
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os : osx
+    env: JOB_NAME=status_checked
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -151,6 +227,9 @@ matrix:
    env: JOB_NAME=status_checked

 install:
+  - if [ "${TRAVIS_OS_NAME}" == osx ]; then
+      PATH=$PATH:/usr/local/opt/ccache/libexec;
+    fi
  - if [ "${JOB_NAME}" == cmake-gcc8 ]; then
      sudo apt-get install -y g++-8 || exit $?;
      CC=gcc-8 && CXX=g++-8;
@@ -166,21 +245,22 @@ install:
      sudo apt-get install -y g++-4.8 || exit $?;
      CC=gcc-4.8 && CXX=g++-4.8;
    fi
-  - |
-    if [[ "${JOB_NAME}" == cmake* ]]; then
-      sudo apt-get remove -y cmake cmake-data
-      export CMAKE_DEB="cmake-3.14.5-Linux-$(uname -m).deb"
-      export CMAKE_DEB_URL="https://rocksdb-deps.s3-us-west-2.amazonaws.com/cmake/${CMAKE_DEB}"
-      curl --silent --fail --show-error --location --output "${CMAKE_DEB}" "${CMAKE_DEB_URL}" || exit $?
-      sudo dpkg -i "${CMAKE_DEB}" || exit $?
-      which cmake && cmake --version
+  - if [[ "${JOB_NAME}" == cmake* ]] && [ "${TRAVIS_OS_NAME}" == linux ]; then
+      sudo apt-get install snapd && sudo snap install cmake --beta --classic || exit $?;
+      export PATH=/snap/bin:$PATH;
    fi
  - |
    if [[ "${JOB_NAME}" == java_test || "${JOB_NAME}" == cmake* ]]; then
      # Ensure JDK 8
-      sudo apt-get install -y openjdk-8-jdk || exit $?
-      export PATH=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin:$PATH
-      export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+      if [ "${TRAVIS_OS_NAME}" == osx ]; then
+        brew tap AdoptOpenJDK/openjdk || exit $?
+        brew cask install adoptopenjdk8 || exit $?
+        export JAVA_HOME=$(/usr/libexec/java_home)
+      else
+        sudo apt-get install -y openjdk-8-jdk || exit $?
+        export PATH=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin:$PATH
+        export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+      fi
      echo "JAVA_HOME=${JAVA_HOME}"
      which java && java -version
      which javac && javac -version
@@ -814,8 +814,6 @@ set(SOURCES
        utilities/transactions/lock/lock_manager.cc
        utilities/transactions/lock/point/point_lock_tracker.cc
        utilities/transactions/lock/point/point_lock_manager.cc
-        utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc
-        utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.cc
        utilities/transactions/optimistic_transaction_db_impl.cc
        utilities/transactions/optimistic_transaction.cc
        utilities/transactions/pessimistic_transaction.cc
@@ -833,7 +831,7 @@ set(SOURCES
        utilities/write_batch_with_index/write_batch_with_index_internal.cc
        $<TARGET_OBJECTS:build_version>)

-list(APPEND SOURCES
+list(APPEND SOURCE
  utilities/transactions/lock/range/range_tree/lib/locktree/concurrent_tree.cc
  utilities/transactions/lock/range/range_tree/lib/locktree/keyrange.cc
  utilities/transactions/lock/range/range_tree/lib/locktree/lock_request.cc
@@ -1176,7 +1174,6 @@ if(WITH_TESTS)
        table/table_test.cc
        table/block_fetcher_test.cc
        test_util/testutil_test.cc
-        trace_replay/block_cache_tracer_test.cc
        trace_replay/io_tracer_test.cc
        tools/block_cache_analyzer/block_cache_trace_analyzer_test.cc
        tools/io_tracer_parser_test.cc
@@ -1227,7 +1224,6 @@ if(WITH_TESTS)
        utilities/transactions/lock/point/point_lock_manager_test.cc
        utilities/transactions/write_prepared_transaction_test.cc
        utilities/transactions/write_unprepared_transaction_test.cc
-        utilities/transactions/lock/range/range_locking_test.cc
        utilities/ttl/ttl_test.cc
        utilities/write_batch_with_index/write_batch_with_index_test.cc
    )
@@ -1,32 +1,29 @@
 # Rocksdb Change Log
-## 6.17.3 (02/18/2021)
+## 6.16.5 (09/08/2021)
 ### Bug Fixes
-* Fix `WRITE_PREPARED`, `WRITE_UNPREPARED` TransactionDB `MultiGet()` may return uncommitted data with snapshot.
+* Fixed a bug affecting the batched `MultiGet` API when used with keys spanning multiple column families and `sorted_input == false`.

-## 6.17.2 (02/05/2021)
+## 6.16.4 (03/30/2021)
+### Bug Fixes
+* Fix build on ppc64 and musl build.
+
+## 6.16.3 (02/05/2021)
 ### Bug Fixes
 * Since 6.15.0, `TransactionDB` returns error `Status`es from calls to `DeleteRange()` and calls to `Write()` where the `WriteBatch` contains a range deletion. Previously such operations may have succeeded while not providing the expected transactional guarantees. There are certain cases where range deletion can still be used on such DBs; see the API doc on `TransactionDB::DeleteRange()` for details.
 * `OptimisticTransactionDB` now returns error `Status`es from calls to `DeleteRange()` and calls to `Write()` where the `WriteBatch` contains a range deletion. Previously such operations may have succeeded while not providing the expected transactional guarantees.

-## 6.17.1 (01/28/2021)
-### Behavior Changes
-* When retryable IO error occurs during compaction, it is mapped to soft error and set the BG error. However, auto resume is not called to clean the soft error since compaction will reschedule by itself. In this change, When retryable IO error occurs during compaction, BG error is not set. User will be informed the error via EventHelper.
-
-## 6.17.0 (01/15/2021)
-### Behavior Changes
-* When verifying full file checksum with `DB::VerifyFileChecksums()`, we now fail with `Status::InvalidArgument` if the name of the checksum generator used for verification does not match the name of the checksum generator used for protecting the file when it was created.
-* Since RocksDB does not continue write the same file if a file write fails for any reason, the file scope write IO error is treated the same as retryable IO error. More information about error handling of file scope IO error is included in `ErrorHandler::SetBGError`.
-
+## 6.16.2 (1/21/2021)
 ### Bug Fixes
-* Version older than 6.15 cannot decode VersionEdits `WalAddition` and `WalDeletion`, fixed this by changing the encoded format of them to be ignorable by older versions.
 * Fix a race condition between DB startups and shutdowns in managing the periodic background worker threads. One effect of this race condition could be the process being terminated.

-### Public API Change
-* Add a public API WriteBufferManager::dummy_entries_in_cache_usage() which reports the size of dummy entries stored in cache (passed to WriteBufferManager). Dummy entries are used to account for DataBlocks.
+## 6.16.1 (1/20/2021)
+### Bug Fixes
+* Version older than 6.15 cannot decode VersionEdits `WalAddition` and `WalDeletion`, fixed this by changing the encoded format of them to be ignorable by older versions.

 ## 6.16.0 (12/18/2020)
 ### Behavior Changes
 * Attempting to write a merge operand without explicitly configuring `merge_operator` now fails immediately, causing the DB to enter read-only mode. Previously, failure was deferred until the `merge_operator` was needed by a user read or a background operation.
+* Since RocksDB does not continue write the same file if a file write fails for any reason, the file scope write IO error is treated the same as retryable IO error. More information about error handling of file scope IO error is included in `ErrorHandler::SetBGError`.

 ### Bug Fixes
 * Truncated WALs ending in incomplete records can no longer produce gaps in the recovered data when `WALRecoveryMode::kPointInTimeRecovery` is used. Gaps are still possible when WALs are truncated exactly on record boundaries; for complete protection, users should enable `track_and_verify_wals_in_manifest`.
@@ -36,7 +33,6 @@
 * Fixed prefix extractor with timestamp issues.
 * Fixed a bug in atomic flush: in two-phase commit mode, the minimum WAL log number to keep is incorrect.
 * Fixed a bug related to checkpoint in PR7789: if there are multiple column families, and the checkpoint is not opened as read only, then in rare cases, data loss may happen in the checkpoint. Since backup engine relies on checkpoint, it may also be affected.
-* When ldb --try_load_options is used with the --column_family option, the ColumnFamilyOptions for the specified column family was not loaded from the OPTIONS file. Fix it so its loaded from OPTIONS and then overridden with command line overrides.

 ### New Features
 * User defined timestamp feature supports `CompactRange` and `GetApproximateSizes`.
@@ -45,10 +41,7 @@

 ### Public API Change
 * Deprecated public but rarely-used FilterBitsBuilder::CalculateNumEntry, which is replaced with ApproximateNumEntries taking a size_t parameter and returning size_t.
-* To improve portability the functions `Env::GetChildren` and `Env::GetChildrenFileAttributes` will no longer return entries for the special directories `.` or `..`.
 * Added a new option `track_and_verify_wals_in_manifest`. If `true`, the log numbers and sizes of the synced WALs are tracked in MANIFEST, then during DB recovery, if a synced WAL is missing from disk, or the WAL's size does not match the recorded size in MANIFEST, an error will be reported and the recovery will be aborted. Note that this option does not work with secondary instance.
-* `rocksdb_approximate_sizes` and `rocksdb_approximate_sizes_cf` in the C API now requires an error pointer (`char** errptr`) for receiving any error.
-* All overloads of DB::GetApproximateSizes now return Status, so that any failure to obtain the sizes is indicated to the caller.

 ## 6.15.0 (11/13/2020)
 ### Bug Fixes
@@ -190,11 +190,6 @@ else
 endif

 ifdef ASSERT_STATUS_CHECKED
-# For ASC, turn off constructor elision, preventing the case where a constructor returned
-# by a method may pass the ASC check if the status is checked in the inner method.  Forcing
-# the copy constructor to be invoked disables the optimization and will cause the calling method
-# to check the status in order to prevent an error from being raised.
-PLATFORM_CXXFLAGS += -fno-elide-constructors
 ifeq ($(filter -DROCKSDB_ASSERT_STATUS_CHECKED,$(OPT)),)
 	OPT += -DROCKSDB_ASSERT_STATUS_CHECKED
 endif
@@ -569,7 +564,6 @@ PARALLEL_TEST = \
 	table_test \
 	transaction_test \
 	point_lock_manager_test \
-	range_locking_test \
 	write_prepared_transaction_test \
 	write_unprepared_transaction_test \

@@ -598,7 +592,6 @@ ifdef ASSERT_STATUS_CHECKED
 		blob_file_reader_test \
 		bloom_test \
 		cassandra_format_test \
-		cassandra_functional_test \
 		cassandra_row_merge_test \
 		cassandra_serialize_test \
 		cleanable_test \
@@ -607,23 +600,10 @@ ifdef ASSERT_STATUS_CHECKED
 		crc32c_test \
 		dbformat_test \
 		db_basic_test \
-		compact_files_test \
-		compaction_picker_test \
-		comparator_db_test \
-		db_encryption_test \
-		db_iter_test \
-		db_iter_stress_test \
-		db_log_iter_test \
-		db_bloom_filter_test \
 		db_blob_basic_test \
 		db_blob_index_test \
 		db_block_cache_test \
-		db_compaction_test \
-		db_compaction_filter_test \
-		db_dynamic_level_test \
 		db_flush_test \
-		db_inplace_update_test \
-		db_io_failure_test \
 		db_iterator_test \
 		db_logical_block_size_cache_test \
 		db_memtable_test \
@@ -632,28 +612,10 @@ ifdef ASSERT_STATUS_CHECKED
 		db_wal_test \
 		db_with_timestamp_basic_test \
 		db_with_timestamp_compaction_test \
-		db_write_test \
 		db_options_test \
 		db_properties_test \
-		db_range_del_test \
 		db_secondary_test \
-		deletefile_test \
-		external_sst_file_test \
 		options_file_test \
-		db_sst_test \
-		db_statistics_test \
-		db_table_properties_test \
-		db_tailing_iter_test \
-		fault_injection_test \
-		listener_test \
-		log_test \
-		manual_compaction_test \
-		obsolete_files_test \
-		perf_context_test \
-		periodic_work_scheduler_test \
-		perf_context_test \
-		version_set_test \
-		wal_manager_test \
 		defer_test \
 		filename_test \
 		dynamic_bloom_test \
@@ -665,7 +627,6 @@ ifdef ASSERT_STATUS_CHECKED
 		external_sst_file_basic_test \
 		auto_roll_logger_test \
 		file_indexer_test \
-		delete_scheduler_test \
 		flush_job_test \
 		hash_table_test \
 		hash_test \
@@ -676,7 +637,6 @@ ifdef ASSERT_STATUS_CHECKED
 		iostats_context_test \
 		ldb_cmd_test \
 		memkind_kmem_allocator_test \
-		merge_test \
 		merger_test \
 		mock_env_test \
 		object_registry_test \
@@ -689,7 +649,6 @@ ifdef ASSERT_STATUS_CHECKED
 		options_settable_test \
 		options_test \
 		point_lock_manager_test \
-		random_access_file_reader_test \
 		random_test \
 		range_del_aggregator_test \
 		sst_file_reader_test \
@@ -698,11 +657,9 @@ ifdef ASSERT_STATUS_CHECKED
 		ribbon_test \
 		skiplist_test \
 		slice_test \
-		slice_transform_test \
 		sst_dump_test \
 		statistics_test \
 		stats_history_test \
-		stringappend_test \
 		thread_local_test \
 		trace_analyzer_test \
 		transaction_test \
@@ -720,43 +677,27 @@ ifdef ASSERT_STATUS_CHECKED
 		version_builder_test \
 		version_edit_test \
 		work_queue_test \
-		write_buffer_manager_test \
 		write_controller_test \
 		write_prepared_transaction_test \
 		write_unprepared_transaction_test \
 		compaction_iterator_test \
 		compaction_job_test \
 		compaction_job_stats_test \
-		io_tracer_test \
-		io_tracer_parser_test \
-		prefetch_test \
+	        io_tracer_test \
 		merge_helper_test \
 		memtable_list_test \
 		flush_job_test \
 		block_based_filter_block_test \
 		block_fetcher_test \
-		block_test \
-		data_block_hash_index_test \
 		full_filter_block_test \
 		partitioned_filter_block_test \
 		column_family_test \
 		file_reader_writer_test \
-		rate_limiter_test \
 		corruption_test \
-		reduce_levels_test \
-		thread_list_test \
-		compact_on_deletion_collector_test \
 		db_universal_compaction_test \
 		import_column_family_test \
-		option_change_migration_test \
-		cuckoo_table_builder_test \
-		cuckoo_table_db_test \
-		cuckoo_table_reader_test \
 		memory_test \
 		table_test \
-		backupable_db_test \
-		blob_db_test \
-		ttl_test \
 		write_batch_test \
 		write_batch_with_index_test \

@@ -1991,9 +1932,6 @@ blob_db_test: $(OBJ_DIR)/utilities/blob_db/blob_db_test.o $(TEST_LIBRARY) $(LIBR
 repeatable_thread_test: $(OBJ_DIR)/util/repeatable_thread_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-range_locking_test: utilities/transactions/lock/range/range_locking_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 range_tombstone_fragmenter_test: $(OBJ_DIR)/db/range_tombstone_fragmenter_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

@@ -2155,11 +2093,11 @@ BZIP2_DOWNLOAD_BASE ?= https://sourceware.org/pub/bzip2
 SNAPPY_VER ?= 1.1.8
 SNAPPY_SHA256 ?= 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f
 SNAPPY_DOWNLOAD_BASE ?= https://github.com/google/snappy/archive
-LZ4_VER ?= 1.9.3
-LZ4_SHA256 ?= 030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1
+LZ4_VER ?= 1.9.2
+LZ4_SHA256 ?= 658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc
 LZ4_DOWNLOAD_BASE ?= https://github.com/lz4/lz4/archive
-ZSTD_VER ?= 1.4.9
-ZSTD_SHA256 ?= acf714d98e3db7b876e5b540cbf6dee298f60eb3c0723104f6d3f065cd60d6a8
+ZSTD_VER ?= 1.4.5
+ZSTD_SHA256 ?= 734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
 ZSTD_DOWNLOAD_BASE ?= https://github.com/facebook/zstd/archive
 CURL_SSL_OPTS ?= --tlsv1

@@ -2288,7 +2226,7 @@ endif
 	$(MAKE) rocksdbjavastatic_javalib

 rocksdbjavastatic_javalib:
-	cd java; SHA256_CMD='$(SHA256_CMD)' $(MAKE) javalib
+	cd java;$(MAKE) javalib
 	rm -f java/target/$(ROCKSDBJNILIB)
 	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC \
 	  -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \
@@ -2382,7 +2320,7 @@ rocksdbjava: $(LIB_OBJECTS)
 ifeq ($(JAVA_HOME),)
 	$(error JAVA_HOME is not set)
 endif
-	$(AM_V_GEN)cd java; SHA256_CMD='$(SHA256_CMD)' $(MAKE) javalib;
+	$(AM_V_GEN)cd java;$(MAKE) javalib;
 	$(AM_V_at)rm -f ./java/target/$(ROCKSDBJNILIB)
 	$(AM_V_at)$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIB_OBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
 	$(AM_V_at)cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md
@@ -2394,13 +2332,13 @@ jclean:
 	cd java;$(MAKE) clean;

 jtest_compile: rocksdbjava
-	cd java; SHA256_CMD='$(SHA256_CMD)' $(MAKE) java_test
+	cd java;$(MAKE) java_test

 jtest_run:
 	cd java;$(MAKE) run_test

 jtest: rocksdbjava
-	cd java;$(MAKE) sample; SHA256_CMD='$(SHA256_CMD)' $(MAKE) test;
+	cd java;$(MAKE) sample;$(MAKE) test;
 	$(PYTHON) tools/check_all_python.py # TODO peterd: find a better place for this check in CI targets

 jdb_bench:
@@ -400,8 +400,6 @@ cpp_library(
        "utilities/transactions/lock/range/range_tree/lib/standalone_port.cc",
        "utilities/transactions/lock/range/range_tree/lib/util/dbt.cc",
        "utilities/transactions/lock/range/range_tree/lib/util/memarena.cc",
-        "utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc",
-        "utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.cc",
        "utilities/transactions/optimistic_transaction.cc",
        "utilities/transactions/optimistic_transaction_db_impl.cc",
        "utilities/transactions/pessimistic_transaction.cc",
@@ -704,8 +702,6 @@ cpp_library(
        "utilities/transactions/lock/range/range_tree/lib/standalone_port.cc",
        "utilities/transactions/lock/range/range_tree/lib/util/dbt.cc",
        "utilities/transactions/lock/range/range_tree/lib/util/memarena.cc",
-        "utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc",
-        "utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.cc",
        "utilities/transactions/optimistic_transaction.cc",
        "utilities/transactions/optimistic_transaction_db_impl.cc",
        "utilities/transactions/pessimistic_transaction.cc",
@@ -1804,13 +1800,6 @@ ROCKS_TESTS = [
        [],
        [],
    ],
-    [
-        "range_locking_test",
-        "utilities/transactions/lock/range/range_locking_test.cc",
-        "parallel",
-        [],
-        [],
-    ],
    [
        "range_tombstone_fragmenter_test",
        "db/range_tombstone_fragmenter_test.cc",
@@ -45,13 +45,8 @@ if test -z "$OUTPUT"; then
  exit 1
 fi

-# we depend on C++11, but should be compatible with newer standards
-if [ "$ROCKSDB_CXX_STANDARD" ]; then
-  PLATFORM_CXXFLAGS="-std=$ROCKSDB_CXX_STANDARD"
-else
-  PLATFORM_CXXFLAGS="-std=c++11"
-fi
-
+# we depend on C++11
+PLATFORM_CXXFLAGS="-std=c++11"
 # we currently depend on POSIX platform
 COMMON_FLAGS="-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX"

@@ -15,6 +15,7 @@
 #include "db/blob/blob_index.h"
 #include "db/blob/blob_log_format.h"
 #include "db/blob/blob_log_sequential_reader.h"
+#include "env/composite_env_wrapper.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
 #include "file/random_access_file_reader.h"
@@ -39,9 +40,7 @@ class TestFileNumberGenerator {

 class BlobFileBuilderTest : public testing::Test {
 protected:
-  BlobFileBuilderTest() : mock_env_(Env::Default()) {
-    fs_ = mock_env_.GetFileSystem();
-  }
+  BlobFileBuilderTest() : mock_env_(Env::Default()), fs_(&mock_env_) {}

  void VerifyBlobFile(uint64_t blob_file_number,
                      const std::string& blob_file_path,
@@ -55,7 +54,7 @@ class BlobFileBuilderTest : public testing::Test {
    std::unique_ptr<FSRandomAccessFile> file;
    constexpr IODebugContext* dbg = nullptr;
    ASSERT_OK(
-        fs_->NewRandomAccessFile(blob_file_path, file_options_, &file, dbg));
+        fs_.NewRandomAccessFile(blob_file_path, file_options_, &file, dbg));

    std::unique_ptr<RandomAccessFileReader> file_reader(
        new RandomAccessFileReader(std::move(file), blob_file_path,
@@ -109,7 +108,7 @@ class BlobFileBuilderTest : public testing::Test {
  }

  MockEnv mock_env_;
-  std::shared_ptr<FileSystem> fs_;
+  LegacyFileSystemWrapper fs_;
  FileOptions file_options_;
 };

@@ -139,7 +138,7 @@ TEST_F(BlobFileBuilderTest, BuildAndCheckOneFile) {
  std::vector<std::string> blob_file_paths;
  std::vector<BlobFileAddition> blob_file_additions;

-  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, fs_.get(),
+  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, &fs_,
                          &immutable_cf_options, &mutable_cf_options,
                          &file_options_, job_id, column_family_id,
                          column_family_name, io_priority, write_hint,
@@ -222,7 +221,7 @@ TEST_F(BlobFileBuilderTest, BuildAndCheckMultipleFiles) {
  std::vector<std::string> blob_file_paths;
  std::vector<BlobFileAddition> blob_file_additions;

-  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, fs_.get(),
+  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, &fs_,
                          &immutable_cf_options, &mutable_cf_options,
                          &file_options_, job_id, column_family_id,
                          column_family_name, io_priority, write_hint,
@@ -307,7 +306,7 @@ TEST_F(BlobFileBuilderTest, InlinedValues) {
  std::vector<std::string> blob_file_paths;
  std::vector<BlobFileAddition> blob_file_additions;

-  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, fs_.get(),
+  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, &fs_,
                          &immutable_cf_options, &mutable_cf_options,
                          &file_options_, job_id, column_family_id,
                          column_family_name, io_priority, write_hint,
@@ -359,7 +358,7 @@ TEST_F(BlobFileBuilderTest, Compression) {
  std::vector<std::string> blob_file_paths;
  std::vector<BlobFileAddition> blob_file_additions;

-  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, fs_.get(),
+  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, &fs_,
                          &immutable_cf_options, &mutable_cf_options,
                          &file_options_, job_id, column_family_id,
                          column_family_name, io_priority, write_hint,
@@ -441,7 +440,7 @@ TEST_F(BlobFileBuilderTest, CompressionError) {
  std::vector<std::string> blob_file_paths;
  std::vector<BlobFileAddition> blob_file_additions;

-  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, fs_.get(),
+  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, &fs_,
                          &immutable_cf_options, &mutable_cf_options,
                          &file_options_, job_id, column_family_id,
                          column_family_name, io_priority, write_hint,
@@ -518,7 +517,7 @@ TEST_F(BlobFileBuilderTest, Checksum) {
  std::vector<std::string> blob_file_paths;
  std::vector<BlobFileAddition> blob_file_additions;

-  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, fs_.get(),
+  BlobFileBuilder builder(TestFileNumberGenerator(), &mock_env_, &fs_,
                          &immutable_cf_options, &mutable_cf_options,
                          &file_options_, job_id, column_family_id,
                          column_family_name, io_priority, write_hint,
@@ -572,12 +571,12 @@ class BlobFileBuilderIOErrorTest
  BlobFileBuilderIOErrorTest()
      : mock_env_(Env::Default()),
        fault_injection_env_(&mock_env_),
-        fs_(fault_injection_env_.GetFileSystem()),
+        fs_(&fault_injection_env_),
        sync_point_(GetParam()) {}

  MockEnv mock_env_;
  FaultInjectionTestEnv fault_injection_env_;
-  std::shared_ptr<FileSystem> fs_;
+  LegacyFileSystemWrapper fs_;
  FileOptions file_options_;
  std::string sync_point_;
 };
@@ -617,7 +616,7 @@ TEST_P(BlobFileBuilderIOErrorTest, IOError) {
  std::vector<BlobFileAddition> blob_file_additions;

  BlobFileBuilder builder(TestFileNumberGenerator(), &fault_injection_env_,
-                          fs_.get(), &immutable_cf_options, &mutable_cf_options,
+                          &fs_, &immutable_cf_options, &mutable_cf_options,
                          &file_options_, job_id, column_family_id,
                          column_family_name, io_priority, write_hint,
                          &blob_file_paths, &blob_file_additions);
@@ -1388,39 +1388,34 @@ char* rocksdb_property_value_cf(
  }
 }

-void rocksdb_approximate_sizes(rocksdb_t* db, int num_ranges,
-                               const char* const* range_start_key,
-                               const size_t* range_start_key_len,
-                               const char* const* range_limit_key,
-                               const size_t* range_limit_key_len,
-                               uint64_t* sizes, char** errptr) {
+void rocksdb_approximate_sizes(
+    rocksdb_t* db,
+    int num_ranges,
+    const char* const* range_start_key, const size_t* range_start_key_len,
+    const char* const* range_limit_key, const size_t* range_limit_key_len,
+    uint64_t* sizes) {
  Range* ranges = new Range[num_ranges];
  for (int i = 0; i < num_ranges; i++) {
    ranges[i].start = Slice(range_start_key[i], range_start_key_len[i]);
    ranges[i].limit = Slice(range_limit_key[i], range_limit_key_len[i]);
  }
-  Status s = db->rep->GetApproximateSizes(ranges, num_ranges, sizes);
-  if (!s.ok()) {
-    SaveError(errptr, s);
-  }
+  db->rep->GetApproximateSizes(ranges, num_ranges, sizes);
  delete[] ranges;
 }

 void rocksdb_approximate_sizes_cf(
-    rocksdb_t* db, rocksdb_column_family_handle_t* column_family,
-    int num_ranges, const char* const* range_start_key,
-    const size_t* range_start_key_len, const char* const* range_limit_key,
-    const size_t* range_limit_key_len, uint64_t* sizes, char** errptr) {
+    rocksdb_t* db,
+    rocksdb_column_family_handle_t* column_family,
+    int num_ranges,
+    const char* const* range_start_key, const size_t* range_start_key_len,
+    const char* const* range_limit_key, const size_t* range_limit_key_len,
+    uint64_t* sizes) {
  Range* ranges = new Range[num_ranges];
  for (int i = 0; i < num_ranges; i++) {
    ranges[i].start = Slice(range_start_key[i], range_start_key_len[i]);
    ranges[i].limit = Slice(range_limit_key[i], range_limit_key_len[i]);
  }
-  Status s = db->rep->GetApproximateSizes(column_family->rep, ranges,
-                                          num_ranges, sizes);
-  if (!s.ok()) {
-    SaveError(errptr, s);
-  }
+  db->rep->GetApproximateSizes(column_family->rep, ranges, num_ranges, sizes);
  delete[] ranges;
 }

@@ -988,9 +988,7 @@ int main(int argc, char** argv) {
                  &err);
      CheckNoError(err);
    }
-    rocksdb_approximate_sizes(db, 2, start, start_len, limit, limit_len, sizes,
-                              &err);
-    CheckNoError(err);
+    rocksdb_approximate_sizes(db, 2, start, start_len, limit, limit_len, sizes);
    CheckCondition(sizes[0] > 0);
    CheckCondition(sizes[1] > 0);
  }
@@ -335,9 +335,7 @@ ColumnFamilyOptions SanitizeOptions(const ImmutableDBOptions& db_options,
  // was not used)
  auto sfm = static_cast<SstFileManagerImpl*>(db_options.sst_file_manager.get());
  for (size_t i = 0; i < result.cf_paths.size(); i++) {
-    DeleteScheduler::CleanupDirectory(db_options.env, sfm,
-                                      result.cf_paths[i].path)
-        .PermitUncheckedError();
+    DeleteScheduler::CleanupDirectory(db_options.env, sfm, result.cf_paths[i].path);
  }
 #endif

@@ -73,7 +73,7 @@ class ColumnFamilyTestBase : public testing::Test {
    db_options_.create_if_missing = true;
    db_options_.fail_if_options_file_error = true;
    db_options_.env = env_;
-    EXPECT_OK(DestroyDB(dbname_, Options(db_options_, column_family_options_)));
+    DestroyDB(dbname_, Options(db_options_, column_family_options_));
  }

  ~ColumnFamilyTestBase() override {
@@ -187,8 +187,8 @@ class ColumnFamilyTestBase : public testing::Test {
    std::vector<ColumnFamilyDescriptor> column_families;
    names_.clear();
    for (size_t i = 0; i < cf.size(); ++i) {
-      column_families.emplace_back(
-          cf[i], options.size() == 0 ? column_family_options_ : options[i]);
+      column_families.push_back(ColumnFamilyDescriptor(
+          cf[i], options.size() == 0 ? column_family_options_ : options[i]));
      names_.push_back(cf[i]);
    }
    return DB::Open(db_options_, dbname_, column_families, &handles_, &db_);
@@ -199,8 +199,8 @@ class ColumnFamilyTestBase : public testing::Test {
    std::vector<ColumnFamilyDescriptor> column_families;
    names_.clear();
    for (size_t i = 0; i < cf.size(); ++i) {
-      column_families.emplace_back(
-          cf[i], options.size() == 0 ? column_family_options_ : options[i]);
+      column_families.push_back(ColumnFamilyDescriptor(
+          cf[i], options.size() == 0 ? column_family_options_ : options[i]));
      names_.push_back(cf[i]);
    }
    return DB::OpenForReadOnly(db_options_, dbname_, column_families, &handles_,
@@ -653,8 +653,8 @@ TEST_P(FlushEmptyCFTestWithParam, FlushEmptyCFTest) {
  // after flushing file B is deleted. At the same time, the min log number of
  // default CF is not written to manifest. Log file A still remains.
  // Flushed to SST file Y.
-  ASSERT_OK(Flush(1));
-  ASSERT_OK(Flush(0));
+  Flush(1);
+  Flush(0);
  ASSERT_OK(Put(1, "bar", "v3"));  // seqID 4
  ASSERT_OK(Put(1, "foo", "v4"));  // seqID 5
  ASSERT_OK(db_->FlushWAL(/*sync=*/false));
@@ -708,15 +708,15 @@ TEST_P(FlushEmptyCFTestWithParam, FlushEmptyCFTest2) {
  // and is set to current. Both CFs' min log number is set to file C so after
  // flushing file B is deleted. Log file A still remains.
  // Flushed to SST file Y.
-  ASSERT_OK(Flush(1));
+  Flush(1);
  ASSERT_OK(Put(0, "bar", "v2"));  // seqID 4
  ASSERT_OK(Put(2, "bar", "v2"));  // seqID 5
  ASSERT_OK(Put(1, "bar", "v3"));  // seqID 6
  // Flushing all column families. This forces all CFs' min log to current. This
  // is written to the manifest file. Log file C is cleared.
-  ASSERT_OK(Flush(0));
-  ASSERT_OK(Flush(1));
-  ASSERT_OK(Flush(2));
+  Flush(0);
+  Flush(1);
+  Flush(2);
  // Write to log file D
  ASSERT_OK(Put(1, "bar", "v4"));  // seqID 7
  ASSERT_OK(Put(1, "bar", "v5"));  // seqID 8
@@ -898,7 +898,9 @@ TEST_P(ColumnFamilyTest, IgnoreRecoveredLog) {
  std::vector<std::string> old_files;
  ASSERT_OK(env_->GetChildren(backup_logs, &old_files));
  for (auto& file : old_files) {
-    ASSERT_OK(env_->DeleteFile(backup_logs + "/" + file));
+    if (file != "." && file != "..") {
+      ASSERT_OK(env_->DeleteFile(backup_logs + "/" + file));
+    }
  }

  column_family_options_.merge_operator =
@@ -927,7 +929,9 @@ TEST_P(ColumnFamilyTest, IgnoreRecoveredLog) {
  std::vector<std::string> logs;
  ASSERT_OK(env_->GetChildren(db_options_.wal_dir, &logs));
  for (auto& log : logs) {
-    CopyFile(db_options_.wal_dir + "/" + log, backup_logs + "/" + log);
+    if (log != ".." && log != ".") {
+      CopyFile(db_options_.wal_dir + "/" + log, backup_logs + "/" + log);
+    }
  }

  // recover the DB
@@ -952,7 +956,9 @@ TEST_P(ColumnFamilyTest, IgnoreRecoveredLog) {
    if (iter == 0) {
      // copy the logs from backup back to wal dir
      for (auto& log : logs) {
-        CopyFile(backup_logs + "/" + log, db_options_.wal_dir + "/" + log);
+        if (log != ".." && log != ".") {
+          CopyFile(backup_logs + "/" + log, db_options_.wal_dir + "/" + log);
+        }
      }
    }
  }
@@ -979,7 +985,7 @@ TEST_P(ColumnFamilyTest, FlushTest) {
    for (int i = 0; i < 3; ++i) {
      uint64_t max_total_in_memory_state =
          MaxTotalInMemoryState();
-      ASSERT_OK(Flush(i));
+      Flush(i);
      AssertMaxTotalInMemoryState(max_total_in_memory_state);
    }
    ASSERT_OK(Put(1, "foofoo", "bar"));
@@ -1087,7 +1093,7 @@ TEST_P(ColumnFamilyTest, CrashAfterFlush) {
  ASSERT_OK(batch.Put(handles_[0], Slice("foo"), Slice("bar")));
  ASSERT_OK(batch.Put(handles_[1], Slice("foo"), Slice("bar")));
  ASSERT_OK(db_->Write(WriteOptions(), &batch));
-  ASSERT_OK(Flush(0));
+  Flush(0);
  fault_env->SetFilesystemActive(false);

  std::vector<std::string> names;
@@ -1097,7 +1103,7 @@ TEST_P(ColumnFamilyTest, CrashAfterFlush) {
    }
  }
  Close();
-  ASSERT_OK(fault_env->DropUnsyncedFileData());
+  fault_env->DropUnsyncedFileData();
  fault_env->ResetState();
  Open(names, {});

@@ -2230,7 +2236,7 @@ TEST_P(ColumnFamilyTest, FlushStaleColumnFamilies) {
  // files for column family [one], because it's empty
  AssertCountLiveFiles(4);

-  ASSERT_OK(Flush(0));
+  Flush(0);
  ASSERT_EQ(0, dbfull()->TEST_total_log_size());
  Close();
 }
@@ -3034,7 +3040,7 @@ TEST_P(ColumnFamilyTest, IteratorCloseWALFile1) {
  Iterator* it = db_->NewIterator(ReadOptions(), handles_[1]);
  ASSERT_OK(it->status());
  // A flush will make `it` hold the last reference of its super version.
-  ASSERT_OK(Flush(1));
+  Flush(1);

  ASSERT_OK(Put(1, "fodor", "mirko"));
  ASSERT_OK(Put(0, "fodor", "mirko"));
@@ -3087,7 +3093,7 @@ TEST_P(ColumnFamilyTest, IteratorCloseWALFile2) {
  Iterator* it = db_->NewIterator(ro, handles_[1]);
  ASSERT_OK(it->status());
  // A flush will make `it` hold the last reference of its super version.
-  ASSERT_OK(Flush(1));
+  Flush(1);

  ASSERT_OK(Put(1, "fodor", "mirko"));
  ASSERT_OK(Put(0, "fodor", "mirko"));
@@ -3141,7 +3147,7 @@ TEST_P(ColumnFamilyTest, ForwardIteratorCloseWALFile) {
  CreateColumnFamilies({"one"});
  ASSERT_OK(Put(1, "fodor", "mirko"));
  ASSERT_OK(Put(1, "fodar2", "mirko"));
-  ASSERT_OK(Flush(1));
+  Flush(1);

  // Create an iterator holding the current super version, as well as
  // the SST file just flushed.
@@ -3153,7 +3159,7 @@ TEST_P(ColumnFamilyTest, ForwardIteratorCloseWALFile) {

  ASSERT_OK(Put(1, "fodor", "mirko"));
  ASSERT_OK(Put(1, "fodar2", "mirko"));
-  ASSERT_OK(Flush(1));
+  Flush(1);

  WaitForCompaction();

@@ -3226,9 +3232,9 @@ TEST_P(ColumnFamilyTest, LogSyncConflictFlush) {
  ROCKSDB_NAMESPACE::port::Thread thread([&] { ASSERT_OK(db_->SyncWAL()); });

  TEST_SYNC_POINT("ColumnFamilyTest::LogSyncConflictFlush:1");
-  ASSERT_OK(Flush(1));
+  Flush(1);
  ASSERT_OK(Put(1, "foo", "bar"));
-  ASSERT_OK(Flush(1));
+  Flush(1);

  TEST_SYNC_POINT("ColumnFamilyTest::LogSyncConflictFlush:2");

@@ -3250,7 +3256,7 @@ TEST_P(ColumnFamilyTest, DISABLED_LogTruncationTest) {
  Build(0, 100);

  // Flush the 0th column family to force a roll of the wal log
-  ASSERT_OK(Flush(0));
+  Flush(0);

  // Add some more entries
  Build(100, 100);
@@ -3326,14 +3332,14 @@ TEST_P(ColumnFamilyTest, DefaultCfPathsTest) {

  // Fill Column family 1.
  PutRandomData(1, 100, 100);
-  ASSERT_OK(Flush(1));
+  Flush(1);

  ASSERT_EQ(1, GetSstFileCount(cf_opt1.cf_paths[0].path));
  ASSERT_EQ(0, GetSstFileCount(dbname_));

  // Fill column family 2
  PutRandomData(2, 100, 100);
-  ASSERT_OK(Flush(2));
+  Flush(2);

  // SST from Column family 2 should be generated in
  // db_paths which is dbname_ in this case.
@@ -3352,14 +3358,14 @@ TEST_P(ColumnFamilyTest, MultipleCFPathsTest) {
  Reopen({ColumnFamilyOptions(), cf_opt1, cf_opt2});

  PutRandomData(1, 100, 100, true /* save */);
-  ASSERT_OK(Flush(1));
+  Flush(1);

  // Check that files are generated in appropriate paths.
  ASSERT_EQ(1, GetSstFileCount(cf_opt1.cf_paths[0].path));
  ASSERT_EQ(0, GetSstFileCount(dbname_));

  PutRandomData(2, 100, 100, true /* save */);
-  ASSERT_OK(Flush(2));
+  Flush(2);

  ASSERT_EQ(1, GetSstFileCount(cf_opt2.cf_paths[0].path));
  ASSERT_EQ(0, GetSstFileCount(dbname_));
@@ -91,9 +91,9 @@ TEST_F(CompactFilesTest, L0ConflictsFiles) {
  // create couple files
  // Background compaction starts and waits in BackgroundCallCompaction:0
  for (int i = 0; i < kLevel0Trigger * 4; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), ToString(i), ""));
-    ASSERT_OK(db->Put(WriteOptions(), ToString(100 - i), ""));
-    ASSERT_OK(db->Flush(FlushOptions()));
+    db->Put(WriteOptions(), ToString(i), "");
+    db->Put(WriteOptions(), ToString(100 - i), "");
+    db->Flush(FlushOptions());
  }

  ROCKSDB_NAMESPACE::ColumnFamilyMetaData meta;
@@ -138,18 +138,18 @@ TEST_F(CompactFilesTest, ObsoleteFiles) {
  DB* db = nullptr;
  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
-  ASSERT_OK(s);
-  ASSERT_NE(db, nullptr);
+  assert(s.ok());
+  assert(db);

  // create couple files
  for (int i = 1000; i < 2000; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), ToString(i),
-                      std::string(kWriteBufferSize / 10, 'a' + (i % 26))));
+    db->Put(WriteOptions(), ToString(i),
+            std::string(kWriteBufferSize / 10, 'a' + (i % 26)));
  }

  auto l0_files = collector->GetFlushedFiles();
  ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files, 1));
-  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForCompact());
+  static_cast_with_check<DBImpl>(db)->TEST_WaitForCompact();

  // verify all compaction input files are deleted
  for (auto fname : l0_files) {
@@ -182,17 +182,15 @@ TEST_F(CompactFilesTest, NotCutOutputOnLevel0) {

  // create couple files
  for (int i = 0; i < 500; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), ToString(i),
-                      std::string(1000, 'a' + (i % 26))));
+    db->Put(WriteOptions(), ToString(i), std::string(1000, 'a' + (i % 26)));
  }
-  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable());
+  static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable();
  auto l0_files_1 = collector->GetFlushedFiles();
  collector->ClearFlushedFiles();
  for (int i = 0; i < 500; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), ToString(i),
-                      std::string(1000, 'a' + (i % 26))));
+    db->Put(WriteOptions(), ToString(i), std::string(1000, 'a' + (i % 26)));
  }
-  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable());
+  static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable();
  auto l0_files_2 = collector->GetFlushedFiles();
  ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files_1, 0));
  ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files_2, 0));
@@ -215,13 +213,13 @@ TEST_F(CompactFilesTest, CapturingPendingFiles) {
  DB* db = nullptr;
  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
-  ASSERT_OK(s);
+  assert(s.ok());
  assert(db);

  // Create 5 files.
  for (int i = 0; i < 5; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), "key" + ToString(i), "value"));
-    ASSERT_OK(db->Flush(FlushOptions()));
+    db->Put(WriteOptions(), "key" + ToString(i), "value");
+    db->Flush(FlushOptions());
  }

  auto l0_files = collector->GetFlushedFiles();
@@ -239,8 +237,8 @@ TEST_F(CompactFilesTest, CapturingPendingFiles) {

  // In the meantime flush another file.
  TEST_SYNC_POINT("CompactFilesTest.CapturingPendingFiles:0");
-  ASSERT_OK(db->Put(WriteOptions(), "key5", "value"));
-  ASSERT_OK(db->Flush(FlushOptions()));
+  db->Put(WriteOptions(), "key5", "value");
+  db->Flush(FlushOptions());
  TEST_SYNC_POINT("CompactFilesTest.CapturingPendingFiles:1");

  compaction_thread.join();
@@ -251,7 +249,7 @@ TEST_F(CompactFilesTest, CapturingPendingFiles) {

  // Make sure we can reopen the DB.
  s = DB::Open(options, db_name_, &db);
-  ASSERT_OK(s);
+  ASSERT_TRUE(s.ok());
  assert(db);
  delete db;
 }
@@ -295,8 +293,8 @@ TEST_F(CompactFilesTest, CompactionFilterWithGetSv) {
  cf->SetDB(db);

  // Write one L0 file
-  ASSERT_OK(db->Put(WriteOptions(), "K1", "V1"));
-  ASSERT_OK(db->Flush(FlushOptions()));
+  db->Put(WriteOptions(), "K1", "V1");
+  db->Flush(FlushOptions());

  // Compact all L0 files using CompactFiles
  ROCKSDB_NAMESPACE::ColumnFamilyMetaData meta;
@@ -339,8 +337,8 @@ TEST_F(CompactFilesTest, SentinelCompressionType) {
    DB* db = nullptr;
    ASSERT_OK(DB::Open(options, db_name_, &db));

-    ASSERT_OK(db->Put(WriteOptions(), "key", "val"));
-    ASSERT_OK(db->Flush(FlushOptions()));
+    db->Put(WriteOptions(), "key", "val");
+    db->Flush(FlushOptions());

    auto l0_files = collector->GetFlushedFiles();
    ASSERT_EQ(1, l0_files.size());
@@ -379,15 +377,14 @@ TEST_F(CompactFilesTest, GetCompactionJobInfo) {
  DB* db = nullptr;
  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
-  ASSERT_OK(s);
+  assert(s.ok());
  assert(db);

  // create couple files
  for (int i = 0; i < 500; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), ToString(i),
-                      std::string(1000, 'a' + (i % 26))));
+    db->Put(WriteOptions(), ToString(i), std::string(1000, 'a' + (i % 26)));
  }
-  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable());
+  static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable();
  auto l0_files_1 = collector->GetFlushedFiles();
  CompactionOptions co;
  co.compression = CompressionType::kLZ4Compression;
@@ -82,11 +82,6 @@ class CompactedDBImpl : public DBImpl {
                       ColumnFamilyHandle* /*column_family*/) override {
    return Status::NotSupported("Not supported in compacted db mode.");
  }
-
-  virtual Status SyncWAL() override {
-    return Status::NotSupported("Not supported in compacted db mode.");
-  }
-
  using DB::IngestExternalFile;
  virtual Status IngestExternalFile(
      ColumnFamilyHandle* /*column_family*/,
@@ -1500,18 +1500,7 @@ Status CompactionJob::FinishCompactionOutputFile(
    std::string fname =
        TableFileName(sub_compact->compaction->immutable_cf_options()->cf_paths,
                      meta->fd.GetNumber(), meta->fd.GetPathId());
-
-    // TODO(AR) it is not clear if there are any larger implications if
-    // DeleteFile fails here
-    Status ds = env_->DeleteFile(fname);
-    if (!ds.ok()) {
-      ROCKS_LOG_WARN(
-          db_options_.info_log,
-          "[%s] [JOB %d] Unable to remove SST file for table #%" PRIu64
-          " at bottom level%s",
-          cfd->GetName().c_str(), job_id_, output_number,
-          meta->marked_for_compaction ? " (need compaction)" : "");
-    }
+    env_->DeleteFile(fname);

    // Also need to remove the file from outputs, or it will be added to the
    // VersionEdit.
@@ -297,14 +297,15 @@ class CompactionJobStatsTest : public testing::Test,
    return result;
  }

-  Status Size(uint64_t* size, const Slice& start, const Slice& limit,
-              int cf = 0) {
+  uint64_t Size(const Slice& start, const Slice& limit, int cf = 0) {
    Range r(start, limit);
+    uint64_t size;
    if (cf == 0) {
-      return db_->GetApproximateSizes(&r, 1, size);
+      db_->GetApproximateSizes(&r, 1, &size);
    } else {
-      return db_->GetApproximateSizes(handles_[1], &r, 1, size);
+      db_->GetApproximateSizes(handles_[1], &r, 1, &size);
    }
+    return size;
  }

  void Compact(int cf, const Slice& start, const Slice& limit,
@@ -72,7 +72,7 @@ class CompactionJobTestBase : public testing::Test {
  CompactionJobTestBase(std::string dbname, const Comparator* ucmp,
                        std::function<std::string(uint64_t)> encode_u64_ts)
      : env_(Env::Default()),
-        fs_(env_->GetFileSystem()),
+        fs_(std::make_shared<LegacyFileSystemWrapper>(env_)),
        dbname_(std::move(dbname)),
        ucmp_(ucmp),
        db_options_(),
@@ -269,7 +269,7 @@ class CompactionJobTestBase : public testing::Test {
                       &write_buffer_manager_, &write_controller_,
                       /*block_cache_tracer=*/nullptr, /*io_tracer=*/nullptr));
    compaction_job_stats_.Reset();
-    ASSERT_OK(SetIdentityFile(env_, dbname_));
+    SetIdentityFile(env_, dbname_);

    VersionEdit new_db;
    new_db.SetLogNumber(0);
@@ -141,7 +141,7 @@ class CompactionPickerTest : public testing::Test {
    if (temp_vstorage_) {
      VersionBuilder builder(FileOptions(), &ioptions_, nullptr,
                             vstorage_.get(), nullptr);
-      ASSERT_OK(builder.SaveTo(temp_vstorage_.get()));
+      builder.SaveTo(temp_vstorage_.get());
      vstorage_ = std::move(temp_vstorage_);
    }
    vstorage_->CalculateBaseBytes(ioptions_, mutable_cf_options_);
@@ -579,7 +579,7 @@ TEST_F(CorruptionTest, FileSystemStateCorrupted) {

    if (iter == 0) {  // corrupt file size
      std::unique_ptr<WritableFile> file;
-      ASSERT_OK(env_->NewWritableFile(filename, &file, EnvOptions()));
+      env_->NewWritableFile(filename, &file, EnvOptions());
      ASSERT_OK(file->Append(Slice("corrupted sst")));
      file.reset();
      Status x = TryReopen(&options);
@@ -616,7 +616,7 @@ TEST_F(CorruptionTest, ParanoidFileChecksOnFlush) {
    options.table_factory = mock;
    mock->SetCorruptionMode(mode);
    ASSERT_OK(DB::Open(options, dbname_, &db_));
-    assert(db_ != nullptr);  // suppress false clang-analyze report
+    assert(db_ != nullptr);
    Build(10);
    s = db_->Flush(FlushOptions());
    if (mode == mock::MockTableFactory::kCorruptNone) {
@@ -642,7 +642,7 @@ TEST_F(CorruptionTest, ParanoidFileChecksOnCompact) {
        std::make_shared<mock::MockTableFactory>();
    options.table_factory = mock;
    ASSERT_OK(DB::Open(options, dbname_, &db_));
-    assert(db_ != nullptr);  // suppress false clang-analyze report
+    assert(db_ != nullptr);
    Build(100, 2);
    // ASSERT_OK(db_->Flush(FlushOptions()));
    DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
@@ -669,7 +669,7 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRangeFirst) {
    ASSERT_OK(DestroyDB(dbname_, options));
    ASSERT_OK(DB::Open(options, dbname_, &db_));
    std::string start, end;
-    assert(db_ != nullptr);  // suppress false clang-analyze report
+    assert(db_ != nullptr);
    ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
                               Key(3, &start), Key(7, &end)));
    auto snap = db_->GetSnapshot();
@@ -701,7 +701,7 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRange) {
    db_ = nullptr;
    ASSERT_OK(DestroyDB(dbname_, options));
    ASSERT_OK(DB::Open(options, dbname_, &db_));
-    assert(db_ != nullptr);  // suppress false clang-analyze report
+    assert(db_ != nullptr);
    Build(10, 0, 0);
    std::string start, end;
    ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
@@ -737,7 +737,7 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRangeLast) {
    db_ = nullptr;
    ASSERT_OK(DestroyDB(dbname_, options));
    ASSERT_OK(DB::Open(options, dbname_, &db_));
-    assert(db_ != nullptr);  // suppress false clang-analyze report
+    assert(db_ != nullptr);
    std::string start, end;
    Build(10);
    ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
@@ -775,7 +775,7 @@ TEST_F(CorruptionTest, LogCorruptionErrorsInCompactionIterator) {
  options.table_factory = mock;

  ASSERT_OK(DB::Open(options, dbname_, &db_));
-  assert(db_ != nullptr);  // suppress false clang-analyze report
+  assert(db_ != nullptr);
  Build(100, 2);

  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
@@ -798,7 +798,7 @@ TEST_F(CorruptionTest, CompactionKeyOrderCheck) {
      std::make_shared<mock::MockTableFactory>();
  options.table_factory = mock;
  ASSERT_OK(DB::Open(options, dbname_, &db_));
-  assert(db_ != nullptr);  // suppress false clang-analyze report
+  assert(db_ != nullptr);
  mock->SetCorruptionMode(mock::MockTableFactory::kCorruptReorderKey);
  Build(100, 2);
  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
@@ -884,7 +884,7 @@ TEST_F(CorruptionTest, VerifyWholeTableChecksum) {
  SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::VerifySstFileChecksum:mismatch", [&](void* arg) {
        auto* s = reinterpret_cast<Status*>(arg);
-        ASSERT_NE(s, nullptr);
+        assert(s);
        ++count;
        ASSERT_NOK(*s);
      });
@@ -129,10 +129,10 @@ TEST_F(CuckooTableDBTest, Flush) {
  ASSERT_OK(Put("key1", "v1"));
  ASSERT_OK(Put("key2", "v2"));
  ASSERT_OK(Put("key3", "v3"));
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  dbfull()->TEST_FlushMemTable();

  TablePropertiesCollection ptc;
-  ASSERT_OK(reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
+  reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc);
  ASSERT_EQ(1U, ptc.size());
  ASSERT_EQ(3U, ptc.begin()->second->num_entries);
  ASSERT_EQ("1", FilesPerLevel());
@@ -146,9 +146,9 @@ TEST_F(CuckooTableDBTest, Flush) {
  ASSERT_OK(Put("key4", "v4"));
  ASSERT_OK(Put("key5", "v5"));
  ASSERT_OK(Put("key6", "v6"));
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  dbfull()->TEST_FlushMemTable();

-  ASSERT_OK(reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
+  reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc);
  ASSERT_EQ(2U, ptc.size());
  auto row = ptc.begin();
  ASSERT_EQ(3U, row->second->num_entries);
@@ -164,8 +164,8 @@ TEST_F(CuckooTableDBTest, Flush) {
  ASSERT_OK(Delete("key6"));
  ASSERT_OK(Delete("key5"));
  ASSERT_OK(Delete("key4"));
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
-  ASSERT_OK(reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
+  dbfull()->TEST_FlushMemTable();
+  reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc);
  ASSERT_EQ(3U, ptc.size());
  row = ptc.begin();
  ASSERT_EQ(3U, row->second->num_entries);
@@ -186,10 +186,10 @@ TEST_F(CuckooTableDBTest, FlushWithDuplicateKeys) {
  ASSERT_OK(Put("key1", "v1"));
  ASSERT_OK(Put("key2", "v2"));
  ASSERT_OK(Put("key1", "v3"));  // Duplicate
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  dbfull()->TEST_FlushMemTable();

  TablePropertiesCollection ptc;
-  ASSERT_OK(reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
+  reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc);
  ASSERT_EQ(1U, ptc.size());
  ASSERT_EQ(2U, ptc.begin()->second->num_entries);
  ASSERT_EQ("1", FilesPerLevel());
@@ -219,7 +219,7 @@ TEST_F(CuckooTableDBTest, Uint64Comparator) {
  ASSERT_OK(Put(Uint64Key(1), "v1"));
  ASSERT_OK(Put(Uint64Key(2), "v2"));
  ASSERT_OK(Put(Uint64Key(3), "v3"));
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  dbfull()->TEST_FlushMemTable();

  ASSERT_EQ("v1", Get(Uint64Key(1)));
  ASSERT_EQ("v2", Get(Uint64Key(2)));
@@ -228,10 +228,10 @@ TEST_F(CuckooTableDBTest, Uint64Comparator) {

  // Add more keys.
  ASSERT_OK(Delete(Uint64Key(2)));  // Delete.
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  dbfull()->TEST_FlushMemTable();
  ASSERT_OK(Put(Uint64Key(3), "v0"));  // Update.
  ASSERT_OK(Put(Uint64Key(4), "v4"));
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  dbfull()->TEST_FlushMemTable();
  ASSERT_EQ("v1", Get(Uint64Key(1)));
  ASSERT_EQ("NOT_FOUND", Get(Uint64Key(2)));
  ASSERT_EQ("v0", Get(Uint64Key(3)));
@@ -251,11 +251,11 @@ TEST_F(CuckooTableDBTest, CompactionIntoMultipleFiles) {
  for (int idx = 0; idx < 28; ++idx) {
    ASSERT_OK(Put(Key(idx), std::string(10000, 'a' + char(idx))));
  }
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+  dbfull()->TEST_WaitForFlushMemTable();
  ASSERT_EQ("1", FilesPerLevel());

-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                        true /* disallow trivial move */));
+  dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
+                              true /* disallow trivial move */);
  ASSERT_EQ("0,2", FilesPerLevel());
  for (int idx = 0; idx < 28; ++idx) {
    ASSERT_EQ(std::string(10000, 'a' + char(idx)), Get(Key(idx)));
@@ -274,15 +274,15 @@ TEST_F(CuckooTableDBTest, SameKeyInsertedInTwoDifferentFilesAndCompacted) {
  for (int idx = 0; idx < 11; ++idx) {
    ASSERT_OK(Put(Key(idx), std::string(10000, 'a')));
  }
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+  dbfull()->TEST_WaitForFlushMemTable();
  ASSERT_EQ("1", FilesPerLevel());

  // Generate one more file in level-0, and should trigger level-0 compaction
  for (int idx = 0; idx < 11; ++idx) {
    ASSERT_OK(Put(Key(idx), std::string(10000, 'a' + char(idx))));
  }
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr));
+  dbfull()->TEST_WaitForFlushMemTable();
+  dbfull()->TEST_CompactRange(0, nullptr, nullptr);

  ASSERT_EQ("0,1", FilesPerLevel());
  for (int idx = 0; idx < 11; ++idx) {
@@ -303,7 +303,7 @@ TEST_F(CuckooTableDBTest, AdaptiveTable) {
  ASSERT_OK(Put("key1", "v1"));
  ASSERT_OK(Put("key2", "v2"));
  ASSERT_OK(Put("key3", "v3"));
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  dbfull()->TEST_FlushMemTable();

  // Write some keys using plain table.
  std::shared_ptr<TableFactory> block_based_factory(
@@ -319,7 +319,7 @@ TEST_F(CuckooTableDBTest, AdaptiveTable) {
  Reopen(&options);
  ASSERT_OK(Put("key4", "v4"));
  ASSERT_OK(Put("key1", "v5"));
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  dbfull()->TEST_FlushMemTable();

  // Write some keys using block based table.
  options.table_factory.reset(NewAdaptiveTableFactory(
@@ -328,7 +328,7 @@ TEST_F(CuckooTableDBTest, AdaptiveTable) {
  Reopen(&options);
  ASSERT_OK(Put("key5", "v6"));
  ASSERT_OK(Put("key2", "v7"));
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  dbfull()->TEST_FlushMemTable();

  ASSERT_EQ("v5", Get("key1"));
  ASSERT_EQ("v7", Get("key2"));
@@ -21,7 +21,6 @@
 #if !defined(ROCKSDB_LITE)
 #include "test_util/sync_point.h"
 #endif
-#include "util/file_checksum_helper.h"
 #include "util/random.h"
 #include "utilities/fault_injection_env.h"
 #include "utilities/merge_operators.h"
@@ -147,7 +146,7 @@ TEST_F(DBBasicTest, ReadOnlyDB) {

  // Reopen and flush memtable.
  Reopen(options);
-  ASSERT_OK(Flush());
+  Flush();
  Close();
  // Now check keys in read only mode.
  ASSERT_OK(ReadOnlyReopen(options));
@@ -183,7 +182,7 @@ TEST_F(DBBasicTest, ReadOnlyDBWithWriteDBIdToManifestSet) {

  // Reopen and flush memtable.
  Reopen(options);
-  ASSERT_OK(Flush());
+  Flush();
  Close();
  // Now check keys in read only mode.
  ASSERT_OK(ReadOnlyReopen(options));
@@ -206,7 +205,7 @@ TEST_F(DBBasicTest, CompactedDB) {
  Reopen(options);
  // 1 L0 file, use CompactedDB if max_open_files = -1
  ASSERT_OK(Put("aaa", DummyString(kFileSize / 2, '1')));
-  ASSERT_OK(Flush());
+  Flush();
  Close();
  ASSERT_OK(ReadOnlyReopen(options));
  Status s = Put("new", "value");
@@ -224,12 +223,12 @@ TEST_F(DBBasicTest, CompactedDB) {
  Reopen(options);
  // Add more L0 files
  ASSERT_OK(Put("bbb", DummyString(kFileSize / 2, '2')));
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(Put("aaa", DummyString(kFileSize / 2, 'a')));
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(Put("bbb", DummyString(kFileSize / 2, 'b')));
  ASSERT_OK(Put("eee", DummyString(kFileSize / 2, 'e')));
-  ASSERT_OK(Flush());
+  Flush();
  Close();

  ASSERT_OK(ReadOnlyReopen(options));
@@ -1362,6 +1361,28 @@ TEST_P(DBMultiGetTestWithParam, MultiGetMultiCFSnapshot) {
  }
 }

+TEST_P(DBMultiGetTestWithParam, MultiGetMultiCFUnsorted) {
+  Options options = CurrentOptions();
+  CreateAndReopenWithCF({"one", "two"}, options);
+
+  ASSERT_OK(Put(1, "foo", "bar"));
+  ASSERT_OK(Put(2, "baz", "xyz"));
+  ASSERT_OK(Put(1, "abc", "def"));
+
+  // Note: keys for the same CF do not form a consecutive range
+  std::vector<int> cfs{1, 2, 1};
+  std::vector<std::string> keys{"foo", "baz", "abc"};
+  std::vector<std::string> values;
+
+  values =
+      MultiGet(cfs, keys, /* snapshot */ nullptr, /* batched */ GetParam());
+
+  ASSERT_EQ(values.size(), 3);
+  ASSERT_EQ(values[0], "bar");
+  ASSERT_EQ(values[1], "xyz");
+  ASSERT_EQ(values[2], "def");
+}
+
 INSTANTIATE_TEST_CASE_P(DBMultiGetTestWithParam, DBMultiGetTestWithParam,
                        testing::Bool());

@@ -1414,10 +1435,10 @@ TEST_F(DBBasicTest, MultiGetBatchedSortedMultiFile) {
    // mix with memtable
    ASSERT_OK(Put(1, "k1", "v1"));
    ASSERT_OK(Put(1, "k2", "v2"));
-    ASSERT_OK(Flush(1));
+    Flush(1);
    ASSERT_OK(Put(1, "k3", "v3"));
    ASSERT_OK(Put(1, "k4", "v4"));
-    ASSERT_OK(Flush(1));
+    Flush(1);
    ASSERT_OK(Delete(1, "k4"));
    ASSERT_OK(Put(1, "k5", "v5"));
    ASSERT_OK(Delete(1, "no_key"));
@@ -1460,19 +1481,19 @@ TEST_F(DBBasicTest, MultiGetBatchedDuplicateKeys) {
  // mix with memtable
  ASSERT_OK(Merge(1, "k1", "v1"));
  ASSERT_OK(Merge(1, "k2", "v2"));
-  ASSERT_OK(Flush(1));
+  Flush(1);
  MoveFilesToLevel(2, 1);
  ASSERT_OK(Merge(1, "k3", "v3"));
  ASSERT_OK(Merge(1, "k4", "v4"));
-  ASSERT_OK(Flush(1));
+  Flush(1);
  MoveFilesToLevel(2, 1);
  ASSERT_OK(Merge(1, "k4", "v4_2"));
  ASSERT_OK(Merge(1, "k6", "v6"));
-  ASSERT_OK(Flush(1));
+  Flush(1);
  MoveFilesToLevel(2, 1);
  ASSERT_OK(Merge(1, "k7", "v7"));
  ASSERT_OK(Merge(1, "k8", "v8"));
-  ASSERT_OK(Flush(1));
+  Flush(1);
  MoveFilesToLevel(2, 1);

  get_perf_context()->Reset();
@@ -1512,12 +1533,12 @@ TEST_F(DBBasicTest, MultiGetBatchedMultiLevel) {
    ASSERT_OK(Put("key_" + std::to_string(i), "val_l2_" + std::to_string(i)));
    num_keys++;
    if (num_keys == 8) {
-      ASSERT_OK(Flush());
+      Flush();
      num_keys = 0;
    }
  }
  if (num_keys > 0) {
-    ASSERT_OK(Flush());
+    Flush();
    num_keys = 0;
  }
  MoveFilesToLevel(2);
@@ -1526,12 +1547,12 @@ TEST_F(DBBasicTest, MultiGetBatchedMultiLevel) {
    ASSERT_OK(Put("key_" + std::to_string(i), "val_l1_" + std::to_string(i)));
    num_keys++;
    if (num_keys == 8) {
-      ASSERT_OK(Flush());
+      Flush();
      num_keys = 0;
    }
  }
  if (num_keys > 0) {
-    ASSERT_OK(Flush());
+    Flush();
    num_keys = 0;
  }
  MoveFilesToLevel(1);
@@ -1540,12 +1561,12 @@ TEST_F(DBBasicTest, MultiGetBatchedMultiLevel) {
    ASSERT_OK(Put("key_" + std::to_string(i), "val_l0_" + std::to_string(i)));
    num_keys++;
    if (num_keys == 8) {
-      ASSERT_OK(Flush());
+      Flush();
      num_keys = 0;
    }
  }
  if (num_keys > 0) {
-    ASSERT_OK(Flush());
+    Flush();
    num_keys = 0;
  }
  ASSERT_EQ(0, num_keys);
@@ -1591,12 +1612,12 @@ TEST_F(DBBasicTest, MultiGetBatchedMultiLevelMerge) {
    ASSERT_OK(Put("key_" + std::to_string(i), "val_l2_" + std::to_string(i)));
    num_keys++;
    if (num_keys == 8) {
-      ASSERT_OK(Flush());
+      Flush();
      num_keys = 0;
    }
  }
  if (num_keys > 0) {
-    ASSERT_OK(Flush());
+    Flush();
    num_keys = 0;
  }
  MoveFilesToLevel(2);
@@ -1605,12 +1626,12 @@ TEST_F(DBBasicTest, MultiGetBatchedMultiLevelMerge) {
    ASSERT_OK(Merge("key_" + std::to_string(i), "val_l1_" + std::to_string(i)));
    num_keys++;
    if (num_keys == 8) {
-      ASSERT_OK(Flush());
+      Flush();
      num_keys = 0;
    }
  }
  if (num_keys > 0) {
-    ASSERT_OK(Flush());
+    Flush();
    num_keys = 0;
  }
  MoveFilesToLevel(1);
@@ -1619,12 +1640,12 @@ TEST_F(DBBasicTest, MultiGetBatchedMultiLevelMerge) {
    ASSERT_OK(Merge("key_" + std::to_string(i), "val_l0_" + std::to_string(i)));
    num_keys++;
    if (num_keys == 8) {
-      ASSERT_OK(Flush());
+      Flush();
      num_keys = 0;
    }
  }
  if (num_keys > 0) {
-    ASSERT_OK(Flush());
+    Flush();
    num_keys = 0;
  }
  ASSERT_EQ(0, num_keys);
@@ -1706,7 +1727,7 @@ TEST_F(DBBasicTest, MultiGetBatchedValueSize) {
    ASSERT_OK(Put(1, "k7", "v7_"));
    ASSERT_OK(Put(1, "k3", "v3_"));
    ASSERT_OK(Put(1, "k4", "v4"));
-    ASSERT_OK(Flush(1));
+    Flush(1);
    ASSERT_OK(Delete(1, "k4"));
    ASSERT_OK(Put(1, "k11", "v11"));
    ASSERT_OK(Delete(1, "no_key"));
@@ -1716,7 +1737,7 @@ TEST_F(DBBasicTest, MultiGetBatchedValueSize) {
    ASSERT_OK(Put(1, "k15", "v15"));
    ASSERT_OK(Put(1, "k16", "v16"));
    ASSERT_OK(Put(1, "k17", "v17"));
-    ASSERT_OK(Flush(1));
+    Flush(1);

    ASSERT_OK(Put(1, "k1", "v1_"));
    ASSERT_OK(Put(1, "k2", "v2_"));
@@ -1786,12 +1807,12 @@ TEST_F(DBBasicTest, MultiGetBatchedValueSizeMultiLevelMerge) {
    ASSERT_OK(Put("key_" + std::to_string(i), "val_l2_" + std::to_string(i)));
    num_keys++;
    if (num_keys == 8) {
-      ASSERT_OK(Flush());
+      Flush();
      num_keys = 0;
    }
  }
  if (num_keys > 0) {
-    ASSERT_OK(Flush());
+    Flush();
    num_keys = 0;
  }
  MoveFilesToLevel(2);
@@ -1800,12 +1821,12 @@ TEST_F(DBBasicTest, MultiGetBatchedValueSizeMultiLevelMerge) {
    ASSERT_OK(Merge("key_" + std::to_string(i), "val_l1_" + std::to_string(i)));
    num_keys++;
    if (num_keys == 8) {
-      ASSERT_OK(Flush());
+      Flush();
      num_keys = 0;
    }
  }
  if (num_keys > 0) {
-    ASSERT_OK(Flush());
+    Flush();
    num_keys = 0;
  }
  MoveFilesToLevel(1);
@@ -1814,12 +1835,12 @@ TEST_F(DBBasicTest, MultiGetBatchedValueSizeMultiLevelMerge) {
    ASSERT_OK(Merge("key_" + std::to_string(i), "val_l0_" + std::to_string(i)));
    num_keys++;
    if (num_keys == 8) {
-      ASSERT_OK(Flush());
+      Flush();
      num_keys = 0;
    }
  }
  if (num_keys > 0) {
-    ASSERT_OK(Flush());
+    Flush();
    num_keys = 0;
  }
  ASSERT_EQ(0, num_keys);
@@ -1909,10 +1930,10 @@ TEST_F(DBBasicTest, MultiGetStats) {
    keys[i] = Slice(keys_str[i]);
    ASSERT_OK(Put(1, "k" + std::to_string(i), rnd.RandomString(1000)));
    if (i % 100 == 0) {
-      ASSERT_OK(Flush(1));
+      Flush(1);
    }
  }
-  ASSERT_OK(Flush(1));
+  Flush(1);
  MoveFilesToLevel(2, 1);

  for (int i = 501; i < 1000; ++i) {
@@ -1920,11 +1941,11 @@ TEST_F(DBBasicTest, MultiGetStats) {
    keys[i] = Slice(keys_str[i]);
    ASSERT_OK(Put(1, "k" + std::to_string(i), rnd.RandomString(1000)));
    if (i % 100 == 0) {
-      ASSERT_OK(Flush(1));
+      Flush(1);
    }
  }

-  ASSERT_OK(Flush(1));
+  Flush(1);
  MoveFilesToLevel(2, 1);

  for (int i = 1001; i < total_keys; ++i) {
@@ -1932,10 +1953,10 @@ TEST_F(DBBasicTest, MultiGetStats) {
    keys[i] = Slice(keys_str[i]);
    ASSERT_OK(Put(1, "k" + std::to_string(i), rnd.RandomString(1000)));
    if (i % 100 == 0) {
-      ASSERT_OK(Flush(1));
+      Flush(1);
    }
  }
-  ASSERT_OK(Flush(1));
+  Flush(1);
  Close();

  ReopenWithColumnFamilies({"default", "pikachu"}, options);
@@ -1962,7 +1983,7 @@ TEST_F(DBBasicTest, MultiGetStats) {
  ASSERT_GT(hist_sst.max, 0);

  // Minimun number of blocks read in a level.
-  ASSERT_EQ(hist_data_blocks.min, 3);
+  ASSERT_EQ(hist_data_blocks.min, 0);
  ASSERT_GT(hist_index_and_filter_blocks.min, 0);
  // Minimun number of sst files read in a level.
  ASSERT_GT(hist_sst.max, 0);
@@ -2043,11 +2064,11 @@ TEST_P(DBMultiGetRowCacheTest, MultiGetBatched) {
    ASSERT_OK(Put(1, "k2", "v2"));
    ASSERT_OK(Put(1, "k3", "v3"));
    ASSERT_OK(Put(1, "k4", "v4"));
-    ASSERT_OK(Flush(1));
+    Flush(1);
    ASSERT_OK(Put(1, "k5", "v5"));
    const Snapshot* snap1 = dbfull()->GetSnapshot();
    ASSERT_OK(Delete(1, "k4"));
-    ASSERT_OK(Flush(1));
+    Flush(1);
    const Snapshot* snap2 = dbfull()->GetSnapshot();

    get_perf_context()->Reset();
@@ -2186,7 +2207,7 @@ TEST_F(DBBasicTest, MultiGetIOBufferOverrun) {
    std::string value(rnd.RandomString(128) + zero_str);
    assert(Put(Key(i), value) == Status::OK());
  }
-  ASSERT_OK(Flush());
+  Flush();

  std::vector<std::string> key_data(10);
  std::vector<Slice> keys;
@@ -2580,7 +2601,7 @@ class DBBasicTestTrackWal : public DBTestBase,

  int CountWalFiles() {
    VectorLogPtr log_files;
-    EXPECT_OK(dbfull()->GetSortedWalFiles(log_files));
+    dbfull()->GetSortedWalFiles(log_files);
    return static_cast<int>(log_files.size());
  };
 };
@@ -2715,9 +2736,9 @@ class DBBasicTestMultiGet : public DBTestBase {
                               : Put(cf, Key(i), values_[i])) == Status::OK());
      }
      if (num_cfs == 1) {
-        EXPECT_OK(Flush());
+        Flush();
      } else {
-        EXPECT_OK(dbfull()->Flush(FlushOptions(), handles_[cf]));
+        dbfull()->Flush(FlushOptions(), handles_[cf]);
      }

      for (int i = 0; i < 100; ++i) {
@@ -2729,9 +2750,9 @@ class DBBasicTestMultiGet : public DBTestBase {
               Status::OK());
      }
      if (num_cfs == 1) {
-        EXPECT_OK(Flush());
+        Flush();
      } else {
-        EXPECT_OK(dbfull()->Flush(FlushOptions(), handles_[cf]));
+        dbfull()->Flush(FlushOptions(), handles_[cf]);
      }
    }
  }
@@ -3274,9 +3295,7 @@ class DeadlineFS : public FileSystemWrapper {

  // Increment the IO counter and return a delay in microseconds
  IOStatus ShouldDelay(const IOOptions& opts) {
-    if (timedout_) {
-      return IOStatus::TimedOut();
-    } else if (!deadline_.count() && !io_timeout_.count()) {
+    if (!deadline_.count() && !io_timeout_.count()) {
      return IOStatus::OK();
    }
    if (!ignore_deadline_ && delay_trigger_ == io_count_++) {
@@ -3583,29 +3602,6 @@ TEST_F(DBBasicTest, VerifyFileChecksums) {
  ASSERT_OK(Flush());

  ASSERT_OK(db_->VerifyFileChecksums(ReadOptions()));
-
-  // Does the right thing but with the wrong name -- using it should lead to an
-  // error.
-  class MisnamedFileChecksumGenerator : public FileChecksumGenCrc32c {
-   public:
-    MisnamedFileChecksumGenerator(const FileChecksumGenContext& context)
-        : FileChecksumGenCrc32c(context) {}
-
-    const char* Name() const override { return "sha1"; }
-  };
-
-  class MisnamedFileChecksumGenFactory : public FileChecksumGenCrc32cFactory {
-   public:
-    std::unique_ptr<FileChecksumGenerator> CreateFileChecksumGenerator(
-        const FileChecksumGenContext& context) override {
-      return std::unique_ptr<FileChecksumGenerator>(
-          new MisnamedFileChecksumGenerator(context));
-    }
-  };
-
-  options.file_checksum_gen_factory.reset(new MisnamedFileChecksumGenFactory());
-  Reopen(options);
-  ASSERT_TRUE(db_->VerifyFileChecksums(ReadOptions()).IsInvalidArgument());
 }
 #endif  // !ROCKSDB_LITE

@@ -3669,7 +3665,7 @@ TEST_P(DBBasicTestDeadline, PointLookupDeadline) {
      std::string key = "k" + ToString(i);
      ASSERT_OK(Put(key, rnd.RandomString(100)));
    }
-    ASSERT_OK(Flush());
+    Flush();

    bool timedout = true;
    // A timeout will be forced when the IO counter reaches this value
@@ -128,8 +128,8 @@ TEST_P(DBBloomFilterTestDefFormatVersion, KeyMayExist) {
    ASSERT_EQ(cache_added, TestGetTickerCount(options, BLOCK_CACHE_ADD));

    ASSERT_OK(Flush(1));
-    ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1],
-                                          true /* disallow trivial move */));
+    dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1],
+                                true /* disallow trivial move */);

    numopen = TestGetTickerCount(options, NO_FILE_OPENS);
    cache_added = TestGetTickerCount(options, BLOCK_CACHE_ADD);
@@ -178,7 +178,7 @@ TEST_F(DBBloomFilterTest, GetFilterByPrefixBloomCustomPrefixExtractor) {
    ASSERT_OK(dbfull()->Put(wo, "barbarbar2", "foo2"));
    ASSERT_OK(dbfull()->Put(wo, "foofoofoo", "bar"));

-    ASSERT_OK(dbfull()->Flush(fo));
+    dbfull()->Flush(fo);

    ASSERT_EQ("foo", Get("barbarbar"));
    ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_USEFUL), 0);
@@ -244,7 +244,7 @@ TEST_F(DBBloomFilterTest, GetFilterByPrefixBloom) {
    ASSERT_OK(dbfull()->Put(wo, "barbarbar2", "foo2"));
    ASSERT_OK(dbfull()->Put(wo, "foofoofoo", "bar"));

-    ASSERT_OK(dbfull()->Flush(fo));
+    dbfull()->Flush(fo);

    ASSERT_EQ("foo", Get("barbarbar"));
    ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_USEFUL), 0);
@@ -297,7 +297,7 @@ TEST_F(DBBloomFilterTest, WholeKeyFilterProp) {
    // ranges.
    ASSERT_OK(dbfull()->Put(wo, "aaa", ""));
    ASSERT_OK(dbfull()->Put(wo, "zzz", ""));
-    ASSERT_OK(dbfull()->Flush(fo));
+    dbfull()->Flush(fo);

    Reopen(options);
    ASSERT_EQ("NOT_FOUND", Get("foo"));
@@ -328,7 +328,7 @@ TEST_F(DBBloomFilterTest, WholeKeyFilterProp) {
    // ranges.
    ASSERT_OK(dbfull()->Put(wo, "aaa", ""));
    ASSERT_OK(dbfull()->Put(wo, "zzz", ""));
-    ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+    db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);

    // Reopen with both of whole key off and prefix extractor enabled.
    // Still no bloom filter should be used.
@@ -351,7 +351,7 @@ TEST_F(DBBloomFilterTest, WholeKeyFilterProp) {
    // ranges.
    ASSERT_OK(dbfull()->Put(wo, "aaa", ""));
    ASSERT_OK(dbfull()->Put(wo, "zzz", ""));
-    ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+    db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);

    options.prefix_extractor.reset();
    bbto.whole_key_filtering = true;
@@ -364,7 +364,7 @@ TEST_F(DBBloomFilterTest, WholeKeyFilterProp) {
    // not filtered out by key ranges.
    ASSERT_OK(dbfull()->Put(wo, "aaa", ""));
    ASSERT_OK(dbfull()->Put(wo, "zzz", ""));
-    ASSERT_OK(Flush());
+    Flush();

    // Now we have two files:
    // File 1: An older file with prefix bloom.
@@ -467,7 +467,7 @@ TEST_P(DBBloomFilterTestWithParam, BloomFilter) {
    for (int i = 0; i < N; i += 100) {
      ASSERT_OK(Put(1, Key(i), Key(i)));
    }
-    ASSERT_OK(Flush(1));
+    Flush(1);

    // Prevent auto compactions triggered by seeks
    env_->delay_sstable_sync_.store(true, std::memory_order_release);
@@ -880,7 +880,7 @@ TEST_F(DBBloomFilterTest, ContextCustomFilterPolicy) {

    // Destroy
    ASSERT_OK(dbfull()->DropColumnFamily(handles_[1]));
-    ASSERT_OK(dbfull()->DestroyColumnFamilyHandle(handles_[1]));
+    dbfull()->DestroyColumnFamilyHandle(handles_[1]);
    handles_[1] = nullptr;
  }
 }
@@ -1444,9 +1444,9 @@ void PrefixScanInit(DBBloomFilterTest* dbtest) {
  snprintf(buf, sizeof(buf), "%02d______:end", 10);
  keystr = std::string(buf);
  ASSERT_OK(dbtest->Put(keystr, keystr));
-  ASSERT_OK(dbtest->Flush());
-  ASSERT_OK(dbtest->dbfull()->CompactRange(CompactRangeOptions(), nullptr,
-                                           nullptr));  // move to level 1
+  dbtest->Flush();
+  dbtest->dbfull()->CompactRange(CompactRangeOptions(), nullptr,
+                                 nullptr);  // move to level 1

  // GROUP 1
  for (int i = 1; i <= small_range_sstfiles; i++) {
@@ -1563,21 +1563,21 @@ TEST_F(DBBloomFilterTest, OptimizeFiltersForHits) {
  for (int key : keys) {
    ASSERT_OK(Put(1, Key(key), "val"));
    if (++num_inserted % 1000 == 0) {
-      ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
-      ASSERT_OK(dbfull()->TEST_WaitForCompact());
+      dbfull()->TEST_WaitForFlushMemTable();
+      dbfull()->TEST_WaitForCompact();
    }
  }
  ASSERT_OK(Put(1, Key(0), "val"));
  ASSERT_OK(Put(1, Key(numkeys), "val"));
  ASSERT_OK(Flush(1));
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  if (NumTableFilesAtLevel(0, 1) == 0) {
    // No Level 0 file. Create one.
    ASSERT_OK(Put(1, Key(0), "val"));
    ASSERT_OK(Put(1, Key(numkeys), "val"));
    ASSERT_OK(Flush(1));
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
+    dbfull()->TEST_WaitForCompact();
  }

  for (int i = 1; i < numkeys; i += 2) {
@@ -1682,8 +1682,7 @@ TEST_F(DBBloomFilterTest, OptimizeFiltersForHits) {
      BottommostLevelCompaction::kSkip;
  compact_options.change_level = true;
  compact_options.target_level = 7;
-  ASSERT_TRUE(db_->CompactRange(compact_options, handles_[1], nullptr, nullptr)
-                  .IsNotSupported());
+  db_->CompactRange(compact_options, handles_[1], nullptr, nullptr);

  ASSERT_EQ(trivial_move, 1);
  ASSERT_EQ(non_trivial_move, 0);
@@ -1715,10 +1714,10 @@ TEST_F(DBBloomFilterTest, OptimizeFiltersForHits) {

 int CountIter(std::unique_ptr<Iterator>& iter, const Slice& key) {
  int count = 0;
-  for (iter->Seek(key); iter->Valid(); iter->Next()) {
+  for (iter->Seek(key); iter->Valid() && iter->status() == Status::OK();
+       iter->Next()) {
    count++;
  }
-  EXPECT_OK(iter->status());
  return count;
 }

@@ -1748,7 +1747,7 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterUpperBound) {
    ASSERT_OK(Put("abcdxxx1", "val2"));
    ASSERT_OK(Put("abcdxxx2", "val3"));
    ASSERT_OK(Put("abcdxxx3", "val4"));
-    ASSERT_OK(dbfull()->Flush(FlushOptions()));
+    dbfull()->Flush(FlushOptions());
    {
      // prefix_extractor has not changed, BF will always be read
      Slice upper_bound("abce");
@@ -1906,7 +1905,7 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterMultipleSST) {
    ASSERT_OK(Put("foo4", "bar4"));
    ASSERT_OK(Put("foq5", "bar5"));
    ASSERT_OK(Put("fpb", "1"));
-    ASSERT_OK(dbfull()->Flush(FlushOptions()));
+    dbfull()->Flush(FlushOptions());
    {
      // BF is cappped:3 now
      std::unique_ptr<Iterator> iter_tmp(db_->NewIterator(read_options));
@@ -1930,7 +1929,7 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterMultipleSST) {
    ASSERT_OK(Put("foo7", "bar7"));
    ASSERT_OK(Put("foq8", "bar8"));
    ASSERT_OK(Put("fpc", "2"));
-    ASSERT_OK(dbfull()->Flush(FlushOptions()));
+    dbfull()->Flush(FlushOptions());
    {
      // BF is fixed:2 now
      std::unique_ptr<Iterator> iter_tmp(db_->NewIterator(read_options));
@@ -2041,10 +2040,10 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterNewColumnFamily) {
      ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_PREFIX_USEFUL), 0);
    }
    ASSERT_OK(dbfull()->DropColumnFamily(handles_[2]));
-    ASSERT_OK(dbfull()->DestroyColumnFamilyHandle(handles_[2]));
+    dbfull()->DestroyColumnFamilyHandle(handles_[2]);
    handles_[2] = nullptr;
    ASSERT_OK(dbfull()->DropColumnFamily(handles_[1]));
-    ASSERT_OK(dbfull()->DestroyColumnFamilyHandle(handles_[1]));
+    dbfull()->DestroyColumnFamilyHandle(handles_[1]);
    handles_[1] = nullptr;
    iteration++;
  }
@@ -42,7 +42,7 @@ class DBTestCompactionFilterWithCompactParam
        option_config_ == kUniversalSubcompactions) {
      assert(options.max_subcompactions > 1);
    }
-    Reopen(options);
+    TryReopen(options);
  }
 };

@@ -276,7 +276,7 @@ TEST_F(DBTestCompactionFilter, CompactionFilter) {
  for (int i = 0; i < 100000; i++) {
    char key[100];
    snprintf(key, sizeof(key), "B%010d", i);
-    ASSERT_OK(Put(1, key, value));
+    Put(1, key, value);
  }
  ASSERT_OK(Flush(1));

@@ -284,10 +284,10 @@ TEST_F(DBTestCompactionFilter, CompactionFilter) {
  // the compaction is each level invokes the filter for
  // all the keys in that level.
  cfilter_count = 0;
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]));
+  dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]);
  ASSERT_EQ(cfilter_count, 100000);
  cfilter_count = 0;
-  ASSERT_OK(dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]));
+  dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]);
  ASSERT_EQ(cfilter_count, 100000);

  ASSERT_EQ(NumTableFilesAtLevel(0, 1), 0);
@@ -321,7 +321,6 @@ TEST_F(DBTestCompactionFilter, CompactionFilter) {
      }
      iter->Next();
    }
-    ASSERT_OK(iter->status());
  }
  ASSERT_EQ(total, 100000);
  ASSERT_EQ(count, 0);
@@ -338,10 +337,10 @@ TEST_F(DBTestCompactionFilter, CompactionFilter) {
  // means that all keys should pass at least once
  // via the compaction filter
  cfilter_count = 0;
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]));
+  dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]);
  ASSERT_EQ(cfilter_count, 100000);
  cfilter_count = 0;
-  ASSERT_OK(dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]));
+  dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]);
  ASSERT_EQ(cfilter_count, 100000);
  ASSERT_EQ(NumTableFilesAtLevel(0, 1), 0);
  ASSERT_EQ(NumTableFilesAtLevel(1, 1), 0);
@@ -370,10 +369,10 @@ TEST_F(DBTestCompactionFilter, CompactionFilter) {
  // verify that at the end of the compaction process,
  // nothing is left.
  cfilter_count = 0;
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]));
+  dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]);
  ASSERT_EQ(cfilter_count, 100000);
  cfilter_count = 0;
-  ASSERT_OK(dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]));
+  dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]);
  ASSERT_EQ(cfilter_count, 0);
  ASSERT_EQ(NumTableFilesAtLevel(0, 1), 0);
  ASSERT_EQ(NumTableFilesAtLevel(1, 1), 0);
@@ -388,7 +387,6 @@ TEST_F(DBTestCompactionFilter, CompactionFilter) {
      count++;
      iter->Next();
    }
-    ASSERT_OK(iter->status());
    ASSERT_EQ(count, 0);
  }

@@ -429,9 +427,9 @@ TEST_F(DBTestCompactionFilter, CompactionFilterDeletesAll) {
  // put some data
  for (int table = 0; table < 4; ++table) {
    for (int i = 0; i < 10 + table; ++i) {
-      ASSERT_OK(Put(ToString(table * 100 + i), "val"));
+      Put(ToString(table * 100 + i), "val");
    }
-    ASSERT_OK(Flush());
+    Flush();
  }

  // this will produce empty file (delete compaction filter)
@@ -442,7 +440,6 @@ TEST_F(DBTestCompactionFilter, CompactionFilterDeletesAll) {

  Iterator* itr = db_->NewIterator(ReadOptions());
  itr->SeekToFirst();
-  ASSERT_OK(itr->status());
  // empty db
  ASSERT_TRUE(!itr->Valid());

@@ -466,25 +463,25 @@ TEST_P(DBTestCompactionFilterWithCompactParam,
  for (int i = 0; i < 100001; i++) {
    char key[100];
    snprintf(key, sizeof(key), "B%010d", i);
-    ASSERT_OK(Put(1, key, value));
+    Put(1, key, value);
  }

  // push all files to  lower levels
  ASSERT_OK(Flush(1));
  if (option_config_ != kUniversalCompactionMultiLevel &&
      option_config_ != kUniversalSubcompactions) {
-    ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]));
-    ASSERT_OK(dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]));
+    dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]);
+    dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]);
  } else {
-    ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), handles_[1],
-                                     nullptr, nullptr));
+    dbfull()->CompactRange(CompactRangeOptions(), handles_[1], nullptr,
+                           nullptr);
  }

  // re-write all data again
  for (int i = 0; i < 100001; i++) {
    char key[100];
    snprintf(key, sizeof(key), "B%010d", i);
-    ASSERT_OK(Put(1, key, value));
+    Put(1, key, value);
  }

  // push all files to  lower levels. This should
@@ -492,11 +489,11 @@ TEST_P(DBTestCompactionFilterWithCompactParam,
  ASSERT_OK(Flush(1));
  if (option_config_ != kUniversalCompactionMultiLevel &&
      option_config_ != kUniversalSubcompactions) {
-    ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]));
-    ASSERT_OK(dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]));
+    dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]);
+    dbfull()->TEST_CompactRange(1, nullptr, nullptr, handles_[1]);
  } else {
-    ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), handles_[1],
-                                     nullptr, nullptr));
+    dbfull()->CompactRange(CompactRangeOptions(), handles_[1], nullptr,
+                           nullptr);
  }

  // verify that all keys now have the new value that
@@ -534,7 +531,7 @@ TEST_F(DBTestCompactionFilter, CompactionFilterWithMergeOperator) {
  ASSERT_OK(Flush());
  std::string newvalue = Get("foo");
  ASSERT_EQ(newvalue, three);
-  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  newvalue = Get("foo");
  ASSERT_EQ(newvalue, three);

@@ -542,12 +539,12 @@ TEST_F(DBTestCompactionFilter, CompactionFilterWithMergeOperator) {
  // merge keys.
  ASSERT_OK(db_->Put(WriteOptions(), "bar", two));
  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  newvalue = Get("bar");
  ASSERT_EQ("NOT_FOUND", newvalue);
  ASSERT_OK(db_->Merge(WriteOptions(), "bar", two));
  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  newvalue = Get("bar");
  ASSERT_EQ(two, two);

@@ -558,7 +555,7 @@ TEST_F(DBTestCompactionFilter, CompactionFilterWithMergeOperator) {
  ASSERT_OK(Flush());
  newvalue = Get("foobar");
  ASSERT_EQ(newvalue, three);
-  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  newvalue = Get("foobar");
  ASSERT_EQ(newvalue, three);

@@ -571,7 +568,7 @@ TEST_F(DBTestCompactionFilter, CompactionFilterWithMergeOperator) {
  ASSERT_OK(Flush());
  newvalue = Get("barfoo");
  ASSERT_EQ(newvalue, four);
-  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  newvalue = Get("barfoo");
  ASSERT_EQ(newvalue, four);
 }
@@ -593,21 +590,21 @@ TEST_F(DBTestCompactionFilter, CompactionFilterContextManual) {
    for (int i = 0; i < num_keys_per_file; i++) {
      char key[100];
      snprintf(key, sizeof(key), "B%08d%02d", i, j);
-      ASSERT_OK(Put(key, value));
+      Put(key, value);
    }
-    ASSERT_OK(dbfull()->TEST_FlushMemTable());
+    dbfull()->TEST_FlushMemTable();
    // Make sure next file is much smaller so automatic compaction will not
    // be triggered.
    num_keys_per_file /= 2;
  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  // Force a manual compaction
  cfilter_count = 0;
  filter->expect_manual_compaction_.store(true);
  filter->expect_full_compaction_.store(true);
  filter->expect_cf_id_.store(0);
-  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  ASSERT_EQ(cfilter_count, 700);
  ASSERT_EQ(NumSortedRuns(0), 1);
  ASSERT_TRUE(filter->compaction_filter_created());
@@ -657,14 +654,14 @@ TEST_F(DBTestCompactionFilter, CompactionFilterContextCfId) {
    for (int i = 0; i < num_keys_per_file; i++) {
      char key[100];
      snprintf(key, sizeof(key), "B%08d%02d", i, j);
-      ASSERT_OK(Put(1, key, value));
+      Put(1, key, value);
    }
-    ASSERT_OK(Flush(1));
+    Flush(1);
    // Make sure next file is much smaller so automatic compaction will not
    // be triggered.
    num_keys_per_file /= 2;
  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  ASSERT_TRUE(filter->compaction_filter_created());
 }
@@ -683,9 +680,9 @@ TEST_F(DBTestCompactionFilter, CompactionFilterIgnoreSnapshot) {
  const Snapshot* snapshot = nullptr;
  for (int table = 0; table < 4; ++table) {
    for (int i = 0; i < 10; ++i) {
-      ASSERT_OK(Put(ToString(table * 100 + i), "val"));
+      Put(ToString(table * 100 + i), "val");
    }
-    ASSERT_OK(Flush());
+    Flush();

    if (table == 0) {
      snapshot = db_->GetSnapshot();
@@ -705,7 +702,6 @@ TEST_F(DBTestCompactionFilter, CompactionFilterIgnoreSnapshot) {
    read_options.snapshot = snapshot;
    std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
    iter->SeekToFirst();
-    ASSERT_OK(iter->status());
    int count = 0;
    while (iter->Valid()) {
      count++;
@@ -714,7 +710,6 @@ TEST_F(DBTestCompactionFilter, CompactionFilterIgnoreSnapshot) {
    ASSERT_EQ(count, 6);
    read_options.snapshot = nullptr;
    std::unique_ptr<Iterator> iter1(db_->NewIterator(read_options));
-    ASSERT_OK(iter1->status());
    iter1->SeekToFirst();
    count = 0;
    while (iter1->Valid()) {
@@ -745,9 +740,9 @@ TEST_F(DBTestCompactionFilter, SkipUntil) {
    for (int i = table * 6; i < 39 + table * 11; ++i) {
      char key[100];
      snprintf(key, sizeof(key), "%010d", table * 100 + i);
-      ASSERT_OK(Put(key, std::to_string(table * 1000 + i)));
+      Put(key, std::to_string(table * 1000 + i));
    }
-    ASSERT_OK(Flush());
+    Flush();
  }

  cfilter_skips = 0;
@@ -786,10 +781,10 @@ TEST_F(DBTestCompactionFilter, SkipUntilWithBloomFilter) {
  options.create_if_missing = true;
  DestroyAndReopen(options);

-  ASSERT_OK(Put("0000000010", "v10"));
-  ASSERT_OK(Put("0000000020", "v20"));  // skipped
-  ASSERT_OK(Put("0000000050", "v50"));
-  ASSERT_OK(Flush());
+  Put("0000000010", "v10");
+  Put("0000000020", "v20");  // skipped
+  Put("0000000050", "v50");
+  Flush();

  cfilter_skips = 0;
  EXPECT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
@@ -827,13 +822,13 @@ TEST_F(DBTestCompactionFilter, IgnoreSnapshotsFalse) {
  options.compaction_filter = new TestNotSupportedFilter();
  DestroyAndReopen(options);

-  ASSERT_OK(Put("a", "v10"));
-  ASSERT_OK(Put("z", "v20"));
-  ASSERT_OK(Flush());
+  Put("a", "v10");
+  Put("z", "v20");
+  Flush();

-  ASSERT_OK(Put("a", "v10"));
-  ASSERT_OK(Put("z", "v20"));
-  ASSERT_OK(Flush());
+  Put("a", "v10");
+  Put("z", "v20");
+  Flush();

  // Comapction should fail because IgnoreSnapshots() = false
  EXPECT_TRUE(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr)
@@ -102,8 +102,7 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase) {
      }

      // Test compact range works
-      ASSERT_OK(
-          dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+      dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
      // All data should be in the last level.
      ColumnFamilyMetaData cf_meta;
      db_->GetColumnFamilyMetaData(&cf_meta);
@@ -167,8 +166,8 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase2) {
  ASSERT_OK(dbfull()->SetOptions({
      {"disable_auto_compactions", "false"},
  }));
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  Flush();
+  dbfull()->TEST_WaitForCompact();
  ASSERT_TRUE(db_->GetIntProperty("rocksdb.base-level", &int_prop));
  ASSERT_EQ(4U, int_prop);

@@ -185,8 +184,8 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase2) {
  ASSERT_OK(dbfull()->SetOptions({
      {"disable_auto_compactions", "false"},
  }));
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  Flush();
+  dbfull()->TEST_WaitForCompact();
  ASSERT_TRUE(db_->GetIntProperty("rocksdb.base-level", &int_prop));
  ASSERT_EQ(3U, int_prop);
  ASSERT_TRUE(db_->GetProperty("rocksdb.num-files-at-level1", &str_prop));
@@ -206,8 +205,8 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase2) {
  ASSERT_OK(dbfull()->SetOptions({
      {"disable_auto_compactions", "false"},
  }));
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  Flush();
+  dbfull()->TEST_WaitForCompact();
  ASSERT_TRUE(db_->GetIntProperty("rocksdb.base-level", &int_prop));
  ASSERT_EQ(3U, int_prop);

@@ -235,8 +234,8 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase2) {
  }));

  TEST_SYNC_POINT("DynamicLevelMaxBytesBase2:0");
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  Flush();
+  dbfull()->TEST_WaitForCompact();
  ASSERT_TRUE(db_->GetIntProperty("rocksdb.base-level", &int_prop));
  ASSERT_EQ(2U, int_prop);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
@@ -265,7 +264,7 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase2) {
  }
  TEST_SYNC_POINT("DynamicLevelMaxBytesBase2:2");

-  ASSERT_OK(Flush());
+  Flush();

  thread.join();

@@ -303,7 +302,7 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesCompactRange) {
  DestroyAndReopen(options);

  // Compact against empty DB
-  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);

  uint64_t int_prop;
  std::string str_prop;
@@ -317,13 +316,13 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesCompactRange) {
    ASSERT_OK(
        Put(Key(static_cast<int>(rnd.Uniform(kMaxKey))), rnd.RandomString(80)));
  }
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  Flush();
+  dbfull()->TEST_WaitForCompact();
  if (NumTableFilesAtLevel(0) == 0) {
    // Make sure level 0 is not empty
    ASSERT_OK(
        Put(Key(static_cast<int>(rnd.Uniform(kMaxKey))), rnd.RandomString(80)));
-    ASSERT_OK(Flush());
+    Flush();
  }

  ASSERT_TRUE(db_->GetIntProperty("rocksdb.base-level", &int_prop));
@@ -344,7 +343,7 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesCompactRange) {
      });
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();

-  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  ASSERT_EQ(output_levels.size(), 2);
  ASSERT_TRUE(output_levels.find(3) != output_levels.end());
  ASSERT_TRUE(output_levels.find(4) != output_levels.end());
@@ -390,8 +389,8 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBaseInc) {
    PutFixed32(&value, static_cast<uint32_t>(i));
    ASSERT_OK(Put(Key(i), value));
  }
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  Flush();
+  dbfull()->TEST_WaitForCompact();
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();

  ASSERT_EQ(non_trivial, 0);
@@ -450,7 +449,7 @@ TEST_F(DBTestDynamicLevel, DISABLED_MigrateToDynamicLevelMaxBytesBase) {
    ASSERT_OK(Delete(Key(i / 10)));
  }
  verify_func(total_keys, false);
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  options.level_compaction_dynamic_level_bytes = true;
  options.disable_auto_compactions = true;
@@ -465,7 +464,7 @@ TEST_F(DBTestDynamicLevel, DISABLED_MigrateToDynamicLevelMaxBytesBase) {
    CompactRangeOptions compact_options;
    compact_options.change_level = true;
    compact_options.target_level = options.num_levels - 1;
-    ASSERT_OK(dbfull()->CompactRange(compact_options, nullptr, nullptr));
+    dbfull()->CompactRange(compact_options, nullptr, nullptr);
    compaction_finished.store(true);
  });
  do {
@@ -485,7 +484,7 @@ TEST_F(DBTestDynamicLevel, DISABLED_MigrateToDynamicLevelMaxBytesBase) {
  }

  verify_func(total_keys2, false);
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  verify_func(total_keys2, false);

  // Base level is not level 1
@@ -44,7 +44,7 @@ TEST_F(DBEncryptionTest, CheckEncrypted) {
  Env* target = GetTargetEnv();
  int hits = 0;
  for (auto it = fileNames.begin() ; it != fileNames.end(); ++it) {
-    if (*it == "LOCK") {
+    if ((*it == "..") || (*it == ".") || (*it == "LOCK")) {
      continue;
    }
    auto filePath = dbname_ + "/" + *it;
@@ -53,6 +53,7 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "db/write_callback.h"
+#include "env/composite_env_wrapper.h"
 #include "file/file_util.h"
 #include "file/filename.h"
 #include "file/random_access_file_reader.h"
@@ -306,21 +307,18 @@ Status DBImpl::ResumeImpl(DBRecoverContext context) {
  mutex_.AssertHeld();
  WaitForBackgroundWork();

+  Status bg_error = error_handler_.GetBGError();
  Status s;
  if (shutdown_initiated_) {
    // Returning shutdown status to SFM during auto recovery will cause it
    // to abort the recovery and allow the shutdown to progress
    s = Status::ShutdownInProgress();
  }
-
-  if (s.ok()) {
-    Status bg_error = error_handler_.GetBGError();
-    if (bg_error.severity() > Status::Severity::kHardError) {
-      ROCKS_LOG_INFO(
-          immutable_db_options_.info_log,
-          "DB resume requested but failed due to Fatal/Unrecoverable error");
-      s = bg_error;
-    }
+  if (s.ok() && bg_error.severity() > Status::Severity::kHardError) {
+    ROCKS_LOG_INFO(
+        immutable_db_options_.info_log,
+        "DB resume requested but failed due to Fatal/Unrecoverable error");
+    s = bg_error;
  }

  // Make sure the IO Status stored in version set is set to OK.
@@ -395,11 +393,6 @@ Status DBImpl::ResumeImpl(DBRecoverContext context) {
  FindObsoleteFiles(&job_context, true);
  if (s.ok()) {
    s = error_handler_.ClearBGError();
-  } else {
-    // NOTE: this is needed to pass ASSERT_STATUS_CHECKED
-    // in the DBSSTTest.DBWithMaxSpaceAllowedRandomized test.
-    // See https://github.com/facebook/rocksdb/pull/7715#issuecomment-754947952
-    error_handler_.GetRecoveryError().PermitUncheckedError();
  }
  mutex_.Unlock();

@@ -416,12 +409,6 @@ Status DBImpl::ResumeImpl(DBRecoverContext context) {
    if (file_deletion_disabled) {
      // Always return ok
      s = EnableFileDeletions(/*force=*/true);
-      if (!s.ok()) {
-        ROCKS_LOG_INFO(
-            immutable_db_options_.info_log,
-            "DB resume requested but could not enable file deletions [%s]",
-            s.ToString().c_str());
-      }
    }
    ROCKS_LOG_INFO(immutable_db_options_.info_log, "Successfully resumed DB");
  }
@@ -703,18 +690,6 @@ void DBImpl::PrintStatistics() {

 void DBImpl::StartPeriodicWorkScheduler() {
 #ifndef ROCKSDB_LITE
-
-#ifndef NDEBUG
-  // It only used by test to disable scheduler
-  bool disable_scheduler = false;
-  TEST_SYNC_POINT_CALLBACK(
-      "DBImpl::StartPeriodicWorkScheduler:DisableScheduler",
-      &disable_scheduler);
-  if (disable_scheduler) {
-    return;
-  }
-#endif  // !NDEBUG
-
  {
    InstrumentedMutexLock l(&mutex_);
    periodic_work_scheduler_ = PeriodicWorkScheduler::Default();
@@ -1718,9 +1693,7 @@ Status DBImpl::GetImpl(const ReadOptions& read_options, const Slice& key,
  }
  // If timestamp is used, we use read callback to ensure <key,t,s> is returned
  // only if t <= read_opts.timestamp and s <= snapshot.
-  if (ts_sz > 0) {
-    assert(!get_impl_options
-                .callback);  // timestamp with callback is not supported
+  if (ts_sz > 0 && !get_impl_options.callback) {
    read_cb.Refresh(snapshot);
    get_impl_options.callback = &read_cb;
  }
@@ -2191,20 +2164,18 @@ void DBImpl::MultiGet(const ReadOptions& read_options, const size_t num_keys,
      multiget_cf_data;
  size_t cf_start = 0;
  ColumnFamilyHandle* cf = sorted_keys[0]->column_family;
+
  for (size_t i = 0; i < num_keys; ++i) {
    KeyContext* key_ctx = sorted_keys[i];
    if (key_ctx->column_family != cf) {
-      multiget_cf_data.emplace_back(
-          MultiGetColumnFamilyData(cf, cf_start, i - cf_start, nullptr));
+      multiget_cf_data.emplace_back(cf, cf_start, i - cf_start, nullptr);
      cf_start = i;
      cf = key_ctx->column_family;
    }
  }
-  {
-    // multiget_cf_data.emplace_back(
-    // MultiGetColumnFamilyData(cf, cf_start, num_keys - cf_start, nullptr));
-    multiget_cf_data.emplace_back(cf, cf_start, num_keys - cf_start, nullptr);
-  }
+
+  multiget_cf_data.emplace_back(cf, cf_start, num_keys - cf_start, nullptr);
+
  std::function<MultiGetColumnFamilyData*(
      autovector<MultiGetColumnFamilyData,
                 MultiGetContext::MAX_BATCH_SIZE>::iterator&)>
@@ -2264,7 +2235,7 @@ struct CompareKeyContext {
        static_cast<ColumnFamilyHandleImpl*>(lhs->column_family);
    uint32_t cfd_id1 = cfh->cfd()->GetID();
    const Comparator* comparator = cfh->cfd()->user_comparator();
-    cfh = static_cast<ColumnFamilyHandleImpl*>(lhs->column_family);
+    cfh = static_cast<ColumnFamilyHandleImpl*>(rhs->column_family);
    uint32_t cfd_id2 = cfh->cfd()->GetID();

    if (cfd_id1 < cfd_id2) {
@@ -2288,39 +2259,24 @@ struct CompareKeyContext {
 void DBImpl::PrepareMultiGetKeys(
    size_t num_keys, bool sorted_input,
    autovector<KeyContext*, MultiGetContext::MAX_BATCH_SIZE>* sorted_keys) {
-#ifndef NDEBUG
  if (sorted_input) {
-    for (size_t index = 0; index < sorted_keys->size(); ++index) {
-      if (index > 0) {
-        KeyContext* lhs = (*sorted_keys)[index - 1];
-        KeyContext* rhs = (*sorted_keys)[index];
-        ColumnFamilyHandleImpl* cfh =
-            static_cast_with_check<ColumnFamilyHandleImpl>(lhs->column_family);
-        uint32_t cfd_id1 = cfh->cfd()->GetID();
-        const Comparator* comparator = cfh->cfd()->user_comparator();
-        cfh =
-            static_cast_with_check<ColumnFamilyHandleImpl>(lhs->column_family);
-        uint32_t cfd_id2 = cfh->cfd()->GetID();
+#ifndef NDEBUG
+    CompareKeyContext key_context_less;

-        assert(cfd_id1 <= cfd_id2);
-        if (cfd_id1 < cfd_id2) {
-          continue;
-        }
+    for (size_t index = 1; index < sorted_keys->size(); ++index) {
+      const KeyContext* const lhs = (*sorted_keys)[index - 1];
+      const KeyContext* const rhs = (*sorted_keys)[index];

-        // Both keys are from the same column family
-        int cmp = comparator->CompareWithoutTimestamp(
-            *(lhs->key), /*a_has_ts=*/false, *(rhs->key), /*b_has_ts=*/false);
-        assert(cmp <= 0);
-      }
-      index++;
+      // lhs should be <= rhs, or in other words, rhs should NOT be < lhs
+      assert(!key_context_less(rhs, lhs));
    }
-  }
 #endif
-  if (!sorted_input) {
-    CompareKeyContext sort_comparator;
-    std::sort(sorted_keys->begin(), sorted_keys->begin() + num_keys,
-              sort_comparator);
+
+    return;
  }
+
+  std::sort(sorted_keys->begin(), sorted_keys->begin() + num_keys,
+            CompareKeyContext());
 }

 void DBImpl::MultiGet(const ReadOptions& read_options,
@@ -2396,9 +2352,8 @@ void DBImpl::MultiGetWithCallback(
  }

  GetWithTimestampReadCallback timestamp_read_callback(0);
-  ReadCallback* read_callback = callback;
+  ReadCallback* read_callback = nullptr;
  if (read_options.timestamp && read_options.timestamp->size() > 0) {
-    assert(!read_callback);  // timestamp with callback is not supported
    timestamp_read_callback.Refresh(consistent_seqnum);
    read_callback = &timestamp_read_callback;
  }
@@ -3127,8 +3082,8 @@ const std::string& DBImpl::GetName() const { return dbname_; }
 Env* DBImpl::GetEnv() const { return env_; }

 FileSystem* DB::GetFileSystem() const {
-  const auto& fs = GetEnv()->GetFileSystem();
-  return fs.get();
+  static LegacyFileSystemWrapper fs_wrap(GetEnv());
+  return &fs_wrap;
 }

 FileSystem* DBImpl::GetFileSystem() const {
@@ -3511,6 +3466,7 @@ Status DBImpl::DeleteFile(std::string name) {
    return Status::InvalidArgument("Invalid file name");
  }

+  Status status;
  if (type == kWalFile) {
    // Only allow deleting archived log files
    if (log_type != kArchivedLogFile) {
@@ -3519,7 +3475,7 @@ Status DBImpl::DeleteFile(std::string name) {
                      name.c_str());
      return Status::NotSupported("Delete only supported for archived logs");
    }
-    Status status = wal_manager_.DeleteFile(name, number);
+    status = wal_manager_.DeleteFile(name, number);
    if (!status.ok()) {
      ROCKS_LOG_ERROR(immutable_db_options_.info_log,
                      "DeleteFile %s failed -- %s.\n", name.c_str(),
@@ -3528,7 +3484,6 @@ Status DBImpl::DeleteFile(std::string name) {
    return status;
  }

-  Status status;
  int level;
  FileMetaData* metadata;
  ColumnFamilyData* cfd;
@@ -3602,7 +3557,7 @@ Status DBImpl::DeleteFile(std::string name) {
 Status DBImpl::DeleteFilesInRanges(ColumnFamilyHandle* column_family,
                                   const RangePtr* ranges, size_t n,
                                   bool include_end) {
-  Status status = Status::OK();
+  Status status;
  auto cfh = static_cast_with_check<ColumnFamilyHandleImpl>(column_family);
  ColumnFamilyData* cfd = cfh->cfd();
  VersionEdit edit;
@@ -3661,7 +3616,7 @@ Status DBImpl::DeleteFilesInRanges(ColumnFamilyHandle* column_family,
    }
    if (edit.GetDeletedFiles().empty()) {
      job_context.Clean();
-      return status;
+      return Status::OK();
    }
    input_version->Ref();
    status = versions_->LogAndApply(cfd, *cfd->GetLatestMutableCFOptions(),
@@ -4382,7 +4337,7 @@ Status DBImpl::IngestExternalFiles(
    }
  }
  // Ingest multiple external SST files atomically.
-  const size_t num_cfs = args.size();
+  size_t num_cfs = args.size();
  for (size_t i = 0; i != num_cfs; ++i) {
    if (args[i].external_files.empty()) {
      char err_msg[128] = {0};
@@ -4423,7 +4378,10 @@ Status DBImpl::IngestExternalFiles(
        env_, versions_.get(), cfd, immutable_db_options_, file_options_,
        &snapshots_, arg.options, &directories_, &event_logger_, io_tracer_);
  }
-
+  std::vector<std::pair<bool, Status>> exec_results;
+  for (size_t i = 0; i != num_cfs; ++i) {
+    exec_results.emplace_back(false, Status::OK());
+  }
  // TODO(yanqin) maybe make jobs run in parallel
  uint64_t start_file_number = next_file_number;
  for (size_t i = 1; i != num_cfs; ++i) {
@@ -4431,13 +4389,10 @@ Status DBImpl::IngestExternalFiles(
    auto* cfd =
        static_cast<ColumnFamilyHandleImpl*>(args[i].column_family)->cfd();
    SuperVersion* super_version = cfd->GetReferencedSuperVersion(this);
-    Status es = ingestion_jobs[i].Prepare(
+    exec_results[i].second = ingestion_jobs[i].Prepare(
        args[i].external_files, args[i].files_checksums,
        args[i].files_checksum_func_names, start_file_number, super_version);
-    // capture first error only
-    if (!es.ok() && status.ok()) {
-      status = es;
-    }
+    exec_results[i].first = true;
    CleanupSuperVersion(super_version);
  }
  TEST_SYNC_POINT("DBImpl::IngestExternalFiles:BeforeLastJobPrepare:0");
@@ -4446,17 +4401,23 @@ Status DBImpl::IngestExternalFiles(
    auto* cfd =
        static_cast<ColumnFamilyHandleImpl*>(args[0].column_family)->cfd();
    SuperVersion* super_version = cfd->GetReferencedSuperVersion(this);
-    Status es = ingestion_jobs[0].Prepare(
+    exec_results[0].second = ingestion_jobs[0].Prepare(
        args[0].external_files, args[0].files_checksums,
        args[0].files_checksum_func_names, next_file_number, super_version);
-    if (!es.ok()) {
-      status = es;
-    }
+    exec_results[0].first = true;
    CleanupSuperVersion(super_version);
  }
+  for (const auto& exec_result : exec_results) {
+    if (!exec_result.second.ok()) {
+      status = exec_result.second;
+      break;
+    }
+  }
  if (!status.ok()) {
    for (size_t i = 0; i != num_cfs; ++i) {
-      ingestion_jobs[i].Cleanup(status);
+      if (exec_results[i].first) {
+        ingestion_jobs[i].Cleanup(status);
+      }
    }
    InstrumentedMutexLock l(&mutex_);
    ReleaseFileNumberFromPendingOutputs(pending_output_elem);
@@ -4900,7 +4861,7 @@ Status DBImpl::VerifySstFileChecksum(const FileMetaData& fmeta,
      fs_.get(), fname, immutable_db_options_.file_checksum_gen_factory.get(),
      fmeta.file_checksum_func_name, &file_checksum, &func_name,
      read_options.readahead_size, immutable_db_options_.allow_mmap_reads,
-      io_tracer_, immutable_db_options_.rate_limiter.get());
+      io_tracer_);
  if (s.ok()) {
    assert(fmeta.file_checksum_func_name == func_name);
    if (file_checksum != fmeta.file_checksum) {
@@ -954,9 +954,6 @@ class DBImpl : public DB {
  // is only for the special test of CancelledCompactions
  Status TEST_WaitForCompact(bool waitUnscheduled = false);

-  // Get the background error status
-  Status TEST_GetBGError();
-
  // Return the maximum overlapping data (in bytes) at next level for any
  // file at a level >= 1.
  int64_t TEST_MaxNextLevelOverlappingBytes(
@@ -35,10 +35,8 @@ bool DBImpl::EnoughRoomForCompaction(
    // Pass the current bg_error_ to SFM so it can decide what checks to
    // perform. If this DB instance hasn't seen any error yet, the SFM can be
    // optimistic and not do disk space checks
-    Status bg_error = error_handler_.GetBGError();
-    enough_room = sfm->EnoughRoomForCompaction(cfd, inputs, bg_error);
-    bg_error.PermitUncheckedError();  // bg_error is just a copy of the Status
-                                      // from the error_handler_
+    enough_room =
+        sfm->EnoughRoomForCompaction(cfd, inputs, error_handler_.GetBGError());
    if (enough_room) {
      *sfm_reserved_compact_space = true;
    }
@@ -286,10 +284,7 @@ Status DBImpl::FlushMemTableToOutputFile(
      // Notify sst_file_manager that a new file was added
      std::string file_path = MakeTableFileName(
          cfd->ioptions()->cf_paths[0].path, file_meta.fd.GetNumber());
-      // TODO (PR7798).  We should only add the file to the FileManager if it
-      // exists. Otherwise, some tests may fail.  Ignore the error in the
-      // interim.
-      sfm->OnAddFile(file_path).PermitUncheckedError();
+      sfm->OnAddFile(file_path);
      if (sfm->IsMaxAllowedSpaceReached()) {
        Status new_bg_error =
            Status::SpaceLimit("Max allowed space was reached");
@@ -623,7 +618,7 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
    auto sfm = static_cast<SstFileManagerImpl*>(
        immutable_db_options_.sst_file_manager.get());
    assert(all_mutable_cf_options.size() == static_cast<size_t>(num_cfs));
-    for (int i = 0; s.ok() && i != num_cfs; ++i) {
+    for (int i = 0; i != num_cfs; ++i) {
      if (cfds[i]->IsDropped()) {
        continue;
      }
@@ -632,10 +627,7 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
      if (sfm) {
        std::string file_path = MakeTableFileName(
            cfds[i]->ioptions()->cf_paths[0].path, file_meta[i].fd.GetNumber());
-        // TODO (PR7798).  We should only add the file to the FileManager if it
-        // exists. Otherwise, some tests may fail.  Ignore the error in the
-        // interim.
-        sfm->OnAddFile(file_path).PermitUncheckedError();
+        sfm->OnAddFile(file_path);
        if (sfm->IsMaxAllowedSpaceReached() &&
            error_handler_.GetBGError().ok()) {
          Status new_bg_error =
@@ -817,20 +809,20 @@ Status DBImpl::CompactRangeInternal(const CompactRangeOptions& options,
  }

  bool flush_needed = true;
-  Status s;
  if (begin != nullptr && end != nullptr) {
    // TODO(ajkr): We could also optimize away the flush in certain cases where
    // one/both sides of the interval are unbounded. But it requires more
    // changes to RangesOverlapWithMemtables.
    Range range(*begin, *end);
    SuperVersion* super_version = cfd->GetReferencedSuperVersion(this);
-    s = cfd->RangesOverlapWithMemtables(
-        {range}, super_version, immutable_db_options_.allow_data_in_errors,
-        &flush_needed);
+    cfd->RangesOverlapWithMemtables({range}, super_version,
+                                    immutable_db_options_.allow_data_in_errors,
+                                    &flush_needed);
    CleanupSuperVersion(super_version);
  }

-  if (s.ok() && flush_needed) {
+  Status s;
+  if (flush_needed) {
    FlushOptions fo;
    fo.allow_write_stall = options.allow_write_stall;
    if (immutable_db_options_.atomic_flush) {
@@ -1202,8 +1194,7 @@ Status DBImpl::CompactFilesImpl(
  mutex_.Unlock();
  TEST_SYNC_POINT("CompactFilesImpl:0");
  TEST_SYNC_POINT("CompactFilesImpl:1");
-  // Ignore the status here, as it will be checked in the Install down below...
-  compaction_job.Run().PermitUncheckedError();
+  compaction_job.Run();
  TEST_SYNC_POINT("CompactFilesImpl:2");
  TEST_SYNC_POINT("CompactFilesImpl:3");
  mutex_.Lock();
@@ -1400,6 +1391,8 @@ Status DBImpl::ReFitLevel(ColumnFamilyData* cfd, int level, int target_level) {

  SuperVersionContext sv_context(/* create_superversion */ true);

+  Status status;
+
  InstrumentedMutexLock guard_lock(&mutex_);

  // only allow one thread refitting
@@ -1463,9 +1456,8 @@ Status DBImpl::ReFitLevel(ColumnFamilyData* cfd, int level, int target_level) {
                    "[%s] Apply version edit:\n%s", cfd->GetName().c_str(),
                    edit.DebugString().data());

-    Status status = versions_->LogAndApply(cfd, mutable_cf_options, &edit,
-                                           &mutex_, directories_.GetDbDir());
-
+    status = versions_->LogAndApply(cfd, mutable_cf_options, &edit, &mutex_,
+                                    directories_.GetDbDir());
    InstallSuperVersionAndScheduleWork(cfd, &sv_context, mutable_cf_options);

    ROCKS_LOG_DEBUG(immutable_db_options_.info_log, "[%s] LogAndApply: %s\n",
@@ -1476,14 +1468,12 @@ Status DBImpl::ReFitLevel(ColumnFamilyData* cfd, int level, int target_level) {
                      "[%s] After refitting:\n%s", cfd->GetName().c_str(),
                      cfd->current()->DebugString().data());
    }
-    sv_context.Clean();
-    refitting_level_ = false;
-
-    return status;
  }

+  sv_context.Clean();
  refitting_level_ = false;
-  return Status::OK();
+
+  return status;
 }

 int DBImpl::NumberLevels(ColumnFamilyHandle* column_family) {
@@ -177,11 +177,6 @@ Status DBImpl::TEST_WaitForCompact(bool wait_unscheduled) {
  return error_handler_.GetBGError();
 }

-Status DBImpl::TEST_GetBGError() {
-  InstrumentedMutexLock l(&mutex_);
-  return error_handler_.GetBGError();
-}
-
 void DBImpl::TEST_LockMutex() { mutex_.Lock(); }

 void DBImpl::TEST_UnlockMutex() { mutex_.Unlock(); }
@@ -191,8 +191,7 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
      // set of all files in the directory. We'll exclude files that are still
      // alive in the subsequent processings.
      std::vector<std::string> files;
-      Status s = env_->GetChildren(path, &files);
-      s.PermitUncheckedError();  // TODO: What should we do on error?
+      env_->GetChildren(path, &files).PermitUncheckedError();  // Ignore errors
      for (const std::string& file : files) {
        uint64_t number;
        FileType type;
@@ -208,8 +207,7 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
          continue;
        }

-        // TODO(icanadi) clean up this mess to avoid having one-off "/"
-        // prefixes
+        // TODO(icanadi) clean up this mess to avoid having one-off "/" prefixes
        job_context->full_scan_candidate_files.emplace_back("/" + file, path);
      }
    }
@@ -217,8 +215,9 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
    // Add log files in wal_dir
    if (immutable_db_options_.wal_dir != dbname_) {
      std::vector<std::string> log_files;
-      Status s = env_->GetChildren(immutable_db_options_.wal_dir, &log_files);
-      s.PermitUncheckedError();  // TODO: What should we do on error?
+      env_->GetChildren(immutable_db_options_.wal_dir,
+                        &log_files)
+          .PermitUncheckedError();  // Ignore errors
      for (const std::string& log_file : log_files) {
        job_context->full_scan_candidate_files.emplace_back(
            log_file, immutable_db_options_.wal_dir);
@@ -228,9 +227,9 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
    if (!immutable_db_options_.db_log_dir.empty() &&
        immutable_db_options_.db_log_dir != dbname_) {
      std::vector<std::string> info_log_files;
-      Status s =
-          env_->GetChildren(immutable_db_options_.db_log_dir, &info_log_files);
-      s.PermitUncheckedError();  // TODO: What should we do on error?
+      // Ignore errors
+      env_->GetChildren(immutable_db_options_.db_log_dir, &info_log_files)
+          .PermitUncheckedError();
      for (std::string& log_file : info_log_files) {
        job_context->full_scan_candidate_files.emplace_back(
            log_file, immutable_db_options_.db_log_dir);
@@ -147,8 +147,7 @@ DBOptions SanitizeOptions(const std::string& dbname, const DBOptions& src) {
    // DeleteScheduler::CleanupDirectory on the same dir later, it will be
    // safe
    std::vector<std::string> filenames;
-    Status s = result.env->GetChildren(result.wal_dir, &filenames);
-    s.PermitUncheckedError();  //**TODO: What to do on error?
+    result.env->GetChildren(result.wal_dir, &filenames).PermitUncheckedError();
    for (std::string& filename : filenames) {
      if (filename.find(".log.trash", filename.length() -
                                          std::string(".log.trash").length()) !=
@@ -164,8 +163,7 @@ DBOptions SanitizeOptions(const std::string& dbname, const DBOptions& src) {
  // was not used)
  auto sfm = static_cast<SstFileManagerImpl*>(result.sst_file_manager.get());
  for (size_t i = 0; i < result.db_paths.size(); i++) {
-    DeleteScheduler::CleanupDirectory(result.env, sfm, result.db_paths[i].path)
-        .PermitUncheckedError();
+    DeleteScheduler::CleanupDirectory(result.env, sfm, result.db_paths[i].path);
  }

  // Create a default SstFileManager for purposes of tracking compaction size
@@ -1741,8 +1739,9 @@ Status DBImpl::Open(const DBOptions& db_options, const std::string& dbname,
    paths.erase(std::unique(paths.begin(), paths.end()), paths.end());
    for (auto& path : paths) {
      std::vector<std::string> existing_files;
+      // TODO: Check for errors here?
      impl->immutable_db_options_.env->GetChildren(path, &existing_files)
-          .PermitUncheckedError();  //**TODO: What do to on error?
+          .PermitUncheckedError();
      for (auto& file_name : existing_files) {
        uint64_t file_number;
        FileType file_type;
@@ -163,6 +163,7 @@ Status DBImpl::WriteImpl(const WriteOptions& write_options,
  StopWatch write_sw(env_, immutable_db_options_.statistics.get(), DB_WRITE);

  write_thread_.JoinBatchGroup(&w);
+  Status status;
  if (w.state == WriteThread::STATE_PARALLEL_MEMTABLE_WRITER) {
    // we are a non-leader in a parallel group

@@ -192,6 +193,8 @@ Status DBImpl::WriteImpl(const WriteOptions& write_options,
    }
    assert(w.state == WriteThread::STATE_COMPLETED);
    // STATE_COMPLETED conditional below handles exit
+
+    status = w.FinalStatus();
  }
  if (w.state == WriteThread::STATE_COMPLETED) {
    if (log_used != nullptr) {
@@ -201,11 +204,13 @@ Status DBImpl::WriteImpl(const WriteOptions& write_options,
      *seq_used = w.sequence;
    }
    // write is complete and leader has updated sequence
+    // Should we handle it?
+    status.PermitUncheckedError();
    return w.FinalStatus();
  }
  // else we are the leader of the write batch group
  assert(w.state == WriteThread::STATE_GROUP_LEADER);
-  Status status;
+
  // Once reaches this point, the current writer "w" will try to do its write
  // job.  It may also pick up some of the remaining writers in the "writers_"
  // when it finds suitable, and finish them in the same write batch.
@@ -526,8 +531,6 @@ Status DBImpl::PipelinedWriteImpl(const WriteOptions& write_options,
    PERF_TIMER_STOP(write_pre_and_post_process_time);

    IOStatus io_s;
-    io_s.PermitUncheckedError();  // Allow io_s to be uninitialized
-
    if (w.status.ok() && !write_options.disableWAL) {
      PERF_TIMER_GUARD(write_wal_time);
      stats->AddDBStats(InternalStats::kIntStatsWriteDoneBySelf, 1);
@@ -563,12 +566,7 @@ Status DBImpl::PipelinedWriteImpl(const WriteOptions& write_options,
    write_thread_.ExitAsBatchGroupLeader(wal_write_group, w.status);
  }

-  // NOTE: the memtable_write_group is declared before the following
-  // `if` statement because its lifetime needs to be longer
-  // that the inner context  of the `if` as a reference to it
-  // may be used further below within the outer _write_thread
  WriteThread::WriteGroup memtable_write_group;
-
  if (w.state == WriteThread::STATE_MEMTABLE_WRITER_LEADER) {
    PERF_TIMER_GUARD(write_memtable_time);
    assert(w.ShouldWriteToMemtable());
@@ -585,10 +583,6 @@ Status DBImpl::PipelinedWriteImpl(const WriteOptions& write_options,
      versions_->SetLastSequence(memtable_write_group.last_sequence);
      write_thread_.ExitAsMemTableWriter(&w, memtable_write_group);
    }
-  } else {
-    // NOTE: the memtable_write_group is never really used,
-    // so we need to set its status to pass ASSERT_STATUS_CHECKED
-    memtable_write_group.status.PermitUncheckedError();
  }

  if (w.state == WriteThread::STATE_PARALLEL_MEMTABLE_WRITER) {
@@ -773,7 +767,6 @@ Status DBImpl::WriteImplWALOnly(
  }
  Status status;
  IOStatus io_s;
-  io_s.PermitUncheckedError();  // Allow io_s to be uninitialized
  if (!write_options.disableWAL) {
    io_s = ConcurrentWriteToWAL(write_group, log_used, &last_sequence, seq_inc);
    status = io_s;
@@ -43,15 +43,11 @@ TEST_F(DBIOFailureTest, DropWrites) {
          if (level > 0 && level == dbfull()->NumberLevels() - 1) {
            break;
          }
-          Status s =
-              dbfull()->TEST_CompactRange(level, nullptr, nullptr, nullptr,
-                                          true /* disallow trivial move */);
-          ASSERT_TRUE(s.ok() || s.IsCorruption());
+          dbfull()->TEST_CompactRange(level, nullptr, nullptr, nullptr,
+                                      true /* disallow trivial move */);
        }
      } else {
-        Status s =
-            dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
-        ASSERT_TRUE(s.ok() || s.IsCorruption());
+        dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);
      }
    }

@@ -60,8 +56,7 @@ TEST_F(DBIOFailureTest, DropWrites) {
    ASSERT_EQ("5", property_value);

    env_->drop_writes_.store(false, std::memory_order_release);
-    const size_t count = CountFiles();
-    ASSERT_LT(count, num_files + 3);
+    ASSERT_LT(CountFiles(), num_files + 3);

    // Check that compaction attempts slept after errors
    // TODO @krad: Figure out why ASSERT_EQ 5 keeps failing in certain compiler
@@ -87,8 +82,7 @@ TEST_F(DBIOFailureTest, DropWritesFlush) {
    ASSERT_TRUE(db_->GetProperty("rocksdb.background-errors", &property_value));
    ASSERT_EQ("0", property_value);

-    // ASSERT file is too short
-    ASSERT_TRUE(dbfull()->TEST_FlushMemTable(true).IsCorruption());
+    dbfull()->TEST_FlushMemTable(true);

    ASSERT_TRUE(db_->GetProperty("rocksdb.background-errors", &property_value));
    ASSERT_EQ("1", property_value);
@@ -172,7 +166,7 @@ TEST_F(DBIOFailureTest, ManifestWriteError) {
    ASSERT_EQ("bar", Get("foo"));

    // Memtable compaction (will succeed)
-    ASSERT_OK(Flush());
+    Flush();
    ASSERT_EQ("bar", Get("foo"));
    const int last = 2;
    MoveFilesToLevel(2);
@@ -180,8 +174,7 @@ TEST_F(DBIOFailureTest, ManifestWriteError) {

    // Merging compaction (will fail)
    error_type->store(true, std::memory_order_release);
-    ASSERT_NOK(
-        dbfull()->TEST_CompactRange(last, nullptr, nullptr));  // Should fail
+    dbfull()->TEST_CompactRange(last, nullptr, nullptr);  // Should fail
    ASSERT_EQ("bar", Get("foo"));

    error_type->store(false, std::memory_order_release);
@@ -199,13 +192,7 @@ TEST_F(DBIOFailureTest, ManifestWriteError) {

    // Merging compaction (will fail)
    error_type->store(true, std::memory_order_release);
-    Status s =
-        dbfull()->TEST_CompactRange(last, nullptr, nullptr);  // Should fail
-    if (iter == 0) {
-      ASSERT_OK(s);
-    } else {
-      ASSERT_TRUE(s.IsIOError());
-    }
+    dbfull()->TEST_CompactRange(last, nullptr, nullptr);  // Should fail
    ASSERT_EQ("bar", Get("foo"));

    // Recovery: should not lose data
@@ -233,15 +220,18 @@ TEST_F(DBIOFailureTest, PutFailsParanoid) {
  options.paranoid_checks = true;
  DestroyAndReopen(options);
  CreateAndReopenWithCF({"pikachu"}, options);
+  Status s;

  ASSERT_OK(Put(1, "foo", "bar"));
  ASSERT_OK(Put(1, "foo1", "bar1"));
  // simulate error
  env_->log_write_error_.store(true, std::memory_order_release);
-  ASSERT_NOK(Put(1, "foo2", "bar2"));
+  s = Put(1, "foo2", "bar2");
+  ASSERT_TRUE(!s.ok());
  env_->log_write_error_.store(false, std::memory_order_release);
+  s = Put(1, "foo3", "bar3");
  // the next put should fail, too
-  ASSERT_NOK(Put(1, "foo3", "bar3"));
+  ASSERT_TRUE(!s.ok());
  // but we're still able to read
  ASSERT_EQ("bar", Get(1, "foo"));

@@ -254,10 +244,12 @@ TEST_F(DBIOFailureTest, PutFailsParanoid) {
  ASSERT_OK(Put(1, "foo1", "bar1"));
  // simulate error
  env_->log_write_error_.store(true, std::memory_order_release);
-  ASSERT_NOK(Put(1, "foo2", "bar2"));
+  s = Put(1, "foo2", "bar2");
+  ASSERT_TRUE(!s.ok());
  env_->log_write_error_.store(false, std::memory_order_release);
+  s = Put(1, "foo3", "bar3");
  // the next put should NOT fail
-  ASSERT_OK(Put(1, "foo3", "bar3"));
+  ASSERT_TRUE(s.ok());
 }
 #if !(defined NDEBUG) || !defined(OS_WIN)
 TEST_F(DBIOFailureTest, FlushSstRangeSyncError) {
@@ -277,14 +269,14 @@ TEST_F(DBIOFailureTest, FlushSstRangeSyncError) {

  DestroyAndReopen(options);
  CreateAndReopenWithCF({"pikachu"}, options);
+  Status s;

-  const char* io_error_msg = "range sync dummy error";
  std::atomic<int> range_sync_called(0);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "SpecialEnv::SStableFile::RangeSync", [&](void* arg) {
        if (range_sync_called.fetch_add(1) == 0) {
          Status* st = static_cast<Status*>(arg);
-          *st = Status::IOError(io_error_msg);
+          *st = Status::IOError("range sync dummy error");
        }
      });
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
@@ -306,9 +298,7 @@ TEST_F(DBIOFailureTest, FlushSstRangeSyncError) {
  ASSERT_OK(Put(1, "foo3_2", rnd_str));
  ASSERT_OK(Put(1, "foo3_3", rnd_str));
  ASSERT_OK(Put(1, "foo4", "bar"));
-  Status s = dbfull()->TEST_WaitForFlushMemTable(handles_[1]);
-  ASSERT_TRUE(s.IsIOError());
-  ASSERT_STREQ(s.getState(), io_error_msg);
+  dbfull()->TEST_WaitForFlushMemTable(handles_[1]);

  // Following writes should fail as flush failed.
  ASSERT_NOK(Put(1, "foo2", "bar3"));
@@ -338,6 +328,7 @@ TEST_F(DBIOFailureTest, CompactSstRangeSyncError) {
  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
  DestroyAndReopen(options);
  CreateAndReopenWithCF({"pikachu"}, options);
+  Status s;

  Random rnd(301);
  std::string rnd_str =
@@ -351,22 +342,21 @@ TEST_F(DBIOFailureTest, CompactSstRangeSyncError) {
  ASSERT_OK(Put(1, "foo1_1", rnd_str));
  ASSERT_OK(Put(1, "foo1_2", rnd_str));
  ASSERT_OK(Put(1, "foo1_3", rnd_str));
-  ASSERT_OK(Flush(1));
+  Flush(1);
  ASSERT_OK(Put(1, "foo", "bar"));
  ASSERT_OK(Put(1, "foo3_1", rnd_str));
  ASSERT_OK(Put(1, "foo3_2", rnd_str));
  ASSERT_OK(Put(1, "foo3_3", rnd_str));
  ASSERT_OK(Put(1, "foo4", "bar"));
-  ASSERT_OK(Flush(1));
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(handles_[1]));
+  Flush(1);
+  dbfull()->TEST_WaitForFlushMemTable(handles_[1]);

-  const char* io_error_msg = "range sync dummy error";
  std::atomic<int> range_sync_called(0);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "SpecialEnv::SStableFile::RangeSync", [&](void* arg) {
        if (range_sync_called.fetch_add(1) == 0) {
          Status* st = static_cast<Status*>(arg);
-          *st = Status::IOError(io_error_msg);
+          *st = Status::IOError("range sync dummy error");
        }
      });
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
@@ -375,9 +365,7 @@ TEST_F(DBIOFailureTest, CompactSstRangeSyncError) {
                                 {
                                     {"disable_auto_compactions", "false"},
                                 }));
-  Status s = dbfull()->TEST_WaitForCompact();
-  ASSERT_TRUE(s.IsIOError());
-  ASSERT_STREQ(s.getState(), io_error_msg);
+  dbfull()->TEST_WaitForCompact();

  // Following writes should fail as flush failed.
  ASSERT_NOK(Put(1, "foo2", "bar3"));
@@ -401,14 +389,13 @@ TEST_F(DBIOFailureTest, FlushSstCloseError) {

  DestroyAndReopen(options);
  CreateAndReopenWithCF({"pikachu"}, options);
-
-  const char* io_error_msg = "close dummy error";
+  Status s;
  std::atomic<int> close_called(0);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "SpecialEnv::SStableFile::Close", [&](void* arg) {
        if (close_called.fetch_add(1) == 0) {
          Status* st = static_cast<Status*>(arg);
-          *st = Status::IOError(io_error_msg);
+          *st = Status::IOError("close dummy error");
        }
      });

@@ -417,9 +404,7 @@ TEST_F(DBIOFailureTest, FlushSstCloseError) {
  ASSERT_OK(Put(1, "foo", "bar"));
  ASSERT_OK(Put(1, "foo1", "bar1"));
  ASSERT_OK(Put(1, "foo", "bar2"));
-  Status s = dbfull()->TEST_WaitForFlushMemTable(handles_[1]);
-  ASSERT_TRUE(s.IsIOError());
-  ASSERT_STREQ(s.getState(), io_error_msg);
+  dbfull()->TEST_WaitForFlushMemTable(handles_[1]);

  // Following writes should fail as flush failed.
  ASSERT_NOK(Put(1, "foo2", "bar3"));
@@ -444,25 +429,25 @@ TEST_F(DBIOFailureTest, CompactionSstCloseError) {

  DestroyAndReopen(options);
  CreateAndReopenWithCF({"pikachu"}, options);
+  Status s;

  ASSERT_OK(Put(1, "foo", "bar"));
  ASSERT_OK(Put(1, "foo2", "bar"));
-  ASSERT_OK(Flush(1));
+  Flush(1);
  ASSERT_OK(Put(1, "foo", "bar2"));
  ASSERT_OK(Put(1, "foo2", "bar"));
-  ASSERT_OK(Flush(1));
+  Flush(1);
  ASSERT_OK(Put(1, "foo", "bar3"));
  ASSERT_OK(Put(1, "foo2", "bar"));
-  ASSERT_OK(Flush(1));
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  Flush(1);
+  dbfull()->TEST_WaitForCompact();

-  const char* io_error_msg = "close dummy error";
  std::atomic<int> close_called(0);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "SpecialEnv::SStableFile::Close", [&](void* arg) {
        if (close_called.fetch_add(1) == 0) {
          Status* st = static_cast<Status*>(arg);
-          *st = Status::IOError(io_error_msg);
+          *st = Status::IOError("close dummy error");
        }
      });

@@ -471,9 +456,7 @@ TEST_F(DBIOFailureTest, CompactionSstCloseError) {
                                 {
                                     {"disable_auto_compactions", "false"},
                                 }));
-  Status s = dbfull()->TEST_WaitForCompact();
-  ASSERT_TRUE(s.IsIOError());
-  ASSERT_STREQ(s.getState(), io_error_msg);
+  dbfull()->TEST_WaitForCompact();

  // Following writes should fail as compaction failed.
  ASSERT_NOK(Put(1, "foo2", "bar3"));
@@ -497,14 +480,13 @@ TEST_F(DBIOFailureTest, FlushSstSyncError) {

  DestroyAndReopen(options);
  CreateAndReopenWithCF({"pikachu"}, options);
-
-  const char* io_error_msg = "sync dummy error";
+  Status s;
  std::atomic<int> sync_called(0);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "SpecialEnv::SStableFile::Sync", [&](void* arg) {
        if (sync_called.fetch_add(1) == 0) {
          Status* st = static_cast<Status*>(arg);
-          *st = Status::IOError(io_error_msg);
+          *st = Status::IOError("sync dummy error");
        }
      });

@@ -513,9 +495,7 @@ TEST_F(DBIOFailureTest, FlushSstSyncError) {
  ASSERT_OK(Put(1, "foo", "bar"));
  ASSERT_OK(Put(1, "foo1", "bar1"));
  ASSERT_OK(Put(1, "foo", "bar2"));
-  Status s = dbfull()->TEST_WaitForFlushMemTable(handles_[1]);
-  ASSERT_TRUE(s.IsIOError());
-  ASSERT_STREQ(s.getState(), io_error_msg);
+  dbfull()->TEST_WaitForFlushMemTable(handles_[1]);

  // Following writes should fail as flush failed.
  ASSERT_NOK(Put(1, "foo2", "bar3"));
@@ -541,25 +521,25 @@ TEST_F(DBIOFailureTest, CompactionSstSyncError) {

  DestroyAndReopen(options);
  CreateAndReopenWithCF({"pikachu"}, options);
+  Status s;

  ASSERT_OK(Put(1, "foo", "bar"));
  ASSERT_OK(Put(1, "foo2", "bar"));
-  ASSERT_OK(Flush(1));
+  Flush(1);
  ASSERT_OK(Put(1, "foo", "bar2"));
  ASSERT_OK(Put(1, "foo2", "bar"));
-  ASSERT_OK(Flush(1));
+  Flush(1);
  ASSERT_OK(Put(1, "foo", "bar3"));
  ASSERT_OK(Put(1, "foo2", "bar"));
-  ASSERT_OK(Flush(1));
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  Flush(1);
+  dbfull()->TEST_WaitForCompact();

-  const char* io_error_msg = "sync dummy error";
  std::atomic<int> sync_called(0);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "SpecialEnv::SStableFile::Sync", [&](void* arg) {
        if (sync_called.fetch_add(1) == 0) {
          Status* st = static_cast<Status*>(arg);
-          *st = Status::IOError(io_error_msg);
+          *st = Status::IOError("close dummy error");
        }
      });

@@ -568,9 +548,7 @@ TEST_F(DBIOFailureTest, CompactionSstSyncError) {
                                 {
                                     {"disable_auto_compactions", "false"},
                                 }));
-  Status s = dbfull()->TEST_WaitForCompact();
-  ASSERT_TRUE(s.IsIOError());
-  ASSERT_STREQ(s.getState(), io_error_msg);
+  dbfull()->TEST_WaitForCompact();

  // Following writes should fail as compaction failed.
  ASSERT_NOK(Put(1, "foo2", "bar3"));
@@ -392,7 +392,6 @@ TEST_F(DBIteratorTest, DBIteratorPrevNext) {

    db_iter->SeekToLast();
    ASSERT_TRUE(!db_iter->Valid());
-    ASSERT_OK(db_iter->status());
  }
  // Test case to check SeekToLast with iterate_upper_bound set
  // (same key put may times - SeekToLast should start with the
@@ -490,7 +489,6 @@ TEST_F(DBIteratorTest, DBIteratorPrevNext) {

    db_iter->SeekToLast();
    ASSERT_TRUE(!db_iter->Valid());
-    ASSERT_OK(db_iter->status());
  }
  // Test to check the SeekToLast() with the iterate_upper_bound set
  // (Deletion cases)
@@ -598,7 +596,6 @@ TEST_F(DBIteratorTest, DBIteratorPrevNext) {

    db_iter->Prev();
    ASSERT_TRUE(!db_iter->Valid());
-    ASSERT_OK(db_iter->status());
  }

  {
@@ -692,7 +689,6 @@ TEST_F(DBIteratorTest, DBIteratorEmpty) {
        nullptr /* read_callback */));
    db_iter->SeekToLast();
    ASSERT_TRUE(!db_iter->Valid());
-    ASSERT_OK(db_iter->status());
  }

  {
@@ -706,7 +702,6 @@ TEST_F(DBIteratorTest, DBIteratorEmpty) {
        nullptr /* read_callback */));
    db_iter->SeekToFirst();
    ASSERT_TRUE(!db_iter->Valid());
-    ASSERT_OK(db_iter->status());
  }
 }

@@ -749,7 +744,6 @@ TEST_F(DBIteratorTest, DBIteratorUseSkipCountSkips) {

  db_iter->Prev();
  ASSERT_TRUE(!db_iter->Valid());
-  ASSERT_OK(db_iter->status());
  ASSERT_EQ(TestGetTickerCount(options, NUMBER_OF_RESEEKS_IN_ITERATION), 3u);
 }

@@ -794,7 +788,6 @@ TEST_F(DBIteratorTest, DBIteratorUseSkip) {
      db_iter->Prev();

      ASSERT_TRUE(!db_iter->Valid());
-      ASSERT_OK(db_iter->status());
    }
  }

@@ -827,7 +820,6 @@ TEST_F(DBIteratorTest, DBIteratorUseSkip) {
      db_iter->Prev();

      ASSERT_TRUE(!db_iter->Valid());
-      ASSERT_OK(db_iter->status());
    }

    {
@@ -863,7 +855,6 @@ TEST_F(DBIteratorTest, DBIteratorUseSkip) {
      db_iter->Prev();

      ASSERT_TRUE(!db_iter->Valid());
-      ASSERT_OK(db_iter->status());
    }
  }

@@ -882,11 +873,9 @@ TEST_F(DBIteratorTest, DBIteratorUseSkip) {
          nullptr /* read_callback */));
      db_iter->SeekToLast();
      ASSERT_TRUE(!db_iter->Valid());
-      ASSERT_OK(db_iter->status());

      db_iter->SeekToFirst();
      ASSERT_TRUE(!db_iter->Valid());
-      ASSERT_OK(db_iter->status());
    }

    TestIterator* internal_iter = new TestIterator(BytewiseComparator());
@@ -907,7 +896,6 @@ TEST_F(DBIteratorTest, DBIteratorUseSkip) {

    db_iter->Prev();
    ASSERT_TRUE(!db_iter->Valid());
-    ASSERT_OK(db_iter->status());

    db_iter->SeekToFirst();
    ASSERT_TRUE(db_iter->Valid());
@@ -916,7 +904,6 @@ TEST_F(DBIteratorTest, DBIteratorUseSkip) {

    db_iter->Next();
    ASSERT_TRUE(!db_iter->Valid());
-    ASSERT_OK(db_iter->status());
  }

  {
@@ -956,7 +943,6 @@ TEST_F(DBIteratorTest, DBIteratorUseSkip) {
      db_iter->Prev();

      ASSERT_TRUE(!db_iter->Valid());
-      ASSERT_OK(db_iter->status());
    }
  }

@@ -997,7 +983,6 @@ TEST_F(DBIteratorTest, DBIteratorUseSkip) {

      db_iter->Prev();
      ASSERT_TRUE(!db_iter->Valid());
-      ASSERT_OK(db_iter->status());
    }
  }
 }
@@ -1054,7 +1039,7 @@ TEST_F(DBIteratorTest, DBIteratorSkipInternalKeys) {

    db_iter->Prev();
    ASSERT_TRUE(!db_iter->Valid());
-    ASSERT_OK(db_iter->status());
+    ASSERT_TRUE(db_iter->status().ok());
  }

  // Test to make sure that the request will *not* fail as incomplete if
@@ -3151,7 +3136,6 @@ TEST_F(DBIteratorTest, SeekToFirstLowerBound) {
    if (i == kNumKeys + 1) {
      // lower bound was beyond the last key
      ASSERT_FALSE(db_iter->Valid());
-      ASSERT_OK(db_iter->status());
    } else {
      ASSERT_TRUE(db_iter->Valid());
      int expected;
@@ -33,8 +33,9 @@ class DBTestXactLogIterator : public DBTestBase {
 };

 namespace {
-SequenceNumber ReadRecords(std::unique_ptr<TransactionLogIterator>& iter,
-                           int& count, bool expect_ok = true) {
+SequenceNumber ReadRecords(
+    std::unique_ptr<TransactionLogIterator>& iter,
+    int& count) {
  count = 0;
  SequenceNumber lastSequence = 0;
  BatchResult res;
@@ -46,11 +47,6 @@ SequenceNumber ReadRecords(std::unique_ptr<TransactionLogIterator>& iter,
    EXPECT_OK(iter->status());
    iter->Next();
  }
-  if (expect_ok) {
-    EXPECT_OK(iter->status());
-  } else {
-    EXPECT_NOK(iter->status());
-  }
  return res.sequence;
 }

@@ -68,9 +64,9 @@ TEST_F(DBTestXactLogIterator, TransactionLogIterator) {
    Options options = OptionsForLogIterTest();
    DestroyAndReopen(options);
    CreateAndReopenWithCF({"pikachu"}, options);
-    ASSERT_OK(Put(0, "key1", DummyString(1024)));
-    ASSERT_OK(Put(1, "key2", DummyString(1024)));
-    ASSERT_OK(Put(1, "key2", DummyString(1024)));
+    Put(0, "key1", DummyString(1024));
+    Put(1, "key2", DummyString(1024));
+    Put(1, "key2", DummyString(1024));
    ASSERT_EQ(dbfull()->GetLatestSequenceNumber(), 3U);
    {
      auto iter = OpenTransactionLogIter(0);
@@ -79,9 +75,9 @@ TEST_F(DBTestXactLogIterator, TransactionLogIterator) {
    ReopenWithColumnFamilies({"default", "pikachu"}, options);
    env_->SleepForMicroseconds(2 * 1000 * 1000);
    {
-      ASSERT_OK(Put(0, "key4", DummyString(1024)));
-      ASSERT_OK(Put(1, "key5", DummyString(1024)));
-      ASSERT_OK(Put(0, "key6", DummyString(1024)));
+      Put(0, "key4", DummyString(1024));
+      Put(1, "key5", DummyString(1024));
+      Put(0, "key6", DummyString(1024));
    }
    {
      auto iter = OpenTransactionLogIter(0);
@@ -113,15 +109,15 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorRace) {
      ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
      Options options = OptionsForLogIterTest();
      DestroyAndReopen(options);
-      ASSERT_OK(Put("key1", DummyString(1024)));
-      ASSERT_OK(dbfull()->Flush(FlushOptions()));
-      ASSERT_OK(Put("key2", DummyString(1024)));
-      ASSERT_OK(dbfull()->Flush(FlushOptions()));
-      ASSERT_OK(Put("key3", DummyString(1024)));
-      ASSERT_OK(dbfull()->Flush(FlushOptions()));
-      ASSERT_OK(Put("key4", DummyString(1024)));
+      Put("key1", DummyString(1024));
+      dbfull()->Flush(FlushOptions());
+      Put("key2", DummyString(1024));
+      dbfull()->Flush(FlushOptions());
+      Put("key3", DummyString(1024));
+      dbfull()->Flush(FlushOptions());
+      Put("key4", DummyString(1024));
      ASSERT_EQ(dbfull()->GetLatestSequenceNumber(), 4U);
-      ASSERT_OK(dbfull()->FlushWAL(false));
+      dbfull()->FlushWAL(false);

      {
        auto iter = OpenTransactionLogIter(0);
@@ -134,11 +130,11 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorRace) {
      // condition
      FlushOptions flush_options;
      flush_options.wait = false;
-      ASSERT_OK(dbfull()->Flush(flush_options));
+      dbfull()->Flush(flush_options);

      // "key5" would be written in a new memtable and log
-      ASSERT_OK(Put("key5", DummyString(1024)));
-      ASSERT_OK(dbfull()->FlushWAL(false));
+      Put("key5", DummyString(1024));
+      dbfull()->FlushWAL(false);
      {
        // this iter would miss "key4" if not fixed
        auto iter = OpenTransactionLogIter(0);
@@ -153,14 +149,14 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorStallAtLastRecord) {
  do {
    Options options = OptionsForLogIterTest();
    DestroyAndReopen(options);
-    ASSERT_OK(Put("key1", DummyString(1024)));
+    Put("key1", DummyString(1024));
    auto iter = OpenTransactionLogIter(0);
    ASSERT_OK(iter->status());
    ASSERT_TRUE(iter->Valid());
    iter->Next();
    ASSERT_TRUE(!iter->Valid());
    ASSERT_OK(iter->status());
-    ASSERT_OK(Put("key2", DummyString(1024)));
+    Put("key2", DummyString(1024));
    iter->Next();
    ASSERT_OK(iter->status());
    ASSERT_TRUE(iter->Valid());
@@ -171,9 +167,9 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorCheckAfterRestart) {
  do {
    Options options = OptionsForLogIterTest();
    DestroyAndReopen(options);
-    ASSERT_OK(Put("key1", DummyString(1024)));
-    ASSERT_OK(Put("key2", DummyString(1023)));
-    ASSERT_OK(dbfull()->Flush(FlushOptions()));
+    Put("key1", DummyString(1024));
+    Put("key2", DummyString(1023));
+    dbfull()->Flush(FlushOptions());
    Reopen(options);
    auto iter = OpenTransactionLogIter(0);
    ExpectRecords(2, iter);
@@ -185,10 +181,10 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorCorruptedLog) {
    Options options = OptionsForLogIterTest();
    DestroyAndReopen(options);
    for (int i = 0; i < 1024; i++) {
-      ASSERT_OK(Put("key" + ToString(i), DummyString(10)));
+      Put("key"+ToString(i), DummyString(10));
    }
-    ASSERT_OK(dbfull()->Flush(FlushOptions()));
-    ASSERT_OK(dbfull()->FlushWAL(false));
+    dbfull()->Flush(FlushOptions());
+    dbfull()->FlushWAL(false);
    // Corrupt this log to create a gap
    ROCKSDB_NAMESPACE::VectorLogPtr wal_files;
    ASSERT_OK(dbfull()->GetSortedWalFiles(wal_files));
@@ -201,13 +197,13 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorCorruptedLog) {
    }

    // Insert a new entry to a new log file
-    ASSERT_OK(Put("key1025", DummyString(10)));
-    ASSERT_OK(dbfull()->FlushWAL(false));
+    Put("key1025", DummyString(10));
+    dbfull()->FlushWAL(false);
    // Try to read from the beginning. Should stop before the gap and read less
    // than 1025 entries
    auto iter = OpenTransactionLogIter(0);
    int count;
-    SequenceNumber last_sequence_read = ReadRecords(iter, count, false);
+    SequenceNumber last_sequence_read = ReadRecords(iter, count);
    ASSERT_LT(last_sequence_read, 1025U);
    // Try to read past the gap, should be able to seek to key1025
    auto iter2 = OpenTransactionLogIter(last_sequence_read + 1);
@@ -221,15 +217,15 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorBatchOperations) {
    DestroyAndReopen(options);
    CreateAndReopenWithCF({"pikachu"}, options);
    WriteBatch batch;
-    ASSERT_OK(batch.Put(handles_[1], "key1", DummyString(1024)));
-    ASSERT_OK(batch.Put(handles_[0], "key2", DummyString(1024)));
-    ASSERT_OK(batch.Put(handles_[1], "key3", DummyString(1024)));
-    ASSERT_OK(batch.Delete(handles_[0], "key2"));
-    ASSERT_OK(dbfull()->Write(WriteOptions(), &batch));
-    ASSERT_OK(Flush(1));
-    ASSERT_OK(Flush(0));
+    batch.Put(handles_[1], "key1", DummyString(1024));
+    batch.Put(handles_[0], "key2", DummyString(1024));
+    batch.Put(handles_[1], "key3", DummyString(1024));
+    batch.Delete(handles_[0], "key2");
+    dbfull()->Write(WriteOptions(), &batch);
+    Flush(1);
+    Flush(0);
    ReopenWithColumnFamilies({"default", "pikachu"}, options);
-    ASSERT_OK(Put(1, "key4", DummyString(1024)));
+    Put(1, "key4", DummyString(1024));
    auto iter = OpenTransactionLogIter(3);
    ExpectRecords(2, iter);
  } while (ChangeCompactOptions());
@@ -241,13 +237,13 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorBlobs) {
  CreateAndReopenWithCF({"pikachu"}, options);
  {
    WriteBatch batch;
-    ASSERT_OK(batch.Put(handles_[1], "key1", DummyString(1024)));
-    ASSERT_OK(batch.Put(handles_[0], "key2", DummyString(1024)));
-    ASSERT_OK(batch.PutLogData(Slice("blob1")));
-    ASSERT_OK(batch.Put(handles_[1], "key3", DummyString(1024)));
-    ASSERT_OK(batch.PutLogData(Slice("blob2")));
-    ASSERT_OK(batch.Delete(handles_[0], "key2"));
-    ASSERT_OK(dbfull()->Write(WriteOptions(), &batch));
+    batch.Put(handles_[1], "key1", DummyString(1024));
+    batch.Put(handles_[0], "key2", DummyString(1024));
+    batch.PutLogData(Slice("blob1"));
+    batch.Put(handles_[1], "key3", DummyString(1024));
+    batch.PutLogData(Slice("blob2"));
+    batch.Delete(handles_[0], "key2");
+    dbfull()->Write(WriteOptions(), &batch);
    ReopenWithColumnFamilies({"default", "pikachu"}, options);
  }

@@ -272,7 +268,7 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorBlobs) {
      return Status::OK();
    }
  } handler;
-  ASSERT_OK(res.writeBatchPtr->Iterate(&handler));
+  res.writeBatchPtr->Iterate(&handler);
  ASSERT_EQ(
      "Put(1, key1, 1024)"
      "Put(0, key2, 1024)"
@@ -190,11 +190,10 @@ TEST_F(DBOptionsTest, SetWalBytesPerSync) {
  options.env = env_;
  Reopen(options);
  ASSERT_EQ(512, dbfull()->GetDBOptions().wal_bytes_per_sync);
-  std::atomic_int counter{0};
+  int counter = 0;
  int low_bytes_per_sync = 0;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "WritableFileWriter::RangeSync:0",
-      [&](void* /*arg*/) { counter.fetch_add(1); });
+      "WritableFileWriter::RangeSync:0", [&](void* /*arg*/) { counter++; });
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
  const std::string kValue(kValueSize, 'v');
  int i = 0;
@@ -730,7 +729,7 @@ TEST_F(DBOptionsTest, SetFIFOCompactionOptions) {
    for (int j = 0; j < 10; j++) {
      ASSERT_OK(Put(ToString(i * 20 + j), rnd.RandomString(980)));
    }
-    ASSERT_OK(Flush());
+    Flush();
  }
  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(NumTableFilesAtLevel(0), 10);
@@ -56,7 +56,7 @@ TEST_F(DBRangeDelTest, EndSameAsStartCoversNothing) {
 }

 TEST_F(DBRangeDelTest, EndComesBeforeStartInvalidArgument) {
-  ASSERT_OK(db_->Put(WriteOptions(), "b", "val"));
+  db_->Put(WriteOptions(), "b", "val");
  ASSERT_TRUE(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "b", "a")
          .IsInvalidArgument());
@@ -82,14 +82,13 @@ TEST_F(DBRangeDelTest, CompactionOutputHasOnlyRangeTombstone) {

    // snapshot protects range tombstone from dropping due to becoming obsolete.
    const Snapshot* snapshot = db_->GetSnapshot();
-    ASSERT_OK(
-        db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));
-    ASSERT_OK(db_->Flush(FlushOptions()));
+    db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z");
+    db_->Flush(FlushOptions());

    ASSERT_EQ(1, NumTableFilesAtLevel(0));
    ASSERT_EQ(0, NumTableFilesAtLevel(1));
-    ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                          true /* disallow_trivial_move */));
+    dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
+                                true /* disallow_trivial_move */);
    ASSERT_EQ(0, NumTableFilesAtLevel(0));
    ASSERT_EQ(1, NumTableFilesAtLevel(1));
    ASSERT_EQ(0, TestGetTickerCount(opts, COMPACTION_RANGE_DEL_DROP_OBSOLETE));
@@ -119,8 +118,7 @@ TEST_F(DBRangeDelTest, CompactionOutputFilesExactlyFilled) {

  // snapshot protects range tombstone from dropping due to becoming obsolete.
  const Snapshot* snapshot = db_->GetSnapshot();
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0),
-                             Key(1)));
+  db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0), Key(1));

  Random rnd(301);
  for (int i = 0; i < kNumFiles; ++i) {
@@ -130,18 +128,18 @@ TEST_F(DBRangeDelTest, CompactionOutputFilesExactlyFilled) {
      values.push_back(rnd.RandomString(3 << 10));
      ASSERT_OK(Put(Key(i * kNumPerFile + j), values[j]));
      if (j == 0 && i > 0) {
-        ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+        dbfull()->TEST_WaitForFlushMemTable();
      }
    }
  }
  // put extra key to trigger final flush
  ASSERT_OK(Put("", ""));
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+  dbfull()->TEST_WaitForFlushMemTable();
  ASSERT_EQ(kNumFiles, NumTableFilesAtLevel(0));
  ASSERT_EQ(0, NumTableFilesAtLevel(1));

-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
+  dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
+                              true /* disallow_trivial_move */);
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
  ASSERT_EQ(2, NumTableFilesAtLevel(1));
  db_->ReleaseSnapshot(snapshot);
@@ -180,12 +178,12 @@ TEST_F(DBRangeDelTest, MaxCompactionBytesCutsOutputFiles) {
    }
    // extra entry to trigger SpecialSkipListFactory's flush
    ASSERT_OK(Put(GetNumericStr(kNumPerFile), ""));
-    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+    dbfull()->TEST_WaitForFlushMemTable();
    ASSERT_EQ(i + 1, NumTableFilesAtLevel(0));
  }

-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
+  dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
+                              true /* disallow_trivial_move */);
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
  ASSERT_GE(NumTableFilesAtLevel(1), 2);

@@ -223,10 +221,10 @@ TEST_F(DBRangeDelTest, SentinelsOmittedFromOutputFile) {
 }

 TEST_F(DBRangeDelTest, FlushRangeDelsSameStartKey) {
-  ASSERT_OK(db_->Put(WriteOptions(), "b1", "val"));
+  db_->Put(WriteOptions(), "b1", "val");
  ASSERT_OK(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "c"));
-  ASSERT_OK(db_->Put(WriteOptions(), "b2", "val"));
+  db_->Put(WriteOptions(), "b2", "val");
  ASSERT_OK(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "b"));
  // first iteration verifies query correctness in memtable, second verifies
@@ -243,9 +241,8 @@ TEST_F(DBRangeDelTest, FlushRangeDelsSameStartKey) {
 }

 TEST_F(DBRangeDelTest, CompactRangeDelsSameStartKey) {
-  ASSERT_OK(db_->Put(WriteOptions(), "unused",
-                     "val"));  // prevents empty after compaction
-  ASSERT_OK(db_->Put(WriteOptions(), "b1", "val"));
+  db_->Put(WriteOptions(), "unused", "val");  // prevents empty after compaction
+  db_->Put(WriteOptions(), "b1", "val");
  ASSERT_OK(db_->Flush(FlushOptions()));
  ASSERT_OK(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "c"));
@@ -257,8 +254,8 @@ TEST_F(DBRangeDelTest, CompactRangeDelsSameStartKey) {

  for (int i = 0; i < 2; ++i) {
    if (i > 0) {
-      ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                            true /* disallow_trivial_move */));
+      dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
+                                  true /* disallow_trivial_move */);
      ASSERT_EQ(0, NumTableFilesAtLevel(0));
      ASSERT_EQ(1, NumTableFilesAtLevel(1));
    }
@@ -282,13 +279,12 @@ TEST_F(DBRangeDelTest, FlushRemovesCoveredKeys) {
    if (i == kNum / 3) {
      snapshot = db_->GetSnapshot();
    } else if (i == 2 * kNum / 3) {
-      ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                                 GetNumericStr(kRangeBegin),
-                                 GetNumericStr(kRangeEnd)));
+      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
+                       GetNumericStr(kRangeBegin), GetNumericStr(kRangeEnd));
    }
-    ASSERT_OK(db_->Put(WriteOptions(), GetNumericStr(i), "val"));
+    db_->Put(WriteOptions(), GetNumericStr(i), "val");
  }
-  ASSERT_OK(db_->Flush(FlushOptions()));
+  db_->Flush(FlushOptions());

  for (int i = 0; i < kNum; ++i) {
    ReadOptions read_opts;
@@ -318,27 +314,24 @@ TEST_F(DBRangeDelTest, CompactionRemovesCoveredKeys) {
  for (int i = 0; i < kNumFiles; ++i) {
    if (i > 0) {
      // range tombstone covers first half of the previous file
-      ASSERT_OK(db_->DeleteRange(
-          WriteOptions(), db_->DefaultColumnFamily(),
-          GetNumericStr((i - 1) * kNumPerFile),
-          GetNumericStr((i - 1) * kNumPerFile + kNumPerFile / 2)));
+      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
+                       GetNumericStr((i - 1) * kNumPerFile),
+                       GetNumericStr((i - 1) * kNumPerFile + kNumPerFile / 2));
    }
    // Make sure a given key appears in each file so compaction won't be able to
    // use trivial move, which would happen if the ranges were non-overlapping.
    // Also, we need an extra element since flush is only triggered when the
    // number of keys is one greater than SpecialSkipListFactory's limit.
    // We choose a key outside the key-range used by the test to avoid conflict.
-    ASSERT_OK(db_->Put(WriteOptions(), GetNumericStr(kNumPerFile * kNumFiles),
-                       "val"));
+    db_->Put(WriteOptions(), GetNumericStr(kNumPerFile * kNumFiles), "val");

    for (int j = 0; j < kNumPerFile; ++j) {
-      ASSERT_OK(
-          db_->Put(WriteOptions(), GetNumericStr(i * kNumPerFile + j), "val"));
+      db_->Put(WriteOptions(), GetNumericStr(i * kNumPerFile + j), "val");
    }
-    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+    dbfull()->TEST_WaitForFlushMemTable();
    ASSERT_EQ(i + 1, NumTableFilesAtLevel(0));
  }
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
  ASSERT_GT(NumTableFilesAtLevel(1), 0);
  ASSERT_EQ((kNumFiles - 1) * kNumPerFile / 2,
@@ -380,8 +373,8 @@ TEST_F(DBRangeDelTest, ValidLevelSubcompactionBoundaries) {
      if (i > 0) {
        // delete [95,105) in two files, [295,305) in next two
        int mid = (j + (1 - j % 2)) * kNumPerFile;
-        ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                                   Key(mid - 5), Key(mid + 5)));
+        db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
+                         Key(mid - 5), Key(mid + 5));
      }
      std::vector<std::string> values;
      // Write 100KB (100 values, each 1K)
@@ -391,7 +384,7 @@ TEST_F(DBRangeDelTest, ValidLevelSubcompactionBoundaries) {
      }
      // put extra key to trigger flush
      ASSERT_OK(Put("", ""));
-      ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+      dbfull()->TEST_WaitForFlushMemTable();
      if (j < kNumFiles - 1) {
        // background compaction may happen early for kNumFiles'th file
        ASSERT_EQ(NumTableFilesAtLevel(0), j + 1);
@@ -407,7 +400,7 @@ TEST_F(DBRangeDelTest, ValidLevelSubcompactionBoundaries) {
        // oversized L0 (relative to base_level) causes the compaction to run
        // earlier.
        ASSERT_OK(db_->EnableAutoCompaction({db_->DefaultColumnFamily()}));
-        ASSERT_OK(dbfull()->TEST_WaitForCompact());
+        dbfull()->TEST_WaitForCompact();
        ASSERT_OK(db_->SetOptions(db_->DefaultColumnFamily(),
                                  {{"disable_auto_compactions", "true"}}));
        ASSERT_EQ(NumTableFilesAtLevel(0), 0);
@@ -440,8 +433,8 @@ TEST_F(DBRangeDelTest, ValidUniversalSubcompactionBoundaries) {
        // insert range deletions [95,105) in two files, [295,305) in next two
        // to prepare L1 for later manual compaction.
        int mid = (j + (1 - j % 2)) * kNumPerFile;
-        ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                                   Key(mid - 5), Key(mid + 5)));
+        db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
+                         Key(mid - 5), Key(mid + 5));
      }
      std::vector<std::string> values;
      // Write 100KB (100 values, each 1K)
@@ -451,13 +444,13 @@ TEST_F(DBRangeDelTest, ValidUniversalSubcompactionBoundaries) {
      }
      // put extra key to trigger flush
      ASSERT_OK(Put("", ""));
-      ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+      dbfull()->TEST_WaitForFlushMemTable();
      if (j < kFilesPerLevel - 1) {
        // background compaction may happen early for kFilesPerLevel'th file
        ASSERT_EQ(NumTableFilesAtLevel(0), j + 1);
      }
    }
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
+    dbfull()->TEST_WaitForCompact();
    ASSERT_EQ(NumTableFilesAtLevel(0), 0);
    ASSERT_GT(NumTableFilesAtLevel(kNumLevels - 1 - i), kFilesPerLevel - 1);
  }
@@ -490,17 +483,17 @@ TEST_F(DBRangeDelTest, CompactionRemovesCoveredMergeOperands) {
  for (int i = 0; i <= kNumFiles * kNumPerFile; ++i) {
    if (i % kNumPerFile == 0 && i / kNumPerFile == kNumFiles - 1) {
      // Delete merge operands from all but the last file
-      ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                                 "key", "key_"));
+      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "key",
+                       "key_");
    }
    std::string val;
    PutFixed64(&val, i);
-    ASSERT_OK(db_->Merge(WriteOptions(), "key", val));
+    db_->Merge(WriteOptions(), "key", val);
    // we need to prevent trivial move using Puts so compaction will actually
    // process the merge operands.
-    ASSERT_OK(db_->Put(WriteOptions(), "prevent_trivial_move", ""));
+    db_->Put(WriteOptions(), "prevent_trivial_move", "");
    if (i > 0 && i % kNumPerFile == 0) {
-      ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+      dbfull()->TEST_WaitForFlushMemTable();
    }
  }

@@ -511,7 +504,7 @@ TEST_F(DBRangeDelTest, CompactionRemovesCoveredMergeOperands) {
  PutFixed64(&expected, 45);  // 1+2+...+9
  ASSERT_EQ(expected, actual);

-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);

  expected.clear();
  ASSERT_OK(db_->Get(read_opts, "key", &actual));
@@ -557,19 +550,19 @@ TEST_F(DBRangeDelTest, ObsoleteTombstoneCleanup) {
  opts.statistics = CreateDBStatistics();
  Reopen(opts);

-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "dr1",
-                             "dr10"));  // obsolete after compaction
-  ASSERT_OK(db_->Put(WriteOptions(), "key", "val"));
-  ASSERT_OK(db_->Flush(FlushOptions()));
+  db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "dr1",
+                   "dr10");  // obsolete after compaction
+  db_->Put(WriteOptions(), "key", "val");
+  db_->Flush(FlushOptions());
  const Snapshot* snapshot = db_->GetSnapshot();
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "dr2",
-                             "dr20"));  // protected by snapshot
-  ASSERT_OK(db_->Put(WriteOptions(), "key", "val"));
-  ASSERT_OK(db_->Flush(FlushOptions()));
+  db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "dr2",
+                   "dr20");  // protected by snapshot
+  db_->Put(WriteOptions(), "key", "val");
+  db_->Flush(FlushOptions());

  ASSERT_EQ(2, NumTableFilesAtLevel(0));
  ASSERT_EQ(0, NumTableFilesAtLevel(1));
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
  ASSERT_EQ(1, NumTableFilesAtLevel(1));
  ASSERT_EQ(1, TestGetTickerCount(opts, COMPACTION_RANGE_DEL_DROP_OBSOLETE));
@@ -616,24 +609,22 @@ TEST_F(DBRangeDelTest, TableEvictedDuringScan) {
  // to bottommost level (i.e., L1).
  const Snapshot* snapshot = db_->GetSnapshot();
  for (int i = 0; i < kNum; ++i) {
-    ASSERT_OK(db_->Put(WriteOptions(), GetNumericStr(i), "val"));
+    db_->Put(WriteOptions(), GetNumericStr(i), "val");
    if (i > 0) {
-      ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+      dbfull()->TEST_WaitForFlushMemTable();
    }
    if (i >= kNum / 2 && i < kNum / 2 + kNumRanges) {
-      ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                                 GetNumericStr(kRangeBegin),
-                                 GetNumericStr(kRangeEnd)));
+      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
+                       GetNumericStr(kRangeBegin), GetNumericStr(kRangeEnd));
    }
  }
  // Must be > 1 so the first L1 file can be closed before scan finishes
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  ASSERT_GT(NumTableFilesAtLevel(1), 1);
  std::vector<uint64_t> file_numbers = ListTableFiles(env_, dbname_);

  ReadOptions read_opts;
  auto* iter = db_->NewIterator(read_opts);
-  ASSERT_OK(iter->status());
  int expected = kRangeEnd;
  iter->SeekToFirst();
  for (auto file_number : file_numbers) {
@@ -656,7 +647,7 @@ TEST_F(DBRangeDelTest, TableEvictedDuringScan) {
 TEST_F(DBRangeDelTest, GetCoveredKeyFromMutableMemtable) {
  do {
    DestroyAndReopen(CurrentOptions());
-    ASSERT_OK(db_->Put(WriteOptions(), "key", "val"));
+    db_->Put(WriteOptions(), "key", "val");
    ASSERT_OK(
        db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));

@@ -678,10 +669,10 @@ TEST_F(DBRangeDelTest, GetCoveredKeyFromImmutableMemtable) {
    opts.memtable_factory.reset(new SpecialSkipListFactory(1));
    DestroyAndReopen(opts);

-    ASSERT_OK(db_->Put(WriteOptions(), "key", "val"));
+    db_->Put(WriteOptions(), "key", "val");
    ASSERT_OK(
        db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));
-    ASSERT_OK(db_->Put(WriteOptions(), "blah", "val"));
+    db_->Put(WriteOptions(), "blah", "val");

    ReadOptions read_opts;
    std::string value;
@@ -692,7 +683,7 @@ TEST_F(DBRangeDelTest, GetCoveredKeyFromImmutableMemtable) {
 TEST_F(DBRangeDelTest, GetCoveredKeyFromSst) {
  do {
    DestroyAndReopen(CurrentOptions());
-    ASSERT_OK(db_->Put(WriteOptions(), "key", "val"));
+    db_->Put(WriteOptions(), "key", "val");
    // snapshot prevents key from being deleted during flush
    const Snapshot* snapshot = db_->GetSnapshot();
    ASSERT_OK(
@@ -715,11 +706,11 @@ TEST_F(DBRangeDelTest, GetCoveredMergeOperandFromMemtable) {
  for (int i = 0; i < kNumMergeOps; ++i) {
    std::string val;
    PutFixed64(&val, i);
-    ASSERT_OK(db_->Merge(WriteOptions(), "key", val));
+    db_->Merge(WriteOptions(), "key", val);
    if (i == kNumMergeOps / 2) {
      // deletes [0, 5]
-      ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                                 "key", "key_"));
+      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "key",
+                       "key_");
    }
  }

@@ -743,16 +734,16 @@ TEST_F(DBRangeDelTest, GetIgnoresRangeDeletions) {
  opts.memtable_factory.reset(new SpecialSkipListFactory(1));
  Reopen(opts);

-  ASSERT_OK(db_->Put(WriteOptions(), "sst_key", "val"));
+  db_->Put(WriteOptions(), "sst_key", "val");
  // snapshot prevents key from being deleted during flush
  const Snapshot* snapshot = db_->GetSnapshot();
  ASSERT_OK(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));
  ASSERT_OK(db_->Flush(FlushOptions()));
-  ASSERT_OK(db_->Put(WriteOptions(), "imm_key", "val"));
+  db_->Put(WriteOptions(), "imm_key", "val");
  ASSERT_OK(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));
-  ASSERT_OK(db_->Put(WriteOptions(), "mem_key", "val"));
+  db_->Put(WriteOptions(), "mem_key", "val");
  ASSERT_OK(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));

@@ -777,15 +768,13 @@ TEST_F(DBRangeDelTest, IteratorRemovesCoveredKeys) {
  // should be deleted.
  for (int i = 0; i < kNum; ++i) {
    if (i == kNum / 2) {
-      ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                                 GetNumericStr(kRangeBegin),
-                                 GetNumericStr(kRangeEnd)));
+      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
+                       GetNumericStr(kRangeBegin), GetNumericStr(kRangeEnd));
    }
-    ASSERT_OK(db_->Put(WriteOptions(), GetNumericStr(i), "val"));
+    db_->Put(WriteOptions(), GetNumericStr(i), "val");
  }
  ReadOptions read_opts;
  auto* iter = db_->NewIterator(read_opts);
-  ASSERT_OK(iter->status());

  int expected = 0;
  for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
@@ -813,16 +802,14 @@ TEST_F(DBRangeDelTest, IteratorOverUserSnapshot) {
  for (int i = 0; i < kNum; ++i) {
    if (i == kNum / 2) {
      snapshot = db_->GetSnapshot();
-      ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                                 GetNumericStr(kRangeBegin),
-                                 GetNumericStr(kRangeEnd)));
+      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
+                       GetNumericStr(kRangeBegin), GetNumericStr(kRangeEnd));
    }
-    ASSERT_OK(db_->Put(WriteOptions(), GetNumericStr(i), "val"));
+    db_->Put(WriteOptions(), GetNumericStr(i), "val");
  }
  ReadOptions read_opts;
  read_opts.snapshot = snapshot;
  auto* iter = db_->NewIterator(read_opts);
-  ASSERT_OK(iter->status());

  int expected = 0;
  for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
@@ -841,23 +828,22 @@ TEST_F(DBRangeDelTest, IteratorIgnoresRangeDeletions) {
  opts.memtable_factory.reset(new SpecialSkipListFactory(1));
  Reopen(opts);

-  ASSERT_OK(db_->Put(WriteOptions(), "sst_key", "val"));
+  db_->Put(WriteOptions(), "sst_key", "val");
  // snapshot prevents key from being deleted during flush
  const Snapshot* snapshot = db_->GetSnapshot();
  ASSERT_OK(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));
  ASSERT_OK(db_->Flush(FlushOptions()));
-  ASSERT_OK(db_->Put(WriteOptions(), "imm_key", "val"));
+  db_->Put(WriteOptions(), "imm_key", "val");
  ASSERT_OK(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));
-  ASSERT_OK(db_->Put(WriteOptions(), "mem_key", "val"));
+  db_->Put(WriteOptions(), "mem_key", "val");
  ASSERT_OK(
      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));

  ReadOptions read_opts;
  read_opts.ignore_range_deletions = true;
  auto* iter = db_->NewIterator(read_opts);
-  ASSERT_OK(iter->status());
  int i = 0;
  std::string expected[] = {"imm_key", "mem_key", "sst_key"};
  for (iter->SeekToFirst(); iter->Valid(); iter->Next(), ++i) {
@@ -871,7 +857,7 @@ TEST_F(DBRangeDelTest, IteratorIgnoresRangeDeletions) {

 #ifndef ROCKSDB_UBSAN_RUN
 TEST_F(DBRangeDelTest, TailingIteratorRangeTombstoneUnsupported) {
-  ASSERT_OK(db_->Put(WriteOptions(), "key", "val"));
+  db_->Put(WriteOptions(), "key", "val");
  // snapshot prevents key from being deleted during flush
  const Snapshot* snapshot = db_->GetSnapshot();
  ASSERT_OK(
@@ -887,7 +873,6 @@ TEST_F(DBRangeDelTest, TailingIteratorRangeTombstoneUnsupported) {
      iter->SeekToFirst();
    }
    ASSERT_TRUE(iter->status().IsNotSupported());
-
    delete iter;
    if (i == 0) {
      ASSERT_OK(db_->Flush(FlushOptions()));
@@ -897,6 +882,7 @@ TEST_F(DBRangeDelTest, TailingIteratorRangeTombstoneUnsupported) {
  }
  db_->ReleaseSnapshot(snapshot);
 }
+
 #endif  // !ROCKSDB_UBSAN_RUN

 TEST_F(DBRangeDelTest, SubcompactionHasEmptyDedicatedRangeDelFile) {
@@ -940,8 +926,8 @@ TEST_F(DBRangeDelTest, SubcompactionHasEmptyDedicatedRangeDelFile) {
  ASSERT_EQ(kNumFiles, NumTableFilesAtLevel(0));
  ASSERT_EQ(1, NumTableFilesAtLevel(1));

-  ASSERT_OK(db_->EnableAutoCompaction({db_->DefaultColumnFamily()}));
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  db_->EnableAutoCompaction({db_->DefaultColumnFamily()});
+  dbfull()->TEST_WaitForCompact();
  db_->ReleaseSnapshot(snapshot);
 }

@@ -963,7 +949,7 @@ TEST_F(DBRangeDelTest, MemtableBloomFilter) {
  for (int i = 0; i < kNumKeys; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0),
                             Key(kNumKeys)));
  for (int i = 0; i < kNumKeys; ++i) {
@@ -1001,8 +987,8 @@ TEST_F(DBRangeDelTest, CompactionTreatsSplitInputLevelDeletionAtomically) {

    // snapshot protects range tombstone from dropping due to becoming obsolete.
    const Snapshot* snapshot = db_->GetSnapshot();
-    ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                               Key(0), Key(2 * kNumFilesPerLevel)));
+    db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0),
+                     Key(2 * kNumFilesPerLevel));

    Random rnd(301);
    std::string value = rnd.RandomString(kValueBytes);
@@ -1011,14 +997,14 @@ TEST_F(DBRangeDelTest, CompactionTreatsSplitInputLevelDeletionAtomically) {
      ASSERT_OK(Put(Key(j), value));
      ASSERT_OK(Put(Key(2 * kNumFilesPerLevel - 1 - j), value));
      if (j > 0) {
-        ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+        dbfull()->TEST_WaitForFlushMemTable();
        ASSERT_EQ(j, NumTableFilesAtLevel(0));
      }
    }
    // put extra key to trigger final flush
    ASSERT_OK(Put("", ""));
-    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
+    dbfull()->TEST_WaitForFlushMemTable();
+    dbfull()->TEST_WaitForCompact();
    ASSERT_EQ(0, NumTableFilesAtLevel(0));
    ASSERT_EQ(kNumFilesPerLevel, NumTableFilesAtLevel(1));

@@ -1036,7 +1022,7 @@ TEST_F(DBRangeDelTest, CompactionTreatsSplitInputLevelDeletionAtomically) {
    } else if (i == 2) {
      ASSERT_OK(db_->SetOptions(db_->DefaultColumnFamily(),
                                {{"max_bytes_for_level_base", "10000"}}));
-      ASSERT_OK(dbfull()->TEST_WaitForCompact());
+      dbfull()->TEST_WaitForCompact();
      ASSERT_EQ(1, NumTableFilesAtLevel(1));
    }
    ASSERT_GT(NumTableFilesAtLevel(2), 0);
@@ -1070,8 +1056,8 @@ TEST_F(DBRangeDelTest, RangeTombstoneEndKeyAsSstableUpperBound) {
  // A snapshot protects the range tombstone from dropping due to
  // becoming obsolete.
  const Snapshot* snapshot = db_->GetSnapshot();
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0),
-                             Key(2 * kNumFilesPerLevel)));
+  db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
+                   Key(0), Key(2 * kNumFilesPerLevel));

  // Create 2 additional sstables in L0. Note that the first sstable
  // contains the range tombstone.
@@ -1110,7 +1096,7 @@ TEST_F(DBRangeDelTest, RangeTombstoneEndKeyAsSstableUpperBound) {
    ASSERT_EQ(value, Get(Key(2)));
    auto begin_str = Key(3);
    const ROCKSDB_NAMESPACE::Slice begin = begin_str;
-    ASSERT_OK(dbfull()->TEST_CompactRange(1, &begin, nullptr));
+    dbfull()->TEST_CompactRange(1, &begin, nullptr);
    ASSERT_EQ(1, NumTableFilesAtLevel(1));
    ASSERT_EQ(2, NumTableFilesAtLevel(2));
    ASSERT_EQ(value, Get(Key(2)));
@@ -1129,7 +1115,7 @@ TEST_F(DBRangeDelTest, RangeTombstoneEndKeyAsSstableUpperBound) {
    //     [key000002#6,1, key000004#72057594037927935,15]
    auto begin_str = Key(0);
    const ROCKSDB_NAMESPACE::Slice begin = begin_str;
-    ASSERT_OK(dbfull()->TEST_CompactRange(1, &begin, &begin));
+    dbfull()->TEST_CompactRange(1, &begin, &begin);
    ASSERT_EQ(0, NumTableFilesAtLevel(1));
    ASSERT_EQ(3, NumTableFilesAtLevel(2));
  }
@@ -1230,9 +1216,9 @@ TEST_F(DBRangeDelTest, KeyAtOverlappingEndpointReappears) {
  std::string value;
  ASSERT_TRUE(db_->Get(ReadOptions(), "key", &value).IsNotFound());

-  ASSERT_OK(dbfull()->TEST_CompactRange(
-      0 /* level */, nullptr /* begin */, nullptr /* end */,
-      nullptr /* column_family */, true /* disallow_trivial_move */));
+  dbfull()->TEST_CompactRange(0 /* level */, nullptr /* begin */,
+                              nullptr /* end */, nullptr /* column_family */,
+                              true /* disallow_trivial_move */);
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
  // Now we have multiple files at L1 all containing a single user key, thus
  // guaranteeing overlap in the file endpoints.
@@ -1243,9 +1229,9 @@ TEST_F(DBRangeDelTest, KeyAtOverlappingEndpointReappears) {

  // Compact and verify again. It's worthwhile because now the files have
  // tighter endpoints, so we can verify that doesn't mess anything up.
-  ASSERT_OK(dbfull()->TEST_CompactRange(
-      1 /* level */, nullptr /* begin */, nullptr /* end */,
-      nullptr /* column_family */, true /* disallow_trivial_move */));
+  dbfull()->TEST_CompactRange(1 /* level */, nullptr /* begin */,
+                              nullptr /* end */, nullptr /* column_family */,
+                              true /* disallow_trivial_move */);
  ASSERT_GT(NumTableFilesAtLevel(2), 1);
  ASSERT_TRUE(db_->Get(ReadOptions(), "key", &value).IsNotFound());

@@ -1321,7 +1307,6 @@ TEST_F(DBRangeDelTest, UntruncatedTombstoneDoesNotDeleteNewerKey) {

  auto get_key_count = [this]() -> int {
    auto* iter = db_->NewIterator(ReadOptions());
-    assert(iter->status().ok());
    iter->SeekToFirst();
    int keys_found = 0;
    for (; iter->Valid(); iter->Next()) {
@@ -1424,7 +1409,6 @@ TEST_F(DBRangeDelTest, DeletedMergeOperandReappearsIterPrev) {
  ASSERT_GT(NumTableFilesAtLevel(1), 1);

  auto* iter = db_->NewIterator(ReadOptions());
-  ASSERT_OK(iter->status());
  iter->SeekToLast();
  int keys_found = 0;
  for (; iter->Valid(); iter->Prev()) {
@@ -1451,12 +1435,11 @@ TEST_F(DBRangeDelTest, SnapshotPreventsDroppedKeys) {
  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0),
                             Key(10)));

-  ASSERT_OK(db_->Flush(FlushOptions()));
+  db_->Flush(FlushOptions());

  ReadOptions read_opts;
  read_opts.snapshot = snapshot;
  auto* iter = db_->NewIterator(read_opts);
-  ASSERT_OK(iter->status());

  iter->SeekToFirst();
  ASSERT_TRUE(iter->Valid());
@@ -1499,7 +1482,6 @@ TEST_F(DBRangeDelTest, SnapshotPreventsDroppedKeysInImmMemTables) {
  ReadOptions read_opts;
  read_opts.snapshot = snapshot.get();
  std::unique_ptr<Iterator> iter(db_->NewIterator(read_opts));
-  ASSERT_OK(iter->status());

  TEST_SYNC_POINT("SnapshotPreventsDroppedKeysInImmMemTables:AfterNewIterator");

@@ -1537,7 +1519,7 @@ TEST_F(DBRangeDelTest, RangeTombstoneWrittenToMinimalSsts) {
      std::string value = rnd.RandomString(kValueBytes);
      ASSERT_OK(Put(key, value));
    }
-    ASSERT_OK(db_->Flush(FlushOptions()));
+    db_->Flush(FlushOptions());
    MoveFilesToLevel(2);
  }
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
@@ -1556,7 +1538,7 @@ TEST_F(DBRangeDelTest, RangeTombstoneWrittenToMinimalSsts) {
  // TODO(ajkr): remove this `Put` after file cutting accounts for range
  // tombstones (#3977).
  ASSERT_OK(Put("c" + Key(1), "value"));
-  ASSERT_OK(db_->Flush(FlushOptions()));
+  db_->Flush(FlushOptions());

  // Ensure manual L0->L1 compaction cuts the outputs before the range tombstone
  // and the range tombstone is only placed in the second SST.
@@ -1564,9 +1546,9 @@ TEST_F(DBRangeDelTest, RangeTombstoneWrittenToMinimalSsts) {
  Slice begin_key(begin_key_storage);
  std::string end_key_storage("d");
  Slice end_key(end_key_storage);
-  ASSERT_OK(dbfull()->TEST_CompactRange(
-      0 /* level */, &begin_key /* begin */, &end_key /* end */,
-      nullptr /* column_family */, true /* disallow_trivial_move */));
+  dbfull()->TEST_CompactRange(0 /* level */, &begin_key /* begin */,
+                              &end_key /* end */, nullptr /* column_family */,
+                              true /* disallow_trivial_move */);
  ASSERT_EQ(2, NumTableFilesAtLevel(1));

  std::vector<LiveFileMetaData> all_metadata;
@@ -1631,15 +1613,15 @@ TEST_F(DBRangeDelTest, OverlappedTombstones) {

  ASSERT_EQ(1, NumTableFilesAtLevel(0));

-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
+  dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
+                              true /* disallow_trivial_move */);

  // The tombstone range is not broken up into multiple SSTs which may incur a
  // large compaction with L2.
  ASSERT_EQ(1, NumTableFilesAtLevel(1));
  std::vector<std::vector<FileMetaData>> files;
-  ASSERT_OK(dbfull()->TEST_CompactRange(1, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
+  dbfull()->TEST_CompactRange(1, nullptr, nullptr, nullptr,
+                              true /* disallow_trivial_move */);
  ASSERT_EQ(1, NumTableFilesAtLevel(2));
  ASSERT_EQ(0, NumTableFilesAtLevel(1));
 }
@@ -1672,13 +1654,13 @@ TEST_F(DBRangeDelTest, OverlappedKeys) {

  // The key range is broken up into three SSTs to avoid a future big compaction
  // with the grandparent
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
+  dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
+                              true /* disallow_trivial_move */);
  ASSERT_EQ(3, NumTableFilesAtLevel(1));

  std::vector<std::vector<FileMetaData>> files;
-  ASSERT_OK(dbfull()->TEST_CompactRange(1, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
+  dbfull()->TEST_CompactRange(1, nullptr, nullptr, nullptr,
+                              true /* disallow_trivial_move */);
  ASSERT_EQ(1, NumTableFilesAtLevel(2));
  ASSERT_EQ(0, NumTableFilesAtLevel(1));
 }
@@ -98,7 +98,7 @@ TEST_F(DBSSTTest, SSTsWithLdbSuffixHandling) {
  for (int i = 0; i < 10; ++i) {
    GenerateNewFile(&rnd, &key_id, false);
  }
-  ASSERT_OK(Flush());
+  Flush();
  Close();
  int const num_files = GetSstFileCount(dbname_);
  ASSERT_GT(num_files, 0);
@@ -170,7 +170,7 @@ TEST_F(DBSSTTest, DontDeleteMovedFile) {
    ASSERT_OK(Flush());
  }
  // this should execute both L0->L1 and L1->(move)->L2 compactions
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  ASSERT_EQ("0,0,1", FilesPerLevel(0));

  // If the moved file is actually deleted (the move-safeguard in
@@ -218,7 +218,7 @@ TEST_F(DBSSTTest, DeleteObsoleteFilesPendingOutputs) {
    ASSERT_OK(Flush());
  }
  // this should execute both L0->L1 and L1->(move)->L2 compactions
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  ASSERT_EQ("0,0,1", FilesPerLevel(0));

  test::SleepingBackgroundTask blocking_thread;
@@ -264,9 +264,9 @@ TEST_F(DBSSTTest, DeleteObsoleteFilesPendingOutputs) {
  // finish the flush!
  blocking_thread.WakeUp();
  blocking_thread.WaitUntilDone();
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+  dbfull()->TEST_WaitForFlushMemTable();
  // File just flushed is too big for L0 and L1 so gets moved to L2.
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  ASSERT_EQ("0,0,1,0,1", FilesPerLevel(0));

  metadata.clear();
@@ -302,8 +302,8 @@ TEST_F(DBSSTTest, DBWithSstFileManager) {
  for (int i = 0; i < 25; i++) {
    GenerateNewRandomFile(&rnd);
    ASSERT_OK(Flush());
-    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
+    dbfull()->TEST_WaitForFlushMemTable();
+    dbfull()->TEST_WaitForCompact();
    // Verify that we are tracking all sst files in dbname_
    std::unordered_map<std::string, uint64_t> files_in_db;
    ASSERT_OK(GetAllSSTFiles(&files_in_db));
@@ -374,14 +374,6 @@ TEST_F(DBSSTTest, RateLimitedDelete) {
        *abs_time_us = Env::Default()->NowMicros();
      });

-  // Disable PeriodicWorkScheduler as it also has TimedWait, which could update
-  // the simulated sleep time
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::StartPeriodicWorkScheduler:DisableScheduler", [&](void* arg) {
-        bool* disable_scheduler = static_cast<bool*>(arg);
-        *disable_scheduler = true;
-      });
-
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();

  Options options = CurrentOptions();
@@ -401,7 +393,7 @@ TEST_F(DBSSTTest, RateLimitedDelete) {

  WriteOptions wo;
  wo.disableWAL = true;
-  Reopen(options);
+  ASSERT_OK(TryReopen(options));
  // Create 4 files in L0
  for (char v = 'a'; v <= 'd'; v++) {
    ASSERT_OK(Put("Key2", DummyString(1024, v), wo));
@@ -548,15 +540,10 @@ TEST_P(DBWALTestWithParam, WALTrashCleanupOnOpen) {
  auto sfm = static_cast<SstFileManagerImpl*>(options.sst_file_manager.get());
  sfm->delete_scheduler()->SetMaxTrashDBRatio(3.1);

-  Reopen(options);
+  ASSERT_OK(TryReopen(options));

  // Create 4 files in L0
  for (char v = 'a'; v <= 'd'; v++) {
-    if (v == 'd') {
-      // Maximize the change that the last log file will be preserved in trash
-      // before restarting the DB.
-      options.sst_file_manager->SetDeleteRateBytesPerSecond(1);
-    }
    ASSERT_OK(Put("Key2", DummyString(1024, v)));
    ASSERT_OK(Put("Key3", DummyString(1024, v)));
    ASSERT_OK(Put("Key4", DummyString(1024, v)));
@@ -575,11 +562,11 @@ TEST_P(DBWALTestWithParam, WALTrashCleanupOnOpen) {
  if (!wal_dir_same_as_dbname_) {
    // Forcibly create some trash log files
    std::unique_ptr<WritableFile> result;
-    ASSERT_OK(env->NewWritableFile(options.wal_dir + "/1000.log.trash", &result,
-                                   EnvOptions()));
+    env->NewWritableFile(options.wal_dir + "/1000.log.trash", &result,
+                         EnvOptions());
    result.reset();
  }
-  ASSERT_OK(env->GetChildren(options.wal_dir, &filenames));
+  env->GetChildren(options.wal_dir, &filenames);
  for (const std::string& fname : filenames) {
    if (fname.find(".log.trash") != std::string::npos) {
      trash_log_count++;
@@ -588,11 +575,11 @@ TEST_P(DBWALTestWithParam, WALTrashCleanupOnOpen) {
  ASSERT_GE(trash_log_count, 1);

  env->set_fake_log_delete(false);
-  Reopen(options);
+  ASSERT_OK(TryReopen(options));

  filenames.clear();
  trash_log_count = 0;
-  ASSERT_OK(env->GetChildren(options.wal_dir, &filenames));
+  env->GetChildren(options.wal_dir, &filenames);
  for (const std::string& fname : filenames) {
    if (fname.find(".log.trash") != std::string::npos) {
      trash_log_count++;
@@ -616,13 +603,13 @@ TEST_F(DBSSTTest, OpenDBWithExistingTrash) {
  Destroy(last_options_);

  // Add some trash files to the db directory so the DB can clean them up
-  ASSERT_OK(env_->CreateDirIfMissing(dbname_));
+  env_->CreateDirIfMissing(dbname_);
  ASSERT_OK(WriteStringToFile(env_, "abc", dbname_ + "/" + "001.sst.trash"));
  ASSERT_OK(WriteStringToFile(env_, "abc", dbname_ + "/" + "002.sst.trash"));
  ASSERT_OK(WriteStringToFile(env_, "abc", dbname_ + "/" + "003.sst.trash"));

  // Reopen the DB and verify that it deletes existing trash files
-  Reopen(options);
+  ASSERT_OK(TryReopen(options));
  sfm->WaitForEmptyTrash();
  ASSERT_NOK(env_->FileExists(dbname_ + "/" + "001.sst.trash"));
  ASSERT_NOK(env_->FileExists(dbname_ + "/" + "002.sst.trash"));
@@ -741,7 +728,7 @@ TEST_F(DBSSTTest, DestroyDBWithRateLimitedDelete) {
  int num_sst_files = 0;
  int num_wal_files = 0;
  std::vector<std::string> db_files;
-  ASSERT_OK(env_->GetChildren(dbname_, &db_files));
+  env_->GetChildren(dbname_, &db_files);
  for (std::string f : db_files) {
    if (f.substr(f.find_last_of(".") + 1) == "sst") {
      num_sst_files++;
@@ -830,7 +817,7 @@ TEST_F(DBSSTTest, CancellingCompactionsWorks) {
    ASSERT_OK(Put(Key(i), rnd.RandomString(50)));
  }
  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact(true));
+  dbfull()->TEST_WaitForCompact(true);

  // Because we set a callback in CancelledCompaction, we actually
  // let the compaction run
@@ -880,12 +867,10 @@ TEST_F(DBSSTTest, CancellingManualCompactionsWorks) {
  ASSERT_OK(Flush());

  // OK, now trigger a manual compaction
-  ASSERT_TRUE(dbfull()
-                  ->CompactRange(CompactRangeOptions(), nullptr, nullptr)
-                  .IsCompactionTooLarge());
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);

  // Wait for manual compaction to get scheduled and finish
-  ASSERT_OK(dbfull()->TEST_WaitForCompact(true));
+  dbfull()->TEST_WaitForCompact(true);

  ASSERT_EQ(sfm->GetCompactionsReservedSize(), 0);
  // Make sure the stat is bumped
@@ -895,13 +880,10 @@ TEST_F(DBSSTTest, CancellingManualCompactionsWorks) {

  // Now make sure CompactFiles also gets cancelled
  auto l0_files = collector->GetFlushedFiles();
-  ASSERT_TRUE(
-      dbfull()
-          ->CompactFiles(ROCKSDB_NAMESPACE::CompactionOptions(), l0_files, 0)
-          .IsCompactionTooLarge());
+  dbfull()->CompactFiles(ROCKSDB_NAMESPACE::CompactionOptions(), l0_files, 0);

  // Wait for manual compaction to get scheduled and finish
-  ASSERT_OK(dbfull()->TEST_WaitForCompact(true));
+  dbfull()->TEST_WaitForCompact(true);

  ASSERT_EQ(dbfull()->immutable_db_options().statistics.get()->getTickerCount(
                COMPACTION_CANCELLED),
@@ -916,9 +898,8 @@ TEST_F(DBSSTTest, CancellingManualCompactionsWorks) {
      "CompactFilesImpl:End", [&](void* /*arg*/) { completed_compactions++; });

  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-  ASSERT_OK(dbfull()->CompactFiles(ROCKSDB_NAMESPACE::CompactionOptions(),
-                                   l0_files, 0));
-  ASSERT_OK(dbfull()->TEST_WaitForCompact(true));
+  dbfull()->CompactFiles(ROCKSDB_NAMESPACE::CompactionOptions(), l0_files, 0);
+  dbfull()->TEST_WaitForCompact(true);

  ASSERT_EQ(sfm->GetCompactionsReservedSize(), 0);
  ASSERT_GT(completed_compactions, 0);
@@ -1022,7 +1003,7 @@ TEST_F(DBSSTTest, OpenDBWithInfiniteMaxOpenFiles) {
    CompactRangeOptions compact_options;
    compact_options.change_level = true;
    compact_options.target_level = 2;
-    ASSERT_OK(db_->CompactRange(compact_options, nullptr, nullptr));
+    db_->CompactRange(compact_options, nullptr, nullptr);

    // Create 12 Files in L0
    for (int i = 0; i < 12; i++) {
@@ -1074,7 +1055,7 @@ TEST_F(DBSSTTest, GetTotalSstFilesSize) {
      std::string val = "val_file_" + ToString(i);
      ASSERT_OK(Put(Key(j), val));
    }
-    ASSERT_OK(Flush());
+    Flush();
  }
  ASSERT_EQ("5", FilesPerLevel(0));

@@ -1098,7 +1079,6 @@ TEST_F(DBSSTTest, GetTotalSstFilesSize) {

  // hold current version
  std::unique_ptr<Iterator> iter1(dbfull()->NewIterator(ReadOptions()));
-  ASSERT_OK(iter1->status());

  // Compact 5 files into 1 file in L0
  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
@@ -1122,13 +1102,12 @@ TEST_F(DBSSTTest, GetTotalSstFilesSize) {

  // hold current version
  std::unique_ptr<Iterator> iter2(dbfull()->NewIterator(ReadOptions()));
-  ASSERT_OK(iter2->status());

  // Delete all keys and compact, this will delete all live files
  for (int i = 0; i < 10; i++) {
    ASSERT_OK(Delete(Key(i)));
  }
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
  ASSERT_EQ("", FilesPerLevel(0));

@@ -1142,7 +1121,6 @@ TEST_F(DBSSTTest, GetTotalSstFilesSize) {
  // Total SST files = 6 (5 original files + compacted file)
  ASSERT_EQ(total_sst_files_size, 6 * single_file_size);

-  ASSERT_OK(iter1->status());
  iter1.reset();
  ASSERT_TRUE(dbfull()->GetIntProperty("rocksdb.total-sst-files-size",
                                       &total_sst_files_size));
@@ -1150,7 +1128,6 @@ TEST_F(DBSSTTest, GetTotalSstFilesSize) {
  // Total SST files = 1 (compacted file)
  ASSERT_EQ(total_sst_files_size, 1 * single_file_size);

-  ASSERT_OK(iter2->status());
  iter2.reset();
  ASSERT_TRUE(dbfull()->GetIntProperty("rocksdb.total-sst-files-size",
                                       &total_sst_files_size));
@@ -1169,7 +1146,7 @@ TEST_F(DBSSTTest, GetTotalSstFilesSizeVersionsFilesShared) {
  // Generate 5 files in L0
  for (int i = 0; i < 5; i++) {
    ASSERT_OK(Put(Key(i), "val"));
-    ASSERT_OK(Flush());
+    Flush();
  }
  ASSERT_EQ("5", FilesPerLevel(0));

@@ -1194,7 +1171,6 @@ TEST_F(DBSSTTest, GetTotalSstFilesSizeVersionsFilesShared) {

  // hold current version
  std::unique_ptr<Iterator> iter1(dbfull()->NewIterator(ReadOptions()));
-  ASSERT_OK(iter1->status());

  // Compaction will do trivial move from L0 to L1
  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
@@ -1218,13 +1194,12 @@ TEST_F(DBSSTTest, GetTotalSstFilesSizeVersionsFilesShared) {

  // hold current version
  std::unique_ptr<Iterator> iter2(dbfull()->NewIterator(ReadOptions()));
-  ASSERT_OK(iter2->status());

  // Delete all keys and compact, this will delete all live files
  for (int i = 0; i < 5; i++) {
    ASSERT_OK(Delete(Key(i)));
  }
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
  ASSERT_EQ("", FilesPerLevel(0));

@@ -1238,9 +1213,7 @@ TEST_F(DBSSTTest, GetTotalSstFilesSizeVersionsFilesShared) {
  // Total SST files = 5 (used in 2 version)
  ASSERT_EQ(total_sst_files_size, 5 * single_file_size);

-  ASSERT_OK(iter1->status());
  iter1.reset();
-  ASSERT_OK(iter2->status());
  iter2.reset();

  ASSERT_TRUE(dbfull()->GetIntProperty("rocksdb.total-sst-files-size",
@@ -137,7 +137,7 @@ TEST_F(DBStatisticsTest, ResetStats) {
      ASSERT_EQ(1, TestGetTickerCount(options, NUMBER_KEYS_WRITTEN));
      options.statistics->histogramData(DB_WRITE, &histogram_data);
      ASSERT_GT(histogram_data.max, 0.0);
-      ASSERT_OK(options.statistics->Reset());
+      options.statistics->Reset();
    }
  }
 }
@@ -65,9 +65,9 @@ TEST_F(DBTablePropertiesTest, GetPropertiesOfAllTablesTest) {
  // Create 4 tables
  for (int table = 0; table < 4; ++table) {
    for (int i = 0; i < 10 + table; ++i) {
-      ASSERT_OK(db_->Put(WriteOptions(), ToString(table * 100 + i), "val"));
+      db_->Put(WriteOptions(), ToString(table * 100 + i), "val");
    }
-    ASSERT_OK(db_->Flush(FlushOptions()));
+    db_->Flush(FlushOptions());
  }

  // 1. Read table properties directly from file
@@ -161,14 +161,14 @@ TEST_F(DBTablePropertiesTest, GetPropertiesOfTablesInRange) {
  for (int i = 0; i < 10000; i++) {
    ASSERT_OK(Put(test::RandomKey(&rnd, 5), rnd.RandomString(102)));
  }
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  Flush();
+  dbfull()->TEST_WaitForCompact();
  if (NumTableFilesAtLevel(0) == 0) {
    ASSERT_OK(Put(test::RandomKey(&rnd, 5), rnd.RandomString(102)));
-    ASSERT_OK(Flush());
+    Flush();
  }

-  ASSERT_OK(db_->PauseBackgroundWork());
+  db_->PauseBackgroundWork();

  // Ensure that we have at least L0, L1 and L2
  ASSERT_GT(NumTableFilesAtLevel(0), 0);
@@ -236,8 +236,8 @@ TEST_F(DBTablePropertiesTest, GetColumnFamilyNameProperty) {
  // Create one table per CF, then verify it was created with the column family
  // name property.
  for (uint32_t cf = 0; cf < 2; ++cf) {
-    ASSERT_OK(Put(cf, "key", "val"));
-    ASSERT_OK(Flush(cf));
+    Put(cf, "key", "val");
+    Flush(cf);

    TablePropertiesCollection fname_to_props;
    ASSERT_OK(db_->GetPropertiesOfAllTables(handles_[cf], &fname_to_props));
@@ -260,17 +260,17 @@ TEST_F(DBTablePropertiesTest, GetDbIdentifiersProperty) {
  CreateAndReopenWithCF({"goku"}, CurrentOptions());

  for (uint32_t cf = 0; cf < 2; ++cf) {
-    ASSERT_OK(Put(cf, "key", "val"));
-    ASSERT_OK(Put(cf, "foo", "bar"));
-    ASSERT_OK(Flush(cf));
+    Put(cf, "key", "val");
+    Put(cf, "foo", "bar");
+    Flush(cf);

    TablePropertiesCollection fname_to_props;
    ASSERT_OK(db_->GetPropertiesOfAllTables(handles_[cf], &fname_to_props));
    ASSERT_EQ(1U, fname_to_props.size());

    std::string id, sid;
-    ASSERT_OK(db_->GetDbIdentity(id));
-    ASSERT_OK(db_->GetDbSessionId(sid));
+    db_->GetDbIdentity(id);
+    db_->GetDbSessionId(sid);
    ASSERT_EQ(id, fname_to_props.begin()->second->db_id);
    ASSERT_EQ(sid, fname_to_props.begin()->second->db_session_id);
  }
@@ -298,9 +298,9 @@ TEST_P(DBTableHostnamePropertyTest, DbHostLocationProperty) {
  CreateAndReopenWithCF({"goku"}, opts);

  for (uint32_t cf = 0; cf < 2; ++cf) {
-    ASSERT_OK(Put(cf, "key", "val"));
-    ASSERT_OK(Put(cf, "foo", "bar"));
-    ASSERT_OK(Flush(cf));
+    Put(cf, "key", "val");
+    Put(cf, "foo", "bar");
+    Flush(cf);

    TablePropertiesCollection fname_to_props;
    ASSERT_OK(db_->GetPropertiesOfAllTables(handles_[cf], &fname_to_props));
@@ -356,8 +356,8 @@ TEST_P(DBTablePropertiesTest, DeletionTriggeredCompactionMarking) {

  // add an L1 file to prevent tombstones from dropping due to obsolescence
  // during flush
-  ASSERT_OK(Put(Key(0), "val"));
-  ASSERT_OK(Flush());
+  Put(Key(0), "val");
+  Flush();
  MoveFilesToLevel(1);

  DeletionTriggeredCompactionTestListener *listener =
@@ -368,14 +368,14 @@ TEST_P(DBTablePropertiesTest, DeletionTriggeredCompactionMarking) {
  for (int i = 0; i < kNumKeys; ++i) {
    if (i >= kNumKeys - kWindowSize &&
        i < kNumKeys - kWindowSize + kNumDelsTrigger) {
-      ASSERT_OK(Delete(Key(i)));
+      Delete(Key(i));
    } else {
-      ASSERT_OK(Put(Key(i), "val"));
+      Put(Key(i), "val");
    }
  }
-  ASSERT_OK(Flush());
+  Flush();

-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  ASSERT_EQ(0, NumTableFilesAtLevel(0));

  // Change the window size and deletion trigger and ensure new values take
@@ -389,14 +389,14 @@ TEST_P(DBTablePropertiesTest, DeletionTriggeredCompactionMarking) {
  for (int i = 0; i < kNumKeys; ++i) {
    if (i >= kNumKeys - kWindowSize &&
        i < kNumKeys - kWindowSize + kNumDelsTrigger) {
-      ASSERT_OK(Delete(Key(i)));
+      Delete(Key(i));
    } else {
-      ASSERT_OK(Put(Key(i), "val"));
+      Put(Key(i), "val");
    }
  }
-  ASSERT_OK(Flush());
+  Flush();

-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  ASSERT_EQ(0, NumTableFilesAtLevel(0));

  // Change the window size to disable delete triggered compaction
@@ -408,14 +408,14 @@ TEST_P(DBTablePropertiesTest, DeletionTriggeredCompactionMarking) {
  for (int i = 0; i < kNumKeys; ++i) {
    if (i >= kNumKeys - kWindowSize &&
        i < kNumKeys - kWindowSize + kNumDelsTrigger) {
-      ASSERT_OK(Delete(Key(i)));
+      Delete(Key(i));
    } else {
-      ASSERT_OK(Put(Key(i), "val"));
+      Put(Key(i), "val");
    }
  }
-  ASSERT_OK(Flush());
+  Flush();

-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  ASSERT_EQ(1, NumTableFilesAtLevel(0));
  ASSERT_LT(0, opts.statistics->getTickerCount(COMPACT_WRITE_BYTES_MARKED));
  ASSERT_LT(0, opts.statistics->getTickerCount(COMPACT_READ_BYTES_MARKED));
@@ -438,8 +438,8 @@ TEST_P(DBTablePropertiesTest, RatioBasedDeletionTriggeredCompactionMarking) {

  // Add an L2 file to prevent tombstones from dropping due to obsolescence
  // during flush
-  ASSERT_OK(Put(Key(0), "val"));
-  ASSERT_OK(Flush());
+  Put(Key(0), "val");
+  Flush();
  MoveFilesToLevel(2);

  auto* listener = new DeletionTriggeredCompactionTestListener();
@@ -31,7 +31,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorSingle) {
  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
  iter->SeekToFirst();
  ASSERT_TRUE(!iter->Valid());
-  ASSERT_OK(iter->status());

  // add a record and check that iter can see it
  ASSERT_OK(db_->Put(WriteOptions(), "mirko", "fodor"));
@@ -49,7 +48,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorKeepAdding) {
  read_options.tailing = true;

  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(iter->status());
  std::string value(1024, 'a');

  const int num_records = 10000;
@@ -72,9 +70,7 @@ TEST_F(DBTestTailingIterator, TailingIteratorSeekToNext) {
  read_options.tailing = true;

  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(iter->status());
  std::unique_ptr<Iterator> itern(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(itern->status());
  std::string value(1024, 'a');

  const int num_records = 1000;
@@ -142,11 +138,8 @@ TEST_F(DBTestTailingIterator, TailingIteratorTrimSeekToNext) {
  Slice keyu(bufe, 20);
  read_options.iterate_upper_bound = &keyu;
  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(iter->status());
  std::unique_ptr<Iterator> itern(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(itern->status());
  std::unique_ptr<Iterator> iterh(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(iterh->status());
  std::string value(1024, 'a');
  bool file_iters_deleted = false;
  bool file_iters_renewed_null = false;
@@ -186,7 +179,7 @@ TEST_F(DBTestTailingIterator, TailingIteratorTrimSeekToNext) {

    if (i % 100 == 99) {
      ASSERT_OK(Flush(1));
-      ASSERT_OK(dbfull()->TEST_WaitForCompact());
+      dbfull()->TEST_WaitForCompact();
      if (i == 299) {
        file_iters_deleted = true;
      }
@@ -232,7 +225,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorTrimSeekToNext) {
  ReopenWithColumnFamilies({"default", "pikachu"}, options);
  read_options.read_tier = kBlockCacheTier;
  std::unique_ptr<Iterator> iteri(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(iteri->status());
  char buf5[32];
  snprintf(buf5, sizeof(buf5), "00a0%016d", (num_records / 2) * 5 - 2);
  Slice target1(buf5, 20);
@@ -244,7 +236,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorTrimSeekToNext) {
  options.table_factory.reset(NewBlockBasedTableFactory());
  ReopenWithColumnFamilies({"default", "pikachu"}, options);
  iter.reset(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(iter->status());
  for (int i = 2 * num_records; i > 0; --i) {
    char buf1[32];
    char buf2[32];
@@ -271,7 +262,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorDeletes) {
  read_options.tailing = true;

  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(iter->status());

  // write a single record, read it using the iterator, then delete it
  ASSERT_OK(Put(1, "0test", "test"));
@@ -319,7 +309,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorPrefixSeek) {
  CreateAndReopenWithCF({"pikachu"}, options);

  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(iter->status());
  ASSERT_OK(Put(1, "0101", "test"));

  ASSERT_OK(Flush(1));
@@ -350,7 +339,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorIncomplete) {
  ASSERT_OK(db_->Put(WriteOptions(), key, value));

  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-  ASSERT_OK(iter->status());
  iter->SeekToFirst();
  // we either see the entry or it's not in cache
  ASSERT_TRUE(iter->Valid() || iter->status().IsIncomplete());
@@ -381,7 +369,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorSeekToSame) {
  }

  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-  ASSERT_OK(iter->status());
  // Seek to 00001.  We expect to find 00002.
  std::string start_key = "00001";
  iter->Seek(start_key);
@@ -417,7 +404,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorUpperBound) {
  ASSERT_OK(Put(1, "21", "21"));

  std::unique_ptr<Iterator> it(db_->NewIterator(read_options, handles_[1]));
-  ASSERT_OK(it->status());
  it->Seek("12");
  ASSERT_TRUE(it->Valid());
  ASSERT_EQ("12", it->key().ToString());
@@ -425,7 +411,7 @@ TEST_F(DBTestTailingIterator, TailingIteratorUpperBound) {
  it->Next();
  // Not valid since "21" is over the upper bound.
  ASSERT_FALSE(it->Valid());
-  ASSERT_OK(it->status());
+
  // This keeps track of the number of times NeedToSeekImmutable() was true.
  int immutable_seeks = 0;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
@@ -438,7 +424,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorUpperBound) {
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();

  ASSERT_FALSE(it->Valid());
-  ASSERT_OK(it->status());
  ASSERT_EQ(0, immutable_seeks);
 }

@@ -493,8 +478,6 @@ TEST_F(DBTestTailingIterator, TailingIteratorGap) {
  it->Next();
  ASSERT_TRUE(it->Valid());
  ASSERT_EQ("40", it->key().ToString());
-
-  ASSERT_OK(it->status());
 }

 TEST_F(DBTestTailingIterator, SeekWithUpperBoundBug) {
@@ -513,7 +496,6 @@ TEST_F(DBTestTailingIterator, SeekWithUpperBoundBug) {
  ASSERT_OK(Flush());

  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-  ASSERT_OK(iter->status());

  iter->Seek("aa");
  ASSERT_TRUE(iter->Valid());
@@ -536,7 +518,6 @@ TEST_F(DBTestTailingIterator, SeekToFirstWithUpperBoundBug) {
  ASSERT_OK(Flush());

  std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-  ASSERT_OK(iter->status());

  iter->SeekToFirst();
  ASSERT_TRUE(iter->Valid());
@@ -1305,6 +1305,51 @@ TEST_F(DBTest, DISABLED_RepeatedWritesToSameKey) {
 }
 #endif  // ROCKSDB_LITE

+TEST_F(DBTest, SparseMerge) {
+  do {
+    Options options = CurrentOptions();
+    options.compression = kNoCompression;
+    CreateAndReopenWithCF({"pikachu"}, options);
+
+    FillLevels("A", "Z", 1);
+
+    // Suppose there is:
+    //    small amount of data with prefix A
+    //    large amount of data with prefix B
+    //    small amount of data with prefix C
+    // and that recent updates have made small changes to all three prefixes.
+    // Check that we do not do a compaction that merges all of B in one shot.
+    const std::string value(1000, 'x');
+    Put(1, "A", "va");
+    // Write approximately 100MB of "B" values
+    for (int i = 0; i < 100000; i++) {
+      char key[100];
+      snprintf(key, sizeof(key), "B%010d", i);
+      Put(1, key, value);
+    }
+    Put(1, "C", "vc");
+    ASSERT_OK(Flush(1));
+    dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]);
+
+    // Make sparse update
+    Put(1, "A", "va2");
+    Put(1, "B100", "bvalue2");
+    Put(1, "C", "vc2");
+    ASSERT_OK(Flush(1));
+
+    // Compactions should not cause us to create a situation where
+    // a file overlaps too much data at the next level.
+    ASSERT_LE(dbfull()->TEST_MaxNextLevelOverlappingBytes(handles_[1]),
+              20 * 1048576);
+    dbfull()->TEST_CompactRange(0, nullptr, nullptr);
+    ASSERT_LE(dbfull()->TEST_MaxNextLevelOverlappingBytes(handles_[1]),
+              20 * 1048576);
+    dbfull()->TEST_CompactRange(1, nullptr, nullptr);
+    ASSERT_LE(dbfull()->TEST_MaxNextLevelOverlappingBytes(handles_[1]),
+              20 * 1048576);
+  } while (ChangeCompactOptions());
+}
+
 #ifndef ROCKSDB_LITE
 static bool Between(uint64_t val, uint64_t low, uint64_t high) {
  bool result = (val >= low) && (val <= high);
@@ -1337,19 +1382,17 @@ TEST_F(DBTest, ApproximateSizesMemTable) {
  SizeApproximationOptions size_approx_options;
  size_approx_options.include_memtabtles = true;
  size_approx_options.include_files = true;
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
  ASSERT_GT(size, 6000);
  ASSERT_LT(size, 204800);
  // Zero if not including mem table
-  ASSERT_OK(db_->GetApproximateSizes(&r, 1, &size));
+  db_->GetApproximateSizes(&r, 1, &size);
  ASSERT_EQ(size, 0);

  start = Key(500);
  end = Key(600);
  r = Range(start, end);
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
  ASSERT_EQ(size, 0);

  for (int i = 0; i < N; i++) {
@@ -1359,15 +1402,13 @@ TEST_F(DBTest, ApproximateSizesMemTable) {
  start = Key(500);
  end = Key(600);
  r = Range(start, end);
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
  ASSERT_EQ(size, 0);

  start = Key(100);
  end = Key(1020);
  r = Range(start, end);
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
  ASSERT_GT(size, 6000);

  options.max_write_buffer_number = 8;
@@ -1393,32 +1434,29 @@ TEST_F(DBTest, ApproximateSizesMemTable) {
  start = Key(100);
  end = Key(300);
  r = Range(start, end);
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
  ASSERT_EQ(size, 0);

  start = Key(1050);
  end = Key(1080);
  r = Range(start, end);
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
  ASSERT_GT(size, 6000);

  start = Key(2100);
  end = Key(2300);
  r = Range(start, end);
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
  ASSERT_EQ(size, 0);

  start = Key(1050);
  end = Key(1080);
  r = Range(start, end);
  uint64_t size_with_mt, size_without_mt;
-  ASSERT_OK(db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1,
-                                     &size_with_mt));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1,
+                           &size_with_mt);
  ASSERT_GT(size_with_mt, 6000);
-  ASSERT_OK(db_->GetApproximateSizes(&r, 1, &size_without_mt));
+  db_->GetApproximateSizes(&r, 1, &size_without_mt);
  ASSERT_EQ(size_without_mt, 0);

  Flush();
@@ -1430,16 +1468,15 @@ TEST_F(DBTest, ApproximateSizesMemTable) {
  start = Key(1050);
  end = Key(1080);
  r = Range(start, end);
-  ASSERT_OK(db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1,
-                                     &size_with_mt));
-  ASSERT_OK(db_->GetApproximateSizes(&r, 1, &size_without_mt));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1,
+                           &size_with_mt);
+  db_->GetApproximateSizes(&r, 1, &size_without_mt);
  ASSERT_GT(size_with_mt, size_without_mt);
  ASSERT_GT(size_without_mt, 6000);

  // Check that include_memtabtles flag works as expected
  size_approx_options.include_memtabtles = false;
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
  ASSERT_EQ(size, size_without_mt);

  // Check that files_size_error_margin works as expected, when the heuristic
@@ -1448,12 +1485,10 @@ TEST_F(DBTest, ApproximateSizesMemTable) {
  end = Key(1000 + N - 2);
  r = Range(start, end);
  size_approx_options.files_size_error_margin = -1.0;  // disabled
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
  uint64_t size2;
  size_approx_options.files_size_error_margin = 0.5;  // enabled, but not used
-  ASSERT_OK(
-      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size2));
+  db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size2);
  ASSERT_EQ(size, size2);
 }

@@ -1504,16 +1539,14 @@ TEST_F(DBTest, ApproximateSizesFilesWithErrorMargin) {

    // Get the precise size without any approximation heuristic
    uint64_t size;
-    ASSERT_OK(db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1,
-                                       &size));
+    db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size);
    ASSERT_NE(size, 0);

    // Get the size with an approximation heuristic
    uint64_t size2;
    const double error_margin = 0.2;
    size_approx_options.files_size_error_margin = error_margin;
-    ASSERT_OK(db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1,
-                                       &size2));
+    db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size2);
    ASSERT_LT(size2, size * (1 + error_margin));
    ASSERT_GT(size2, size * (1 - error_margin));
  }
@@ -1529,7 +1562,7 @@ TEST_F(DBTest, ApproximateSizesFilesWithErrorMargin) {
      const std::string end = Key(i + 11);  // overlap by 1 key
      const Range r(start, end);
      uint64_t size;
-      ASSERT_OK(db_->GetApproximateSizes(&r, 1, &size));
+      db_->GetApproximateSizes(&r, 1, &size);
      ASSERT_LE(size, 11 * 100);
    }
  }
@@ -1597,12 +1630,9 @@ TEST_F(DBTest, ApproximateSizes) {
    DestroyAndReopen(options);
    CreateAndReopenWithCF({"pikachu"}, options);

-    uint64_t size;
-    ASSERT_OK(Size("", "xyz", 1, &size));
-    ASSERT_TRUE(Between(size, 0, 0));
+    ASSERT_TRUE(Between(Size("", "xyz", 1), 0, 0));
    ReopenWithColumnFamilies({"default", "pikachu"}, options);
-    ASSERT_OK(Size("", "xyz", 1, &size));
-    ASSERT_TRUE(Between(size, 0, 0));
+    ASSERT_TRUE(Between(Size("", "xyz", 1), 0, 0));

    // Write 8MB (80 values, each 100K)
    ASSERT_EQ(NumTableFilesAtLevel(0, 1), 0);
@@ -1615,8 +1645,7 @@ TEST_F(DBTest, ApproximateSizes) {
    }

    // 0 because GetApproximateSizes() does not account for memtable space
-    ASSERT_OK(Size("", Key(50), 1, &size));
-    ASSERT_TRUE(Between(size, 0, 0));
+    ASSERT_TRUE(Between(Size("", Key(50), 1), 0, 0));

    // Check sizes across recovery by reopening a few times
    for (int run = 0; run < 3; run++) {
@@ -1624,17 +1653,14 @@ TEST_F(DBTest, ApproximateSizes) {

      for (int compact_start = 0; compact_start < N; compact_start += 10) {
        for (int i = 0; i < N; i += 10) {
-          ASSERT_OK(Size("", Key(i), 1, &size));
-          ASSERT_TRUE(Between(size, S1 * i, S2 * i));
-          ASSERT_OK(Size("", Key(i) + ".suffix", 1, &size));
-          ASSERT_TRUE(Between(size, S1 * (i + 1), S2 * (i + 1)));
-          ASSERT_OK(Size(Key(i), Key(i + 10), 1, &size));
-          ASSERT_TRUE(Between(size, S1 * 10, S2 * 10));
+          ASSERT_TRUE(Between(Size("", Key(i), 1), S1 * i, S2 * i));
+          ASSERT_TRUE(Between(Size("", Key(i) + ".suffix", 1), S1 * (i + 1),
+                              S2 * (i + 1)));
+          ASSERT_TRUE(Between(Size(Key(i), Key(i + 10), 1), S1 * 10, S2 * 10));
        }
-        ASSERT_OK(Size("", Key(50), 1, &size));
-        ASSERT_TRUE(Between(size, S1 * 50, S2 * 50));
-        ASSERT_OK(Size("", Key(50) + ".suffix", 1, &size));
-        ASSERT_TRUE(Between(size, S1 * 50, S2 * 50));
+        ASSERT_TRUE(Between(Size("", Key(50), 1), S1 * 50, S2 * 50));
+        ASSERT_TRUE(
+            Between(Size("", Key(50) + ".suffix", 1), S1 * 50, S2 * 50));

        std::string cstart_str = Key(compact_start);
        std::string cend_str = Key(compact_start + 9);
@@ -1669,32 +1695,21 @@ TEST_F(DBTest, ApproximateSizes_MixOfSmallAndLarge) {
    ASSERT_OK(Put(1, Key(7), rnd.RandomString(10000)));

    // Check sizes across recovery by reopening a few times
-    uint64_t size;
    for (int run = 0; run < 3; run++) {
      ReopenWithColumnFamilies({"default", "pikachu"}, options);

-      ASSERT_OK(Size("", Key(0), 1, &size));
-      ASSERT_TRUE(Between(size, 0, 0));
-      ASSERT_OK(Size("", Key(1), 1, &size));
-      ASSERT_TRUE(Between(size, 10000, 11000));
-      ASSERT_OK(Size("", Key(2), 1, &size));
-      ASSERT_TRUE(Between(size, 20000, 21000));
-      ASSERT_OK(Size("", Key(3), 1, &size));
-      ASSERT_TRUE(Between(size, 120000, 121000));
-      ASSERT_OK(Size("", Key(4), 1, &size));
-      ASSERT_TRUE(Between(size, 130000, 131000));
-      ASSERT_OK(Size("", Key(5), 1, &size));
-      ASSERT_TRUE(Between(size, 230000, 232000));
-      ASSERT_OK(Size("", Key(6), 1, &size));
-      ASSERT_TRUE(Between(size, 240000, 242000));
+      ASSERT_TRUE(Between(Size("", Key(0), 1), 0, 0));
+      ASSERT_TRUE(Between(Size("", Key(1), 1), 10000, 11000));
+      ASSERT_TRUE(Between(Size("", Key(2), 1), 20000, 21000));
+      ASSERT_TRUE(Between(Size("", Key(3), 1), 120000, 121000));
+      ASSERT_TRUE(Between(Size("", Key(4), 1), 130000, 131000));
+      ASSERT_TRUE(Between(Size("", Key(5), 1), 230000, 232000));
+      ASSERT_TRUE(Between(Size("", Key(6), 1), 240000, 242000));
      // Ensure some overhead is accounted for, even without including all
-      ASSERT_OK(Size("", Key(7), 1, &size));
-      ASSERT_TRUE(Between(size, 540500, 545000));
-      ASSERT_OK(Size("", Key(8), 1, &size));
-      ASSERT_TRUE(Between(size, 550500, 555000));
+      ASSERT_TRUE(Between(Size("", Key(7), 1), 540500, 545000));
+      ASSERT_TRUE(Between(Size("", Key(8), 1), 550500, 555000));

-      ASSERT_OK(Size(Key(3), Key(5), 1, &size));
-      ASSERT_TRUE(Between(size, 110100, 111000));
+      ASSERT_TRUE(Between(Size(Key(3), Key(5), 1), 110100, 111000));

      dbfull()->TEST_CompactRange(0, nullptr, nullptr, handles_[1]);
    }
@@ -1778,7 +1793,6 @@ TEST_F(DBTest, Snapshot) {
 TEST_F(DBTest, HiddenValuesAreRemoved) {
  anon::OptionsOverride options_override;
  options_override.skip_policy = kSkipNoSnapshot;
-  uint64_t size;
  do {
    Options options = CurrentOptions(options_override);
    CreateAndReopenWithCF({"pikachu"}, options);
@@ -1796,8 +1810,7 @@ TEST_F(DBTest, HiddenValuesAreRemoved) {
    ASSERT_GT(NumTableFilesAtLevel(0, 1), 0);

    ASSERT_EQ(big, Get(1, "foo", snapshot));
-    ASSERT_OK(Size("", "pastfoo", 1, &size));
-    ASSERT_TRUE(Between(size, 50000, 60000));
+    ASSERT_TRUE(Between(Size("", "pastfoo", 1), 50000, 60000));
    db_->ReleaseSnapshot(snapshot);
    ASSERT_EQ(AllEntriesFor("foo", 1), "[ tiny, " + big + " ]");
    Slice x("x");
@@ -1808,8 +1821,7 @@ TEST_F(DBTest, HiddenValuesAreRemoved) {
    dbfull()->TEST_CompactRange(1, nullptr, &x, handles_[1]);
    ASSERT_EQ(AllEntriesFor("foo", 1), "[ tiny ]");

-    ASSERT_OK(Size("", "pastfoo", 1, &size));
-    ASSERT_TRUE(Between(size, 0, 1000));
+    ASSERT_TRUE(Between(Size("", "pastfoo", 1), 0, 1000));
    // ApproximateOffsetOf() is not yet implemented in plain table format,
    // which is used by Size().
  } while (ChangeOptions(kSkipUniversalCompaction | kSkipFIFOCompaction |
@@ -41,7 +41,9 @@ TEST_F(DBTest2, OpenForReadOnly) {
  std::vector<std::string> files;
  ASSERT_OK(env_->GetChildren(dbname, &files));
  for (auto& f : files) {
-    ASSERT_OK(env_->DeleteFile(dbname + "/" + f));
+    if (f != "." && f != "..") {
+      ASSERT_OK(env_->DeleteFile(dbname + "/" + f));
+    }
  }
  // <dbname> should be empty now and we should be able to delete it
  ASSERT_OK(env_->DeleteDir(dbname));
@@ -73,7 +75,9 @@ TEST_F(DBTest2, OpenForReadOnlyWithColumnFamilies) {
  std::vector<std::string> files;
  ASSERT_OK(env_->GetChildren(dbname, &files));
  for (auto& f : files) {
-    ASSERT_OK(env_->DeleteFile(dbname + "/" + f));
+    if (f != "." && f != "..") {
+      ASSERT_OK(env_->DeleteFile(dbname + "/" + f));
+    }
  }
  // <dbname> should be empty now and we should be able to delete it
  ASSERT_OK(env_->DeleteDir(dbname));
@@ -3681,26 +3685,20 @@ TEST_F(DBTest2, LiveFilesOmitObsoleteFiles) {

 TEST_F(DBTest2, TestNumPread) {
  Options options = CurrentOptions();
-  bool prefetch_supported =
-      test::IsPrefetchSupported(env_->GetFileSystem(), dbname_);
  // disable block cache
  BlockBasedTableOptions table_options;
  table_options.no_block_cache = true;
  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
  Reopen(options);
  env_->count_random_reads_ = true;
+
  env_->random_file_open_counter_.store(0);
  ASSERT_OK(Put("bar", "foo"));
  ASSERT_OK(Put("foo", "bar"));
  ASSERT_OK(Flush());
-  if (prefetch_supported) {
-    // After flush, we'll open the file and read footer, meta block,
-    // property block and index block.
-    ASSERT_EQ(4, env_->random_read_counter_.Read());
-  } else {
-    // With prefetch not supported, we will do a single read into a buffer
-    ASSERT_EQ(1, env_->random_read_counter_.Read());
-  }
+  // After flush, we'll open the file and read footer, meta block,
+  // property block and index block.
+  ASSERT_EQ(4, env_->random_read_counter_.Read());
  ASSERT_EQ(1, env_->random_file_open_counter_.load());

  // One pread per a normal data block read
@@ -3716,30 +3714,19 @@ TEST_F(DBTest2, TestNumPread) {
  ASSERT_OK(Put("bar2", "foo2"));
  ASSERT_OK(Put("foo2", "bar2"));
  ASSERT_OK(Flush());
-  if (prefetch_supported) {
-    // After flush, we'll open the file and read footer, meta block,
-    // property block and index block.
-    ASSERT_EQ(4, env_->random_read_counter_.Read());
-  } else {
-    // With prefetch not supported, we will do a single read into a buffer
-    ASSERT_EQ(1, env_->random_read_counter_.Read());
-  }
+  // After flush, we'll open the file and read footer, meta block,
+  // property block and index block.
+  ASSERT_EQ(4, env_->random_read_counter_.Read());
  ASSERT_EQ(1, env_->random_file_open_counter_.load());

+  // Compaction needs two input blocks, which requires 2 preads, and
+  // generate a new SST file which needs 4 preads (footer, meta block,
+  // property block and index block). In total 6.
  env_->random_file_open_counter_.store(0);
  env_->random_read_counter_.Reset();
  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
-  if (prefetch_supported) {
-    // Compaction needs two input blocks, which requires 2 preads, and
-    // generate a new SST file which needs 4 preads (footer, meta block,
-    // property block and index block). In total 6.
-    ASSERT_EQ(6, env_->random_read_counter_.Read());
-  } else {
-    // With prefetch off, compaction needs two input blocks,
-    // followed by a single buffered read.  In total 3.
-    ASSERT_EQ(3, env_->random_read_counter_.Read());
-  }
-  // All compaction input files should have already been opened.
+  ASSERT_EQ(6, env_->random_read_counter_.Read());
+  // All compactin input files should have already been opened.
  ASSERT_EQ(1, env_->random_file_open_counter_.load());

  // One pread per a normal data block read
@@ -236,7 +236,7 @@ bool DBTestBase::ChangeWalOptions() {
    auto options = CurrentOptions();
    Destroy(options);
    options.create_if_missing = true;
-    Reopen(options);
+    TryReopen(options);
    return true;
  } else if (option_config_ == kDBLogDir) {
    option_config_ = kWalDirAndMmapReads;
@@ -244,14 +244,14 @@ bool DBTestBase::ChangeWalOptions() {
    auto options = CurrentOptions();
    Destroy(options);
    options.create_if_missing = true;
-    Reopen(options);
+    TryReopen(options);
    return true;
  } else if (option_config_ == kWalDirAndMmapReads) {
    option_config_ = kRecycleLogFiles;
    Destroy(last_options_);
    auto options = CurrentOptions();
    Destroy(options);
-    Reopen(options);
+    TryReopen(options);
    return true;
  } else {
    return false;
@@ -1128,48 +1128,26 @@ std::string DBTestBase::FilesPerLevel(int cf) {
 #endif  // !ROCKSDB_LITE

 size_t DBTestBase::CountFiles() {
-  size_t count = 0;
  std::vector<std::string> files;
-  if (env_->GetChildren(dbname_, &files).ok()) {
-    count += files.size();
-  }
+  env_->GetChildren(dbname_, &files);

+  std::vector<std::string> logfiles;
  if (dbname_ != last_options_.wal_dir) {
-    if (env_->GetChildren(last_options_.wal_dir, &files).ok()) {
-      count += files.size();
-    }
+    env_->GetChildren(last_options_.wal_dir, &logfiles);
  }

-  return count;
-};
-
-Status DBTestBase::CountFiles(size_t* count) {
-  std::vector<std::string> files;
-  Status s = env_->GetChildren(dbname_, &files);
-  if (!s.ok()) {
-    return s;
-  }
-  size_t files_count = files.size();
-
-  if (dbname_ != last_options_.wal_dir) {
-    s = env_->GetChildren(last_options_.wal_dir, &files);
-    if (!s.ok()) {
-      return s;
-    }
-    *count = files_count + files.size();
-  }
-
-  return Status::OK();
+  return files.size() + logfiles.size();
 }

-Status DBTestBase::Size(const Slice& start, const Slice& limit, int cf,
-                        uint64_t* size) {
+uint64_t DBTestBase::Size(const Slice& start, const Slice& limit, int cf) {
  Range r(start, limit);
+  uint64_t size;
  if (cf == 0) {
-    return db_->GetApproximateSizes(&r, 1, size);
+    db_->GetApproximateSizes(&r, 1, &size);
  } else {
-    return db_->GetApproximateSizes(handles_[1], &r, 1, size);
+    db_->GetApproximateSizes(handles_[1], &r, 1, &size);
  }
+  return size;
 }

 void DBTestBase::Compact(int cf, const Slice& start, const Slice& limit,
@@ -1288,8 +1266,8 @@ void DBTestBase::GenerateNewRandomFile(Random* rnd, bool nowait) {
  }
  ASSERT_OK(Put("key" + rnd->RandomString(7), rnd->RandomString(200)));
  if (!nowait) {
-    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
+    dbfull()->TEST_WaitForFlushMemTable();
+    dbfull()->TEST_WaitForCompact();
  }
 }

@@ -1070,13 +1070,7 @@ class DBTestBase : public testing::Test {

  size_t CountFiles();

-  Status CountFiles(size_t* count);
-
-  Status Size(const Slice& start, const Slice& limit, uint64_t* size) {
-    return Size(start, limit, 0, size);
-  }
-
-  Status Size(const Slice& start, const Slice& limit, int cf, uint64_t* size);
+  uint64_t Size(const Slice& start, const Slice& limit, int cf = 0);

  void Compact(int cf, const Slice& start, const Slice& limit,
               uint32_t target_path_id);
@@ -996,7 +996,7 @@ TEST_P(DBTestUniversalCompaction, UniversalCompactionStopStyleSimilarSize) {
  //   First, clean up memtable before inserting new data. This will generate
  //   a level-0 file, with size around 0.4 (according to previously written
  //   data amount).
-  ASSERT_OK(dbfull()->Flush(FlushOptions()));
+  dbfull()->Flush(FlushOptions());
  for (int num = 0; num < options.level0_file_num_compaction_trigger - 3;
       num++) {
    // Write 110KB (11 values, each 10K)
@@ -1781,7 +1781,7 @@ TEST_P(DBTestUniversalCompaction, FinalSortedRunCompactFilesConflict) {
      dbfull()->TEST_write_controler().GetCompactionPressureToken();

  ASSERT_OK(Put("key", "val"));
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));
  ASSERT_EQ(NumTableFilesAtLevel(num_levels_ - 1), 1);
  ColumnFamilyMetaData cf_meta;
@@ -1807,7 +1807,7 @@ TEST_P(DBTestUniversalCompaction, FinalSortedRunCompactFilesConflict) {
      "DBTestUniversalCompaction:FinalSortedRunCompactFilesConflict:0");
  for (int i = 0; i < 2; ++i) {
    ASSERT_OK(Put("key", "val"));
-    ASSERT_OK(Flush());
+    Flush();
  }
  ASSERT_OK(dbfull()->TEST_WaitForCompact());

@@ -1911,7 +1911,7 @@ TEST_F(DBTestUniversalCompaction2, BasicL0toL1) {
  for (i = 0; i < 2000; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  //  MoveFilesToLevel(6);
  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));

@@ -1923,7 +1923,7 @@ TEST_F(DBTestUniversalCompaction2, BasicL0toL1) {
      ASSERT_OK(Put(Key(i), "val"));
    }
  }
-  ASSERT_OK(Flush());
+  Flush();

  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
@@ -1954,7 +1954,7 @@ TEST_F(DBTestUniversalCompaction2, SingleLevel) {
  for (i = 0; i < 2000; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();

  for (i = 1999; i < kNumKeys; ++i) {
    if (i >= kNumKeys - kWindowSize &&
@@ -1964,7 +1964,7 @@ TEST_F(DBTestUniversalCompaction2, SingleLevel) {
      ASSERT_OK(Put(Key(i), "val"));
    }
  }
-  ASSERT_OK(Flush()(;
+  Flush();

  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(1, NumTableFilesAtLevel(0));
@@ -1992,19 +1992,19 @@ TEST_F(DBTestUniversalCompaction2, MultipleLevels) {
  for (i = 0; i < 500; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  for (i = 500; i < 1000; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  for (i = 1000; i < 1500; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  for (i = 1500; i < 2000; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();

  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
@@ -2013,15 +2013,15 @@ TEST_F(DBTestUniversalCompaction2, MultipleLevels) {
  for (i = 1999; i < 2333; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  for (i = 2333; i < 2666; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  for (i = 2666; i < 2999; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();

  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
@@ -2031,7 +2031,7 @@ TEST_F(DBTestUniversalCompaction2, MultipleLevels) {
  for (i = 1900; i < 2100; ++i) {
    ASSERT_OK(Delete(Key(i)));
  }
-  ASSERT_OK(Flush());
+  Flush();

  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
@@ -2064,19 +2064,19 @@ TEST_F(DBTestUniversalCompaction2, OverlappingL0) {
  for (i = 0; i < 2000; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  for (i = 2000; i < 3000; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  for (i = 3500; i < 4000; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  for (i = 2900; i < 3100; ++i) {
    ASSERT_OK(Delete(Key(i)));
  }
-  ASSERT_OK(Flush());
+  Flush();

  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(2, NumTableFilesAtLevel(0));
@@ -2106,7 +2106,7 @@ TEST_F(DBTestUniversalCompaction2, IngestBehind) {
  for (i = 0; i < 2000; ++i) {
    ASSERT_OK(Put(Key(i), "val"));
  }
-  ASSERT_OK(Flush());
+  Flush();
  //  MoveFilesToLevel(6);
  ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr));

@@ -2118,7 +2118,7 @@ TEST_F(DBTestUniversalCompaction2, IngestBehind) {
      ASSERT_OK(Put(Key(i), "val"));
    }
  }
-  ASSERT_OK(Flush());
+  Flush();

  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(0, NumTableFilesAtLevel(0));
@@ -2184,7 +2184,7 @@ TEST_F(DBTestUniversalCompaction2, PeriodicCompaction) {

  // Case 1: Oldest flushed file excceeds periodic compaction threshold.
  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_EQ(0, periodic_compactions);
  // Move clock forward so that the flushed file would qualify periodic
  // compaction.
@@ -2192,7 +2192,7 @@ TEST_F(DBTestUniversalCompaction2, PeriodicCompaction) {

  // Another flush would trigger compaction the oldest file.
  ASSERT_OK(Put("foo", "bar2"));
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(dbfull()->TEST_WaitForCompact());

  ASSERT_EQ(1, periodic_compactions);
@@ -2203,7 +2203,7 @@ TEST_F(DBTestUniversalCompaction2, PeriodicCompaction) {
  periodic_compactions = 0;
  // A flush doesn't trigger a periodic compaction when threshold not hit
  ASSERT_OK(Put("foo", "bar2"));
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(0, periodic_compactions);

@@ -2211,7 +2211,7 @@ TEST_F(DBTestUniversalCompaction2, PeriodicCompaction) {
  // a compaction
  ASSERT_OK(Put("foo", "bar2"));
  env_->MockSleepForSeconds(48 * 60 * 60 + 100);
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  ASSERT_EQ(1, periodic_compactions);
  ASSERT_EQ(0, start_level);
@@ -506,7 +506,9 @@ TEST_F(DBWALTest, IgnoreRecoveredLog) {
    std::vector<std::string> old_files;
    ASSERT_OK(env_->GetChildren(backup_logs, &old_files));
    for (auto& file : old_files) {
-      ASSERT_OK(env_->DeleteFile(backup_logs + "/" + file));
+      if (file != "." && file != "..") {
+        ASSERT_OK(env_->DeleteFile(backup_logs + "/" + file));
+      }
    }
    Options options = CurrentOptions();
    options.create_if_missing = true;
@@ -526,7 +528,9 @@ TEST_F(DBWALTest, IgnoreRecoveredLog) {
    std::vector<std::string> logs;
    ASSERT_OK(env_->GetChildren(options.wal_dir, &logs));
    for (auto& log : logs) {
-      CopyFile(options.wal_dir + "/" + log, backup_logs + "/" + log);
+      if (log != ".." && log != ".") {
+        CopyFile(options.wal_dir + "/" + log, backup_logs + "/" + log);
+      }
    }

    // recover the DB
@@ -537,7 +541,9 @@ TEST_F(DBWALTest, IgnoreRecoveredLog) {

    // copy the logs from backup back to wal dir
    for (auto& log : logs) {
-      CopyFile(backup_logs + "/" + log, options.wal_dir + "/" + log);
+      if (log != ".." && log != ".") {
+        CopyFile(backup_logs + "/" + log, options.wal_dir + "/" + log);
+      }
    }
    // this should ignore the log files, recovery should not happen again
    // if the recovery happens, the same merge operator would be called twice,
@@ -553,7 +559,9 @@ TEST_F(DBWALTest, IgnoreRecoveredLog) {
    // copy the logs from backup back to wal dir
    ASSERT_OK(env_->CreateDirIfMissing(options.wal_dir));
    for (auto& log : logs) {
-      CopyFile(backup_logs + "/" + log, options.wal_dir + "/" + log);
+      if (log != ".." && log != ".") {
+        CopyFile(backup_logs + "/" + log, options.wal_dir + "/" + log);
+      }
    }
    // assert that we successfully recovered only from logs, even though we
    // destroyed the DB
@@ -566,9 +574,11 @@ TEST_F(DBWALTest, IgnoreRecoveredLog) {
    // copy the logs from backup back to wal dir
    ASSERT_OK(env_->CreateDirIfMissing(options.wal_dir));
    for (auto& log : logs) {
-      CopyFile(backup_logs + "/" + log, options.wal_dir + "/" + log);
-      // we won't be needing this file no more
-      ASSERT_OK(env_->DeleteFile(backup_logs + "/" + log));
+      if (log != ".." && log != ".") {
+        CopyFile(backup_logs + "/" + log, options.wal_dir + "/" + log);
+        // we won't be needing this file no more
+        ASSERT_OK(env_->DeleteFile(backup_logs + "/" + log));
+      }
    }
    Status s = TryReopen(options);
    ASSERT_NOK(s);
@@ -270,7 +270,7 @@ TEST_F(DBBasicTestWithTimestamp, GetApproximateSizes) {
  ASSERT_EQ(range_sizes[1], size);

  // Zero if not including mem table
-  ASSERT_OK(db_->GetApproximateSizes(&r, 1, &size));
+  db_->GetApproximateSizes(&r, 1, &size);
  ASSERT_EQ(size, 0);

  start = Key(500);
@@ -60,15 +60,14 @@ TEST_P(DBWriteTest, WriteStallRemoveNoSlowdownWrite) {
    std::string key = "foo" + std::to_string(a);
    WriteOptions wo;
    wo.no_slowdown = false;
-    ASSERT_OK(dbfull()->Put(wo, key, "bar"));
+    dbfull()->Put(wo, key, "bar");
  };
  std::function<void()> write_no_slowdown_func = [&]() {
    int a = thread_num.fetch_add(1);
    std::string key = "foo" + std::to_string(a);
    WriteOptions wo;
    wo.no_slowdown = true;
-    Status s = dbfull()->Put(wo, key, "bar");
-    ASSERT_TRUE(s.ok() || s.IsIncomplete());
+    dbfull()->Put(wo, key, "bar");
  };
  std::function<void(void*)> unblock_main_thread_func = [&](void*) {
    mutex.Lock();
@@ -78,13 +77,13 @@ TEST_P(DBWriteTest, WriteStallRemoveNoSlowdownWrite) {
  };

  // Create 3 L0 files and schedule 4th without waiting
-  ASSERT_OK(Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar"));
+  Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar");
+  Flush();
+  Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar");
+  Flush();
+  Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar");
+  Flush();
+  Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar");

  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "WriteThread::JoinBatchGroup:Start", unblock_main_thread_func);
@@ -105,7 +104,7 @@ TEST_P(DBWriteTest, WriteStallRemoveNoSlowdownWrite) {
  // write_thread
  FlushOptions fopt;
  fopt.wait = false;
-  ASSERT_OK(dbfull()->Flush(fopt));
+  dbfull()->Flush(fopt);

  // Create a mix of slowdown/no_slowdown write threads
  mutex.Lock();
@@ -146,7 +145,7 @@ TEST_P(DBWriteTest, WriteStallRemoveNoSlowdownWrite) {
  mutex.Unlock();

  TEST_SYNC_POINT("DBWriteTest::WriteStallRemoveNoSlowdownWrite:1");
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(nullptr));
+  dbfull()->TEST_WaitForFlushMemTable(nullptr);
  // This would have triggered a write stall. Unblock the write group leader
  TEST_SYNC_POINT("DBWriteTest::WriteStallRemoveNoSlowdownWrite:2");
  // The leader is going to create missing newer links. When the leader
@@ -179,15 +178,14 @@ TEST_P(DBWriteTest, WriteThreadHangOnWriteStall) {
    std::string key = "foo" + std::to_string(a);
    WriteOptions wo;
    wo.no_slowdown = false;
-    ASSERT_OK(dbfull()->Put(wo, key, "bar"));
+    dbfull()->Put(wo, key, "bar");
  };
  std::function<void()> write_no_slowdown_func = [&]() {
    int a = thread_num.fetch_add(1);
    std::string key = "foo" + std::to_string(a);
    WriteOptions wo;
    wo.no_slowdown = true;
-    Status s = dbfull()->Put(wo, key, "bar");
-    ASSERT_TRUE(s.ok() || s.IsIncomplete());
+    dbfull()->Put(wo, key, "bar");
  };
  std::function<void(void *)> unblock_main_thread_func = [&](void *) {
    mutex.Lock();
@@ -197,13 +195,13 @@ TEST_P(DBWriteTest, WriteThreadHangOnWriteStall) {
  };

  // Create 3 L0 files and schedule 4th without waiting
-  ASSERT_OK(Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar"));
+  Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar");
+  Flush();
+  Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar");
+  Flush();
+  Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar");
+  Flush();
+  Put("foo" + std::to_string(thread_num.fetch_add(1)), "bar");

  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "WriteThread::JoinBatchGroup:Start", unblock_main_thread_func);
@@ -224,7 +222,7 @@ TEST_P(DBWriteTest, WriteThreadHangOnWriteStall) {
  // write_thread
  FlushOptions fopt;
  fopt.wait = false;
-  ASSERT_OK(dbfull()->Flush(fopt));
+  dbfull()->Flush(fopt);

  // Create a mix of slowdown/no_slowdown write threads
  mutex.Lock();
@@ -245,7 +243,7 @@ TEST_P(DBWriteTest, WriteThreadHangOnWriteStall) {
  mutex.Unlock();

  TEST_SYNC_POINT("DBWriteTest::WriteThreadHangOnWriteStall:1");
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(nullptr));
+  dbfull()->TEST_WaitForFlushMemTable(nullptr);
  // This would have triggered a write stall. Unblock the write group leader
  TEST_SYNC_POINT("DBWriteTest::WriteThreadHangOnWriteStall:2");
  // The leader is going to create missing newer links. When the leader finishes,
@@ -309,11 +307,6 @@ TEST_P(DBWriteTest, IOErrorOnWALWritePropagateToWriteThreadFollower) {
    threads[i].join();
  }
  ASSERT_EQ(1, leader_count);
-
-  // The Failed PUT operations can cause a BG error to be set.
-  // Mark it as Checked for the ASSERT_STATUS_CHECKED
-  dbfull()->Resume().PermitUncheckedError();
-
  // Close before mock_env destruct.
  Close();
 }
@@ -358,9 +351,7 @@ TEST_P(DBWriteTest, IOErrorOnWALWriteTriggersReadOnlyMode) {
    }
    */
    if (!options.manual_wal_flush) {
-      ASSERT_NOK(res);
-    } else {
-      ASSERT_OK(res);
+      ASSERT_FALSE(res.ok());
    }
  }
  // Close before mock_env destruct.
@@ -432,14 +423,13 @@ TEST_P(DBWriteTest, ConcurrentlyDisabledWAL) {
              ROCKSDB_NAMESPACE::WriteOptions write_option_default;
              std::string no_wal_key = no_wal_key_prefix + std::to_string(t) +
                                       "_" + std::to_string(i);
-              ASSERT_OK(
-                  this->Put(no_wal_key, no_wal_value, write_option_disable));
+              this->Put(no_wal_key, no_wal_value, write_option_disable);
              std::string wal_key =
                  wal_key_prefix + std::to_string(i) + "_" + std::to_string(i);
-              ASSERT_OK(this->Put(wal_key, wal_value, write_option_default));
-              ASSERT_OK(dbfull()->SyncWAL());
+              this->Put(wal_key, wal_value, write_option_default);
+              dbfull()->SyncWAL();
            }
-            return;
+            return 0;
        });
    }
    for (auto& t: threads) {
@@ -40,7 +40,7 @@ class DeleteFileTest : public DBTestBase {
        wal_dir_(dbname_ + "/wal_files") {}

  void SetOptions(Options* options) {
-    ASSERT_NE(options, nullptr);
+    assert(options);
    options->delete_obsolete_files_period_micros = 0;  // always do full purge
    options->enable_thread_tracking = true;
    options->write_buffer_size = 1024 * 1024 * 1000;
@@ -105,7 +105,7 @@ class DeleteFileTest : public DBTestBase {
  void CheckFileTypeCounts(const std::string& dir, int required_log,
                           int required_sst, int required_manifest) {
    std::vector<std::string> filenames;
-    ASSERT_OK(env_->GetChildren(dir, &filenames));
+    env_->GetChildren(dir, &filenames);

    int log_cnt = 0, sst_cnt = 0, manifest_cnt = 0;
    for (auto file : filenames) {
@@ -180,8 +180,7 @@ TEST_F(DeleteFileTest, AddKeysAndQueryLevels) {
  ASSERT_TRUE(status.IsInvalidArgument());

  // Lowest level file deletion should succeed.
-  status = db_->DeleteFile(level2file);
-  ASSERT_OK(status);
+  ASSERT_OK(db_->DeleteFile(level2file));
 }

 TEST_F(DeleteFileTest, PurgeObsoleteFilesTest) {
@@ -202,7 +201,7 @@ TEST_F(DeleteFileTest, PurgeObsoleteFilesTest) {
  compact_options.change_level = true;
  compact_options.target_level = 2;
  Slice first_slice(first), last_slice(last);
-  ASSERT_OK(db_->CompactRange(compact_options, &first_slice, &last_slice));
+  db_->CompactRange(compact_options, &first_slice, &last_slice);
  // 1 sst after compaction
  CheckFileTypeCounts(dbname_, 0, 1, 1);

@@ -211,9 +210,7 @@ TEST_F(DeleteFileTest, PurgeObsoleteFilesTest) {
  Iterator *itr = nullptr;
  CreateTwoLevels();
  itr = db_->NewIterator(ReadOptions());
-  ASSERT_OK(itr->status());
-  ASSERT_OK(db_->CompactRange(compact_options, &first_slice, &last_slice));
-  ASSERT_OK(itr->status());
+  db_->CompactRange(compact_options, &first_slice, &last_slice);
  // 3 sst after compaction with live iterator
  CheckFileTypeCounts(dbname_, 0, 3, 1);
  delete itr;
@@ -240,8 +237,7 @@ TEST_F(DeleteFileTest, BackgroundPurgeIteratorTest) {
  ReadOptions read_options;
  read_options.background_purge_on_iterator_cleanup = true;
  itr = db_->NewIterator(read_options);
-  ASSERT_OK(itr->status());
-  ASSERT_OK(db_->CompactRange(compact_options, &first_slice, &last_slice));
+  db_->CompactRange(compact_options, &first_slice, &last_slice);
  // 3 sst after compaction with live iterator
  CheckFileTypeCounts(dbname_, 0, 3, 1);
  test::SleepingBackgroundTask sleeping_task_before;
@@ -348,12 +344,11 @@ TEST_F(DeleteFileTest, BackgroundPurgeCopyOptions) {
    ReadOptions read_options;
    read_options.background_purge_on_iterator_cleanup = true;
    itr = db_->NewIterator(read_options);
-    ASSERT_OK(itr->status());
    // ReadOptions is deleted, but iterator cleanup function should not be
    // affected
  }

-  ASSERT_OK(db_->CompactRange(compact_options, &first_slice, &last_slice));
+  db_->CompactRange(compact_options, &first_slice, &last_slice);
  // 3 sst after compaction with live iterator
  CheckFileTypeCounts(dbname_, 0, 3, 1);
  delete itr;
@@ -387,11 +382,9 @@ TEST_F(DeleteFileTest, BackgroundPurgeTestMultipleJobs) {
  ReadOptions read_options;
  read_options.background_purge_on_iterator_cleanup = true;
  Iterator* itr1 = db_->NewIterator(read_options);
-  ASSERT_OK(itr1->status());
  CreateTwoLevels();
  Iterator* itr2 = db_->NewIterator(read_options);
-  ASSERT_OK(itr2->status());
-  ASSERT_OK(db_->CompactRange(compact_options, &first_slice, &last_slice));
+  db_->CompactRange(compact_options, &first_slice, &last_slice);
  // 5 sst files after 2 compactions with 2 live iterators
  CheckFileTypeCounts(dbname_, 0, 5, 1);

@@ -424,7 +417,6 @@ TEST_F(DeleteFileTest, DeleteFileWithIterator) {
  CreateTwoLevels();
  ReadOptions read_options;
  Iterator* it = db_->NewIterator(read_options);
-  ASSERT_OK(it->status());
  std::vector<LiveFileMetaData> metadata;
  db_->GetLiveFilesMetaData(&metadata);

@@ -440,7 +432,7 @@ TEST_F(DeleteFileTest, DeleteFileWithIterator) {
  Status status = db_->DeleteFile(level2file);
  fprintf(stdout, "Deletion status %s: %s\n",
          level2file.c_str(), status.ToString().c_str());
-  ASSERT_OK(status);
+  ASSERT_TRUE(status.ok());
  it->SeekToFirst();
  int numKeysIterated = 0;
  while(it->Valid()) {
@@ -460,7 +452,7 @@ TEST_F(DeleteFileTest, DeleteLogFiles) {

  AddKeys(10, 0);
  VectorLogPtr logfiles;
-  ASSERT_OK(db_->GetSortedWalFiles(logfiles));
+  db_->GetSortedWalFiles(logfiles);
  ASSERT_GT(logfiles.size(), 0UL);
  // Take the last log file which is expected to be alive and try to delete it
  // Should not succeed because live logs are not allowed to be deleted
@@ -469,7 +461,7 @@ TEST_F(DeleteFileTest, DeleteLogFiles) {
  ASSERT_OK(env_->FileExists(wal_dir_ + "/" + alive_log->PathName()));
  fprintf(stdout, "Deleting alive log file %s\n",
          alive_log->PathName().c_str());
-  ASSERT_NOK(db_->DeleteFile(alive_log->PathName()));
+  ASSERT_TRUE(!db_->DeleteFile(alive_log->PathName()).ok());
  ASSERT_OK(env_->FileExists(wal_dir_ + "/" + alive_log->PathName()));
  logfiles.clear();

@@ -477,10 +469,10 @@ TEST_F(DeleteFileTest, DeleteLogFiles) {
  // Call Flush again to flush out memtable and move alive log to archived log
  // and try to delete the archived log file
  FlushOptions fopts;
-  ASSERT_OK(db_->Flush(fopts));
+  db_->Flush(fopts);
  AddKeys(10, 0);
-  ASSERT_OK(db_->Flush(fopts));
-  ASSERT_OK(db_->GetSortedWalFiles(logfiles));
+  db_->Flush(fopts);
+  db_->GetSortedWalFiles(logfiles);
  ASSERT_GT(logfiles.size(), 0UL);
  std::unique_ptr<LogFile> archived_log = std::move(logfiles.front());
  ASSERT_EQ(archived_log->Type(), kArchivedLogFile);
@@ -488,8 +480,8 @@ TEST_F(DeleteFileTest, DeleteLogFiles) {
  fprintf(stdout, "Deleting archived log file %s\n",
          archived_log->PathName().c_str());
  ASSERT_OK(db_->DeleteFile(archived_log->PathName()));
-  ASSERT_TRUE(
-      env_->FileExists(wal_dir_ + "/" + archived_log->PathName()).IsNotFound());
+  ASSERT_EQ(Status::NotFound(),
+            env_->FileExists(wal_dir_ + "/" + archived_log->PathName()));
 }

 TEST_F(DeleteFileTest, DeleteNonDefaultColumnFamily) {
@@ -528,7 +520,6 @@ TEST_F(DeleteFileTest, DeleteNonDefaultColumnFamily) {

  {
    std::unique_ptr<Iterator> itr(db_->NewIterator(ReadOptions(), handles_[1]));
-    ASSERT_OK(itr->status());
    int count = 0;
    for (itr->SeekToFirst(); itr->Valid(); itr->Next()) {
      ASSERT_OK(itr->status());
@@ -417,11 +417,11 @@ const Status& ErrorHandler::SetBGError(const IOStatus& bg_io_err,
                                          &new_bg_io_err, db_mutex_,
                                          &auto_recovery);
    if (BackgroundErrorReason::kCompaction == reason) {
-      // We map the retryable IO error during compaction to soft error. Since
-      // compaction can reschedule by itself. We will not set the BG error in
-      // this case
-      // TODO:  a better way to set or clean the retryable IO error which
-      // happens during compaction SST file write.
+      Status bg_err(new_bg_io_err, Status::Severity::kSoftError);
+      if (bg_err.severity() > bg_error_.severity()) {
+        bg_error_ = bg_err;
+      }
+      recover_context_ = context;
      return bg_error_;
    } else if (BackgroundErrorReason::kFlushNoWAL == reason ||
               BackgroundErrorReason::kManifestWriteNoWAL == reason) {
@@ -173,7 +173,7 @@ TEST_F(DBErrorHandlingFSTest, FLushWriteError) {
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  Reopen(options);
  ASSERT_EQ("val", Get(Key(0)));
@@ -355,7 +355,7 @@ TEST_F(DBErrorHandlingFSTest, FLushWritNoWALRetryableError1) {
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_EQ("val2", Get(Key(2)));
  ASSERT_OK(Put(Key(3), "val3", wo));
@@ -398,7 +398,7 @@ TEST_F(DBErrorHandlingFSTest, FLushWritNoWALRetryableError2) {
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_EQ("val2", Get(Key(2)));
  ASSERT_OK(Put(Key(3), "val3", wo));
@@ -441,7 +441,7 @@ TEST_F(DBErrorHandlingFSTest, FLushWritNoWALRetryableError3) {
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_EQ("val2", Get(Key(2)));
  ASSERT_OK(Put(Key(3), "val3", wo));
@@ -483,7 +483,7 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteError) {
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
@@ -526,7 +526,7 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteRetryableError) {
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
@@ -617,7 +617,7 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteNoWALRetryableError) {
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
@@ -665,7 +665,7 @@ TEST_F(DBErrorHandlingFSTest, DoubleManifestWriteError) {

  // A successful Resume() will create a new manifest file
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
@@ -698,7 +698,7 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteError) {
  ASSERT_OK(Put(Key(0), "val"));
  ASSERT_OK(Put(Key(2), "val"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      // Wait for flush of 2nd L0 file before starting compaction
@@ -728,7 +728,7 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteError) {
  // This Flush will trigger a compaction, which will fail when appending to
  // the manifest
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  TEST_SYNC_POINT("CompactionManifestWriteError:0");
  // Clear all errors so when the compaction is retried, it will succeed
@@ -739,7 +739,7 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteError) {

  s = dbfull()->TEST_WaitForCompact();
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
@@ -772,7 +772,7 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteRetryableError) {
  ASSERT_OK(Put(Key(0), "val"));
  ASSERT_OK(Put(Key(2), "val"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  listener->OverrideBGError(Status(error_msg, Status::Severity::kHardError));
  listener->EnableAutoRecovery(false);
@@ -798,7 +798,7 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteRetryableError) {

  ASSERT_OK(Put(Key(1), "val"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  TEST_SYNC_POINT("CompactionManifestWriteError:0");
  TEST_SYNC_POINT("CompactionManifestWriteError:1");
@@ -810,7 +810,7 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteRetryableError) {
  SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
@@ -836,7 +836,7 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteError) {
  ASSERT_OK(Put(Key(0), "va;"));
  ASSERT_OK(Put(Key(2), "va;"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  listener->OverrideBGError(
      Status(Status::NoSpace(), Status::Severity::kHardError));
@@ -853,14 +853,14 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteError) {

  ASSERT_OK(Put(Key(1), "val"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  s = dbfull()->TEST_WaitForCompact();
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kHardError);

  fault_fs_->SetFilesystemActive(true);
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
  Destroy(options);
 }

@@ -882,7 +882,7 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteRetryableError) {
  ASSERT_OK(Put(Key(0), "va;"));
  ASSERT_OK(Put(Key(2), "va;"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  listener->OverrideBGError(Status(error_msg, Status::Severity::kHardError));
  listener->EnableAutoRecovery(false);
@@ -892,22 +892,20 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteRetryableError) {
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "CompactionJob::OpenCompactionOutputFile",
      [&](void*) { fault_fs_->SetFilesystemActive(false, error_msg); });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCompaction:Finish",
-      [&](void*) { CancelAllBackgroundWork(dbfull()); });
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();

  ASSERT_OK(Put(Key(1), "val"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
+
+  s = dbfull()->TEST_WaitForCompact();
+  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);

-  s = dbfull()->TEST_GetBGError();
-  ASSERT_OK(s);
  fault_fs_->SetFilesystemActive(true);
  SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
  s = dbfull()->Resume();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
  Destroy(options);
 }

@@ -942,17 +940,14 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteFileScopeError) {
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "CompactionJob::OpenCompactionOutputFile",
      [&](void*) { fault_fs_->SetFilesystemActive(false, error_msg); });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCompaction:Finish",
-      [&](void*) { CancelAllBackgroundWork(dbfull()); });
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();

  ASSERT_OK(Put(Key(1), "val"));
  s = Flush();
  ASSERT_OK(s);

-  s = dbfull()->TEST_GetBGError();
-  ASSERT_OK(s);
+  s = dbfull()->TEST_WaitForCompact();
+  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);

  fault_fs_->SetFilesystemActive(true);
  SyncPoint::GetInstance()->ClearAllCallBacks();
@@ -973,7 +968,7 @@ TEST_F(DBErrorHandlingFSTest, CorruptionError) {
  ASSERT_OK(Put(Key(0), "va;"));
  ASSERT_OK(Put(Key(2), "va;"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      {{"DBImpl::FlushMemTable:FlushMemTableFinished",
@@ -987,7 +982,7 @@ TEST_F(DBErrorHandlingFSTest, CorruptionError) {

  ASSERT_OK(Put(Key(1), "val"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  s = dbfull()->TEST_WaitForCompact();
  ASSERT_EQ(s.severity(),
@@ -995,7 +990,7 @@ TEST_F(DBErrorHandlingFSTest, CorruptionError) {

  fault_fs_->SetFilesystemActive(true);
  s = dbfull()->Resume();
-  ASSERT_NOK(s);
+  ASSERT_NE(s, Status::OK());
  Destroy(options);
 }

@@ -1027,7 +1022,7 @@ TEST_F(DBErrorHandlingFSTest, AutoRecoverFlushError) {
  ASSERT_EQ(listener->WaitForRecovery(5000000), true);

  s = Put(Key(1), "val");
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  Reopen(options);
  ASSERT_EQ("val", Get(Key(0)));
@@ -1057,7 +1052,7 @@ TEST_F(DBErrorHandlingFSTest, FailRecoverFlushError) {
  // We should be able to shutdown the database while auto recovery is going
  // on in the background
  Close();
-  DestroyDB(dbname_, options).PermitUncheckedError();
+  DestroyDB(dbname_, options);
 }

 TEST_F(DBErrorHandlingFSTest, WALWriteError) {
@@ -1087,7 +1082,7 @@ TEST_F(DBErrorHandlingFSTest, WALWriteError) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(dbfull()->Write(wopts, &batch));
+    ASSERT_EQ(dbfull()->Write(wopts, &batch), Status::OK());
  };

  {
@@ -1143,6 +1138,7 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableError) {
  options.listeners.emplace_back(listener);
  options.paranoid_checks = true;
  options.max_bgerror_resume_count = 0;
+  Status s;
  Random rnd(301);

  DestroyAndReopen(options);
@@ -1160,7 +1156,7 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableError) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(dbfull()->Write(wopts, &batch));
+    ASSERT_EQ(dbfull()->Write(wopts, &batch), Status::OK());
  };

  // For the second batch, the first 2 file Append are successful, then the
@@ -1183,8 +1179,8 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableError) {
    SyncPoint::GetInstance()->EnableProcessing();
    WriteOptions wopts;
    wopts.sync = true;
-    Status s = dbfull()->Write(wopts, &batch);
-    ASSERT_TRUE(s.IsIOError());
+    s = dbfull()->Write(wopts, &batch);
+    ASSERT_EQ(true, s.IsIOError());
  }
  fault_fs_->SetFilesystemActive(true);
  SyncPoint::GetInstance()->ClearAllCallBacks();
@@ -1200,7 +1196,8 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableError) {
  }

  // Resume and write a new batch, should be in the WAL
-  ASSERT_OK(dbfull()->Resume());
+  s = dbfull()->Resume();
+  ASSERT_EQ(s, Status::OK());
  {
    WriteBatch batch;

@@ -1210,7 +1207,7 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableError) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(dbfull()->Write(wopts, &batch));
+    ASSERT_EQ(dbfull()->Write(wopts, &batch), Status::OK());
  };

  Reopen(options);
@@ -1236,6 +1233,7 @@ TEST_F(DBErrorHandlingFSTest, MultiCFWALWriteError) {
  options.create_if_missing = true;
  options.writable_file_max_buffer_size = 32768;
  options.listeners.emplace_back(listener);
+  Status s;
  Random rnd(301);

  listener->EnableAutoRecovery();
@@ -1252,7 +1250,7 @@ TEST_F(DBErrorHandlingFSTest, MultiCFWALWriteError) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(dbfull()->Write(wopts, &batch));
+    ASSERT_EQ(dbfull()->Write(wopts, &batch), Status::OK());
  };

  {
@@ -1275,8 +1273,8 @@ TEST_F(DBErrorHandlingFSTest, MultiCFWALWriteError) {
    SyncPoint::GetInstance()->EnableProcessing();
    WriteOptions wopts;
    wopts.sync = true;
-    Status s = dbfull()->Write(wopts, &batch);
-    ASSERT_TRUE(s.IsNoSpace());
+    s = dbfull()->Write(wopts, &batch);
+    ASSERT_EQ(s, s.NoSpace());
  }
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
@@ -1344,8 +1342,9 @@ TEST_F(DBErrorHandlingFSTest, MultiDBCompactionError) {
    listener[i]->InjectFileCreationError(fault_fs[i], 3,
                                         IOStatus::NoSpace("Out of space"));
    snprintf(buf, sizeof(buf), "_%d", i);
-    ASSERT_OK(DestroyDB(dbname_ + std::string(buf), options[i]));
-    ASSERT_OK(DB::Open(options[i], dbname_ + std::string(buf), &dbptr));
+    DestroyDB(dbname_ + std::string(buf), options[i]);
+    ASSERT_EQ(DB::Open(options[i], dbname_ + std::string(buf), &dbptr),
+              Status::OK());
    db.emplace_back(dbptr);
  }

@@ -1358,8 +1357,8 @@ TEST_F(DBErrorHandlingFSTest, MultiDBCompactionError) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(db[i]->Write(wopts, &batch));
-    ASSERT_OK(db[i]->Flush(FlushOptions()));
+    ASSERT_EQ(db[i]->Write(wopts, &batch), Status::OK());
+    ASSERT_EQ(db[i]->Flush(FlushOptions()), Status::OK());
  }

  def_env->SetFilesystemActive(false, Status::NoSpace("Out of space"));
@@ -1373,8 +1372,8 @@ TEST_F(DBErrorHandlingFSTest, MultiDBCompactionError) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(db[i]->Write(wopts, &batch));
-    ASSERT_OK(db[i]->Flush(FlushOptions()));
+    ASSERT_EQ(db[i]->Write(wopts, &batch), Status::OK());
+    ASSERT_EQ(db[i]->Flush(FlushOptions()), Status::OK());
  }

  for (auto i = 0; i < kNumDbInstances; ++i) {
@@ -1387,7 +1386,8 @@ TEST_F(DBErrorHandlingFSTest, MultiDBCompactionError) {
  for (auto i = 0; i < kNumDbInstances; ++i) {
    std::string prop;
    ASSERT_EQ(listener[i]->WaitForRecovery(5000000), true);
-    ASSERT_OK(static_cast<DBImpl*>(db[i])->TEST_WaitForCompact(true));
+    ASSERT_EQ(static_cast<DBImpl*>(db[i])->TEST_WaitForCompact(true),
+              Status::OK());
    EXPECT_TRUE(db[i]->GetProperty(
        "rocksdb.num-files-at-level" + NumberToString(0), &prop));
    EXPECT_EQ(atoi(prop.c_str()), 0);
@@ -1404,7 +1404,7 @@ TEST_F(DBErrorHandlingFSTest, MultiDBCompactionError) {
    if (getenv("KEEP_DB")) {
      printf("DB is still at %s%s\n", dbname_.c_str(), buf);
    } else {
-      ASSERT_OK(DestroyDB(dbname_ + std::string(buf), options[i]));
+      Status s = DestroyDB(dbname_ + std::string(buf), options[i]);
    }
  }
  options.clear();
@@ -1459,8 +1459,9 @@ TEST_F(DBErrorHandlingFSTest, MultiDBVariousErrors) {
        break;
    }
    snprintf(buf, sizeof(buf), "_%d", i);
-    ASSERT_OK(DestroyDB(dbname_ + std::string(buf), options[i]));
-    ASSERT_OK(DB::Open(options[i], dbname_ + std::string(buf), &dbptr));
+    DestroyDB(dbname_ + std::string(buf), options[i]);
+    ASSERT_EQ(DB::Open(options[i], dbname_ + std::string(buf), &dbptr),
+              Status::OK());
    db.emplace_back(dbptr);
  }

@@ -1473,8 +1474,8 @@ TEST_F(DBErrorHandlingFSTest, MultiDBVariousErrors) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(db[i]->Write(wopts, &batch));
-    ASSERT_OK(db[i]->Flush(FlushOptions()));
+    ASSERT_EQ(db[i]->Write(wopts, &batch), Status::OK());
+    ASSERT_EQ(db[i]->Flush(FlushOptions()), Status::OK());
  }

  def_env->SetFilesystemActive(false, Status::NoSpace("Out of space"));
@@ -1488,11 +1489,11 @@ TEST_F(DBErrorHandlingFSTest, MultiDBVariousErrors) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(db[i]->Write(wopts, &batch));
+    ASSERT_EQ(db[i]->Write(wopts, &batch), Status::OK());
    if (i != 1) {
-      ASSERT_OK(db[i]->Flush(FlushOptions()));
+      ASSERT_EQ(db[i]->Flush(FlushOptions()), Status::OK());
    } else {
-      ASSERT_TRUE(db[i]->Flush(FlushOptions()).IsNoSpace());
+      ASSERT_EQ(db[i]->Flush(FlushOptions()), Status::NoSpace());
    }
  }

@@ -1506,7 +1507,7 @@ TEST_F(DBErrorHandlingFSTest, MultiDBVariousErrors) {
        ASSERT_EQ(s.severity(), Status::Severity::kHardError);
        break;
      case 2:
-        ASSERT_OK(s);
+        ASSERT_EQ(s, Status::OK());
        break;
    }
    fault_fs[i]->SetFilesystemActive(true);
@@ -1519,7 +1520,8 @@ TEST_F(DBErrorHandlingFSTest, MultiDBVariousErrors) {
      ASSERT_EQ(listener[i]->WaitForRecovery(5000000), true);
    }
    if (i == 1) {
-      ASSERT_OK(static_cast<DBImpl*>(db[i])->TEST_WaitForCompact(true));
+      ASSERT_EQ(static_cast<DBImpl*>(db[i])->TEST_WaitForCompact(true),
+                Status::OK());
    }
    EXPECT_TRUE(db[i]->GetProperty(
        "rocksdb.num-files-at-level" + NumberToString(0), &prop));
@@ -1537,7 +1539,7 @@ TEST_F(DBErrorHandlingFSTest, MultiDBVariousErrors) {
    if (getenv("KEEP_DB")) {
      printf("DB is still at %s%s\n", dbname_.c_str(), buf);
    } else {
-      EXPECT_OK(DestroyDB(dbname_ + std::string(buf), options[i]));
+      DestroyDB(dbname_ + std::string(buf), options[i]);
    }
  }
  options.clear();
@@ -1594,10 +1596,12 @@ TEST_F(DBErrorHandlingFSTest, FLushWritNoWALRetryableeErrorAutoRecover1) {
  ASSERT_EQ("val2", Get(Key(2)));

  // call auto resume
-  ASSERT_OK(dbfull()->Resume());
+  s = dbfull()->Resume();
+  ASSERT_EQ(s, Status::OK());
  ASSERT_OK(Put(Key(3), "val3", wo));
+  s = Flush();
  // After resume is successful, the flush should be ok.
-  ASSERT_OK(Flush());
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val3", Get(Key(3)));
  Destroy(options);
 }
@@ -1687,7 +1691,8 @@ TEST_F(DBErrorHandlingFSTest, DISABLED_FLushWritRetryableeErrorAutoRecover1) {
  Reopen(options);
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_OK(Put(Key(2), "val2"));
-  ASSERT_OK(Flush());
+  s = Flush();
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val2", Get(Key(2)));

  Destroy(options);
@@ -1727,7 +1732,8 @@ TEST_F(DBErrorHandlingFSTest, FLushWritRetryableeErrorAutoRecover2) {
  Reopen(options);
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_OK(Put(Key(2), "val2"));
-  ASSERT_OK(Flush());
+  s = Flush();
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val2", Get(Key(2)));

  Destroy(options);
@@ -1774,9 +1780,10 @@ TEST_F(DBErrorHandlingFSTest, FLushWritRetryableeErrorAutoRecover3) {
  // resume manually here.
  s = dbfull()->Resume();
  ASSERT_EQ("val1", Get(Key(1)));
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
  ASSERT_OK(Put(Key(2), "val2"));
-  ASSERT_OK(Flush());
+  s = Flush();
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val2", Get(Key(2)));

  Destroy(options);
@@ -1827,16 +1834,19 @@ TEST_F(DBErrorHandlingFSTest, DISABLED_FLushWritRetryableeErrorAutoRecover4) {
  // Even the FS is recoverd, due to the Fatal Error in bg_error_ the resume
  // and flush will all fail.
  ASSERT_EQ("val1", Get(Key(1)));
-  ASSERT_NOK(dbfull()->Resume());
+  s = dbfull()->Resume();
+  ASSERT_NE(s, Status::OK());
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_OK(Put(Key(2), "val2"));
-  ASSERT_NOK(Flush());
+  s = Flush();
+  ASSERT_NE(s, Status::OK());
  ASSERT_EQ("NOT_FOUND", Get(Key(2)));

  Reopen(options);
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_OK(Put(Key(2), "val2"));
-  ASSERT_OK(Flush());
+  s = Flush();
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val2", Get(Key(2)));

  Destroy(options);
@@ -1876,7 +1886,7 @@ TEST_F(DBErrorHandlingFSTest, DISABLED_FLushWritRetryableeErrorAutoRecover5) {
  // The first resume will cause recovery_error and its severity is the
  // Fatal error
  s = dbfull()->Close();
-  ASSERT_NOK(s);
+  ASSERT_NE(s, Status::OK());
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
@@ -1885,7 +1895,7 @@ TEST_F(DBErrorHandlingFSTest, DISABLED_FLushWritRetryableeErrorAutoRecover5) {
  ASSERT_NE("val1", Get(Key(1)));
  ASSERT_OK(Put(Key(2), "val2"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val2", Get(Key(2)));

  Destroy(options);
@@ -1936,14 +1946,14 @@ TEST_F(DBErrorHandlingFSTest, FLushWritRetryableeErrorAutoRecover6) {
  // The first resume will cause recovery_error and its severity is the
  // Fatal error
  s = dbfull()->Close();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
  SyncPoint::GetInstance()->DisableProcessing();

  Reopen(options);
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_OK(Put(Key(2), "val2"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());
  ASSERT_EQ("val2", Get(Key(2)));

  Destroy(options);
@@ -2080,7 +2090,8 @@ TEST_F(DBErrorHandlingFSTest,

  ASSERT_OK(Put(Key(0), "val"));
  ASSERT_OK(Put(Key(2), "val"));
-  ASSERT_OK(Flush());
+  s = Flush();
+  ASSERT_EQ(s, Status::OK());

  listener->OverrideBGError(Status(error_msg, Status::Severity::kHardError));
  listener->EnableAutoRecovery(false);
@@ -2117,7 +2128,7 @@ TEST_F(DBErrorHandlingFSTest,

  ASSERT_OK(Put(Key(1), "val"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  TEST_SYNC_POINT("CompactionManifestWriteErrorAR:0");
  TEST_SYNC_POINT("CompactionManifestWriteErrorAR:1");
@@ -2167,7 +2178,7 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteRetryableErrorAutoRecover) {
  ASSERT_OK(Put(Key(0), "va;"));
  ASSERT_OK(Put(Key(2), "va;"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  listener->OverrideBGError(Status(error_msg, Status::Severity::kHardError));
  listener->EnableAutoRecovery(false);
@@ -2192,10 +2203,11 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteRetryableErrorAutoRecover) {

  ASSERT_OK(Put(Key(1), "val"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  s = dbfull()->TEST_WaitForCompact();
-  ASSERT_OK(s);
+  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);
+
  TEST_SYNC_POINT("CompactionWriteRetryableErrorAutoRecover0");
  SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
@@ -2231,7 +2243,7 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableErrorAutoRecover1) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(dbfull()->Write(wopts, &batch));
+    ASSERT_EQ(dbfull()->Write(wopts, &batch), Status::OK());
  };

  // For the second batch, the first 2 file Append are successful, then the
@@ -2288,7 +2300,7 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableErrorAutoRecover1) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(dbfull()->Write(wopts, &batch));
+    ASSERT_EQ(dbfull()->Write(wopts, &batch), Status::OK());
  };

  Reopen(options);
@@ -2332,7 +2344,7 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableErrorAutoRecover2) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(dbfull()->Write(wopts, &batch));
+    ASSERT_EQ(dbfull()->Write(wopts, &batch), Status::OK());
  };

  // For the second batch, the first 2 file Append are successful, then the
@@ -2389,7 +2401,7 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableErrorAutoRecover2) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(dbfull()->Write(wopts, &batch));
+    ASSERT_EQ(dbfull()->Write(wopts, &batch), Status::OK());
  };

  Reopen(options);
@@ -2451,7 +2463,7 @@ TEST_P(DBErrorHandlingFencingTest, ManifestWriteFenced) {
  old_manifest = GetManifestNameFromLiveFiles();

  ASSERT_OK(Put(Key(0), "val"));
-  ASSERT_OK(Flush());
+  Flush();
  ASSERT_OK(Put(Key(1), "val"));
  SyncPoint::GetInstance()->SetCallBack(
      "VersionSet::LogAndApply:WriteManifest", [&](void*) {
@@ -2484,7 +2496,7 @@ TEST_P(DBErrorHandlingFencingTest, CompactionWriteFenced) {
  ASSERT_OK(Put(Key(0), "va;"));
  ASSERT_OK(Put(Key(2), "va;"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  listener->EnableAutoRecovery(true);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
@@ -2498,7 +2510,7 @@ TEST_P(DBErrorHandlingFencingTest, CompactionWriteFenced) {

  ASSERT_OK(Put(Key(1), "val"));
  s = Flush();
-  ASSERT_OK(s);
+  ASSERT_EQ(s, Status::OK());

  s = dbfull()->TEST_WaitForCompact();
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kFatalError);
@@ -2534,7 +2546,7 @@ TEST_P(DBErrorHandlingFencingTest, WALWriteFenced) {

    WriteOptions wopts;
    wopts.sync = true;
-    ASSERT_OK(dbfull()->Write(wopts, &batch));
+    ASSERT_EQ(dbfull()->Write(wopts, &batch), Status::OK());
  };

  {
@@ -213,16 +213,17 @@ void EventHelpers::NotifyOnErrorRecoveryCompleted(
    const std::vector<std::shared_ptr<EventListener>>& listeners,
    Status old_bg_error, InstrumentedMutex* db_mutex) {
 #ifndef ROCKSDB_LITE
-  if (listeners.size() > 0) {
-    db_mutex->AssertHeld();
-    // release lock while notifying events
-    db_mutex->Unlock();
-    for (auto& listener : listeners) {
-      listener->OnErrorRecoveryCompleted(old_bg_error);
-    }
-    db_mutex->Lock();
+  if (listeners.size() == 0U) {
+    return;
+  }
+  db_mutex->AssertHeld();
+  // release lock while notifying events
+  db_mutex->Unlock();
+  for (auto& listener : listeners) {
+    listener->OnErrorRecoveryCompleted(old_bg_error);
  }
  old_bg_error.PermitUncheckedError();
+  db_mutex->Lock();
 #else
  (void)listeners;
  (void)old_bg_error;
@@ -201,8 +201,7 @@ Status ExternalSstFileIngestionJob::Prepare(
            requested_checksum_func_name, &generated_checksum,
            &generated_checksum_func_name,
            ingestion_options_.verify_checksums_readahead_size,
-            db_options_.allow_mmap_reads, io_tracer_,
-            db_options_.rate_limiter.get());
+            db_options_.allow_mmap_reads, io_tracer_);
        if (!io_s.ok()) {
          status = io_s;
          ROCKS_LOG_WARN(db_options_.info_log,
@@ -857,7 +856,7 @@ IOStatus ExternalSstFileIngestionJob::GenerateChecksumForIngestedFile(
      db_options_.file_checksum_gen_factory.get(), requested_checksum_func_name,
      &file_checksum, &file_checksum_func_name,
      ingestion_options_.verify_checksums_readahead_size,
-      db_options_.allow_mmap_reads, io_tracer_, db_options_.rate_limiter.get());
+      db_options_.allow_mmap_reads, io_tracer_);
  if (!io_s.ok()) {
    return io_s;
  }
@@ -47,8 +47,8 @@ class ExternSSTFileLinkFailFallbackTest
      : DBTestBase("/external_sst_file_test", /*env_do_fsync=*/true),
        test_env_(new ExternalSSTTestEnv(env_, true)) {
    sst_files_dir_ = dbname_ + "/sst_files/";
-    EXPECT_EQ(DestroyDir(env_, sst_files_dir_), Status::OK());
-    EXPECT_EQ(env_->CreateDir(sst_files_dir_), Status::OK());
+    DestroyDir(env_, sst_files_dir_);
+    env_->CreateDir(sst_files_dir_);
    options_ = CurrentOptions();
    options_.disable_auto_compactions = true;
    options_.env = test_env_;
@@ -79,8 +79,8 @@ class ExternalSSTFileTest
  }

  void DestroyAndRecreateExternalSSTFilesDir() {
-    ASSERT_OK(DestroyDir(env_, sst_files_dir_));
-    ASSERT_OK(env_->CreateDir(sst_files_dir_));
+    DestroyDir(env_, sst_files_dir_);
+    env_->CreateDir(sst_files_dir_);
  }

  Status GenerateOneExternalFile(
@@ -116,7 +116,7 @@ class ExternalSSTFileTest
    for (const auto& entry : data) {
      s = sst_file_writer.Put(entry.first, entry.second);
      if (!s.ok()) {
-        sst_file_writer.Finish().PermitUncheckedError();
+        sst_file_writer.Finish();
        return s;
      }
    }
@@ -171,7 +171,7 @@ class ExternalSSTFileTest
    for (auto& entry : data) {
      s = sst_file_writer.Put(entry.first, entry.second);
      if (!s.ok()) {
-        sst_file_writer.Finish().PermitUncheckedError();
+        sst_file_writer.Finish();
        return s;
      }
    }
@@ -213,10 +213,11 @@ class ExternalSSTFileTest
    size_t num_cfs = column_families.size();
    assert(ifos.size() == num_cfs);
    assert(data.size() == num_cfs);
+    Status s;
    std::vector<IngestExternalFileArg> args(num_cfs);
    for (size_t i = 0; i != num_cfs; ++i) {
      std::string external_file_path;
-      Status s = GenerateOneExternalFile(
+      s = GenerateOneExternalFile(
          options, column_families[i], data[i], file_id, sort_data,
          &external_file_path,
          true_data.size() == num_cfs ? &true_data[i] : nullptr);
@@ -229,7 +230,8 @@ class ExternalSSTFileTest
      args[i].external_files.push_back(external_file_path);
      args[i].options = ifos[i];
    }
-    return db_->IngestExternalFiles(args);
+    s = db_->IngestExternalFiles(args);
+    return s;
  }

  Status GenerateAndAddExternalFile(
@@ -280,9 +282,7 @@ class ExternalSSTFileTest
    return db_->IngestExternalFile(files, opts);
  }

-  ~ExternalSSTFileTest() override {
-    DestroyDir(env_, sst_files_dir_).PermitUncheckedError();
-  }
+  ~ExternalSSTFileTest() override { DestroyDir(env_, sst_files_dir_); }

 protected:
  int last_file_id_ = 0;
@@ -305,7 +305,8 @@ TEST_F(ExternalSSTFileTest, Basic) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
    }
    ExternalSstFileInfo file1_info;
-    ASSERT_OK(sst_file_writer.Finish(&file1_info));
+    Status s = sst_file_writer.Finish(&file1_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();

    // Current file size should be non-zero after success write.
    ASSERT_GT(sst_file_writer.FileSize(), 0);
@@ -318,7 +319,8 @@ TEST_F(ExternalSSTFileTest, Basic) {
    ASSERT_EQ(file1_info.smallest_range_del_key, "");
    ASSERT_EQ(file1_info.largest_range_del_key, "");
    // sst_file_writer already finished, cannot add this value
-    ASSERT_NOK(sst_file_writer.Put(Key(100), "bad_val"));
+    s = sst_file_writer.Put(Key(100), "bad_val");
+    ASSERT_FALSE(s.ok()) << s.ToString();

    // file2.sst (100 => 199)
    std::string file2 = sst_files_dir_ + "file2.sst";
@@ -327,9 +329,11 @@ TEST_F(ExternalSSTFileTest, Basic) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
    }
    // Cannot add this key because it's not after last added key
-    ASSERT_NOK(sst_file_writer.Put(Key(99), "bad_val"));
+    s = sst_file_writer.Put(Key(99), "bad_val");
+    ASSERT_FALSE(s.ok()) << s.ToString();
    ExternalSstFileInfo file2_info;
-    ASSERT_OK(sst_file_writer.Finish(&file2_info));
+    s = sst_file_writer.Finish(&file2_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file2_info.file_path, file2);
    ASSERT_EQ(file2_info.num_entries, 100);
    ASSERT_EQ(file2_info.smallest_key, Key(100));
@@ -343,8 +347,9 @@ TEST_F(ExternalSSTFileTest, Basic) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val_overlap"));
    }
    ExternalSstFileInfo file3_info;
-    ASSERT_OK(sst_file_writer.Finish(&file3_info));
+    s = sst_file_writer.Finish(&file3_info);

+    ASSERT_TRUE(s.ok()) << s.ToString();
    // Current file size should be non-zero after success finish.
    ASSERT_GT(sst_file_writer.FileSize(), 0);
    ASSERT_EQ(file3_info.file_path, file3);
@@ -360,7 +365,8 @@ TEST_F(ExternalSSTFileTest, Basic) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val_overlap"));
    }
    ExternalSstFileInfo file4_info;
-    ASSERT_OK(sst_file_writer.Finish(&file4_info));
+    s = sst_file_writer.Finish(&file4_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file4_info.file_path, file4);
    ASSERT_EQ(file4_info.num_entries, 10);
    ASSERT_EQ(file4_info.smallest_key, Key(30));
@@ -373,7 +379,8 @@ TEST_F(ExternalSSTFileTest, Basic) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
    }
    ExternalSstFileInfo file5_info;
-    ASSERT_OK(sst_file_writer.Finish(&file5_info));
+    s = sst_file_writer.Finish(&file5_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file5_info.file_path, file5);
    ASSERT_EQ(file5_info.num_entries, 100);
    ASSERT_EQ(file5_info.smallest_key, Key(400));
@@ -382,9 +389,10 @@ TEST_F(ExternalSSTFileTest, Basic) {
    // file6.sst (delete 400 => 500)
    std::string file6 = sst_files_dir_ + "file6.sst";
    ASSERT_OK(sst_file_writer.Open(file6));
-    ASSERT_OK(sst_file_writer.DeleteRange(Key(400), Key(500)));
+    sst_file_writer.DeleteRange(Key(400), Key(500));
    ExternalSstFileInfo file6_info;
-    ASSERT_OK(sst_file_writer.Finish(&file6_info));
+    s = sst_file_writer.Finish(&file6_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file6_info.file_path, file6);
    ASSERT_EQ(file6_info.num_entries, 0);
    ASSERT_EQ(file6_info.smallest_key, "");
@@ -396,16 +404,17 @@ TEST_F(ExternalSSTFileTest, Basic) {
    // file7.sst (delete 500 => 570, put 520 => 599 divisible by 2)
    std::string file7 = sst_files_dir_ + "file7.sst";
    ASSERT_OK(sst_file_writer.Open(file7));
-    ASSERT_OK(sst_file_writer.DeleteRange(Key(500), Key(550)));
+    sst_file_writer.DeleteRange(Key(500), Key(550));
    for (int k = 520; k < 560; k += 2) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
    }
-    ASSERT_OK(sst_file_writer.DeleteRange(Key(525), Key(575)));
+    sst_file_writer.DeleteRange(Key(525), Key(575));
    for (int k = 560; k < 600; k += 2) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
    }
    ExternalSstFileInfo file7_info;
-    ASSERT_OK(sst_file_writer.Finish(&file7_info));
+    s = sst_file_writer.Finish(&file7_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file7_info.file_path, file7);
    ASSERT_EQ(file7_info.num_entries, 40);
    ASSERT_EQ(file7_info.smallest_key, Key(520));
@@ -417,9 +426,10 @@ TEST_F(ExternalSSTFileTest, Basic) {
    // file8.sst (delete 600 => 700)
    std::string file8 = sst_files_dir_ + "file8.sst";
    ASSERT_OK(sst_file_writer.Open(file8));
-    ASSERT_OK(sst_file_writer.DeleteRange(Key(600), Key(700)));
+    sst_file_writer.DeleteRange(Key(600), Key(700));
    ExternalSstFileInfo file8_info;
-    ASSERT_OK(sst_file_writer.Finish(&file8_info));
+    s = sst_file_writer.Finish(&file8_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file8_info.file_path, file8);
    ASSERT_EQ(file8_info.num_entries, 0);
    ASSERT_EQ(file8_info.smallest_key, "");
@@ -431,11 +441,13 @@ TEST_F(ExternalSSTFileTest, Basic) {
    // Cannot create an empty sst file
    std::string file_empty = sst_files_dir_ + "file_empty.sst";
    ExternalSstFileInfo file_empty_info;
-    ASSERT_NOK(sst_file_writer.Finish(&file_empty_info));
+    s = sst_file_writer.Finish(&file_empty_info);
+    ASSERT_NOK(s);

    DestroyAndReopen(options);
    // Add file using file path
-    ASSERT_OK(DeprecatedAddFile({file1}));
+    s = DeprecatedAddFile({file1});
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(db_->GetLatestSequenceNumber(), 0U);
    for (int k = 0; k < 100; k++) {
      ASSERT_EQ(Get(Key(k)), Key(k) + "_val");
@@ -456,10 +468,12 @@ TEST_F(ExternalSSTFileTest, Basic) {
    }

    // This file has overlapping values with the existing data
-    ASSERT_NOK(DeprecatedAddFile({file3}));
+    s = DeprecatedAddFile({file3});
+    ASSERT_FALSE(s.ok()) << s.ToString();

    // This file has overlapping values with the existing data
-    ASSERT_NOK(DeprecatedAddFile({file4}));
+    s = DeprecatedAddFile({file4});
+    ASSERT_FALSE(s.ok()) << s.ToString();

    // Overwrite values of keys divisible by 5
    for (int k = 0; k < 200; k += 5) {
@@ -471,7 +485,8 @@ TEST_F(ExternalSSTFileTest, Basic) {
    ASSERT_OK(DeprecatedAddFile({file5}));

    // This file has overlapping values with the existing data
-    ASSERT_NOK(DeprecatedAddFile({file6}));
+    s = DeprecatedAddFile({file6});
+    ASSERT_FALSE(s.ok()) << s.ToString();

    // Key range of file7 (500 => 598) don't overlap with any keys in DB
    ASSERT_OK(DeprecatedAddFile({file7}));
@@ -599,13 +614,15 @@ TEST_F(ExternalSSTFileTest, AddList) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
    }
    ExternalSstFileInfo file1_info;
-    ASSERT_OK(sst_file_writer.Finish(&file1_info));
+    Status s = sst_file_writer.Finish(&file1_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file1_info.file_path, file1);
    ASSERT_EQ(file1_info.num_entries, 100);
    ASSERT_EQ(file1_info.smallest_key, Key(0));
    ASSERT_EQ(file1_info.largest_key, Key(99));
    // sst_file_writer already finished, cannot add this value
-    ASSERT_NOK(sst_file_writer.Put(Key(100), "bad_val"));
+    s = sst_file_writer.Put(Key(100), "bad_val");
+    ASSERT_FALSE(s.ok()) << s.ToString();

    // file2.sst (100 => 199)
    std::string file2 = sst_files_dir_ + "file2.sst";
@@ -614,9 +631,11 @@ TEST_F(ExternalSSTFileTest, AddList) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
    }
    // Cannot add this key because it's not after last added key
-    ASSERT_NOK(sst_file_writer.Put(Key(99), "bad_val"));
+    s = sst_file_writer.Put(Key(99), "bad_val");
+    ASSERT_FALSE(s.ok()) << s.ToString();
    ExternalSstFileInfo file2_info;
-    ASSERT_OK(sst_file_writer.Finish(&file2_info));
+    s = sst_file_writer.Finish(&file2_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file2_info.file_path, file2);
    ASSERT_EQ(file2_info.num_entries, 100);
    ASSERT_EQ(file2_info.smallest_key, Key(100));
@@ -630,7 +649,8 @@ TEST_F(ExternalSSTFileTest, AddList) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val_overlap"));
    }
    ExternalSstFileInfo file3_info;
-    ASSERT_OK(sst_file_writer.Finish(&file3_info));
+    s = sst_file_writer.Finish(&file3_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file3_info.file_path, file3);
    ASSERT_EQ(file3_info.num_entries, 5);
    ASSERT_EQ(file3_info.smallest_key, Key(195));
@@ -644,7 +664,8 @@ TEST_F(ExternalSSTFileTest, AddList) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val_overlap"));
    }
    ExternalSstFileInfo file4_info;
-    ASSERT_OK(sst_file_writer.Finish(&file4_info));
+    s = sst_file_writer.Finish(&file4_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file4_info.file_path, file4);
    ASSERT_EQ(file4_info.num_entries, 10);
    ASSERT_EQ(file4_info.smallest_key, Key(30));
@@ -657,7 +678,8 @@ TEST_F(ExternalSSTFileTest, AddList) {
      ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
    }
    ExternalSstFileInfo file5_info;
-    ASSERT_OK(sst_file_writer.Finish(&file5_info));
+    s = sst_file_writer.Finish(&file5_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file5_info.file_path, file5);
    ASSERT_EQ(file5_info.num_entries, 100);
    ASSERT_EQ(file5_info.smallest_key, Key(200));
@@ -669,7 +691,8 @@ TEST_F(ExternalSSTFileTest, AddList) {
    ASSERT_OK(sst_file_writer.DeleteRange(Key(0), Key(75)));
    ASSERT_OK(sst_file_writer.DeleteRange(Key(25), Key(100)));
    ExternalSstFileInfo file6_info;
-    ASSERT_OK(sst_file_writer.Finish(&file6_info));
+    s = sst_file_writer.Finish(&file6_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file6_info.file_path, file6);
    ASSERT_EQ(file6_info.num_entries, 0);
    ASSERT_EQ(file6_info.smallest_key, "");
@@ -683,7 +706,8 @@ TEST_F(ExternalSSTFileTest, AddList) {
    ASSERT_OK(sst_file_writer.Open(file7));
    ASSERT_OK(sst_file_writer.DeleteRange(Key(99), Key(201)));
    ExternalSstFileInfo file7_info;
-    ASSERT_OK(sst_file_writer.Finish(&file7_info));
+    s = sst_file_writer.Finish(&file7_info);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(file7_info.file_path, file7);
    ASSERT_EQ(file7_info.num_entries, 0);
    ASSERT_EQ(file7_info.smallest_key, "");
@@ -703,13 +727,17 @@ TEST_F(ExternalSSTFileTest, AddList) {
    DestroyAndReopen(options);

    // These lists of files have key ranges that overlap with each other
-    ASSERT_NOK(DeprecatedAddFile(file_list1));
+    s = DeprecatedAddFile(file_list1);
+    ASSERT_FALSE(s.ok()) << s.ToString();
    // Both of the following overlap on the range deletion tombstone.
-    ASSERT_NOK(DeprecatedAddFile(file_list4));
-    ASSERT_NOK(DeprecatedAddFile(file_list5));
+    s = DeprecatedAddFile(file_list4);
+    ASSERT_FALSE(s.ok()) << s.ToString();
+    s = DeprecatedAddFile(file_list5);
+    ASSERT_FALSE(s.ok()) << s.ToString();

    // Add files using file path list
-    ASSERT_OK(DeprecatedAddFile(file_list0));
+    s = DeprecatedAddFile(file_list0);
+    ASSERT_TRUE(s.ok()) << s.ToString();
    ASSERT_EQ(db_->GetLatestSequenceNumber(), 0U);
    for (int k = 0; k < 200; k++) {
      ASSERT_EQ(Get(Key(k)), Key(k) + "_val");
@@ -750,7 +778,8 @@ TEST_F(ExternalSSTFileTest, AddList) {
    }

    // This file list has overlapping values with the existing data
-    ASSERT_NOK(DeprecatedAddFile(file_list3));
+    s = DeprecatedAddFile(file_list3);
+    ASSERT_FALSE(s.ok()) << s.ToString();

    // Overwrite values of keys divisible by 5
    for (int k = 0; k < 200; k += 5) {
@@ -818,14 +847,16 @@ TEST_F(ExternalSSTFileTest, AddListAtomicity) {
      for (int k = i * 100; k < (i + 1) * 100; k++) {
        ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
      }
-      ASSERT_OK(sst_file_writer.Finish(&files_info[i]));
+      Status s = sst_file_writer.Finish(&files_info[i]);
+      ASSERT_TRUE(s.ok()) << s.ToString();
      ASSERT_EQ(files_info[i].file_path, files[i]);
      ASSERT_EQ(files_info[i].num_entries, 100);
      ASSERT_EQ(files_info[i].smallest_key, Key(i * 100));
      ASSERT_EQ(files_info[i].largest_key, Key((i + 1) * 100 - 1));
    }
    files.push_back(sst_files_dir_ + "file" + std::to_string(n) + ".sst");
-    ASSERT_NOK(DeprecatedAddFile(files));
+    auto s = DeprecatedAddFile(files);
+    ASSERT_NOK(s) << s.ToString();
    for (int k = 0; k < n * 100; k++) {
      ASSERT_EQ("NOT_FOUND", Get(Key(k)));
    }
@@ -847,14 +878,17 @@ TEST_F(ExternalSSTFileTest, PurgeObsoleteFilesBug) {

  // file1.sst (0 => 500)
  std::string sst_file_path = sst_files_dir_ + "file1.sst";
-  ASSERT_OK(sst_file_writer.Open(sst_file_path));
+  Status s = sst_file_writer.Open(sst_file_path);
+  ASSERT_OK(s);
  for (int i = 0; i < 500; i++) {
    std::string k = Key(i);
-    ASSERT_OK(sst_file_writer.Put(k, k + "_val"));
+    s = sst_file_writer.Put(k, k + "_val");
+    ASSERT_OK(s);
  }

  ExternalSstFileInfo sst_file_info;
-  ASSERT_OK(sst_file_writer.Finish(&sst_file_info));
+  s = sst_file_writer.Finish(&sst_file_info);
+  ASSERT_OK(s);

  options.delete_obsolete_files_period_micros = 0;
  options.disable_auto_compactions = true;
@@ -866,11 +900,12 @@ TEST_F(ExternalSSTFileTest, PurgeObsoleteFilesBug) {
        ASSERT_OK(Flush());
        ASSERT_OK(Put("aaa", "xxx"));
        ASSERT_OK(Flush());
-        ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+        db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
      });
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();

-  ASSERT_OK(DeprecatedAddFile({sst_file_path}));
+  s = DeprecatedAddFile({sst_file_path});
+  ASSERT_OK(s);

  for (int i = 0; i < 500; i++) {
    std::string k = Key(i);
@@ -893,7 +928,8 @@ TEST_F(ExternalSSTFileTest, SkipSnapshot) {
    ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
  }
  ExternalSstFileInfo file1_info;
-  ASSERT_OK(sst_file_writer.Finish(&file1_info));
+  Status s = sst_file_writer.Finish(&file1_info);
+  ASSERT_TRUE(s.ok()) << s.ToString();
  ASSERT_EQ(file1_info.file_path, file1);
  ASSERT_EQ(file1_info.num_entries, 100);
  ASSERT_EQ(file1_info.smallest_key, Key(0));
@@ -906,7 +942,8 @@ TEST_F(ExternalSSTFileTest, SkipSnapshot) {
    ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
  }
  ExternalSstFileInfo file2_info;
-  ASSERT_OK(sst_file_writer.Finish(&file2_info));
+  s = sst_file_writer.Finish(&file2_info);
+  ASSERT_TRUE(s.ok()) << s.ToString();
  ASSERT_EQ(file2_info.file_path, file2);
  ASSERT_EQ(file2_info.num_entries, 200);
  ASSERT_EQ(file2_info.smallest_key, Key(100));
@@ -935,7 +972,8 @@ TEST_F(ExternalSSTFileTest, SkipSnapshot) {
    ASSERT_OK(sst_file_writer.Put(Key(k), Key(k) + "_val"));
  }
  ExternalSstFileInfo file3_info;
-  ASSERT_OK(sst_file_writer.Finish(&file3_info));
+  s = sst_file_writer.Finish(&file3_info);
+  ASSERT_TRUE(s.ok()) << s.ToString();
  ASSERT_EQ(file3_info.file_path, file3);
  ASSERT_EQ(file3_info.num_entries, 100);
  ASSERT_EQ(file3_info.smallest_key, Key(300));
@@ -981,7 +1019,8 @@ TEST_F(ExternalSSTFileTest, MultiThreaded) {
        ASSERT_OK(sst_file_writer.Put(Key(k), Key(k)));
      }

-      ASSERT_OK(sst_file_writer.Finish());
+      Status s = sst_file_writer.Finish();
+      ASSERT_TRUE(s.ok()) << s.ToString();
    };
    // Write num_files files in parallel
    std::vector<port::Thread> sst_writer_threads;
@@ -1043,7 +1082,8 @@ TEST_F(ExternalSSTFileTest, MultiThreaded) {
    // Overwrite values of keys divisible by 100
    for (int k = 0; k < num_files * keys_per_file; k += 100) {
      std::string key = Key(k);
-      ASSERT_OK(Put(key, key + "_new"));
+      Status s = Put(key, key + "_new");
+      ASSERT_TRUE(s.ok());
    }

    for (int i = 0; i < 2; i++) {
@@ -1127,8 +1167,7 @@ TEST_F(ExternalSSTFileTest, OverlappingRanges) {

        // Generate the file containing the range
        std::string file_name = sst_files_dir_ + env_->GenerateUniqueId();
-        s = sst_file_writer.Open(file_name);
-        ASSERT_OK(s);
+        ASSERT_OK(sst_file_writer.Open(file_name));
        for (int k = range_start; k <= range_end; k++) {
          s = sst_file_writer.Put(Key(k), range_val);
          ASSERT_OK(s);
@@ -1173,10 +1212,10 @@ TEST_F(ExternalSSTFileTest, OverlappingRanges) {

      // Flush / Compact the DB
      if (i && i % 50 == 0) {
-        ASSERT_OK(Flush());
+        Flush();
      }
      if (i && i % 75 == 0) {
-        ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+        db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
      }
    }

@@ -1254,7 +1293,7 @@ TEST_P(ExternalSSTFileTest, PickedLevel) {
  // Hold compaction from finishing
  TEST_SYNC_POINT("ExternalSSTFileTest::PickedLevel:2");

-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  EXPECT_EQ(FilesPerLevel(), "1,1,1,2");

  size_t kcnt = 0;
@@ -1341,7 +1380,7 @@ TEST_F(ExternalSSTFileTest, PickedLevelBug) {
  ASSERT_OK(bg_addfile_status);
  ASSERT_OK(bg_compact_status);

-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  int total_keys = 0;
  Iterator* iter = db_->NewIterator(ReadOptions());
@@ -1378,7 +1417,7 @@ TEST_F(ExternalSSTFileTest, IngestNonExistingFile) {

  // After full compaction, there should be only 1 file.
  std::vector<std::string> files;
-  ASSERT_OK(env_->GetChildren(dbname_, &files));
+  env_->GetChildren(dbname_, &files);
  int num_sst_files = 0;
  for (auto& f : files) {
    uint64_t number;
@@ -1500,7 +1539,7 @@ TEST_F(ExternalSSTFileTest, PickedLevelDynamic) {
  TEST_SYNC_POINT("ExternalSSTFileTest::PickedLevelDynamic:2");

  // Output of the compaction will go to L3
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  EXPECT_EQ(FilesPerLevel(), "1,0,0,2");

  Close();
@@ -1642,7 +1681,7 @@ TEST_F(ExternalSSTFileTest, AddFileTrivialMoveBug) {
  cro.exclusive_manual_compaction = false;
  ASSERT_OK(db_->CompactRange(cro, nullptr, nullptr));

-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
 }
@@ -1694,9 +1733,9 @@ TEST_F(ExternalSSTFileTest, WithUnorderedWrite) {
  Options options = CurrentOptions();
  options.unordered_write = true;
  DestroyAndReopen(options);
-  ASSERT_OK(Put("foo", "v1"));
+  Put("foo", "v1");
  SyncPoint::GetInstance()->EnableProcessing();
-  port::Thread writer([&]() { ASSERT_OK(Put("bar", "v2")); });
+  port::Thread writer([&]() { Put("bar", "v2"); });

  TEST_SYNC_POINT("ExternalSSTFileTest::WithUnorderedWrite:WaitWriteWAL");
  ASSERT_OK(GenerateAndAddExternalFile(options, {{"bar", "v3"}}, -1,
@@ -1745,7 +1784,7 @@ TEST_P(ExternalSSTFileTest, IngestFileWithGlobalSeqnoRandomized) {
    }
    size_t kcnt = 0;
    VerifyDBFromMap(true_data, &kcnt, false);
-    ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+    db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
    VerifyDBFromMap(true_data, &kcnt, false);
  }
 }
@@ -1829,8 +1868,8 @@ TEST_P(ExternalSSTFileTest, IngestFileWithGlobalSeqnoMemtableFlush) {
    ASSERT_OK(Put(Key(k), "memtable"));
    true_data[Key(k)] = "memtable";
  }
-  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
-                                  &entries_in_memtable));
+  db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
+                      &entries_in_memtable);
  ASSERT_GE(entries_in_memtable, 1);

  bool write_global_seqno = std::get<0>(GetParam());
@@ -1839,40 +1878,40 @@ TEST_P(ExternalSSTFileTest, IngestFileWithGlobalSeqnoMemtableFlush) {
  ASSERT_OK(GenerateAndAddExternalFile(
      options, {90, 100, 110}, -1, true, write_global_seqno,
      verify_checksums_before_ingest, false, false, &true_data));
-  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
-                                  &entries_in_memtable));
+  db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
+                      &entries_in_memtable);
  ASSERT_GE(entries_in_memtable, 1);

  // This file will flush the memtable
  ASSERT_OK(GenerateAndAddExternalFile(
      options, {19, 20, 21}, -1, true, write_global_seqno,
      verify_checksums_before_ingest, false, false, &true_data));
-  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
-                                  &entries_in_memtable));
+  db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
+                      &entries_in_memtable);
  ASSERT_EQ(entries_in_memtable, 0);

  for (int k : {200, 201, 205, 206}) {
    ASSERT_OK(Put(Key(k), "memtable"));
    true_data[Key(k)] = "memtable";
  }
-  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
-                                  &entries_in_memtable));
+  db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
+                      &entries_in_memtable);
  ASSERT_GE(entries_in_memtable, 1);

  // No need for flush, this file keys fit between the memtable keys
  ASSERT_OK(GenerateAndAddExternalFile(
      options, {202, 203, 204}, -1, true, write_global_seqno,
      verify_checksums_before_ingest, false, false, &true_data));
-  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
-                                  &entries_in_memtable));
+  db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
+                      &entries_in_memtable);
  ASSERT_GE(entries_in_memtable, 1);

  // This file will flush the memtable
  ASSERT_OK(GenerateAndAddExternalFile(
      options, {206, 207}, -1, true, write_global_seqno,
      verify_checksums_before_ingest, false, false, &true_data));
-  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
-                                  &entries_in_memtable));
+  db_->GetIntProperty(DB::Properties::kNumEntriesActiveMemTable,
+                      &entries_in_memtable);
  ASSERT_EQ(entries_in_memtable, 0);

  size_t kcnt = 0;
@@ -2270,7 +2309,7 @@ TEST_P(ExternalSSTFileTest, IngestBehind) {
    ASSERT_OK(Put(Key(i), "memtable"));
    true_data[Key(i)] = "memtable";
  }
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  // Universal picker should go at second from the bottom level
  ASSERT_EQ("0,1", FilesPerLevel());
  ASSERT_OK(GenerateAndAddExternalFile(
@@ -2284,7 +2323,7 @@ TEST_P(ExternalSSTFileTest, IngestBehind) {
      verify_checksums_before_ingest, true /*ingest_behind*/,
      false /*sort_data*/, &true_data));
  ASSERT_EQ("0,1,1", FilesPerLevel());
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  // bottom level should be empty
  ASSERT_EQ("0,1", FilesPerLevel());

@@ -2432,8 +2471,9 @@ TEST_P(ExternalSSTFileTest, IngestFilesIntoMultipleColumnFamilies_Success) {
  // Resize the true_data vector upon construction to avoid re-alloc
  std::vector<std::map<std::string, std::string>> true_data(
      column_families.size());
-  ASSERT_OK(GenerateAndAddExternalFiles(options, column_families, ifos, data,
-                                        -1, true, true_data));
+  Status s = GenerateAndAddExternalFiles(options, column_families, ifos, data,
+                                         -1, true, true_data);
+  ASSERT_OK(s);
  Close();
  ReopenWithColumnFamilies({kDefaultColumnFamilyName, "pikachu", "eevee"},
                           options);
@@ -2614,8 +2654,9 @@ TEST_P(ExternalSSTFileTest, IngestFilesIntoMultipleColumnFamilies_PrepareFail) {
  std::vector<std::map<std::string, std::string>> true_data(
      column_families.size());
  port::Thread ingest_thread([&]() {
-    ASSERT_NOK(GenerateAndAddExternalFiles(options, column_families, ifos, data,
-                                           -1, true, true_data));
+    Status s = GenerateAndAddExternalFiles(options, column_families, ifos, data,
+                                           -1, true, true_data);
+    ASSERT_NOK(s);
  });
  TEST_SYNC_POINT(
      "ExternalSSTFileTest::IngestFilesIntoMultipleColumnFamilies_PrepareFail:"
@@ -2683,8 +2724,9 @@ TEST_P(ExternalSSTFileTest, IngestFilesIntoMultipleColumnFamilies_CommitFail) {
  std::vector<std::map<std::string, std::string>> true_data(
      column_families.size());
  port::Thread ingest_thread([&]() {
-    ASSERT_NOK(GenerateAndAddExternalFiles(options, column_families, ifos, data,
-                                           -1, true, true_data));
+    Status s = GenerateAndAddExternalFiles(options, column_families, ifos, data,
+                                           -1, true, true_data);
+    ASSERT_NOK(s);
  });
  TEST_SYNC_POINT(
      "ExternalSSTFileTest::IngestFilesIntoMultipleColumnFamilies_CommitFail:"
@@ -2757,8 +2799,9 @@ TEST_P(ExternalSSTFileTest,
  std::vector<std::map<std::string, std::string>> true_data(
      column_families.size());
  port::Thread ingest_thread([&]() {
-    ASSERT_NOK(GenerateAndAddExternalFiles(options, column_families, ifos, data,
-                                           -1, true, true_data));
+    Status s = GenerateAndAddExternalFiles(options, column_families, ifos, data,
+                                           -1, true, true_data);
+    ASSERT_NOK(s);
  });
  TEST_SYNC_POINT(
      "ExternalSSTFileTest::IngestFilesIntoMultipleColumnFamilies_"
@@ -2769,7 +2812,7 @@ TEST_P(ExternalSSTFileTest,
      "PartialManifestWriteFail:1");
  ingest_thread.join();

-  ASSERT_OK(fault_injection_env->DropUnsyncedFileData());
+  fault_injection_env->DropUnsyncedFileData();
  fault_injection_env->SetFilesystemActive(true);
  Close();
  ReopenWithColumnFamilies({kDefaultColumnFamilyName, "pikachu", "eevee"},
@@ -2804,7 +2847,7 @@ TEST_P(ExternalSSTFileTest, IngestFilesTriggerFlushingWithTwoWriteQueue) {
  // sure that it won't enter the 2nd writer queue for the second time.
  std::vector<std::pair<std::string, std::string>> data;
  data.push_back(std::make_pair("1001", "v2"));
-  ASSERT_OK(GenerateAndAddExternalFile(options, data, -1, true));
+  GenerateAndAddExternalFile(options, data);
 }

 TEST_P(ExternalSSTFileTest, DeltaEncodingWhileGlobalSeqnoPresent) {
@@ -192,7 +192,7 @@ class FaultInjectionTest
    for (int i = start_idx; i < start_idx + num_vals; i++) {
      Slice key = Key(i, &key_space);
      batch.Clear();
-      ASSERT_OK(batch.Put(key, Value(i, &value_space)));
+      batch.Put(key, Value(i, &value_space));
      ASSERT_OK(db_->Write(write_options, &batch));
    }
  }
@@ -272,12 +272,12 @@ class FaultInjectionTest
    for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
      ASSERT_OK(db_->Delete(WriteOptions(), iter->key()));
    }
-    ASSERT_OK(iter->status());
+
    delete iter;

    FlushOptions flush_options;
    flush_options.wait = true;
-    ASSERT_OK(db_->Flush(flush_options));
+    db_->Flush(flush_options);
  }

  // rnd cannot be null for kResetDropRandomUnsyncedData
@@ -310,7 +310,7 @@ class FaultInjectionTest

    Build(write_options, 0, num_pre_sync);
    if (sync_use_compact_) {
-      ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+      db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
    }
    write_options.sync = false;
    Build(write_options, num_pre_sync, num_post_sync);
@@ -342,7 +342,7 @@ class FaultInjectionTest
  }

  void WaitCompactionFinish() {
-    ASSERT_OK(static_cast<DBImpl*>(db_->GetRootDB())->TEST_WaitForCompact());
+    static_cast<DBImpl*>(db_->GetRootDB())->TEST_WaitForCompact();
    ASSERT_OK(db_->Put(WriteOptions(), "", ""));
  }
 };
@@ -409,7 +409,7 @@ TEST_P(FaultInjectionTest, WriteOptionSyncTest) {
  write_options.sync = true;
  ASSERT_OK(
      db_->Put(write_options, Key(2, &key_space), Value(2, &value_space)));
-  ASSERT_OK(db_->FlushWAL(false));
+  db_->FlushWAL(false);

  env_->SetFilesystemActive(false);
  NoWriteTestReopenWithFault(kResetDropAndDeleteUnsynced);
@@ -450,7 +450,7 @@ TEST_P(FaultInjectionTest, UninstalledCompaction) {
  Build(WriteOptions(), 0, kNumKeys);
  FlushOptions flush_options;
  flush_options.wait = true;
-  ASSERT_OK(db_->Flush(flush_options));
+  db_->Flush(flush_options);
  ASSERT_OK(db_->Put(WriteOptions(), "", ""));
  TEST_SYNC_POINT("FaultInjectionTest::FaultTest:0");
  TEST_SYNC_POINT("FaultInjectionTest::FaultTest:1");
@@ -521,9 +521,9 @@ TEST_P(FaultInjectionTest, WriteBatchWalTerminationTest) {
  wo.sync = true;
  wo.disableWAL = false;
  WriteBatch batch;
-  ASSERT_OK(batch.Put("cats", "dogs"));
+  batch.Put("cats", "dogs");
  batch.MarkWalTerminationPoint();
-  ASSERT_OK(batch.Put("boys", "girls"));
+  batch.Put("boys", "girls");
  ASSERT_OK(db_->Write(wo, &batch));

  env_->SetFilesystemActive(false);
@@ -32,7 +32,7 @@ class FlushJobTestBase : public testing::Test {
 protected:
  FlushJobTestBase(std::string dbname, const Comparator* ucmp)
      : env_(Env::Default()),
-        fs_(env_->GetFileSystem()),
+        fs_(std::make_shared<LegacyFileSystemWrapper>(env_)),
        dbname_(std::move(dbname)),
        ucmp_(ucmp),
        options_(),
@@ -52,7 +52,7 @@ class FlushJobTestBase : public testing::Test {
  }

  void NewDB() {
-    ASSERT_OK(SetIdentityFile(env_, dbname_));
+    SetIdentityFile(env_, dbname_);
    VersionEdit new_db;

    new_db.SetLogNumber(0);
@@ -85,7 +85,6 @@ class FlushJobTestBase : public testing::Test {
      std::string record;
      new_db.EncodeTo(&record);
      s = log.AddRecord(record);
-      ASSERT_OK(s);

      for (const auto& e : new_cfs) {
        record.clear();
@@ -47,7 +47,11 @@ class ForwardLevelIterator : public InternalIterator {
        pinned_iters_mgr_(nullptr),
        prefix_extractor_(prefix_extractor),
        allow_unprepared_value_(allow_unprepared_value) {
-    status_.PermitUncheckedError();  // Allow uninitialized status through
+    /*
+    NOTE needed for ASSERT_STATUS_CHECKED
+    in MergeOperatorPinningTest/MergeOperatorPinningTest.TailingIterator
+    */
+    status_.PermitUncheckedError();
  }

  ~ForwardLevelIterator() override {
@@ -240,12 +244,6 @@ ForwardIterator::ForwardIterator(DBImpl* db, const ReadOptions& read_options,
  if (sv_) {
    RebuildIterators(false);
  }
-
-  // immutable_status_ is a local aggregation of the
-  // status of the immutable Iterators.
-  // We have to PermitUncheckedError in case it is never
-  // used, otherwise it will fail ASSERT_STATUS_CHECKED.
-  immutable_status_.PermitUncheckedError();
 }

 ForwardIterator::~ForwardIterator() {
@@ -104,9 +104,9 @@ TEST_F(ImportColumnFamilyTest, ImportSSTFileWriterFiles) {
    ASSERT_NE(import_cfh_, nullptr);

    std::string value;
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, "K1", &value));
+    db_->Get(ReadOptions(), import_cfh_, "K1", &value);
    ASSERT_EQ(value, "V1");
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, "K2", &value));
+    db_->Get(ReadOptions(), import_cfh_, "K2", &value);
    ASSERT_EQ(value, "V2");
    ASSERT_OK(db_->DropColumnFamily(import_cfh_));
    ASSERT_OK(db_->DestroyColumnFamilyHandle(import_cfh_));
@@ -125,9 +125,9 @@ TEST_F(ImportColumnFamilyTest, ImportSSTFileWriterFiles) {
    ASSERT_NE(import_cfh_, nullptr);

    std::string value;
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, "K3", &value));
+    db_->Get(ReadOptions(), import_cfh_, "K3", &value);
    ASSERT_EQ(value, "V1");
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, "K4", &value));
+    db_->Get(ReadOptions(), import_cfh_, "K4", &value);
    ASSERT_EQ(value, "V2");
  }
 }
@@ -214,7 +214,7 @@ TEST_F(ImportColumnFamilyTest, ImportSSTFileWriterFilesWithOverlap) {

  for (int i = 0; i < 100; i++) {
    std::string value;
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, Key(i), &value));
+    db_->Get(ReadOptions(), import_cfh_, Key(i), &value);
    if (i % 16 == 0) {
      ASSERT_EQ(value, Key(i) + "_overwrite4");
    } else if (i % 4 == 0) {
@@ -235,7 +235,7 @@ TEST_F(ImportColumnFamilyTest, ImportSSTFileWriterFilesWithOverlap) {
  ASSERT_OK(db_->Flush(FlushOptions(), import_cfh_));
  for (int i = 0; i < 100; i++) {
    std::string value;
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, Key(i), &value));
+    db_->Get(ReadOptions(), import_cfh_, Key(i), &value);
    if (i % 5 == 0) {
      ASSERT_EQ(value, Key(i) + "_overwrite5");
    } else if (i % 16 == 0) {
@@ -254,7 +254,7 @@ TEST_F(ImportColumnFamilyTest, ImportSSTFileWriterFilesWithOverlap) {
      db_->CompactRange(CompactRangeOptions(), import_cfh_, nullptr, nullptr));
  for (int i = 0; i < 100; i++) {
    std::string value;
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, Key(i), &value));
+    db_->Get(ReadOptions(), import_cfh_, Key(i), &value);
    if (i % 5 == 0) {
      ASSERT_EQ(value, Key(i) + "_overwrite5");
    } else if (i % 16 == 0) {
@@ -318,12 +318,12 @@ TEST_F(ImportColumnFamilyTest, ImportExportedSSTFromAnotherCF) {
  std::string value1, value2;

  for (int i = 0; i < 100; ++i) {
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, Key(i), &value1));
+    db_->Get(ReadOptions(), import_cfh_, Key(i), &value1);
    ASSERT_EQ(Get(1, Key(i)), value1);
  }

  for (int i = 0; i < 100; ++i) {
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh2_, Key(i), &value2));
+    db_->Get(ReadOptions(), import_cfh2_, Key(i), &value2);
    ASSERT_EQ(Get(1, Key(i)), value2);
  }

@@ -340,16 +340,16 @@ TEST_F(ImportColumnFamilyTest, ImportExportedSSTFromAnotherCF) {
        db_->Get(ReadOptions(), import_cfh_, Key(i), &value1).IsNotFound());
  }
  for (int i = 25; i < 50; ++i) {
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, Key(i), &value1));
+    db_->Get(ReadOptions(), import_cfh_, Key(i), &value1);
    ASSERT_EQ(Key(i) + "_overwrite3", value1);
  }
  for (int i = 50; i < 100; ++i) {
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, Key(i), &value1));
+    db_->Get(ReadOptions(), import_cfh_, Key(i), &value1);
    ASSERT_EQ(Key(i) + "_overwrite2", value1);
  }

  for (int i = 0; i < 100; ++i) {
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh2_, Key(i), &value2));
+    db_->Get(ReadOptions(), import_cfh2_, Key(i), &value2);
    ASSERT_EQ(Get(1, Key(i)), value2);
  }

@@ -363,16 +363,16 @@ TEST_F(ImportColumnFamilyTest, ImportExportedSSTFromAnotherCF) {
        db_->Get(ReadOptions(), import_cfh_, Key(i), &value1).IsNotFound());
  }
  for (int i = 25; i < 50; ++i) {
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, Key(i), &value1));
+    db_->Get(ReadOptions(), import_cfh_, Key(i), &value1);
    ASSERT_EQ(Key(i) + "_overwrite3", value1);
  }
  for (int i = 50; i < 100; ++i) {
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh_, Key(i), &value1));
+    db_->Get(ReadOptions(), import_cfh_, Key(i), &value1);
    ASSERT_EQ(Key(i) + "_overwrite2", value1);
  }

  for (int i = 0; i < 100; ++i) {
-    ASSERT_OK(db_->Get(ReadOptions(), import_cfh2_, Key(i), &value2));
+    db_->Get(ReadOptions(), import_cfh2_, Key(i), &value2);
    ASSERT_EQ(Get(1, Key(i)), value2);
  }
 }
@@ -424,7 +424,7 @@ TEST_F(ImportColumnFamilyTest, ImportExportedSSTFromAnotherDB) {

  for (int i = 0; i < 100; ++i) {
    std::string value;
-    ASSERT_OK(db_copy->Get(ReadOptions(), cfh, Key(i), &value));
+    db_copy->Get(ReadOptions(), cfh, Key(i), &value);
    ASSERT_EQ(Get(1, Key(i)), value);
  }
  ASSERT_OK(db_copy->DropColumnFamily(cfh));
@@ -192,10 +192,10 @@ TEST_F(EventListenerTest, OnSingleDBCompactionTest) {
  ASSERT_OK(Put(7, "popovich", std::string(90000, 'p')));
  for (int i = 1; i < 8; ++i) {
    ASSERT_OK(Flush(i));
-    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+    dbfull()->TEST_WaitForFlushMemTable();
    ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), handles_[i],
                                     nullptr, nullptr));
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
+    dbfull()->TEST_WaitForCompact();
  }

  ASSERT_EQ(listener->compacted_dbs_.size(), cf_names.size());
@@ -211,10 +211,6 @@ class TestFlushListener : public EventListener {
      : slowdown_count(0), stop_count(0), db_closed(), env_(env), test_(test) {
    db_closed = false;
  }
-
-  virtual ~TestFlushListener() {
-    prev_fc_info_.status.PermitUncheckedError();  // Ignore the status
-  }
  void OnTableFileCreated(
      const TableFileCreationInfo& info) override {
    // remember the info for later checking the FlushJobInfo.
@@ -337,7 +333,7 @@ TEST_F(EventListenerTest, OnSingleDBFlushTest) {
  ASSERT_OK(Put(7, "popovich", std::string(90000, 'p')));
  for (int i = 1; i < 8; ++i) {
    ASSERT_OK(Flush(i));
-    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+    dbfull()->TEST_WaitForFlushMemTable();
    ASSERT_EQ(listener->flushed_dbs_.size(), i);
    ASSERT_EQ(listener->flushed_column_family_names_.size(), i);
  }
@@ -421,7 +417,7 @@ TEST_F(EventListenerTest, MultiDBMultiListeners) {
    ASSERT_OK(DB::Open(options, dbname_ + ToString(d), &db));
    for (size_t c = 0; c < cf_names.size(); ++c) {
      ColumnFamilyHandle* handle;
-      ASSERT_OK(db->CreateColumnFamily(cf_opts, cf_names[c], &handle));
+      db->CreateColumnFamily(cf_opts, cf_names[c], &handle);
      handles.push_back(handle);
    }

@@ -439,8 +435,7 @@ TEST_F(EventListenerTest, MultiDBMultiListeners) {
  for (size_t c = 0; c < cf_names.size(); ++c) {
    for (int d = 0; d < kNumDBs; ++d) {
      ASSERT_OK(dbs[d]->Flush(FlushOptions(), vec_handles[d][c]));
-      ASSERT_OK(
-          static_cast_with_check<DBImpl>(dbs[d])->TEST_WaitForFlushMemTable());
+      static_cast_with_check<DBImpl>(dbs[d])->TEST_WaitForFlushMemTable();
    }
  }

@@ -499,10 +494,10 @@ TEST_F(EventListenerTest, DisableBGCompaction) {
  // keep writing until writes are forced to stop.
  for (int i = 0; static_cast<int>(cf_meta.file_count) < kSlowdownTrigger * 10;
       ++i) {
-    ASSERT_OK(Put(1, ToString(i), std::string(10000, 'x'), WriteOptions()));
+    Put(1, ToString(i), std::string(10000, 'x'), WriteOptions());
    FlushOptions fo;
    fo.allow_write_stall = true;
-    ASSERT_OK(db_->Flush(fo, handles_[1]));
+    db_->Flush(fo, handles_[1]);
    db_->GetColumnFamilyMetaData(handles_[1], &cf_meta);
  }
  ASSERT_GE(listener->slowdown_count, kSlowdownTrigger * 9);
@@ -539,7 +534,7 @@ TEST_F(EventListenerTest, CompactionReasonLevel) {
  for (int i = 0; i < 4; i++) {
    GenerateNewRandomFile(&rnd);
  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  ASSERT_EQ(listener->compaction_reasons_.size(), 1);
  ASSERT_EQ(listener->compaction_reasons_[0],
@@ -556,14 +551,14 @@ TEST_F(EventListenerTest, CompactionReasonLevel) {
  }

  // Do a trivial move from L0 -> L1
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);

  options.max_bytes_for_level_base = 1;
  Close();
  listener->compaction_reasons_.clear();
  Reopen(options);

-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();
  ASSERT_GT(listener->compaction_reasons_.size(), 1);

  for (auto compaction_reason : listener->compaction_reasons_) {
@@ -575,7 +570,7 @@ TEST_F(EventListenerTest, CompactionReasonLevel) {
  listener->compaction_reasons_.clear();
  Reopen(options);

-  ASSERT_OK(Put("key", "value"));
+  Put("key", "value");
  CompactRangeOptions cro;
  cro.bottommost_level_compaction = BottommostLevelCompaction::kForceOptimized;
  ASSERT_OK(db_->CompactRange(cro, nullptr, nullptr));
@@ -609,7 +604,7 @@ TEST_F(EventListenerTest, CompactionReasonUniversal) {
  for (int i = 0; i < 8; i++) {
    GenerateNewRandomFile(&rnd);
  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  ASSERT_GT(listener->compaction_reasons_.size(), 0);
  for (auto compaction_reason : listener->compaction_reasons_) {
@@ -627,7 +622,7 @@ TEST_F(EventListenerTest, CompactionReasonUniversal) {
  for (int i = 0; i < 8; i++) {
    GenerateNewRandomFile(&rnd);
  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  ASSERT_GT(listener->compaction_reasons_.size(), 0);
  for (auto compaction_reason : listener->compaction_reasons_) {
@@ -639,7 +634,7 @@ TEST_F(EventListenerTest, CompactionReasonUniversal) {
  listener->compaction_reasons_.clear();
  Reopen(options);

-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);

  ASSERT_GT(listener->compaction_reasons_.size(), 0);
  for (auto compaction_reason : listener->compaction_reasons_) {
@@ -668,7 +663,7 @@ TEST_F(EventListenerTest, CompactionReasonFIFO) {
  for (int i = 0; i < 4; i++) {
    GenerateNewRandomFile(&rnd);
  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->TEST_WaitForCompact();

  ASSERT_GT(listener->compaction_reasons_.size(), 0);
  for (auto compaction_reason : listener->compaction_reasons_) {
@@ -788,7 +783,7 @@ TEST_F(EventListenerTest, TableFileCreationListenersTest) {
  ASSERT_OK(Put("foo", "aaa"));
  ASSERT_OK(Put("bar", "bbb"));
  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+  dbfull()->TEST_WaitForFlushMemTable();
  listener->CheckAndResetCounters(1, 1, 0, 0, 0, 0);
  ASSERT_OK(Put("foo", "aaa1"));
  ASSERT_OK(Put("bar", "bbb1"));
@@ -801,23 +796,21 @@ TEST_F(EventListenerTest, TableFileCreationListenersTest) {
  ASSERT_OK(Put("foo", "aaa2"));
  ASSERT_OK(Put("bar", "bbb2"));
  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+  dbfull()->TEST_WaitForFlushMemTable();
  listener->CheckAndResetCounters(1, 1, 0, 0, 0, 0);

  const Slice kRangeStart = "a";
  const Slice kRangeEnd = "z";
-  ASSERT_OK(
-      dbfull()->CompactRange(CompactRangeOptions(), &kRangeStart, &kRangeEnd));
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
+  dbfull()->CompactRange(CompactRangeOptions(), &kRangeStart, &kRangeEnd);
+  dbfull()->TEST_WaitForCompact();
  listener->CheckAndResetCounters(0, 0, 0, 1, 1, 0);

  ASSERT_OK(Put("foo", "aaa3"));
  ASSERT_OK(Put("bar", "bbb3"));
  ASSERT_OK(Flush());
  test_env->SetStatus(Status::NotSupported("not supported"));
-  ASSERT_NOK(
-      dbfull()->CompactRange(CompactRangeOptions(), &kRangeStart, &kRangeEnd));
-  ASSERT_NOK(dbfull()->TEST_WaitForCompact());
+  dbfull()->CompactRange(CompactRangeOptions(), &kRangeStart, &kRangeEnd);
+  dbfull()->TEST_WaitForCompact();
  listener->CheckAndResetCounters(1, 1, 0, 1, 1, 1);
  Close();
 }
@@ -1083,8 +1076,8 @@ TEST_F(EventListenerTest, OnFileOperationTest) {
  }
  DestroyAndReopen(options);
  ASSERT_OK(Put("foo", "aaa"));
-  ASSERT_OK(dbfull()->Flush(FlushOptions()));
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+  dbfull()->Flush(FlushOptions());
+  dbfull()->TEST_WaitForFlushMemTable();
  ASSERT_GE(listener->file_writes_.load(),
            listener->file_writes_success_.load());
  ASSERT_GT(listener->file_writes_.load(), 0);
@@ -9,6 +9,7 @@

 #include "db/log_reader.h"
 #include "db/log_writer.h"
+#include "env/composite_env_wrapper.h"
 #include "file/sequence_file_reader.h"
 #include "file/writable_file_writer.h"
 #include "rocksdb/env.h"
@@ -49,7 +50,7 @@ static std::string RandomSkewedString(int i, Random* rnd) {
 // get<1>(tuple): true if allow retry after read EOF, false otherwise
 class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
 private:
-  class StringSource : public FSSequentialFile {
+  class StringSource : public SequentialFile {
   public:
    Slice& contents_;
    bool force_error_;
@@ -67,8 +68,7 @@ class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
          returned_partial_(false),
          fail_after_read_partial_(fail_after_read_partial) {}

-    IOStatus Read(size_t n, const IOOptions& /*opts*/, Slice* result,
-                  char* scratch, IODebugContext* /*dbg*/) override {
+    Status Read(size_t n, Slice* result, char* scratch) override {
      if (fail_after_read_partial_) {
        EXPECT_TRUE(!returned_partial_) << "must not Read() after eof/error";
      }
@@ -81,7 +81,7 @@ class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
          contents_.remove_prefix(force_error_position_);
          force_error_ = false;
          returned_partial_ = true;
-          return IOStatus::Corruption("read error");
+          return Status::Corruption("read error");
        }
      }

@@ -106,21 +106,28 @@ class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
      *result = Slice(scratch, n);

      contents_.remove_prefix(n);
-      return IOStatus::OK();
+      return Status::OK();
    }

-    IOStatus Skip(uint64_t n) override {
+    Status Skip(uint64_t n) override {
      if (n > contents_.size()) {
        contents_.clear();
-        return IOStatus::NotFound("in-memory file skipepd past end");
+        return Status::NotFound("in-memory file skipepd past end");
      }

      contents_.remove_prefix(n);

-      return IOStatus::OK();
+      return Status::OK();
    }
  };

+  inline StringSource* GetStringSourceFromLegacyReader(
+      SequentialFileReader* reader) {
+    LegacySequentialFileWrapper* file =
+        static_cast<LegacySequentialFileWrapper*>(reader->file());
+    return static_cast<StringSource*>(file->target());
+  }
+
  class ReportCollector : public Reader::Reporter {
   public:
    size_t dropped_bytes_;
@@ -133,17 +140,29 @@ class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
    }
  };

-  std::string& dest_contents() { return sink_->contents_; }
+  std::string& dest_contents() {
+    auto dest = test::GetStringSinkFromLegacyWriter(writer_.file());
+    assert(dest);
+    return dest->contents_;
+  }

-  const std::string& dest_contents() const { return sink_->contents_; }
+  const std::string& dest_contents() const {
+    auto dest = test::GetStringSinkFromLegacyWriter(writer_.file());
+    assert(dest);
+    return dest->contents_;
+  }

-  void reset_source_contents() { source_->contents_ = dest_contents(); }
+  void reset_source_contents() {
+    auto src = GetStringSourceFromLegacyReader(reader_->file());
+    assert(src);
+    src->contents_ = dest_contents();
+  }

  Slice reader_contents_;
-  test::StringSink* sink_;
-  StringSource* source_;
+  std::unique_ptr<WritableFileWriter> dest_holder_;
+  std::unique_ptr<SequentialFileReader> source_holder_;
  ReportCollector report_;
-  std::unique_ptr<Writer> writer_;
+  Writer writer_;
  std::unique_ptr<Reader> reader_;

 protected:
@@ -152,23 +171,19 @@ class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
 public:
  LogTest()
      : reader_contents_(),
-        sink_(new test::StringSink(&reader_contents_)),
-        source_(new StringSource(reader_contents_, !std::get<1>(GetParam()))),
+        dest_holder_(test::GetWritableFileWriter(
+            new test::StringSink(&reader_contents_), "" /* don't care */)),
+        source_holder_(test::GetSequentialFileReader(
+            new StringSource(reader_contents_, !std::get<1>(GetParam())),
+            "" /* file name */)),
+        writer_(std::move(dest_holder_), 123, std::get<0>(GetParam())),
        allow_retry_read_(std::get<1>(GetParam())) {
-    std::unique_ptr<FSWritableFile> sink_holder(sink_);
-    std::unique_ptr<WritableFileWriter> file_writer(new WritableFileWriter(
-        std::move(sink_holder), "" /* don't care */, FileOptions()));
-    writer_.reset(
-        new Writer(std::move(file_writer), 123, std::get<0>(GetParam())));
-    std::unique_ptr<FSSequentialFile> source_holder(source_);
-    std::unique_ptr<SequentialFileReader> file_reader(
-        new SequentialFileReader(std::move(source_holder), "" /* file name */));
    if (allow_retry_read_) {
-      reader_.reset(new FragmentBufferedReader(nullptr, std::move(file_reader),
-                                               &report_, true /* checksum */,
-                                               123 /* log_number */));
+      reader_.reset(new FragmentBufferedReader(
+          nullptr, std::move(source_holder_), &report_, true /* checksum */,
+          123 /* log_number */));
    } else {
-      reader_.reset(new Reader(nullptr, std::move(file_reader), &report_,
+      reader_.reset(new Reader(nullptr, std::move(source_holder_), &report_,
                               true /* checksum */, 123 /* log_number */));
    }
  }
@@ -176,7 +191,7 @@ class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
  Slice* get_reader_contents() { return &reader_contents_; }

  void Write(const std::string& msg) {
-    ASSERT_OK(writer_->AddRecord(Slice(msg)));
+    writer_.AddRecord(Slice(msg));
  }

  size_t WrittenBytes() const {
@@ -204,7 +219,11 @@ class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
    dest_contents()[offset] = new_byte;
  }

-  void ShrinkSize(int bytes) { sink_->Drop(bytes); }
+  void ShrinkSize(int bytes) {
+    auto dest = test::GetStringSinkFromLegacyWriter(writer_.file());
+    assert(dest);
+    dest->Drop(bytes);
+  }

  void FixChecksum(int header_offset, int len, bool recyclable) {
    // Compute crc of type/len/data
@@ -216,8 +235,9 @@ class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
  }

  void ForceError(size_t position = 0) {
-    source_->force_error_ = true;
-    source_->force_error_position_ = position;
+    auto src = GetStringSourceFromLegacyReader(reader_->file());
+    src->force_error_ = true;
+    src->force_error_position_ = position;
  }

  size_t DroppedBytes() const {
@@ -229,12 +249,14 @@ class LogTest : public ::testing::TestWithParam<std::tuple<int, bool>> {
  }

  void ForceEOF(size_t position = 0) {
-    source_->force_eof_ = true;
-    source_->force_eof_position_ = position;
+    auto src = GetStringSourceFromLegacyReader(reader_->file());
+    src->force_eof_ = true;
+    src->force_eof_position_ = position;
  }

  void UnmarkEOF() {
-    source_->returned_partial_ = false;
+    auto src = GetStringSourceFromLegacyReader(reader_->file());
+    src->returned_partial_ = false;
    reader_->UnmarkEOF();
  }

@@ -663,13 +685,12 @@ TEST_P(LogTest, Recycle) {
  while (get_reader_contents()->size() < log::kBlockSize * 2) {
    Write("xxxxxxxxxxxxxxxx");
  }
-  std::unique_ptr<FSWritableFile> sink(
-      new test::OverwritingStringSink(get_reader_contents()));
-  std::unique_ptr<WritableFileWriter> dest_holder(new WritableFileWriter(
-      std::move(sink), "" /* don't care */, FileOptions()));
+  std::unique_ptr<WritableFileWriter> dest_holder(test::GetWritableFileWriter(
+      new test::OverwritingStringSink(get_reader_contents()),
+      "" /* don't care */));
  Writer recycle_writer(std::move(dest_holder), 123, true);
-  ASSERT_OK(recycle_writer.AddRecord(Slice("foooo")));
-  ASSERT_OK(recycle_writer.AddRecord(Slice("bar")));
+  recycle_writer.AddRecord(Slice("foooo"));
+  recycle_writer.AddRecord(Slice("bar"));
  ASSERT_GE(get_reader_contents()->size(), log::kBlockSize * 2);
  ASSERT_EQ("foooo", Read());
  ASSERT_EQ("bar", Read());
@@ -697,9 +718,10 @@ class RetriableLogTest : public ::testing::TestWithParam<int> {
  };

  Slice contents_;
-  test::StringSink* sink_;
+  std::unique_ptr<WritableFileWriter> dest_holder_;
  std::unique_ptr<Writer> log_writer_;
  Env* env_;
+  EnvOptions env_options_;
  const std::string test_dir_;
  const std::string log_file_;
  std::unique_ptr<WritableFileWriter> writer_;
@@ -710,58 +732,61 @@ class RetriableLogTest : public ::testing::TestWithParam<int> {
 public:
  RetriableLogTest()
      : contents_(),
-        sink_(new test::StringSink(&contents_)),
+        dest_holder_(nullptr),
        log_writer_(nullptr),
        env_(Env::Default()),
        test_dir_(test::PerThreadDBPath("retriable_log_test")),
        log_file_(test_dir_ + "/log"),
        writer_(nullptr),
        reader_(nullptr),
-        log_reader_(nullptr) {
-    std::unique_ptr<FSWritableFile> sink_holder(sink_);
-    std::unique_ptr<WritableFileWriter> wfw(new WritableFileWriter(
-        std::move(sink_holder), "" /* file name */, FileOptions()));
-    log_writer_.reset(new Writer(std::move(wfw), 123, GetParam()));
-  }
+        log_reader_(nullptr) {}

  Status SetupTestEnv() {
+    dest_holder_.reset(test::GetWritableFileWriter(
+        new test::StringSink(&contents_), "" /* file name */));
+    assert(dest_holder_ != nullptr);
+    log_writer_.reset(new Writer(std::move(dest_holder_), 123, GetParam()));
+    assert(log_writer_ != nullptr);
+
    Status s;
-    FileOptions fopts;
-    auto fs = env_->GetFileSystem();
-    s = fs->CreateDirIfMissing(test_dir_, IOOptions(), nullptr);
-    std::unique_ptr<FSWritableFile> writable_file;
+    s = env_->CreateDirIfMissing(test_dir_);
+    std::unique_ptr<WritableFile> writable_file;
    if (s.ok()) {
-      s = fs->NewWritableFile(log_file_, fopts, &writable_file, nullptr);
+      s = env_->NewWritableFile(log_file_, &writable_file, env_options_);
    }
    if (s.ok()) {
-      writer_.reset(
-          new WritableFileWriter(std::move(writable_file), log_file_, fopts));
-      EXPECT_NE(writer_, nullptr);
+      writer_.reset(new WritableFileWriter(
+          NewLegacyWritableFileWrapper(std::move(writable_file)), log_file_,
+          env_options_));
+      assert(writer_ != nullptr);
    }
-    std::unique_ptr<FSSequentialFile> seq_file;
+    std::unique_ptr<SequentialFile> seq_file;
    if (s.ok()) {
-      s = fs->NewSequentialFile(log_file_, fopts, &seq_file, nullptr);
+      s = env_->NewSequentialFile(log_file_, &seq_file, env_options_);
    }
    if (s.ok()) {
-      reader_.reset(new SequentialFileReader(std::move(seq_file), log_file_));
-      EXPECT_NE(reader_, nullptr);
+      reader_.reset(new SequentialFileReader(
+          NewLegacySequentialFileWrapper(seq_file), log_file_));
+      assert(reader_ != nullptr);
      log_reader_.reset(new FragmentBufferedReader(
          nullptr, std::move(reader_), &report_, true /* checksum */,
          123 /* log_number */));
-      EXPECT_NE(log_reader_, nullptr);
+      assert(log_reader_ != nullptr);
    }
    return s;
  }

-  std::string contents() { return sink_->contents_; }
-
-  void Encode(const std::string& msg) {
-    ASSERT_OK(log_writer_->AddRecord(Slice(msg)));
+  std::string contents() {
+    auto file = test::GetStringSinkFromLegacyWriter(log_writer_->file());
+    assert(file != nullptr);
+    return file->contents_;
  }

+  void Encode(const std::string& msg) { log_writer_->AddRecord(Slice(msg)); }
+
  void Write(const Slice& data) {
-    ASSERT_OK(writer_->Append(data));
-    ASSERT_OK(writer_->Sync(true));
+    writer_->Append(data);
+    writer_->Sync(true);
  }

  bool TryRead(std::string* result) {
@@ -33,7 +33,7 @@ Writer::Writer(std::unique_ptr<WritableFileWriter>&& dest, uint64_t log_number,

 Writer::~Writer() {
  if (dest_) {
-    WriteBuffer().PermitUncheckedError();
+    WriteBuffer();
  }
 }

@@ -100,13 +100,13 @@ TEST_F(ManualCompactionTest, CompactTouchesAllKeys) {
    options.compaction_filter = new DestroyAllCompactionFilter();
    ASSERT_OK(DB::Open(options, dbname_, &db));

-    ASSERT_OK(db->Put(WriteOptions(), Slice("key1"), Slice("destroy")));
-    ASSERT_OK(db->Put(WriteOptions(), Slice("key2"), Slice("destroy")));
-    ASSERT_OK(db->Put(WriteOptions(), Slice("key3"), Slice("value3")));
-    ASSERT_OK(db->Put(WriteOptions(), Slice("key4"), Slice("destroy")));
+    db->Put(WriteOptions(), Slice("key1"), Slice("destroy"));
+    db->Put(WriteOptions(), Slice("key2"), Slice("destroy"));
+    db->Put(WriteOptions(), Slice("key3"), Slice("value3"));
+    db->Put(WriteOptions(), Slice("key4"), Slice("destroy"));

    Slice key4("key4");
-    ASSERT_OK(db->CompactRange(CompactRangeOptions(), nullptr, &key4));
+    db->CompactRange(CompactRangeOptions(), nullptr, &key4);
    Iterator* itr = db->NewIterator(ReadOptions());
    itr->SeekToFirst();
    ASSERT_TRUE(itr->Valid());
@@ -135,21 +135,21 @@ TEST_F(ManualCompactionTest, Test) {
  // create first key range
  WriteBatch batch;
  for (int i = 0; i < kNumKeys; i++) {
-    ASSERT_OK(batch.Put(Key1(i), "value for range 1 key"));
+    batch.Put(Key1(i), "value for range 1 key");
  }
  ASSERT_OK(db->Write(WriteOptions(), &batch));

  // create second key range
  batch.Clear();
  for (int i = 0; i < kNumKeys; i++) {
-    ASSERT_OK(batch.Put(Key2(i), "value for range 2 key"));
+    batch.Put(Key2(i), "value for range 2 key");
  }
  ASSERT_OK(db->Write(WriteOptions(), &batch));

  // delete second key range
  batch.Clear();
  for (int i = 0; i < kNumKeys; i++) {
-    ASSERT_OK(batch.Delete(Key2(i)));
+    batch.Delete(Key2(i));
  }
  ASSERT_OK(db->Write(WriteOptions(), &batch));

@@ -160,7 +160,7 @@ TEST_F(ManualCompactionTest, Test) {
  Slice greatest(end_key.data(), end_key.size());

  // commenting out the line below causes the example to work correctly
-  ASSERT_OK(db->CompactRange(CompactRangeOptions(), &least, &greatest));
+  db->CompactRange(CompactRangeOptions(), &least, &greatest);

  // count the keys
  Iterator* iter = db->NewIterator(ReadOptions());
@@ -205,7 +205,7 @@ TEST_F(ManualCompactionTest, SkipLevel) {
    Slice start("5");
    Slice end("7");
    filter->Reset();
-    ASSERT_OK(db->CompactRange(CompactRangeOptions(), &start, &end));
+    db->CompactRange(CompactRangeOptions(), &start, &end);
    ASSERT_EQ(0, filter->NumKeys());
  }

@@ -215,7 +215,7 @@ TEST_F(ManualCompactionTest, SkipLevel) {
    Slice start("3");
    Slice end("7");
    filter->Reset();
-    ASSERT_OK(db->CompactRange(CompactRangeOptions(), &start, &end));
+    db->CompactRange(CompactRangeOptions(), &start, &end);
    ASSERT_EQ(2, filter->NumKeys());
    ASSERT_EQ(0, filter->KeyLevel("4"));
    ASSERT_EQ(0, filter->KeyLevel("8"));
@@ -227,7 +227,7 @@ TEST_F(ManualCompactionTest, SkipLevel) {
    // no file has keys in range (-inf, 0]
    Slice end("0");
    filter->Reset();
-    ASSERT_OK(db->CompactRange(CompactRangeOptions(), nullptr, &end));
+    db->CompactRange(CompactRangeOptions(), nullptr, &end);
    ASSERT_EQ(0, filter->NumKeys());
  }

@@ -237,7 +237,7 @@ TEST_F(ManualCompactionTest, SkipLevel) {
    // no file has keys in range [9, inf)
    Slice start("9");
    filter->Reset();
-    ASSERT_OK(db->CompactRange(CompactRangeOptions(), &start, nullptr));
+    db->CompactRange(CompactRangeOptions(), &start, nullptr);
    ASSERT_EQ(0, filter->NumKeys());
  }

@@ -248,7 +248,7 @@ TEST_F(ManualCompactionTest, SkipLevel) {
    Slice start("2");
    Slice end("2");
    filter->Reset();
-    ASSERT_OK(db->CompactRange(CompactRangeOptions(), &start, &end));
+    db->CompactRange(CompactRangeOptions(), &start, &end);
    ASSERT_EQ(1, filter->NumKeys());
    ASSERT_EQ(0, filter->KeyLevel("2"));
  }
@@ -260,7 +260,7 @@ TEST_F(ManualCompactionTest, SkipLevel) {
    Slice start("2");
    Slice end("5");
    filter->Reset();
-    ASSERT_OK(db->CompactRange(CompactRangeOptions(), &start, &end));
+    db->CompactRange(CompactRangeOptions(), &start, &end);
    ASSERT_EQ(3, filter->NumKeys());
    ASSERT_EQ(1, filter->KeyLevel("2"));
    ASSERT_EQ(1, filter->KeyLevel("4"));
@@ -273,7 +273,7 @@ TEST_F(ManualCompactionTest, SkipLevel) {
    // [0, inf) overlaps all files
    Slice start("0");
    filter->Reset();
-    ASSERT_OK(db->CompactRange(CompactRangeOptions(), &start, nullptr));
+    db->CompactRange(CompactRangeOptions(), &start, nullptr);
    ASSERT_EQ(4, filter->NumKeys());
    // 1 is first compacted to L1 and then further compacted into [2, 4, 8],
    // so finally the logged level for 1 is L1.
@@ -30,14 +30,14 @@ class MemTableListTest : public testing::Test {
  MemTableListTest() : db(nullptr), file_number(1) {
    dbname = test::PerThreadDBPath("memtable_list_test");
    options.create_if_missing = true;
-    EXPECT_OK(DestroyDB(dbname, options));
+    DestroyDB(dbname, options);
  }

  // Create a test db if not yet created
  void CreateDB() {
    if (db == nullptr) {
      options.create_if_missing = true;
-      EXPECT_OK(DestroyDB(dbname, options));
+      DestroyDB(dbname, options);
      // Open DB only with default column family
      ColumnFamilyOptions cf_options;
      std::vector<ColumnFamilyDescriptor> cf_descs;
@@ -78,7 +78,7 @@ class MemTableListTest : public testing::Test {
      handles.clear();
      delete db;
      db = nullptr;
-      EXPECT_OK(DestroyDB(dbname, options, cf_descs));
+      DestroyDB(dbname, options, cf_descs);
    }
  }

@@ -80,8 +80,8 @@ std::shared_ptr<DB> OpenDb(const std::string& dbname, const bool ttl = false,
  options.create_if_missing = true;
  options.merge_operator = std::make_shared<CountMergeOperator>();
  options.max_successive_merges = max_successive_merges;
-  EXPECT_OK(DestroyDB(dbname, Options()));
  Status s;
+  DestroyDB(dbname, Options());
 // DBWithTTL is not supported in ROCKSDB_LITE
 #ifndef ROCKSDB_LITE
  if (ttl) {
@@ -95,8 +95,10 @@ std::shared_ptr<DB> OpenDb(const std::string& dbname, const bool ttl = false,
  assert(!ttl);
  s = DB::Open(options, dbname, &db);
 #endif  // !ROCKSDB_LITE
-  EXPECT_OK(s);
-  assert(s.ok());
+  if (!s.ok()) {
+    std::cerr << s.ToString() << std::endl;
+    assert(false);
+  }
  return std::shared_ptr<DB>(db);
 }

@@ -256,25 +258,21 @@ void testCounters(Counters& counters, DB* db, bool test_compaction) {

  counters.assert_set("a", 1);

-  if (test_compaction) {
-    ASSERT_OK(db->Flush(o));
-  }
+  if (test_compaction) db->Flush(o);

-  ASSERT_EQ(counters.assert_get("a"), 1);
+  assert(counters.assert_get("a") == 1);

  counters.assert_remove("b");

  // defaut value is 0 if non-existent
-  ASSERT_EQ(counters.assert_get("b"), 0);
+  assert(counters.assert_get("b") == 0);

  counters.assert_add("a", 2);

-  if (test_compaction) {
-    ASSERT_OK(db->Flush(o));
-  }
+  if (test_compaction) db->Flush(o);

  // 1+2 = 3
-  ASSERT_EQ(counters.assert_get("a"), 3);
+  assert(counters.assert_get("a")== 3);

  dumpDb(db);

@@ -284,19 +282,19 @@ void testCounters(Counters& counters, DB* db, bool test_compaction) {
    counters.assert_add("b", i);
    sum += i;
  }
-  ASSERT_EQ(counters.assert_get("b"), sum);
+  assert(counters.assert_get("b") == sum);

  dumpDb(db);

  if (test_compaction) {
-    ASSERT_OK(db->Flush(o));
+    db->Flush(o);

-    ASSERT_OK(db->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+    db->CompactRange(CompactRangeOptions(), nullptr, nullptr);

    dumpDb(db);

-    ASSERT_EQ(counters.assert_get("a"), 3);
-    ASSERT_EQ(counters.assert_get("b"), sum);
+    assert(counters.assert_get("a")== 3);
+    assert(counters.assert_get("b") == sum);
  }
 }

@@ -402,14 +400,14 @@ void testSuccessiveMerge(Counters& counters, size_t max_num_merges,
    sum += i;

    if (i % (max_num_merges + 1) == 0) {
-      ASSERT_EQ(num_merge_operator_calls, max_num_merges + 1);
+      assert(num_merge_operator_calls == max_num_merges + 1);
    } else {
-      ASSERT_EQ(num_merge_operator_calls, 0);
+      assert(num_merge_operator_calls == 0);
    }

    resetNumMergeOperatorCalls();
-    ASSERT_EQ(counters.assert_get("z"), sum);
-    ASSERT_EQ(num_merge_operator_calls, i % (max_num_merges + 1));
+    assert(counters.assert_get("z") == sum);
+    assert(num_merge_operator_calls == i % (max_num_merges + 1));
  }
 }

@@ -426,8 +424,8 @@ void testPartialMerge(Counters* counters, DB* db, size_t max_merge,
    counters->assert_add("b", i);
    tmp_sum += i;
  }
-  ASSERT_OK(db->Flush(o));
-  ASSERT_OK(db->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  db->Flush(o);
+  db->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  ASSERT_EQ(tmp_sum, counters->assert_get("b"));
  if (count > max_merge) {
    // in this case, FullMerge should be called instead.
@@ -440,20 +438,20 @@ void testPartialMerge(Counters* counters, DB* db, size_t max_merge,
  // Test case 2: partial merge should not be called when a put is found.
  resetNumPartialMergeCalls();
  tmp_sum = 0;
-  ASSERT_OK(db->Put(ROCKSDB_NAMESPACE::WriteOptions(), "c", "10"));
+  db->Put(ROCKSDB_NAMESPACE::WriteOptions(), "c", "10");
  for (size_t i = 1; i <= count; i++) {
    counters->assert_add("c", i);
    tmp_sum += i;
  }
-  ASSERT_OK(db->Flush(o));
-  ASSERT_OK(db->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+  db->Flush(o);
+  db->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  ASSERT_EQ(tmp_sum, counters->assert_get("c"));
  ASSERT_EQ(num_partial_merge_calls, 0U);
 }

 void testSingleBatchSuccessiveMerge(DB* db, size_t max_num_merges,
                                    size_t num_merges) {
-  ASSERT_GT(num_merges, max_num_merges);
+  assert(num_merges > max_num_merges);

  Slice key("BatchSuccessiveMerge");
  uint64_t merge_value = 1;
@@ -464,12 +462,15 @@ void testSingleBatchSuccessiveMerge(DB* db, size_t max_num_merges,
  // Create the batch
  WriteBatch batch;
  for (size_t i = 0; i < num_merges; ++i) {
-    ASSERT_OK(batch.Merge(key, merge_value_slice));
+    batch.Merge(key, merge_value_slice);
  }

  // Apply to memtable and count the number of merges
  resetNumMergeOperatorCalls();
-  ASSERT_OK(db->Write(WriteOptions(), &batch));
+  {
+    Status s = db->Write(WriteOptions(), &batch);
+    assert(s.ok());
+  }
  ASSERT_EQ(
      num_merge_operator_calls,
      static_cast<size_t>(num_merges - (num_merges % (max_num_merges + 1))));
@@ -477,7 +478,10 @@ void testSingleBatchSuccessiveMerge(DB* db, size_t max_num_merges,
  // Get the value
  resetNumMergeOperatorCalls();
  std::string get_value_str;
-  ASSERT_OK(db->Get(ReadOptions(), key, &get_value_str));
+  {
+    Status s = db->Get(ReadOptions(), key, &get_value_str);
+    assert(s.ok());
+  }
  assert(get_value_str.size() == sizeof(uint64_t));
  uint64_t get_value = DecodeFixed64(&get_value_str[0]);
  ASSERT_EQ(get_value, num_merges * merge_value);
@@ -501,7 +505,7 @@ void runTest(const std::string& dbname, const bool use_ttl = false) {
    }
  }

-  ASSERT_OK(DestroyDB(dbname, Options()));
+  DestroyDB(dbname, Options());

  {
    size_t max_merge = 5;
@@ -510,8 +514,7 @@ void runTest(const std::string& dbname, const bool use_ttl = false) {
    testCounters(counters, db.get(), use_compression);
    testSuccessiveMerge(counters, max_merge, max_merge * 2);
    testSingleBatchSuccessiveMerge(db.get(), 5, 7);
-    ASSERT_OK(db->Close());
-    ASSERT_OK(DestroyDB(dbname, Options()));
+    DestroyDB(dbname, Options());
  }

  {
@@ -522,16 +525,14 @@ void runTest(const std::string& dbname, const bool use_ttl = false) {
      auto db = OpenDb(dbname, use_ttl, max_merge);
      MergeBasedCounters counters(db, 0);
      testPartialMerge(&counters, db.get(), max_merge, min_merge, count);
-      ASSERT_OK(db->Close());
-      ASSERT_OK(DestroyDB(dbname, Options()));
+      DestroyDB(dbname, Options());
    }
    {
      auto db = OpenDb(dbname, use_ttl, max_merge);
      MergeBasedCounters counters(db, 0);
      testPartialMerge(&counters, db.get(), max_merge, min_merge,
                       min_merge * 10);
-      ASSERT_OK(db->Close());
-      ASSERT_OK(DestroyDB(dbname, Options()));
+      DestroyDB(dbname, Options());
    }
  }

@@ -542,15 +543,15 @@ void runTest(const std::string& dbname, const bool use_ttl = false) {
      counters.add("test-key", 1);
      counters.add("test-key", 1);
      counters.add("test-key", 1);
-      ASSERT_OK(db->CompactRange(CompactRangeOptions(), nullptr, nullptr));
+      db->CompactRange(CompactRangeOptions(), nullptr, nullptr);
    }

    DB* reopen_db;
    ASSERT_OK(DB::Open(Options(), dbname, &reopen_db));
    std::string value;
-    ASSERT_NOK(reopen_db->Get(ReadOptions(), "test-key", &value));
+    ASSERT_TRUE(!(reopen_db->Get(ReadOptions(), "test-key", &value).ok()));
    delete reopen_db;
-    ASSERT_OK(DestroyDB(dbname, Options()));
+    DestroyDB(dbname, Options());
  }

  /* Temporary remove this test
@@ -590,7 +591,7 @@ TEST_F(MergeTest, MergeWithCompactionAndFlush) {
      testCountersWithFlushAndCompaction(counters, db.get());
    }
  }
-  ASSERT_OK(DestroyDB(dbname, Options()));
+  DestroyDB(dbname, Options());
 }
 #endif  // !ROCKSDB_LITE

@@ -61,7 +61,7 @@ class ObsoleteFilesTest : public DBTestBase {
  void CheckFileTypeCounts(const std::string& dir, int required_log,
                           int required_sst, int required_manifest) {
    std::vector<std::string> filenames;
-    ASSERT_OK(env_->GetChildren(dir, &filenames));
+    env_->GetChildren(dir, &filenames);

    int log_cnt = 0;
    int sst_cnt = 0;
@@ -65,7 +65,7 @@ TEST_F(OptionsFileTest, NumberOfOptionsFiles) {
  const int kReopenCount = 20;
  Options opt;
  opt.create_if_missing = true;
-  ASSERT_OK(DestroyDB(dbname_, opt));
+  DestroyDB(dbname_, opt);
  std::unordered_set<std::string> filename_history;
  DB* db;
  for (int i = 0; i < kReopenCount; ++i) {
@@ -76,12 +76,12 @@ TEST_F(PerfContextTest, SeekIntoDeletion) {
    std::string key = "k" + ToString(i);
    std::string value = "v" + ToString(i);

-    ASSERT_OK(db->Put(write_options, key, value));
+    db->Put(write_options, key, value);
  }

  for (int i = 0; i < FLAGS_total_keys -1 ; ++i) {
    std::string key = "k" + ToString(i);
-    ASSERT_OK(db->Delete(write_options, key));
+    db->Delete(write_options, key);
  }

  HistogramImpl hist_get;
@@ -116,9 +116,10 @@ TEST_F(PerfContextTest, SeekIntoDeletion) {
    auto elapsed_nanos = timer.ElapsedNanos();

    if (FLAGS_verbose) {
-      std::cout << "SeekToFirst user key comparison: \n"
-                << hist_seek_to_first.ToString() << "ikey skipped: "
-                << get_perf_context()->internal_key_skipped_count << "\n"
+      std::cout << "SeekToFirst uesr key comparison: \n"
+                << hist_seek_to_first.ToString()
+                << "ikey skipped: " << get_perf_context()->internal_key_skipped_count
+                << "\n"
                << "idelete skipped: "
                << get_perf_context()->internal_delete_skipped_count << "\n"
                << "elapsed: " << elapsed_nanos << "\n";
@@ -155,7 +156,7 @@ TEST_F(PerfContextTest, SeekIntoDeletion) {
  }

  if (FLAGS_verbose) {
-    std::cout << "Seek user key comparison: \n" << hist_seek.ToString();
+    std::cout << "Seek uesr key comparison: \n" << hist_seek.ToString();
  }
 }

@@ -269,7 +270,7 @@ void ProfileQueries(bool enabled_time = false) {
    std::vector<std::string> values;

    get_perf_context()->Reset();
-    ASSERT_OK(db->Put(write_options, key, value));
+    db->Put(write_options, key, value);
    if (++num_mutex_waited > 3) {
 #ifndef NDEBUG
      ThreadStatusUtil::TEST_SetStateDelay(ThreadStatus::STATE_MUTEX_WAIT, 0U);
@@ -313,10 +314,7 @@ void ProfileQueries(bool enabled_time = false) {
    hist_get.Add(get_perf_context()->user_key_comparison_count);

    get_perf_context()->Reset();
-    auto statuses = db->MultiGet(read_options, multiget_keys, &values);
-    for (const auto& s : statuses) {
-      ASSERT_OK(s);
-    }
+    db->MultiGet(read_options, multiget_keys, &values);
    hist_mget_snapshot.Add(get_perf_context()->get_snapshot_time);
    hist_mget_memtable.Add(get_perf_context()->get_from_memtable_time);
    hist_mget_files.Add(get_perf_context()->get_from_output_files_time);
@@ -326,10 +324,9 @@ void ProfileQueries(bool enabled_time = false) {
  }

  if (FLAGS_verbose) {
-    std::cout << "Put user key comparison: \n"
-              << hist_put.ToString() << "Get user key comparison: \n"
-              << hist_get.ToString() << "MultiGet user key comparison: \n"
-              << hist_get.ToString();
+    std::cout << "Put uesr key comparison: \n" << hist_put.ToString()
+              << "Get uesr key comparison: \n" << hist_get.ToString()
+              << "MultiGet uesr key comparison: \n" << hist_get.ToString();
    std::cout << "Put(): Pre and Post Process Time: \n"
              << hist_write_pre_post.ToString() << " Writing WAL time: \n"
              << hist_write_wal_time.ToString() << "\n"
@@ -431,10 +428,7 @@ void ProfileQueries(bool enabled_time = false) {
    hist_get.Add(get_perf_context()->user_key_comparison_count);

    get_perf_context()->Reset();
-    auto statuses = db->MultiGet(read_options, multiget_keys, &values);
-    for (const auto& s : statuses) {
-      ASSERT_OK(s);
-    }
+    db->MultiGet(read_options, multiget_keys, &values);
    hist_mget_snapshot.Add(get_perf_context()->get_snapshot_time);
    hist_mget_memtable.Add(get_perf_context()->get_from_memtable_time);
    hist_mget_files.Add(get_perf_context()->get_from_output_files_time);
@@ -444,9 +438,8 @@ void ProfileQueries(bool enabled_time = false) {
  }

  if (FLAGS_verbose) {
-    std::cout << "ReadOnly Get user key comparison: \n"
-              << hist_get.ToString()
-              << "ReadOnly MultiGet user key comparison: \n"
+    std::cout << "ReadOnly Get uesr key comparison: \n" << hist_get.ToString()
+              << "ReadOnly MultiGet uesr key comparison: \n"
              << hist_mget.ToString();

    std::cout << "ReadOnly Get(): Time to get snapshot: \n"
@@ -546,7 +539,7 @@ TEST_F(PerfContextTest, SeekKeyComparison) {

    get_perf_context()->Reset();
    timer.Start();
-    ASSERT_OK(db->Put(write_options, key, value));
+    db->Put(write_options, key, value);
    auto put_time = timer.ElapsedNanos();
    hist_put_time.Add(put_time);
    hist_wal_time.Add(get_perf_context()->write_wal_time);
@@ -580,7 +573,7 @@ TEST_F(PerfContextTest, SeekKeyComparison) {
    iter->Next();
    hist_next.Add(get_perf_context()->user_key_comparison_count);
  }
-  ASSERT_OK(iter->status());
+
  if (FLAGS_verbose) {
    std::cout << "Seek:\n" << hist_seek.ToString() << "Next:\n"
              << hist_next.ToString();
@@ -842,7 +835,7 @@ TEST_F(PerfContextTest, CPUTimer) {
    std::string value = "v" + i_str;
    max_str = max_str > i_str ? max_str : i_str;

-    ASSERT_OK(db->Put(write_options, key, value));
+    db->Put(write_options, key, value);
  }
  std::string last_key = "k" + max_str;
  std::string last_value = "v" + max_str;
@@ -185,7 +185,7 @@ TEST_F(PeriodicWorkSchedulerTest, MultiInstances) {
  ASSERT_EQ(expected_run, pst_st_counter);

  for (int i = half; i < kInstanceNum; i++) {
-    ASSERT_OK(dbs[i]->Close());
+    dbs[i]->Close();
    delete dbs[i];
  }
 }
@@ -217,7 +217,7 @@ TEST_F(PeriodicWorkSchedulerTest, MultiEnv) {
  ASSERT_EQ(dbi->TEST_GetPeriodicWorkScheduler(),
            dbfull()->TEST_GetPeriodicWorkScheduler());

-  ASSERT_OK(db->Close());
+  db->Close();
  delete db;
  Close();
 }
@@ -49,9 +49,9 @@ TEST_F(PlainTableKeyDecoderTest, ReadNonMmap) {
  Slice contents(tmp);
  test::StringSource* string_source =
      new test::StringSource(contents, 0, false);
-  std::unique_ptr<FSRandomAccessFile> holder(string_source);
+
  std::unique_ptr<RandomAccessFileReader> file_reader(
-      new RandomAccessFileReader(std::move(holder), "test"));
+      test::GetRandomAccessFileReader(string_source));
  std::unique_ptr<PlainTableReaderFileInfo> file_info(
      new PlainTableReaderFileInfo(std::move(file_reader), EnvOptions(),
                                   kLength));
@@ -311,7 +311,7 @@ TEST(SamePrefixTest, InDomainTest) {
    ASSERT_OK(db->Put(write_options, "HHKB pro2", "Mar 24, 2006"));
    ASSERT_OK(db->Put(write_options, "HHKB pro2 Type-S", "June 29, 2011"));
    ASSERT_OK(db->Put(write_options, "Realforce 87u", "idk"));
-    ASSERT_OK(db->Flush(FlushOptions()));
+    db->Flush(FlushOptions());
    std::string result;
    auto db_iter = db->NewIterator(ReadOptions());

@@ -331,7 +331,7 @@ TEST(SamePrefixTest, InDomainTest) {
    ASSERT_OK(db->Put(write_options, "pikachu", "1"));
    ASSERT_OK(db->Put(write_options, "Meowth", "1"));
    ASSERT_OK(db->Put(write_options, "Mewtwo", "idk"));
-    ASSERT_OK(db->Flush(FlushOptions()));
+    db->Flush(FlushOptions());
    std::string result;
    auto db_iter = db->NewIterator(ReadOptions());

@@ -351,7 +351,7 @@ TEST_F(PrefixTest, TestResult) {
      std::cout << "*** Mem table: " << options.memtable_factory->Name()
                << " number of buckets: " << num_buckets
                << std::endl;
-      ASSERT_OK(DestroyDB(kDbName, Options()));
+      DestroyDB(kDbName, Options());
      auto db = OpenDb();
      WriteOptions write_options;
      ReadOptions read_options;
@@ -528,7 +528,7 @@ TEST_F(PrefixTest, PrefixValid) {
    while (NextOptions(num_buckets)) {
      std::cout << "*** Mem table: " << options.memtable_factory->Name()
                << " number of buckets: " << num_buckets << std::endl;
-      ASSERT_OK(DestroyDB(kDbName, Options()));
+      DestroyDB(kDbName, Options());
      auto db = OpenDb();
      WriteOptions write_options;
      ReadOptions read_options;
@@ -543,7 +543,7 @@ TEST_F(PrefixTest, PrefixValid) {
      PutKey(db.get(), write_options, 12345, 8, v18);
      PutKey(db.get(), write_options, 12345, 9, v19);
      PutKey(db.get(), write_options, 12346, 8, v16);
-      ASSERT_OK(db->Flush(FlushOptions()));
+      db->Flush(FlushOptions());
      TestKey test_key(12346, 8);
      std::string s;
      ASSERT_OK(db->Delete(write_options, TestKeyToSlice(s, test_key)));
@@ -581,7 +581,7 @@ TEST_F(PrefixTest, DynamicPrefixIterator) {
  while (NextOptions(FLAGS_bucket_count)) {
    std::cout << "*** Mem table: " << options.memtable_factory->Name()
        << std::endl;
-    ASSERT_OK(DestroyDB(kDbName, Options()));
+    DestroyDB(kDbName, Options());
    auto db = OpenDb();
    WriteOptions write_options;
    ReadOptions read_options;
@@ -689,7 +689,7 @@ TEST_F(PrefixTest, PrefixSeekModePrev) {
  for (size_t m = 1; m < 100; m++) {
    std::cout << "[" + std::to_string(m) + "]" + "*** Mem table: "
              << options.memtable_factory->Name() << std::endl;
-    ASSERT_OK(DestroyDB(kDbName, Options()));
+    DestroyDB(kDbName, Options());
    auto db = OpenDb();
    WriteOptions write_options;
    ReadOptions read_options;
@@ -714,7 +714,7 @@ TEST_F(PrefixTest, PrefixSeekModePrev) {
        }
      }
      if (i < 2) {
-        ASSERT_OK(db->Flush(FlushOptions()));
+        db->Flush(FlushOptions());
      }
    }

@@ -439,6 +439,7 @@ class Repairer {
        range_del_iters.emplace_back(range_del_iter);
      }

+      LegacyFileSystemWrapper fs(env_);
      IOStatus io_s;
      status = BuildTable(
          dbname_, /* versions */ nullptr, immutable_db_options_,
@@ -80,8 +80,8 @@ TEST_F(RepairTest, CorruptManifest) {
  Close();
  ASSERT_OK(env_->FileExists(manifest_path));

-  ASSERT_OK(CreateFile(env_->GetFileSystem(), manifest_path, "blah",
-                       false /* use_fsync */));
+  LegacyFileSystemWrapper fs(env_);
+  ASSERT_OK(CreateFile(&fs, manifest_path, "blah", false /* use_fsync */));
  ASSERT_OK(RepairDB(dbname_, CurrentOptions()));
  Reopen(CurrentOptions());

@@ -163,8 +163,8 @@ TEST_F(RepairTest, CorruptSst) {
  ASSERT_OK(GetFirstSstPath(&sst_path));
  ASSERT_FALSE(sst_path.empty());

-  ASSERT_OK(CreateFile(env_->GetFileSystem(), sst_path, "blah",
-                       false /* use_fsync */));
+  LegacyFileSystemWrapper fs(env_);
+  ASSERT_OK(CreateFile(&fs, sst_path, "blah", false /* use_fsync */));

  Close();
  ASSERT_OK(RepairDB(dbname_, CurrentOptions()));
@@ -13,6 +13,7 @@

 #include "db/db_impl/db_impl.h"
 #include "db/dbformat.h"
+#include "env/composite_env_wrapper.h"
 #include "file/sequence_file_reader.h"
 #include "file/writable_file_writer.h"
 #include "options/cf_options.h"
@@ -48,9 +49,10 @@ void MakeBuilder(const Options& options, const ImmutableCFOptions& ioptions,
                     int_tbl_prop_collector_factories,
                 std::unique_ptr<WritableFileWriter>* writable,
                 std::unique_ptr<TableBuilder>* builder) {
-  std::unique_ptr<FSWritableFile> wf(new test::StringSink);
+  std::unique_ptr<WritableFile> wf(new test::StringSink);
  writable->reset(
-      new WritableFileWriter(std::move(wf), "" /* don't care */, EnvOptions()));
+      new WritableFileWriter(NewLegacyWritableFileWrapper(std::move(wf)),
+                             "" /* don't care */, EnvOptions()));
  int unknown_level = -1;
  builder->reset(NewTableBuilder(
      ioptions, moptions, internal_comparator, int_tbl_prop_collector_factories,
@@ -284,13 +286,12 @@ void TestCustomizedTablePropertiesCollector(
  writer->Flush();

  // -- Step 2: Read properties
-  test::StringSink* fwf =
-      static_cast<test::StringSink*>(writer->writable_file());
-  std::unique_ptr<FSRandomAccessFile> source(
-      new test::StringSource(fwf->contents()));
+  LegacyWritableFileWrapper* file =
+      static_cast<LegacyWritableFileWrapper*>(writer->writable_file());
+  test::StringSink* fwf = static_cast<test::StringSink*>(file->target());
  std::unique_ptr<RandomAccessFileReader> fake_file_reader(
-      new RandomAccessFileReader(std::move(source), "test"));
-
+      test::GetRandomAccessFileReader(
+          new test::StringSource(fwf->contents())));
  TableProperties* props;
  Status s = ReadTableProperties(fake_file_reader.get(), fwf->contents().size(),
                                 magic_number, ioptions, &props,
@@ -426,13 +427,12 @@ void TestInternalKeyPropertiesCollector(
    ASSERT_OK(builder->Finish());
    writable->Flush();

-    test::StringSink* fwf =
-        static_cast<test::StringSink*>(writable->writable_file());
-    std::unique_ptr<FSRandomAccessFile> source(
-        new test::StringSource(fwf->contents()));
+    LegacyWritableFileWrapper* file =
+        static_cast<LegacyWritableFileWrapper*>(writable->writable_file());
+    test::StringSink* fwf = static_cast<test::StringSink*>(file->target());
    std::unique_ptr<RandomAccessFileReader> reader(
-        new RandomAccessFileReader(std::move(source), "test"));
-
+        test::GetRandomAccessFileReader(
+            new test::StringSource(fwf->contents())));
    TableProperties* props;
    Status s =
        ReadTableProperties(reader.get(), fwf->contents().size(), magic_number,
@@ -34,7 +34,7 @@ TransactionLogIteratorImpl::TransactionLogIteratorImpl(
      io_tracer_(io_tracer) {
  assert(files_ != nullptr);
  assert(versions_ != nullptr);
-  current_status_.PermitUncheckedError();  // Clear on start
+
  reporter_.env = options_->env;
  reporter_.info_log = options_->info_log.get();
  SeekToStartSequence(); // Seek till starting sequence
@@ -225,8 +225,7 @@ bool TransactionLogIteratorImpl::IsBatchExpected(

 void TransactionLogIteratorImpl::UpdateCurrentWriteBatch(const Slice& record) {
  std::unique_ptr<WriteBatch> batch(new WriteBatch());
-  Status s = WriteBatchInternal::SetContents(batch.get(), record);
-  s.PermitUncheckedError();  // TODO: What should we do with this error?
+  WriteBatchInternal::SetContents(batch.get(), record);

  SequenceNumber expected_seq = current_last_seq_ + 1;
  // If the iterator has started, then confirm that we get continuous batches
@@ -556,8 +556,7 @@ Status VersionEdit::DecodeFrom(const Slice& src) {
        break;
      }

-      case kBlobFileAddition:
-      case kBlobFileAddition_DEPRECATED: {
+      case kBlobFileAddition: {
        BlobFileAddition blob_file_addition;
        const Status s = blob_file_addition.DecodeFrom(&input);
        if (!s.ok()) {
@@ -568,8 +567,7 @@ Status VersionEdit::DecodeFrom(const Slice& src) {
        break;
      }

-      case kBlobFileGarbage:
-      case kBlobFileGarbage_DEPRECATED: {
+      case kBlobFileGarbage: {
        BlobFileGarbage blob_file_garbage;
        const Status s = blob_file_garbage.DecodeFrom(&input);
        if (!s.ok()) {
@@ -52,16 +52,13 @@ enum Tag : uint32_t {

  kInAtomicGroup = 300,

-  kBlobFileAddition = 400,
-  kBlobFileGarbage,
-
  // Mask for an unidentified tag from the future which can be safely ignored.
  kTagSafeIgnoreMask = 1 << 13,

  // Forward compatible (aka ignorable) records
  kDbId,
-  kBlobFileAddition_DEPRECATED,
-  kBlobFileGarbage_DEPRECATED,
+  kBlobFileAddition,
+  kBlobFileGarbage,
  kWalAddition,
  kWalDeletion,
  kFullHistoryTsLow,
@@ -98,18 +98,12 @@ Status ListColumnFamiliesHandler::ApplyVersionEdit(
 Status FileChecksumRetriever::ApplyVersionEdit(VersionEdit& edit,
                                               ColumnFamilyData** /*unused*/) {
  for (const auto& deleted_file : edit.GetDeletedFiles()) {
-    Status s = file_checksum_list_.RemoveOneFileChecksum(deleted_file.second);
-    if (!s.ok()) {
-      return s;
-    }
+    file_checksum_list_.RemoveOneFileChecksum(deleted_file.second);
  }
  for (const auto& new_file : edit.GetNewFiles()) {
-    Status s = file_checksum_list_.InsertOneFileChecksum(
+    file_checksum_list_.InsertOneFileChecksum(
        new_file.second.fd.GetNumber(), new_file.second.file_checksum,
        new_file.second.file_checksum_func_name);
-    if (!s.ok()) {
-      return s;
-    }
  }
  return Status::OK();
 }
@@ -1231,7 +1231,7 @@ TEST_F(VersionSetTest, WalEditsNotAppliedToVersion) {
      [&](void* arg) { versions.push_back(reinterpret_cast<Version*>(arg)); });
  SyncPoint::GetInstance()->EnableProcessing();

-  ASSERT_OK(LogAndApplyToDefaultCF(edits));
+  LogAndApplyToDefaultCF(edits);

  SyncPoint::GetInstance()->DisableProcessing();
  SyncPoint::GetInstance()->ClearAllCallBacks();
@@ -1267,7 +1267,7 @@ TEST_F(VersionSetTest, NonWalEditsAppliedToVersion) {
      [&](void* arg) { versions.push_back(reinterpret_cast<Version*>(arg)); });
  SyncPoint::GetInstance()->EnableProcessing();

-  ASSERT_OK(LogAndApplyToDefaultCF(edits));
+  LogAndApplyToDefaultCF(edits);

  SyncPoint::GetInstance()->DisableProcessing();
  SyncPoint::GetInstance()->ClearAllCallBacks();
@@ -1674,7 +1674,7 @@ TEST_F(VersionSetTest, AtomicGroupWithWalEdits) {
  edits.back()->MarkAtomicGroup(--remaining);
  ASSERT_EQ(remaining, 0);

-  ASSERT_OK(LogAndApplyToDefaultCF(edits));
+  Status s = LogAndApplyToDefaultCF(edits);

  // Recover a new VersionSet, the min log number and the last WAL should be
  // kept.
@@ -243,13 +243,9 @@ void WalManager::PurgeObsoleteWALFiles() {

  size_t files_del_num = log_files_num - files_keep_num;
  VectorLogPtr archived_logs;
-  s = GetSortedWalsOfType(archival_dir, archived_logs, kArchivedLogFile);
-  if (!s.ok()) {
-    ROCKS_LOG_WARN(db_options_.info_log,
-                   "Unable to get archived WALs from: %s: %s",
-                   archival_dir.c_str(), s.ToString().c_str());
-    files_del_num = 0;
-  } else if (files_del_num > archived_logs.size()) {
+  GetSortedWalsOfType(archival_dir, archived_logs, kArchivedLogFile);
+
+  if (files_del_num > archived_logs.size()) {
    ROCKS_LOG_WARN(db_options_.info_log,
                   "Trying to delete more archived log files than "
                   "exist. Deleting all");
@@ -47,7 +47,8 @@ class WalManagerTest : public testing::Test {
                                      std::numeric_limits<uint64_t>::max());
    db_options_.wal_dir = dbname_;
    db_options_.env = env_.get();
-    db_options_.fs = env_->GetFileSystem();
+    fs_.reset(new LegacyFileSystemWrapper(env_.get()));
+    db_options_.fs = fs_;

    versions_.reset(
        new VersionSet(dbname_, &db_options_, env_options_, table_cache_.get(),
@@ -68,10 +69,9 @@ class WalManagerTest : public testing::Test {
    assert(current_log_writer_.get() != nullptr);
    uint64_t seq =  versions_->LastSequence() + 1;
    WriteBatch batch;
-    ASSERT_OK(batch.Put(key, value));
+    batch.Put(key, value);
    WriteBatchInternal::SetSequence(&batch, seq);
-    ASSERT_OK(
-        current_log_writer_->AddRecord(WriteBatchInternal::Contents(&batch)));
+    current_log_writer_->AddRecord(WriteBatchInternal::Contents(&batch));
    versions_->SetLastAllocatedSequence(seq);
    versions_->SetLastPublishedSequence(seq);
    versions_->SetLastSequence(seq);
@@ -115,6 +115,7 @@ class WalManagerTest : public testing::Test {
  WriteBufferManager write_buffer_manager_;
  std::unique_ptr<VersionSet> versions_;
  std::unique_ptr<WalManager> wal_manager_;
+  std::shared_ptr<LegacyFileSystemWrapper> fs_;

  std::unique_ptr<log::Writer> current_log_writer_;
  uint64_t current_log_number_;
@@ -139,9 +140,9 @@ TEST_F(WalManagerTest, ReadFirstRecordCache) {
  log::Writer writer(std::move(file_writer), 1,
                     db_options_.recycle_log_file_num > 0);
  WriteBatch batch;
-  ASSERT_OK(batch.Put("foo", "bar"));
+  batch.Put("foo", "bar");
  WriteBatchInternal::SetSequence(&batch, 10);
-  ASSERT_OK(writer.AddRecord(WriteBatchInternal::Contents(&batch)));
+  writer.AddRecord(WriteBatchInternal::Contents(&batch));

  // TODO(icanadi) move SpecialEnv outside of db_test, so we can reuse it here.
  // Waiting for lei to finish with db_test
@@ -166,14 +167,14 @@ namespace {
 uint64_t GetLogDirSize(std::string dir_path, Env* env) {
  uint64_t dir_size = 0;
  std::vector<std::string> files;
-  EXPECT_OK(env->GetChildren(dir_path, &files));
+  env->GetChildren(dir_path, &files);
  for (auto& f : files) {
    uint64_t number;
    FileType type;
    if (ParseFileName(f, &number, &type) && type == kWalFile) {
      std::string const file_path = dir_path + "/" + f;
      uint64_t file_size;
-      EXPECT_OK(env->GetFileSize(file_path, &file_size));
+      env->GetFileSize(file_path, &file_size);
      dir_size += file_size;
    }
  }
@@ -183,9 +184,9 @@ std::vector<std::uint64_t> ListSpecificFiles(
    Env* env, const std::string& path, const FileType expected_file_type) {
  std::vector<std::string> files;
  std::vector<uint64_t> file_numbers;
+  env->GetChildren(path, &files);
  uint64_t number;
  FileType type;
-  EXPECT_OK(env->GetChildren(path, &files));
  for (size_t i = 0; i < files.size(); ++i) {
    if (ParseFileName(files[i], &number, &type)) {
      if (type == expected_file_type) {
@@ -208,7 +209,6 @@ int CountRecords(TransactionLogIterator* iter) {
    EXPECT_OK(iter->status());
    iter->Next();
  }
-  EXPECT_OK(iter->status());
  return count;
 }
 }  // namespace
@@ -111,7 +111,7 @@ TEST_P(WriteCallbackPTest, WriteWithCallbackTest) {

    void Put(const string& key, const string& val) {
      kvs_.push_back(std::make_pair(key, val));
-      ASSERT_OK(write_batch_.Put(key, val));
+      write_batch_.Put(key, val);
    }

    void Clear() {
@@ -319,7 +319,7 @@ TEST_P(WriteCallbackPTest, WriteWithCallbackTest) {
          DBImpl* db_impl_;
        } publish_seq_callback(db_impl);
        // seq_per_batch_ requires a natural batch separator or Noop
-        ASSERT_OK(WriteBatchInternal::InsertNoop(&write_op.write_batch_));
+        WriteBatchInternal::InsertNoop(&write_op.write_batch_);
        const size_t ONE_BATCH = 1;
        s = db_impl->WriteImpl(woptions, &write_op.write_batch_,
                               &write_op.callback_, nullptr, 0, false, nullptr,
@@ -396,8 +396,8 @@ TEST_F(WriteCallbackTest, WriteCallBackTest) {

  WriteBatch wb;

-  ASSERT_OK(wb.Put("a", "value.a"));
-  ASSERT_OK(wb.Delete("x"));
+  wb.Put("a", "value.a");
+  wb.Delete("x");

  // Test a simple Write
  s = db->Write(write_options, &wb);
@@ -411,7 +411,7 @@ TEST_F(WriteCallbackTest, WriteCallBackTest) {
  WriteCallbackTestWriteCallback1 callback1;
  WriteBatch wb2;

-  ASSERT_OK(wb2.Put("a", "value.a2"));
+  wb2.Put("a", "value.a2");

  s = db_impl->WriteWithCallback(write_options, &wb2, &callback1);
  ASSERT_OK(s);
@@ -425,7 +425,7 @@ TEST_F(WriteCallbackTest, WriteCallBackTest) {
  WriteCallbackTestWriteCallback2 callback2;
  WriteBatch wb3;

-  ASSERT_OK(wb3.Put("a", "value.a3"));
+  wb3.Put("a", "value.a3");

  s = db_impl->WriteWithCallback(write_options, &wb3, &callback2);
  ASSERT_NOK(s);
@@ -472,7 +472,7 @@ Status StressTest::NewTxn(WriteOptions& write_opts, Transaction** txn) {
  }
  static std::atomic<uint64_t> txn_id = {0};
  TransactionOptions txn_options;
-  txn_options.lock_timeout = 600000;  // 10 min
+  txn_options.lock_timeout = 60000;  // 1min
  txn_options.deadlock_detect = true;
  *txn = txn_db_->BeginTransaction(write_opts, txn_options);
  auto istr = std::to_string(txn_id.fetch_add(1));
@@ -1505,11 +1505,11 @@ Status StressTest::TestCheckpoint(ThreadState* thread,
      }
    }
  }
-  delete checkpoint;
-  checkpoint = nullptr;
  std::vector<ColumnFamilyHandle*> cf_handles;
  DB* checkpoint_db = nullptr;
  if (s.ok()) {
+    delete checkpoint;
+    checkpoint = nullptr;
    Options options(options_);
    options.listeners.clear();
    std::vector<ColumnFamilyDescriptor> cf_descs;
@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-gem 'github-pages', '~> 209'
-
-gem "webrick", "~> 1.7"
+gem 'github-pages', '~> 207'
@@ -1,7 +1,7 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (6.0.3.4)
+    activesupport (6.0.3.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
@@ -17,40 +17,37 @@ GEM
    commonmarker (0.17.13)
      ruby-enum (~> 0.5)
    concurrent-ruby (1.1.7)
-    dnsruby (1.61.5)
+    dnsruby (1.61.4)
      simpleidn (~> 0.1)
-    em-websocket (0.5.2)
+    em-websocket (0.5.1)
      eventmachine (>= 0.12.9)
      http_parser.rb (~> 0.6.0)
    ethon (0.12.0)
      ffi (>= 1.3.0)
    eventmachine (1.2.7)
    execjs (2.7.0)
-    faraday (1.3.0)
-      faraday-net_http (~> 1.0)
+    faraday (1.0.1)
      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-net_http (1.0.0)
-    ffi (1.14.2)
+    ffi (1.13.1)
    forwardable-extended (2.6.0)
    gemoji (3.0.1)
-    github-pages (209)
+    github-pages (207)
      github-pages-health-check (= 1.16.1)
      jekyll (= 3.9.0)
      jekyll-avatar (= 0.7.0)
      jekyll-coffeescript (= 1.1.1)
      jekyll-commonmark-ghpages (= 0.1.6)
      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
+      jekyll-feed (= 0.13.0)
      jekyll-gist (= 1.5.0)
      jekyll-github-metadata (= 2.13.0)
-      jekyll-mentions (= 1.6.0)
+      jekyll-mentions (= 1.5.1)
      jekyll-optional-front-matter (= 0.3.2)
      jekyll-paginate (= 1.1.0)
      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.16.0)
+      jekyll-redirect-from (= 0.15.0)
      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.2)
+      jekyll-remote-theme (= 0.4.1)
      jekyll-sass-converter (= 1.5.2)
      jekyll-seo-tag (= 2.6.1)
      jekyll-sitemap (= 1.4.0)
@@ -58,7 +55,7 @@ GEM
      jekyll-theme-architect (= 0.1.1)
      jekyll-theme-cayman (= 0.1.1)
      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.2)
+      jekyll-theme-hacker (= 0.1.1)
      jekyll-theme-leap-day (= 0.1.1)
      jekyll-theme-merlot (= 0.1.1)
      jekyll-theme-midnight (= 0.1.1)
@@ -69,14 +66,14 @@ GEM
      jekyll-theme-tactile (= 0.1.1)
      jekyll-theme-time-machine (= 0.1.1)
      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
+      jemoji (= 0.11.1)
      kramdown (= 2.3.0)
      kramdown-parser-gfm (= 1.1.0)
      liquid (= 4.0.3)
      mercenary (~> 0.3)
      minima (= 2.5.1)
      nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 3.23.0)
+      rouge (= 3.19.0)
      terminal-table (~> 1.4)
    github-pages-health-check (1.16.1)
      addressable (~> 2.3)
@@ -84,7 +81,7 @@ GEM
      octokit (~> 4.0)
      public_suffix (~> 3.0)
      typhoeus (~> 1.3)
-    html-pipeline (2.14.0)
+    html-pipeline (2.13.0)
      activesupport (>= 2)
      nokogiri (>= 1.4)
    http_parser.rb (0.6.0)
@@ -117,14 +114,14 @@ GEM
      rouge (>= 2.0, < 4.0)
    jekyll-default-layout (0.1.4)
      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
+    jekyll-feed (0.13.0)
      jekyll (>= 3.7, < 5.0)
    jekyll-gist (1.5.0)
      octokit (~> 4.2)
    jekyll-github-metadata (2.13.0)
      jekyll (>= 3.4, < 5.0)
      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.6.0)
+    jekyll-mentions (1.5.1)
      html-pipeline (~> 2.3)
      jekyll (>= 3.7, < 5.0)
    jekyll-optional-front-matter (0.3.2)
@@ -132,15 +129,14 @@ GEM
    jekyll-paginate (1.1.0)
    jekyll-readme-index (0.3.0)
      jekyll (>= 3.0, < 5.0)
-    jekyll-redirect-from (0.16.0)
+    jekyll-redirect-from (0.15.0)
      jekyll (>= 3.3, < 5.0)
    jekyll-relative-links (0.6.1)
      jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.2)
+    jekyll-remote-theme (0.4.1)
      addressable (~> 2.0)
      jekyll (>= 3.5, < 5.0)
-      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
-      rubyzip (>= 1.3.0, < 3.0)
+      rubyzip (>= 1.3.0)
    jekyll-sass-converter (1.5.2)
      sass (~> 3.4)
    jekyll-seo-tag (2.6.1)
@@ -157,8 +153,8 @@ GEM
    jekyll-theme-dinky (0.1.1)
      jekyll (~> 3.5)
      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.2)
-      jekyll (> 3.5, < 5.0)
+    jekyll-theme-hacker (0.1.1)
+      jekyll (~> 3.5)
      jekyll-seo-tag (~> 2.0)
    jekyll-theme-leap-day (0.1.1)
      jekyll (~> 3.5)
@@ -192,7 +188,7 @@ GEM
      jekyll (>= 3.3, < 5.0)
    jekyll-watch (2.2.1)
      listen (~> 3.0)
-    jemoji (0.12.0)
+    jemoji (0.11.1)
      gemoji (~> 3.0)
      html-pipeline (~> 2.2)
      jekyll (>= 3.0, < 5.0)
@@ -201,35 +197,32 @@ GEM
    kramdown-parser-gfm (1.1.0)
      kramdown (~> 2.0)
    liquid (4.0.3)
-    listen (3.4.0)
+    listen (3.2.1)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    mercenary (0.3.6)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.4.0)
    minima (2.5.1)
      jekyll (>= 3.5, < 5.0)
      jekyll-feed (~> 0.9)
      jekyll-seo-tag (~> 2.1)
-    minitest (5.14.3)
+    minitest (5.14.1)
    multipart-post (2.1.1)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    octokit (4.20.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    octokit (4.18.0)
      faraday (>= 0.9)
      sawyer (~> 0.8.0, >= 0.5.3)
    pathutil (0.16.2)
      forwardable-extended (~> 2.6)
    public_suffix (3.1.1)
-    racc (1.5.2)
    rb-fsevent (0.10.4)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    rexml (3.2.4)
-    rouge (3.23.0)
+    rouge (3.19.0)
    ruby-enum (0.8.0)
      i18n
-    ruby2_keywords (0.0.2)
    rubyzip (2.3.0)
    safe_yaml (1.0.5)
    sass (3.7.4)
@@ -247,21 +240,19 @@ GEM
    thread_safe (0.3.6)
    typhoeus (1.4.0)
      ethon (>= 0.9.0)
-    tzinfo (1.2.9)
+    tzinfo (1.2.7)
      thread_safe (~> 0.1)
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.7.7)
    unicode-display_width (1.7.0)
-    webrick (1.7.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.4.0)

 PLATFORMS
  ruby

 DEPENDENCIES
-  github-pages (~> 209)
-  webrick (~> 1.7)
+  github-pages (~> 207)

 BUNDLED WITH
-   2.2.3
+   2.1.4
@@ -8,13 +8,6 @@
 #include "rocksdb/env.h"
 #include "rocksdb/file_system.h"

-#ifdef _WIN32
-// Windows API macro interference
-#undef DeleteFile
-#undef GetCurrentTime
-#undef LoadLibrary
-#endif
-
 namespace ROCKSDB_NAMESPACE {

 // The CompositeEnvWrapper class provides an interface that is compatible
@@ -278,11 +271,16 @@ class CompositeDirectoryWrapper : public Directory {
  std::unique_ptr<FSDirectory> target_;
 };

-class CompositeEnv : public Env {
+class CompositeEnvWrapper : public Env {
 public:
  // Initialize a CompositeEnvWrapper that delegates all thread/time related
  // calls to env, and all file operations to fs
-  explicit CompositeEnv(const std::shared_ptr<FileSystem>& fs) : Env(fs) {}
+  explicit CompositeEnvWrapper(Env* env, std::shared_ptr<FileSystem> fs)
+      : Env(fs), env_target_(env) {}
+  ~CompositeEnvWrapper() {}
+
+  // Return the target to which this Env forwards all calls
+  Env* env_target() const { return env_target_; }

  Status RegisterDbPaths(const std::vector<std::string>& paths) override {
    return file_system_->RegisterDbPaths(paths);
@@ -500,66 +498,6 @@ class CompositeEnv : public Env {
    return file_system_->IsDirectory(path, io_opts, is_dir, &dbg);
  }

-  Status GetTestDirectory(std::string* path) override {
-    IOOptions io_opts;
-    IODebugContext dbg;
-    return file_system_->GetTestDirectory(io_opts, path, &dbg);
-  }
-
-  EnvOptions OptimizeForLogRead(const EnvOptions& env_options) const override {
-    return file_system_->OptimizeForLogRead(FileOptions(env_options));
-  }
-
-  EnvOptions OptimizeForManifestRead(
-      const EnvOptions& env_options) const override {
-    return file_system_->OptimizeForManifestRead(FileOptions(env_options));
-  }
-
-  EnvOptions OptimizeForLogWrite(const EnvOptions& env_options,
-                                 const DBOptions& db_options) const override {
-    return file_system_->OptimizeForLogWrite(FileOptions(env_options),
-                                             db_options);
-  }
-
-  EnvOptions OptimizeForManifestWrite(
-      const EnvOptions& env_options) const override {
-    return file_system_->OptimizeForManifestWrite(FileOptions(env_options));
-  }
-
-  EnvOptions OptimizeForCompactionTableWrite(
-      const EnvOptions& env_options,
-      const ImmutableDBOptions& immutable_ops) const override {
-    return file_system_->OptimizeForCompactionTableWrite(
-        FileOptions(env_options), immutable_ops);
-  }
-  EnvOptions OptimizeForCompactionTableRead(
-      const EnvOptions& env_options,
-      const ImmutableDBOptions& db_options) const override {
-    return file_system_->OptimizeForCompactionTableRead(
-        FileOptions(env_options), db_options);
-  }
-
-  // This seems to clash with a macro on Windows, so #undef it here
-#ifdef GetFreeSpace
-#undef GetFreeSpace
-#endif
-  Status GetFreeSpace(const std::string& path, uint64_t* diskfree) override {
-    IOOptions io_opts;
-    IODebugContext dbg;
-    return file_system_->GetFreeSpace(path, io_opts, diskfree, &dbg);
-  }
-};
-
-class CompositeEnvWrapper : public CompositeEnv {
- public:
-  // Initialize a CompositeEnvWrapper that delegates all thread/time related
-  // calls to env, and all file operations to fs
-  explicit CompositeEnvWrapper(Env* env, const std::shared_ptr<FileSystem>& fs)
-      : CompositeEnv(fs), env_target_(env) {}
-
-  // Return the target to which this Env forwards all calls
-  Env* env_target() const { return env_target_; }
-
 #if !defined(OS_WIN) && !defined(ROCKSDB_NO_DYNAMIC_EXTENSION)
  Status LoadLibrary(const std::string& lib_name,
                     const std::string& search_path,
@@ -584,7 +522,11 @@ class CompositeEnvWrapper : public CompositeEnv {
  unsigned int GetThreadPoolQueueLen(Priority pri = LOW) const override {
    return env_target_->GetThreadPoolQueueLen(pri);
  }
-
+  Status GetTestDirectory(std::string* path) override {
+    IOOptions io_opts;
+    IODebugContext dbg;
+    return file_system_->GetTestDirectory(io_opts, path, &dbg);
+  }
  uint64_t NowMicros() override { return env_target_->NowMicros(); }
  uint64_t NowNanos() override { return env_target_->NowNanos(); }
  uint64_t NowCPUNanos() override { return env_target_->NowCPUNanos(); }
@@ -643,6 +585,45 @@ class CompositeEnvWrapper : public CompositeEnv {
    return env_target_->GenerateUniqueId();
  }

+  EnvOptions OptimizeForLogRead(const EnvOptions& env_options) const override {
+    return file_system_->OptimizeForLogRead(FileOptions(env_options));
+  }
+  EnvOptions OptimizeForManifestRead(
+      const EnvOptions& env_options) const override {
+    return file_system_->OptimizeForManifestRead(FileOptions(env_options));
+  }
+  EnvOptions OptimizeForLogWrite(const EnvOptions& env_options,
+                                 const DBOptions& db_options) const override {
+    return file_system_->OptimizeForLogWrite(FileOptions(env_options),
+                                             db_options);
+  }
+  EnvOptions OptimizeForManifestWrite(
+      const EnvOptions& env_options) const override {
+    return file_system_->OptimizeForManifestWrite(FileOptions(env_options));
+  }
+  EnvOptions OptimizeForCompactionTableWrite(
+      const EnvOptions& env_options,
+      const ImmutableDBOptions& immutable_ops) const override {
+    return file_system_->OptimizeForCompactionTableWrite(
+        FileOptions(env_options), immutable_ops);
+  }
+  EnvOptions OptimizeForCompactionTableRead(
+      const EnvOptions& env_options,
+      const ImmutableDBOptions& db_options) const override {
+    return file_system_->OptimizeForCompactionTableRead(
+        FileOptions(env_options), db_options);
+  }
+
+  // This seems to clash with a macro on Windows, so #undef it here
+#ifdef GetFreeSpace
+#undef GetFreeSpace
+#endif
+  Status GetFreeSpace(const std::string& path, uint64_t* diskfree) override {
+    IOOptions io_opts;
+    IODebugContext dbg;
+    return file_system_->GetFreeSpace(path, io_opts, diskfree, &dbg);
+  }
+
 private:
  Env* env_target_;
 };
@@ -899,6 +880,249 @@ class LegacyDirectoryWrapper : public FSDirectory {
  std::unique_ptr<Directory> target_;
 };

+class LegacyFileSystemWrapper : public FileSystem {
+ public:
+  // Initialize an EnvWrapper that delegates all calls to *t
+  explicit LegacyFileSystemWrapper(Env* t) : target_(t) {}
+  ~LegacyFileSystemWrapper() override {}
+
+  const char* Name() const override { return "Legacy File System"; }
+
+  // Return the target to which this Env forwards all calls
+  Env* target() const { return target_; }
+
+  // The following text is boilerplate that forwards all methods to target()
+  IOStatus NewSequentialFile(const std::string& f,
+                             const FileOptions& file_opts,
+                             std::unique_ptr<FSSequentialFile>* r,
+                             IODebugContext* /*dbg*/) override {
+    std::unique_ptr<SequentialFile> file;
+    Status s = target_->NewSequentialFile(f, &file, file_opts);
+    if (s.ok()) {
+      r->reset(new LegacySequentialFileWrapper(std::move(file)));
+    }
+    return status_to_io_status(std::move(s));
+  }
+  IOStatus NewRandomAccessFile(const std::string& f,
+      const FileOptions& file_opts,
+                               std::unique_ptr<FSRandomAccessFile>* r,
+                               IODebugContext* /*dbg*/) override {
+    std::unique_ptr<RandomAccessFile> file;
+    Status s = target_->NewRandomAccessFile(f, &file, file_opts);
+    if (s.ok()) {
+      r->reset(new LegacyRandomAccessFileWrapper(std::move(file)));
+    }
+    return status_to_io_status(std::move(s));
+  }
+  IOStatus NewWritableFile(const std::string& f, const FileOptions& file_opts,
+                           std::unique_ptr<FSWritableFile>* r,
+                           IODebugContext* /*dbg*/) override {
+    std::unique_ptr<WritableFile> file;
+    Status s = target_->NewWritableFile(f, &file, file_opts);
+    if (s.ok()) {
+      r->reset(new LegacyWritableFileWrapper(std::move(file)));
+    }
+    return status_to_io_status(std::move(s));
+  }
+  IOStatus ReopenWritableFile(const std::string& fname,
+                              const FileOptions& file_opts,
+                              std::unique_ptr<FSWritableFile>* result,
+                              IODebugContext* /*dbg*/) override {
+    std::unique_ptr<WritableFile> file;
+    Status s = target_->ReopenWritableFile(fname, &file, file_opts);
+    if (s.ok()) {
+      result->reset(new LegacyWritableFileWrapper(std::move(file)));
+    }
+    return status_to_io_status(std::move(s));
+  }
+  IOStatus ReuseWritableFile(const std::string& fname,
+                             const std::string& old_fname,
+                             const FileOptions& file_opts,
+                             std::unique_ptr<FSWritableFile>* r,
+                             IODebugContext* /*dbg*/) override {
+    std::unique_ptr<WritableFile> file;
+    Status s = target_->ReuseWritableFile(fname, old_fname, &file, file_opts);
+    if (s.ok()) {
+      r->reset(new LegacyWritableFileWrapper(std::move(file)));
+    }
+    return status_to_io_status(std::move(s));
+  }
+  IOStatus NewRandomRWFile(const std::string& fname,
+      const FileOptions& file_opts,
+                           std::unique_ptr<FSRandomRWFile>* result,
+                           IODebugContext* /*dbg*/) override {
+    std::unique_ptr<RandomRWFile> file;
+    Status s = target_->NewRandomRWFile(fname, &file, file_opts);
+    if (s.ok()) {
+      result->reset(new LegacyRandomRWFileWrapper(std::move(file)));
+    }
+    return status_to_io_status(std::move(s));
+  }
+  IOStatus NewMemoryMappedFileBuffer(
+      const std::string& fname,
+      std::unique_ptr<MemoryMappedFileBuffer>* result) override {
+    return status_to_io_status(
+        target_->NewMemoryMappedFileBuffer(fname, result));
+  }
+  IOStatus NewDirectory(const std::string& name, const IOOptions& /*io_opts*/,
+                        std::unique_ptr<FSDirectory>* result,
+                        IODebugContext* /*dbg*/) override {
+    std::unique_ptr<Directory> dir;
+    Status s = target_->NewDirectory(name, &dir);
+    if (s.ok()) {
+      result->reset(new LegacyDirectoryWrapper(std::move(dir)));
+    }
+    return status_to_io_status(std::move(s));
+  }
+  IOStatus FileExists(const std::string& f, const IOOptions& /*io_opts*/,
+                      IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->FileExists(f));
+  }
+  IOStatus GetChildren(const std::string& dir, const IOOptions& /*io_opts*/,
+                       std::vector<std::string>* r,
+                       IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->GetChildren(dir, r));
+  }
+  IOStatus GetChildrenFileAttributes(const std::string& dir,
+                                     const IOOptions& /*options*/,
+                                     std::vector<FileAttributes>* result,
+                                     IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->GetChildrenFileAttributes(dir, result));
+  }
+  IOStatus DeleteFile(const std::string& f, const IOOptions& /*options*/,
+                      IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->DeleteFile(f));
+  }
+  IOStatus Truncate(const std::string& fname, size_t size,
+                    const IOOptions& /*options*/,
+                    IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->Truncate(fname, size));
+  }
+  IOStatus CreateDir(const std::string& d, const IOOptions& /*options*/,
+                     IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->CreateDir(d));
+  }
+  IOStatus CreateDirIfMissing(const std::string& d,
+                              const IOOptions& /*options*/,
+                              IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->CreateDirIfMissing(d));
+  }
+  IOStatus DeleteDir(const std::string& d, const IOOptions& /*options*/,
+                     IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->DeleteDir(d));
+  }
+  IOStatus GetFileSize(const std::string& f, const IOOptions& /*options*/,
+                       uint64_t* s, IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->GetFileSize(f, s));
+  }
+
+  IOStatus GetFileModificationTime(const std::string& fname,
+                                   const IOOptions& /*options*/,
+                                   uint64_t* file_mtime,
+                                   IODebugContext* /*dbg*/) override {
+    return status_to_io_status(
+        target_->GetFileModificationTime(fname, file_mtime));
+  }
+
+  IOStatus GetAbsolutePath(const std::string& db_path,
+                           const IOOptions& /*options*/,
+                           std::string* output_path,
+                           IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->GetAbsolutePath(db_path, output_path));
+  }
+
+  IOStatus RenameFile(const std::string& s, const std::string& t,
+                      const IOOptions& /*options*/,
+                      IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->RenameFile(s, t));
+  }
+
+  IOStatus LinkFile(const std::string& s, const std::string& t,
+                    const IOOptions& /*options*/,
+                    IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->LinkFile(s, t));
+  }
+
+  IOStatus NumFileLinks(const std::string& fname, const IOOptions& /*options*/,
+                        uint64_t* count, IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->NumFileLinks(fname, count));
+  }
+
+  IOStatus AreFilesSame(const std::string& first, const std::string& second,
+                        const IOOptions& /*options*/, bool* res,
+                        IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->AreFilesSame(first, second, res));
+  }
+
+  IOStatus LockFile(const std::string& f, const IOOptions& /*options*/,
+                    FileLock** l, IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->LockFile(f, l));
+  }
+
+  IOStatus UnlockFile(FileLock* l, const IOOptions& /*options*/,
+                      IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->UnlockFile(l));
+  }
+
+  IOStatus GetTestDirectory(const IOOptions& /*options*/, std::string* path,
+                            IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->GetTestDirectory(path));
+  }
+  IOStatus NewLogger(const std::string& fname, const IOOptions& /*options*/,
+                     std::shared_ptr<Logger>* result,
+                     IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->NewLogger(fname, result));
+  }
+
+  void SanitizeFileOptions(FileOptions* opts) const override {
+    target_->SanitizeEnvOptions(opts);
+  }
+
+  FileOptions OptimizeForLogRead(
+                  const FileOptions& file_options) const override {
+    return target_->OptimizeForLogRead(file_options);
+  }
+  FileOptions OptimizeForManifestRead(
+      const FileOptions& file_options) const override {
+    return target_->OptimizeForManifestRead(file_options);
+  }
+  FileOptions OptimizeForLogWrite(const FileOptions& file_options,
+                                 const DBOptions& db_options) const override {
+    return target_->OptimizeForLogWrite(file_options, db_options);
+  }
+  FileOptions OptimizeForManifestWrite(
+      const FileOptions& file_options) const override {
+    return target_->OptimizeForManifestWrite(file_options);
+  }
+  FileOptions OptimizeForCompactionTableWrite(
+      const FileOptions& file_options,
+      const ImmutableDBOptions& immutable_ops) const override {
+    return target_->OptimizeForCompactionTableWrite(file_options,
+                                                     immutable_ops);
+  }
+  FileOptions OptimizeForCompactionTableRead(
+      const FileOptions& file_options,
+      const ImmutableDBOptions& db_options) const override {
+    return target_->OptimizeForCompactionTableRead(file_options, db_options);
+  }
+
+// This seems to clash with a macro on Windows, so #undef it here
+#ifdef GetFreeSpace
+#undef GetFreeSpace
+#endif
+  IOStatus GetFreeSpace(const std::string& path, const IOOptions& /*options*/,
+                        uint64_t* diskfree, IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->GetFreeSpace(path, diskfree));
+  }
+  IOStatus IsDirectory(const std::string& path, const IOOptions& /*options*/,
+                       bool* is_dir, IODebugContext* /*dbg*/) override {
+    return status_to_io_status(target_->IsDirectory(path, is_dir));
+  }
+
+ private:
+  Env* target_;
+};
+
 inline std::unique_ptr<FSSequentialFile> NewLegacySequentialFileWrapper(
    std::unique_ptr<SequentialFile>& file) {
  return std::unique_ptr<FSSequentialFile>(
@@ -20,248 +20,6 @@
 #include "util/autovector.h"

 namespace ROCKSDB_NAMESPACE {
-namespace {
-class LegacyFileSystemWrapper : public FileSystem {
- public:
-  // Initialize an EnvWrapper that delegates all calls to *t
-  explicit LegacyFileSystemWrapper(Env* t) : target_(t) {}
-  ~LegacyFileSystemWrapper() override {}
-
-  const char* Name() const override { return "Legacy File System"; }
-
-  // Return the target to which this Env forwards all calls
-  Env* target() const { return target_; }
-
-  // The following text is boilerplate that forwards all methods to target()
-  IOStatus NewSequentialFile(const std::string& f, const FileOptions& file_opts,
-                             std::unique_ptr<FSSequentialFile>* r,
-                             IODebugContext* /*dbg*/) override {
-    std::unique_ptr<SequentialFile> file;
-    Status s = target_->NewSequentialFile(f, &file, file_opts);
-    if (s.ok()) {
-      r->reset(new LegacySequentialFileWrapper(std::move(file)));
-    }
-    return status_to_io_status(std::move(s));
-  }
-  IOStatus NewRandomAccessFile(const std::string& f,
-                               const FileOptions& file_opts,
-                               std::unique_ptr<FSRandomAccessFile>* r,
-                               IODebugContext* /*dbg*/) override {
-    std::unique_ptr<RandomAccessFile> file;
-    Status s = target_->NewRandomAccessFile(f, &file, file_opts);
-    if (s.ok()) {
-      r->reset(new LegacyRandomAccessFileWrapper(std::move(file)));
-    }
-    return status_to_io_status(std::move(s));
-  }
-  IOStatus NewWritableFile(const std::string& f, const FileOptions& file_opts,
-                           std::unique_ptr<FSWritableFile>* r,
-                           IODebugContext* /*dbg*/) override {
-    std::unique_ptr<WritableFile> file;
-    Status s = target_->NewWritableFile(f, &file, file_opts);
-    if (s.ok()) {
-      r->reset(new LegacyWritableFileWrapper(std::move(file)));
-    }
-    return status_to_io_status(std::move(s));
-  }
-  IOStatus ReopenWritableFile(const std::string& fname,
-                              const FileOptions& file_opts,
-                              std::unique_ptr<FSWritableFile>* result,
-                              IODebugContext* /*dbg*/) override {
-    std::unique_ptr<WritableFile> file;
-    Status s = target_->ReopenWritableFile(fname, &file, file_opts);
-    if (s.ok()) {
-      result->reset(new LegacyWritableFileWrapper(std::move(file)));
-    }
-    return status_to_io_status(std::move(s));
-  }
-  IOStatus ReuseWritableFile(const std::string& fname,
-                             const std::string& old_fname,
-                             const FileOptions& file_opts,
-                             std::unique_ptr<FSWritableFile>* r,
-                             IODebugContext* /*dbg*/) override {
-    std::unique_ptr<WritableFile> file;
-    Status s = target_->ReuseWritableFile(fname, old_fname, &file, file_opts);
-    if (s.ok()) {
-      r->reset(new LegacyWritableFileWrapper(std::move(file)));
-    }
-    return status_to_io_status(std::move(s));
-  }
-  IOStatus NewRandomRWFile(const std::string& fname,
-                           const FileOptions& file_opts,
-                           std::unique_ptr<FSRandomRWFile>* result,
-                           IODebugContext* /*dbg*/) override {
-    std::unique_ptr<RandomRWFile> file;
-    Status s = target_->NewRandomRWFile(fname, &file, file_opts);
-    if (s.ok()) {
-      result->reset(new LegacyRandomRWFileWrapper(std::move(file)));
-    }
-    return status_to_io_status(std::move(s));
-  }
-  IOStatus NewMemoryMappedFileBuffer(
-      const std::string& fname,
-      std::unique_ptr<MemoryMappedFileBuffer>* result) override {
-    return status_to_io_status(
-        target_->NewMemoryMappedFileBuffer(fname, result));
-  }
-  IOStatus NewDirectory(const std::string& name, const IOOptions& /*io_opts*/,
-                        std::unique_ptr<FSDirectory>* result,
-                        IODebugContext* /*dbg*/) override {
-    std::unique_ptr<Directory> dir;
-    Status s = target_->NewDirectory(name, &dir);
-    if (s.ok()) {
-      result->reset(new LegacyDirectoryWrapper(std::move(dir)));
-    }
-    return status_to_io_status(std::move(s));
-  }
-  IOStatus FileExists(const std::string& f, const IOOptions& /*io_opts*/,
-                      IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->FileExists(f));
-  }
-  IOStatus GetChildren(const std::string& dir, const IOOptions& /*io_opts*/,
-                       std::vector<std::string>* r,
-                       IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->GetChildren(dir, r));
-  }
-  IOStatus GetChildrenFileAttributes(const std::string& dir,
-                                     const IOOptions& /*options*/,
-                                     std::vector<FileAttributes>* result,
-                                     IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->GetChildrenFileAttributes(dir, result));
-  }
-  IOStatus DeleteFile(const std::string& f, const IOOptions& /*options*/,
-                      IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->DeleteFile(f));
-  }
-  IOStatus Truncate(const std::string& fname, size_t size,
-                    const IOOptions& /*options*/,
-                    IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->Truncate(fname, size));
-  }
-  IOStatus CreateDir(const std::string& d, const IOOptions& /*options*/,
-                     IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->CreateDir(d));
-  }
-  IOStatus CreateDirIfMissing(const std::string& d,
-                              const IOOptions& /*options*/,
-                              IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->CreateDirIfMissing(d));
-  }
-  IOStatus DeleteDir(const std::string& d, const IOOptions& /*options*/,
-                     IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->DeleteDir(d));
-  }
-  IOStatus GetFileSize(const std::string& f, const IOOptions& /*options*/,
-                       uint64_t* s, IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->GetFileSize(f, s));
-  }
-
-  IOStatus GetFileModificationTime(const std::string& fname,
-                                   const IOOptions& /*options*/,
-                                   uint64_t* file_mtime,
-                                   IODebugContext* /*dbg*/) override {
-    return status_to_io_status(
-        target_->GetFileModificationTime(fname, file_mtime));
-  }
-
-  IOStatus GetAbsolutePath(const std::string& db_path,
-                           const IOOptions& /*options*/,
-                           std::string* output_path,
-                           IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->GetAbsolutePath(db_path, output_path));
-  }
-
-  IOStatus RenameFile(const std::string& s, const std::string& t,
-                      const IOOptions& /*options*/,
-                      IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->RenameFile(s, t));
-  }
-
-  IOStatus LinkFile(const std::string& s, const std::string& t,
-                    const IOOptions& /*options*/,
-                    IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->LinkFile(s, t));
-  }
-
-  IOStatus NumFileLinks(const std::string& fname, const IOOptions& /*options*/,
-                        uint64_t* count, IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->NumFileLinks(fname, count));
-  }
-
-  IOStatus AreFilesSame(const std::string& first, const std::string& second,
-                        const IOOptions& /*options*/, bool* res,
-                        IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->AreFilesSame(first, second, res));
-  }
-
-  IOStatus LockFile(const std::string& f, const IOOptions& /*options*/,
-                    FileLock** l, IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->LockFile(f, l));
-  }
-
-  IOStatus UnlockFile(FileLock* l, const IOOptions& /*options*/,
-                      IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->UnlockFile(l));
-  }
-
-  IOStatus GetTestDirectory(const IOOptions& /*options*/, std::string* path,
-                            IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->GetTestDirectory(path));
-  }
-  IOStatus NewLogger(const std::string& fname, const IOOptions& /*options*/,
-                     std::shared_ptr<Logger>* result,
-                     IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->NewLogger(fname, result));
-  }
-
-  void SanitizeFileOptions(FileOptions* opts) const override {
-    target_->SanitizeEnvOptions(opts);
-  }
-
-  FileOptions OptimizeForLogRead(
-      const FileOptions& file_options) const override {
-    return target_->OptimizeForLogRead(file_options);
-  }
-  FileOptions OptimizeForManifestRead(
-      const FileOptions& file_options) const override {
-    return target_->OptimizeForManifestRead(file_options);
-  }
-  FileOptions OptimizeForLogWrite(const FileOptions& file_options,
-                                  const DBOptions& db_options) const override {
-    return target_->OptimizeForLogWrite(file_options, db_options);
-  }
-  FileOptions OptimizeForManifestWrite(
-      const FileOptions& file_options) const override {
-    return target_->OptimizeForManifestWrite(file_options);
-  }
-  FileOptions OptimizeForCompactionTableWrite(
-      const FileOptions& file_options,
-      const ImmutableDBOptions& immutable_ops) const override {
-    return target_->OptimizeForCompactionTableWrite(file_options,
-                                                    immutable_ops);
-  }
-  FileOptions OptimizeForCompactionTableRead(
-      const FileOptions& file_options,
-      const ImmutableDBOptions& db_options) const override {
-    return target_->OptimizeForCompactionTableRead(file_options, db_options);
-  }
-
-#ifdef GetFreeSpace
-#undef GetFreeSpace
-#endif
-  IOStatus GetFreeSpace(const std::string& path, const IOOptions& /*options*/,
-                        uint64_t* diskfree, IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->GetFreeSpace(path, diskfree));
-  }
-  IOStatus IsDirectory(const std::string& path, const IOOptions& /*options*/,
-                       bool* is_dir, IODebugContext* /*dbg*/) override {
-    return status_to_io_status(target_->IsDirectory(path, is_dir));
-  }
-
- private:
-  Env* target_;
-};
-}  // end anonymous namespace

 Env::Env() : thread_status_updater_(nullptr) {
  file_system_ = std::make_shared<LegacyFileSystemWrapper>(this);
@@ -628,13 +386,13 @@ void Log(const std::shared_ptr<Logger>& info_log, const char* format, ...) {

 Status WriteStringToFile(Env* env, const Slice& data, const std::string& fname,
                         bool should_sync) {
-  const auto& fs = env->GetFileSystem();
-  return WriteStringToFile(fs.get(), data, fname, should_sync);
+  LegacyFileSystemWrapper lfsw(env);
+  return WriteStringToFile(&lfsw, data, fname, should_sync);
 }

 Status ReadFileToString(Env* env, const std::string& fname, std::string* data) {
-  const auto& fs = env->GetFileSystem();
-  return ReadFileToString(fs.get(), fname, data);
+  LegacyFileSystemWrapper lfsw(env);
+  return ReadFileToString(&lfsw, fname, data);
 }

 EnvWrapper::~EnvWrapper() {
@@ -730,4 +488,11 @@ Status NewEnvLogger(const std::string& fname, Env* env,
 const std::shared_ptr<FileSystem>& Env::GetFileSystem() const {
  return file_system_;
 }
+
+#ifdef OS_WIN
+std::unique_ptr<Env> NewCompositeEnv(std::shared_ptr<FileSystem> fs) {
+  return std::unique_ptr<Env>(new CompositeEnvWrapper(Env::Default(), fs));
+}
+#endif
+
 }  // namespace ROCKSDB_NAMESPACE
@@ -10,7 +10,6 @@
 #include <vector>

 #include "env/mock_env.h"
-#include "file/file_util.h"
 #include "rocksdb/convenience.h"
 #include "rocksdb/env.h"
 #include "rocksdb/env_encryption.h"
@@ -18,6 +17,46 @@

 namespace ROCKSDB_NAMESPACE {

+// Normalizes trivial differences across Envs such that these test cases can
+// run on all Envs.
+class NormalizingEnvWrapper : public EnvWrapper {
+ private:
+  std::unique_ptr<Env> base_;
+
+ public:
+  explicit NormalizingEnvWrapper(std::unique_ptr<Env>&& base)
+      : EnvWrapper(base.get()), base_(std::move(base)) {}
+  explicit NormalizingEnvWrapper(Env* base) : EnvWrapper(base) {}
+
+  // Removes . and .. from directory listing
+  Status GetChildren(const std::string& dir,
+                     std::vector<std::string>* result) override {
+    Status status = EnvWrapper::GetChildren(dir, result);
+    if (status.ok()) {
+      result->erase(std::remove_if(result->begin(), result->end(),
+                                   [](const std::string& s) {
+                                     return s == "." || s == "..";
+                                   }),
+                    result->end());
+    }
+    return status;
+  }
+
+  // Removes . and .. from directory listing
+  Status GetChildrenFileAttributes(
+      const std::string& dir, std::vector<FileAttributes>* result) override {
+    Status status = EnvWrapper::GetChildrenFileAttributes(dir, result);
+    if (status.ok()) {
+      result->erase(std::remove_if(result->begin(), result->end(),
+                                   [](const FileAttributes& fa) {
+                                     return fa.name == "." || fa.name == "..";
+                                   }),
+                    result->end());
+    }
+    return status;
+  }
+};
+
 class EnvBasicTestWithParam : public testing::Test,
                              public ::testing::WithParamInterface<Env*> {
 public:
@@ -29,17 +68,32 @@ class EnvBasicTestWithParam : public testing::Test,
    test_dir_ = test::PerThreadDBPath(env_, "env_basic_test");
  }

-  void SetUp() override { ASSERT_OK(env_->CreateDirIfMissing(test_dir_)); }
+  void SetUp() override {
+    env_->CreateDirIfMissing(test_dir_).PermitUncheckedError();
+  }

-  void TearDown() override { ASSERT_OK(DestroyDir(env_, test_dir_)); }
+  void TearDown() override {
+    std::vector<std::string> files;
+    env_->GetChildren(test_dir_, &files).PermitUncheckedError();
+    for (const auto& file : files) {
+      // don't know whether it's file or directory, try both. The tests must
+      // only create files or empty directories, so one must succeed, else the
+      // directory's corrupted.
+      Status s = env_->DeleteFile(test_dir_ + "/" + file);
+      if (!s.ok()) {
+        ASSERT_OK(env_->DeleteDir(test_dir_ + "/" + file));
+      }
+    }
+  }
 };

 class EnvMoreTestWithParam : public EnvBasicTestWithParam {};

+static std::unique_ptr<Env> def_env(new NormalizingEnvWrapper(Env::Default()));
 INSTANTIATE_TEST_CASE_P(EnvDefault, EnvBasicTestWithParam,
-                        ::testing::Values(Env::Default()));
+                        ::testing::Values(def_env.get()));
 INSTANTIATE_TEST_CASE_P(EnvDefault, EnvMoreTestWithParam,
-                        ::testing::Values(Env::Default()));
+                        ::testing::Values(def_env.get()));

 static std::unique_ptr<Env> mock_env(new MockEnv(Env::Default()));
 INSTANTIATE_TEST_CASE_P(MockEnv, EnvBasicTestWithParam,
@@ -50,7 +104,8 @@ static Env* NewTestEncryptedEnv(Env* base, const std::string& provider_id) {
  std::shared_ptr<EncryptionProvider> provider;
  EXPECT_OK(EncryptionProvider::CreateFromString(ConfigOptions(), provider_id,
                                                 &provider));
-  return NewEncryptedEnv(base, provider);
+  std::unique_ptr<Env> encrypted(NewEncryptedEnv(base, provider));
+  return new NormalizingEnvWrapper(std::move(encrypted));
 }

 // next statements run env test against default encryption code.
@@ -270,7 +325,7 @@ TEST_P(EnvMoreTestWithParam, MakeDir) {
  ASSERT_OK(env_->CreateDir(test_dir_ + "/j"));
  ASSERT_OK(env_->FileExists(test_dir_ + "/j"));
  std::vector<std::string> children;
-  ASSERT_OK(env_->GetChildren(test_dir_, &children));
+  env_->GetChildren(test_dir_, &children);
  ASSERT_EQ(1U, children.size());
  // fail because file already exists
  ASSERT_TRUE(!env_->CreateDir(test_dir_ + "/j").ok());
@@ -319,32 +374,6 @@ TEST_P(EnvMoreTestWithParam, GetChildren) {
  ASSERT_EQ(0U, children.size());
 }

-TEST_P(EnvMoreTestWithParam, GetChildrenIgnoresDotAndDotDot) {
-  auto* env = Env::Default();
-  ASSERT_OK(env->CreateDirIfMissing(test_dir_));
-
-  // Create a single file
-  std::string path = test_dir_;
-  const EnvOptions soptions;
-#ifdef OS_WIN
-  path.append("\\test_file");
-#else
-  path.append("/test_file");
-#endif
-  std::string data("test data");
-  std::unique_ptr<WritableFile> file;
-  ASSERT_OK(env->NewWritableFile(path, &file, soptions));
-  ASSERT_OK(file->Append("test data"));
-
-  // get the children
-  std::vector<std::string> result;
-  ASSERT_OK(env->GetChildren(test_dir_, &result));
-
-  // expect only one file named `test_data`, i.e. no `.` or `..` names
-  ASSERT_EQ(result.size(), 1);
-  ASSERT_EQ(result.at(0), "test_file");
-}
-
 }  // namespace ROCKSDB_NAMESPACE
 int main(int argc, char** argv) {
  ::testing::InitGoogleTest(&argc, argv);
@@ -122,9 +122,14 @@ class PosixDynamicLibrary : public DynamicLibrary {
 };
 #endif  // !ROCKSDB_NO_DYNAMIC_EXTENSION

-class PosixEnv : public CompositeEnv {
+class PosixEnv : public CompositeEnvWrapper {
 public:
-  PosixEnv(const PosixEnv* default_env, const std::shared_ptr<FileSystem>& fs);
+  // This constructor is for constructing non-default Envs, mainly by
+  // NewCompositeEnv(). It allows new instances to share the same
+  // threadpool and other resources as the default Env, while allowing
+  // a non-default FileSystem implementation
+  PosixEnv(const PosixEnv* default_env, std::shared_ptr<FileSystem> fs);
+
  ~PosixEnv() override {
    if (this == Env::Default()) {
      for (const auto tid : threads_to_join_) {
@@ -382,7 +387,7 @@ class PosixEnv : public CompositeEnv {
 };

 PosixEnv::PosixEnv()
-    : CompositeEnv(FileSystem::Default()),
+    : CompositeEnvWrapper(this, FileSystem::Default()),
      thread_pools_storage_(Priority::TOTAL),
      allow_non_owner_access_storage_(true),
      thread_pools_(thread_pools_storage_),
@@ -399,13 +404,12 @@ PosixEnv::PosixEnv()
  thread_status_updater_ = CreateThreadStatusUpdater();
 }

-PosixEnv::PosixEnv(const PosixEnv* default_env,
-                   const std::shared_ptr<FileSystem>& fs)
-    : CompositeEnv(fs),
-      thread_pools_(default_env->thread_pools_),
-      mu_(default_env->mu_),
-      threads_to_join_(default_env->threads_to_join_),
-      allow_non_owner_access_(default_env->allow_non_owner_access_) {
+PosixEnv::PosixEnv(const PosixEnv* default_env, std::shared_ptr<FileSystem> fs)
+  : CompositeEnvWrapper(this, fs),
+    thread_pools_(default_env->thread_pools_),
+    mu_(default_env->mu_),
+    threads_to_join_(default_env->threads_to_join_),
+    allow_non_owner_access_(default_env->allow_non_owner_access_) {
  thread_status_updater_ = default_env->thread_status_updater_;
 }

@@ -504,7 +508,7 @@ Env* Env::Default() {
  return &default_env;
 }

-std::unique_ptr<Env> NewCompositeEnv(const std::shared_ptr<FileSystem>& fs) {
+std::unique_ptr<Env> NewCompositeEnv(std::shared_ptr<FileSystem> fs) {
  PosixEnv* default_env = static_cast<PosixEnv*>(Env::Default());
  return std::unique_ptr<Env>(new PosixEnv(default_env, fs));
 }
@@ -2166,7 +2166,7 @@ TEST_P(EnvFSTestWithParam, OptionsTest) {

    ASSERT_OK(db->Close());
    delete db;
-    ASSERT_OK(DestroyDB(dbname, opts));
+    DestroyDB(dbname, opts);

    dbname = dbname2_;
  }
@@ -129,4 +129,13 @@ IOStatus ReadFileToString(FileSystem* fs, const std::string& fname,
  return s;
 }

+#ifdef OS_WIN
+std::shared_ptr<FileSystem> FileSystem::Default() {
+  static LegacyFileSystemWrapper default_fs(Env::Default());
+  static std::shared_ptr<LegacyFileSystemWrapper> default_fs_ptr(
+      &default_fs, [](LegacyFileSystemWrapper*) {});
+  return default_fs_ptr;
+}
+#endif
+
 }  // namespace ROCKSDB_NAMESPACE
@@ -607,7 +607,6 @@ class PosixFileSystem : public FileSystem {
                       std::vector<std::string>* result,
                       IODebugContext* /*dbg*/) override {
    result->clear();
-
    DIR* d = opendir(dir.c_str());
    if (d == nullptr) {
      switch (errno) {
@@ -619,34 +618,11 @@ class PosixFileSystem : public FileSystem {
          return IOError("While opendir", dir, errno);
      }
    }
-
-    const auto pre_read_errno = errno;  // errno may be modified by readdir
    struct dirent* entry;
-    while ((entry = readdir(d)) != nullptr && errno == pre_read_errno) {
-      // filter out '.' and '..' directory entries
-      // which appear only on some platforms
-      const bool ignore =
-          entry->d_type == DT_DIR &&
-          (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0);
-      if (!ignore) {
-        result->push_back(entry->d_name);
-      }
+    while ((entry = readdir(d)) != nullptr) {
+      result->push_back(entry->d_name);
    }
-
-    // always attempt to close the dir
-    const auto pre_close_errno = errno;  // errno may be modified by closedir
-    const int close_result = closedir(d);
-
-    if (pre_close_errno != pre_read_errno) {
-      // error occured during readdir
-      return IOError("While readdir", dir, pre_close_errno);
-    }
-
-    if (close_result != 0) {
-      // error occured during closedir
-      return IOError("While closedir", dir, errno);
-    }
-
+    closedir(d);
    return IOStatus::OK();
  }

@@ -51,21 +51,19 @@ DeleteScheduler::~DeleteScheduler() {
  if (bg_thread_) {
    bg_thread_->join();
  }
-  for (const auto& it : bg_errors_) {
-    it.second.PermitUncheckedError();
-  }
 }

 Status DeleteScheduler::DeleteFile(const std::string& file_path,
                                   const std::string& dir_to_sync,
                                   const bool force_bg) {
+  Status s;
  if (rate_bytes_per_sec_.load() <= 0 || (!force_bg &&
      total_trash_size_.load() >
          sst_file_manager_->GetTotalSize() * max_trash_db_ratio_.load())) {
    // Rate limiting is disabled or trash size makes up more than
    // max_trash_db_ratio_ (default 25%) of the total DB size
    TEST_SYNC_POINT("DeleteScheduler::DeleteFile");
-    Status s = fs_->DeleteFile(file_path, IOOptions(), nullptr);
+    s = fs_->DeleteFile(file_path, IOOptions(), nullptr);
    if (s.ok()) {
      s = sst_file_manager_->OnDeleteFile(file_path);
      ROCKS_LOG_INFO(info_log_,
@@ -81,7 +79,7 @@ Status DeleteScheduler::DeleteFile(const std::string& file_path,

  // Move file to trash
  std::string trash_file;
-  Status s = MarkAsTrash(file_path, &trash_file);
+  s = MarkAsTrash(file_path, &trash_file);
  ROCKS_LOG_INFO(info_log_, "Mark file: %s as trash -- %s", trash_file.c_str(),
                 s.ToString().c_str());

@@ -101,13 +99,8 @@ Status DeleteScheduler::DeleteFile(const std::string& file_path,

  // Update the total trash size
  uint64_t trash_file_size = 0;
-  IOStatus io_s =
-      fs_->GetFileSize(trash_file, IOOptions(), &trash_file_size, nullptr);
-  if (io_s.ok()) {
-    total_trash_size_.fetch_add(trash_file_size);
-  }
-  //**TODO: What should we do if we failed to
-  // get the file size?
+  fs_->GetFileSize(trash_file, IOOptions(), &trash_file_size, nullptr);
+  total_trash_size_.fetch_add(trash_file_size);

  // Add file to delete queue
  {
@@ -176,17 +169,17 @@ Status DeleteScheduler::MarkAsTrash(const std::string& file_path,
    return Status::InvalidArgument("file_path is corrupted");
  }

+  Status s;
  if (DeleteScheduler::IsTrashFile(file_path)) {
    // This is already a trash file
    *trash_file = file_path;
-    return Status::OK();
+    return s;
  }

  *trash_file = file_path + kTrashExtension;
  // TODO(tec) : Implement Env::RenameFileIfNotExist and remove
  //             file_move_mu mutex.
  int cnt = 0;
-  Status s;
  InstrumentedMutexLock l(&file_move_mu_);
  while (true) {
    s = fs_->FileExists(*trash_file, IOOptions(), nullptr);
@@ -204,7 +197,7 @@ Status DeleteScheduler::MarkAsTrash(const std::string& file_path,
    cnt++;
  }
  if (s.ok()) {
-    s = sst_file_manager_->OnMoveFile(file_path, *trash_file);
+    sst_file_manager_->OnMoveFile(file_path, *trash_file);
  }
  return s;
 }
@@ -26,7 +26,7 @@ class SstFileManagerImpl;

 // DeleteScheduler allows the DB to enforce a rate limit on file deletion,
 // Instead of deleteing files immediately, files are marked as trash
-// and deleted in a background thread that apply sleep penalty between deletes
+// and deleted in a background thread that apply sleep penlty between deletes
 // if they are happening in a rate faster than rate_bytes_per_sec,
 //
 // Rate limiting can be turned off by setting rate_bytes_per_sec = 0, In this
@@ -48,7 +48,7 @@ class DeleteScheduler {
    MaybeCreateBackgroundThread();
  }

-  // Mark file as trash directory and schedule its deletion. If force_bg is
+  // Mark file as trash directory and schedule it's deletion. If force_bg is
  // set, it forces the file to always be deleted in the background thread,
  // except when rate limiting is disabled
  Status DeleteFile(const std::string& fname, const std::string& dir_to_sync,
@@ -78,7 +78,7 @@ class DeleteScheduler {
  static const std::string kTrashExtension;
  static bool IsTrashFile(const std::string& file_path);

-  // Check if there are any .trash files in path, and schedule their deletion
+  // Check if there are any .trash filse in path, and schedule their deletion
  // Or delete immediately if sst_file_manager is nullptr
  static Status CleanupDirectory(Env* env, SstFileManagerImpl* sfm,
                                 const std::string& path);
@@ -10,6 +10,7 @@
 #include <thread>
 #include <vector>

+#include "env/composite_env_wrapper.h"
 #include "file/file_util.h"
 #include "file/sst_file_manager_impl.h"
 #include "rocksdb/env.h"
@@ -57,7 +58,7 @@ class DeleteSchedulerTest : public testing::Test {

    int normal_cnt = 0;
    for (auto& f : files_in_dir) {
-      if (!DeleteScheduler::IsTrashFile(f)) {
+      if (!DeleteScheduler::IsTrashFile(f) && f != "." && f != "..") {
        normal_cnt++;
      }
    }
@@ -95,9 +96,11 @@ class DeleteSchedulerTest : public testing::Test {
    // Tests in this file are for DeleteScheduler component and don't create any
    // DBs, so we need to set max_trash_db_ratio to 100% (instead of default
    // 25%)
-    sst_file_mgr_.reset(new SstFileManagerImpl(
-        env_, env_->GetFileSystem(), nullptr, rate_bytes_per_sec_,
-        /* max_trash_db_ratio= */ 1.1, 128 * 1024));
+    std::shared_ptr<FileSystem>
+                fs(std::make_shared<LegacyFileSystemWrapper>(env_));
+    sst_file_mgr_.reset(
+        new SstFileManagerImpl(env_, fs, nullptr, rate_bytes_per_sec_,
+                               /* max_trash_db_ratio= */ 1.1, 128 * 1024));
    delete_scheduler_ = sst_file_mgr_->delete_scheduler();
    sst_file_mgr_->SetStatisticsPtr(stats_);
  }
@@ -423,9 +426,7 @@ TEST_F(DeleteSchedulerTest, BackgroundError) {
  delete_scheduler_->WaitForEmptyTrash();
  auto bg_errors = delete_scheduler_->GetBackgroundErrors();
  ASSERT_EQ(bg_errors.size(), 10);
-  for (const auto& it : bg_errors) {
-    ASSERT_TRUE(it.second.IsPathNotFound());
-  }
+
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
 }

@@ -669,7 +670,7 @@ TEST_F(DeleteSchedulerTest, ImmediateDeleteOn25PercDBSize) {
  }

  for (std::string& file_name : generated_files) {
-    ASSERT_OK(delete_scheduler_->DeleteFile(file_name, ""));
+    delete_scheduler_->DeleteFile(file_name, "");
  }

  // When we end up with 26 files in trash we will start
@@ -109,8 +109,7 @@ Status FilePrefetchBuffer::Prefetch(const IOOptions& opts,

 bool FilePrefetchBuffer::TryReadFromCache(const IOOptions& opts,
                                          uint64_t offset, size_t n,
-                                          Slice* result, Status* status,
-                                          bool for_compaction) {
+                                          Slice* result, bool for_compaction) {
  if (track_min_offset_ && offset < min_offset_read_) {
    min_offset_read_ = static_cast<size_t>(offset);
  }
@@ -135,9 +134,6 @@ bool FilePrefetchBuffer::TryReadFromCache(const IOOptions& opts,
                     for_compaction);
      }
      if (!s.ok()) {
-        if (status) {
-          *status = s;
-        }
 #ifndef NDEBUG
        IGNORE_STATUS_IF_ERROR(s);
 #endif
@@ -75,7 +75,7 @@ class FilePrefetchBuffer {
  // result : output buffer to put the data into.
  // for_compaction : if cache read is done for compaction read.
  bool TryReadFromCache(const IOOptions& opts, uint64_t offset, size_t n,
-                        Slice* result, Status* s, bool for_compaction = false);
+                        Slice* result, bool for_compaction = false);

  // The minimum `offset` ever passed to TryReadFromCache(). This will nly be
  // tracked if track_min_offset = true.
Author	SHA1	Message	Date
Peter Dillinger	b705f808e4	Update version and HISTORY for 6.16.5	2021-09-08 12:34:59 -07:00
Levi Tamasi	cc4c9e80e4	Fix the sorting of KeyContexts for batched MultiGet (#8633 ) Summary: `CompareKeyContext::operator()` on the trunk has a bug: when comparing column family IDs, `lhs` is used for both sides of the comparison. This results in the `KeyContext`s getting sorted solely based on key, which in turn means that keys with the same column family do not necessarily form a single range in the sorted list. This violates an assumption of the batched `MultiGet` logic, leading to the same column family showing up multiple times in the list of `MultiGetColumnFamilyData`. The end result is the code attempting to check out the thread-local `SuperVersion` for the same CF multiple times, causing an assertion violation in debug builds and memory corruption/crash in release builds. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8633 Test Plan: `make check` Reviewed By: riversand963 Differential Revision: D30169182 Pulled By: ltamasi fbshipit-source-id: a47710652df7e95b14b40fb710924c11a8478023	2021-09-08 12:25:27 -07:00
Jay Zhuang	9d95050ca7	Bump version and update HISTORY.md for 6.16.4	2021-03-30 15:54:11 -07:00
Adam Retter	9857d45f37	Fix compilation against musl lib C (#7875 ) Summary: See https://github.com/percona/PerconaFT/pull/450 Pull Request resolved: https://github.com/facebook/rocksdb/pull/7875 Reviewed By: ajkr Differential Revision: D25938020 Pulled By: jay-zhuang fbshipit-source-id: 9014dbc7b23bf92c5e63bfbdda4565bb0d2f2b58	2021-03-30 13:48:39 -07:00
Adam Retter	5884cf5d5b	range_tree requires GNU libc on ppc64 (#8070 ) Summary: If the platform is ppc64 and the libc is not GNU libc, then we exclude the range_tree from compilation. See https://jira.percona.com/browse/PS-7559 Pull Request resolved: https://github.com/facebook/rocksdb/pull/8070 Reviewed By: jay-zhuang Differential Revision: D27246004 Pulled By: mrambacher fbshipit-source-id: 59d8433242ce7ce608988341becb4f83312445f5	2021-03-29 20:28:50 -07:00
Andrew Kryczka	e32a64aa54	bump version and update HISTORY.md for 6.16.3	2021-02-05 17:09:36 -08:00
Andrew Kryczka	031368f67a	Allow range deletions in `*TransactionDB` only when safe (#7929 ) Summary: Explicitly reject all range deletions on `TransactionDB` or `OptimisticTransactionDB`, except when the user provides sufficient promises that allow us to proceed safely. The necessary promises are described in the API doc for `TransactionDB::DeleteRange()`. There is currently no way to provide enough promises to make it safe in `OptimisticTransactionDB`. Fixes https://github.com/facebook/rocksdb/issues/7913. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7929 Test Plan: unit tests covering the cases it's permitted/rejected Reviewed By: ltamasi Differential Revision: D26240254 Pulled By: ajkr fbshipit-source-id: 2834a0ce64cc3e4c3799e35b885a5e79c2f4f6d9	2021-02-05 17:08:28 -08:00
Andrew Kryczka	5105db8d7b	update HISTORY.md and bump version for 6.16.2	2021-01-21 12:36:23 -08:00
Andrew Kryczka	ba7c46a3d8	workaround race conditions during `PeriodicWorkScheduler` registration (#7888 ) Summary: This provides a workaround for two race conditions that will be fixed in a more sophisticated way later. This PR: (1) Makes the client serialize calls to `Timer::Start()` and `Timer::Shutdown()` (see https://github.com/facebook/rocksdb/issues/7711). The long-term fix will be to make those functions thread-safe. (2) Makes `PeriodicWorkScheduler` atomically add/cancel work together with starting/shutting down its `Timer`. The long-term fix will be for `Timer` API to offer more specialized APIs so the client will not need to synchronize. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7888 Test Plan: ran the repro provided in https://github.com/facebook/rocksdb/issues/7881 Reviewed By: jay-zhuang Differential Revision: D25990891 Pulled By: ajkr fbshipit-source-id: a97fdaebbda6d7db7ddb1b146738b68c16c5be38	2021-01-21 12:35:30 -08:00
Cheng Chang	be40c99dda	bump to 6.16.1	2021-01-20 08:40:10 -08:00
Cheng Chang	89dd231f6a	Update HISTORY.md	2021-01-20 08:38:18 -08:00
Cheng Chang	e931bbfec0	Make it able to ignore WAL related VersionEdits in older versions (#7873 ) Summary: Although the tags for `WalAddition`, `WalDeletion` are after `kTagSafeIgnoreMask`, to actually be able to skip these entries in older versions of RocksDB, we require that they are encoded with their encoded size as the prefix. This requirement is not met in the current codebase, so a downgraded DB may fail to open if these entries exist in the MANIFEST. If a DB wants to downgrade, and its MANIFEST contains `WalAddition` or `WalDeletion`, it can set `track_and_verify_wals_in_manifest` to `false`, then restart twice, then downgrade. On the first restart, a new MANIFEST will be created with a `WalDeletion` indicating that all previously tracked WALs are removed from MANIFEST. On the second restart, since there is no tracked WALs in MANIFEST now, a new MANIFEST will be created with neither `WalAddition` nor `WalDeletion`. Then the DB can downgrade. Tags for `BlobFileAddition`, `BlobFileGarbage` also have the same problem, but this PR focuses on solving the problem for WAL edits. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7873 Test Plan: Added a `VersionEditTest::IgnorableTags` unit test to verify all entries with tags larger than `kTagSafeIgnoreMask` can actually be skipped and won't affect parsing of other entries. Reviewed By: ajkr Differential Revision: D25935930 Pulled By: cheng-chang fbshipit-source-id: 7a02fdba4311d6084328c14aed110a26d08c3efb	2021-01-20 08:34:52 -08:00
Cheng Chang	67f8189e68	Update HISTORY.md	2021-01-20 08:34:06 -08:00
Cheng Chang	0a91c691a9	Add note for PR 7789 in history (#7855 ) Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/7855 Reviewed By: ajkr Differential Revision: D25872797 Pulled By: cheng-chang fbshipit-source-id: 82159a13f897aaaad5f3c70c7dfa822e073bc623	2021-01-11 13:55:25 -08:00
Jay Zhuang	dff9219df6	Fix checkpoint_test hang (#7849 ) Summary: `CheckpointTest.CurrentFileModifiedWhileCheckpointing` could hang because now create checkpoint triggers flush twice. The test should wait both flush done. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7849 Test Plan: `gtest-parallel ./checkpoint_test --gtest_filter=CheckpointTest.CurrentFileModifiedWhileCheckpointing -r 100` Reviewed By: ajkr Differential Revision: D25860713 Pulled By: jay-zhuang fbshipit-source-id: e1c2f23037dedc33e205519f4289a25e77816b41	2021-01-09 13:29:00 -08:00
Cheng Chang	eeea27a048	Get manifest size again after getting min_log_num during checkpoint (#7836 ) Summary: Currently, manifest size is determined before getting min_log_num. But between getting manifest size and getting min_log_num, concurrently, a flush might succeed, which will write new records to manifest to make some WALs become outdated, then min_log_num will be correspondingly increased, but the new records in manifest will not be copied into the checkpoint because the manifest's size is determined before them, then the newly outdated WALs will still exist in the checkpoint's manifest, but they are not linked/copied to the checkpoint because their log number is < min_log_num, so a corruption of missing WAL will be reported when restoring from the checkpoint. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7836 Test Plan: make crash_test Reviewed By: ajkr Differential Revision: D25788204 Pulled By: cheng-chang fbshipit-source-id: a4e5acf30f08270b3c0a95304ff559a9e655252f	2021-01-08 10:16:03 -08:00
Zhichao Cao	2b64cddf99	Treat File Scope Write IO Error the same as Retryable IO Error (#7840 ) Summary: In RocksDB, when IO error happens, the flags of IOStatus can be set. If the IOStatus is set as "File Scope IO Error", it indicate that the error is constrained in the file level. Since RocksDB does not continues write data to a file when any IO Error happens, File Scope IO Error can be treated the same as Retryable IO Error. Adding the logic to ErrorHandler::SetBGError to include the file scope IO Error in its error handling logic, which is the same as retryable IO Error. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7840 Test Plan: added new unit tests in error_handler_fs_test. make check Reviewed By: anand1976 Differential Revision: D25820481 Pulled By: zhichao-cao fbshipit-source-id: 69cabd3d010073e064d6142ce1cabf341b8a6806	2021-01-08 10:15:54 -08:00
Adam Retter	79a21d67cb	Attempt to fix build errors around missing compression library includes (#7803 ) Summary: This fixes an issue introduced in https://github.com/facebook/rocksdb/pull/7769 that caused many errors about missing compression libraries to be displayed during compilation, although compilation actually succeeded. This PR fixes the compilation so the compression libraries are only introduced where strictly needed. It likely needs to be merged into the same branches as https://github.com/facebook/rocksdb/pull/7769 which I think are: 1. master 2. 6.15.fb 3. 6.16.fb Pull Request resolved: https://github.com/facebook/rocksdb/pull/7803 Reviewed By: ramvadiv Differential Revision: D25733743 Pulled By: pdillinger fbshipit-source-id: 6c04f6864b2ff4a345841d791a89b19e0e3f5bf7	2021-01-04 11:49:56 -08:00
cheng-chang	2eaad9e1b1	Skip WALs according to MinLogNumberToKeep when creating checkpoint (#7789 ) Summary: In a stress test failure, we observe that a WAL is skipped when creating checkpoint, although its log number >= MinLogNumberToKeep(). This might happen in the following case: 1. when creating the checkpoint, there are 2 column families: CF0 and CF1, and there are 2 WALs: 1, 2; 2. CF0's log number is 1, CF0's active memtable is empty, CF1's log number is 2, CF1's active memtable is not empty, WAL 2 is not empty, the sequence number points to WAL 2; 2. the checkpoint process flushes CF0, since CF0' active memtable is empty, there is no need to SwitchMemtable, thus no new WAL will be created, so CF0's log number is now 2, concurrently, some data is written to CF0 and WAL 2; 3. the checkpoint process flushes CF1, WAL 3 is created and CF1's log number is now 3, CF0's log number is still 2 because CF0 is not empty and WAL 2 contains its unflushed data concurrently written in step 2; 4. the checkpoint process determines that WAL 1 and 2 are no longer needed according to [live_wal_files[i]->StartSequence() >= *sequence_number](https://github.com/facebook/rocksdb/blob/master/utilities/checkpoint/checkpoint_impl.cc#L388), so it skips linking them to the checkpoint directory; 5. but according to `MinLogNumberToKeep()`, WAL 2 still needs to be kept because CF0's log number is 2. If the checkpoint is reopened in read-only mode, and only read from the snapshot with the initial sequence number, then there will be no data loss or data inconsistency. But if the checkpoint is reopened and read from the most recent sequence number, suppose in step 3, there are also data concurrently written to CF1 and WAL 3, then the most recent sequence number refers to the latest entry in WAL 3, so the data written in step 2 should also be visible, but since WAL 2 is discarded, those data are lost. When tracking WAL in MANIFEST is enabled, when reopening the checkpoint, since WAL 2 is still tracked in MANIFEST as alive, but it's missing from the checkpoint directory, a corruption will be reported. This PR makes the checkpoint process to only skip a WAL if its log number < `MinLogNumberToKeep`. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7789 Test Plan: watch existing tests to pass. Reviewed By: ajkr Differential Revision: D25662346 Pulled By: cheng-chang fbshipit-source-id: 136471095baa01886cf44809455cf855f24857a0	2020-12-23 14:22:45 -08:00
Sergei Petrunia	2a2d4d0f37	Apply the changes from: PS-5501 : Re-license PerconaFT 'locktree' to Apache V2 (#7801 ) Summary: commit d5178f513c0b4144a5ac9358ec0f6a3b54a28e76 Author: George O. Lorch III <george.lorch@percona.com> Date: Tue Mar 19 12:18:40 2019 -0700 PS-5501 : Re-license PerconaFT 'locktree' to Apache V2 - Fixed some incomplete relicensed files from previous round. - Added missing license text to some. - Relicensed more files to Apache V2 that locktree depends on. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7801 Reviewed By: jay-zhuang Differential Revision: D25682430 Pulled By: cheng-chang fbshipit-source-id: deb8a0de3e76f3638672997bfbd300e2fffbe5f5	2020-12-23 14:20:51 -08:00