ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rocksdb: Switch default RocksDB branch to latest (6.15.fb)

Browse Source 
!Do not merge this patch before RocksDB patches are merged:

https: //review.spdk.io/gerrit/c/spdk/rocksdb/+/6485
https: //review.spdk.io/gerrit/c/spdk/rocksdb/+/6486

Signed-off-by: Maciej Szwed <maciej.szwed@intel.com>
Change-Id: Ie13ff102ddf627026013dcb8b41cb3ee205eaaeb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6761
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Maciej Szwed 2021-03-08 10:24:11 +01:00 committed by Tomasz Zawadzki
parent f046750c32
commit fa67893428
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/blobfs.md
View File

@ -14,24 +14,24 @@ make
~~~ ~~~
Clone the RocksDB repository from the SPDK GitHub fork into a separate directory. Clone the RocksDB repository from the SPDK GitHub fork into a separate directory.
Make sure you check out the `spdk-v5.14.3` branch. Make sure you check out the `6.15.fb` branch.
~~~{.sh} ~~~{.sh}
cd .. cd ..
git clone -b spdk-v5.14.3 https://github.com/spdk/rocksdb.git git clone -b 6.15.fb https://github.com/spdk/rocksdb.git
~~~ ~~~
Build RocksDB. Only the `db_bench` benchmarking tool is integrated with BlobFS. Build RocksDB. Only the `db_bench` benchmarking tool is integrated with BlobFS.
~~~{.sh} ~~~{.sh}
cd rocksdb cd rocksdb
make db_bench SPDK_DIR=path/to/spdk make db_bench SPDK_DIR=relative_path/to/spdk
~~~ ~~~
Or you can also add `DEBUG_LEVEL=0` for a release build (need to turn on `USE_RTTI`). Or you can also add `DEBUG_LEVEL=0` for a release build (need to turn on `USE_RTTI`).
~~~{.sh} ~~~{.sh}
export USE_RTTI=1 && make db_bench DEBUG_LEVEL=0 SPDK_DIR=path/to/spdk export USE_RTTI=1 && make db_bench DEBUG_LEVEL=0 SPDK_DIR=relative_path/to/spdk
~~~ ~~~
Create an NVMe section in the configuration file using SPDK's `gen_nvme.sh` script. Create an NVMe section in the configuration file using SPDK's `gen_nvme.sh` script.

4
test/common/config/pkgdep/git
View File

@ -192,10 +192,10 @@ function install_rocksdb() {
# Rocksdb is installed for use with the blobfs tests. # Rocksdb is installed for use with the blobfs tests.
if [ ! -d /usr/src/rocksdb ]; then if [ ! -d /usr/src/rocksdb ]; then
git clone "${GIT_REPO_ROCKSDB}" "$GIT_REPOS/rocksdb" git clone "${GIT_REPO_ROCKSDB}" "$GIT_REPOS/rocksdb"
git -C "$GIT_REPOS/rocksdb" checkout spdk-v5.6.1 git -C "$GIT_REPOS/rocksdb" checkout 6.15.fb
sudo mv "$GIT_REPOS/rocksdb" /usr/src/ sudo mv "$GIT_REPOS/rocksdb" /usr/src/
else else
sudo git -C /usr/src/rocksdb checkout spdk-v5.6.1 sudo git -C /usr/src/rocksdb checkout 6.15.fb
echo "rocksdb already in /usr/src. Not checking out again" echo "rocksdb already in /usr/src. Not checking out again"
fi fi
} }