Commit fa678934 authored by Maciej Szwed's avatar Maciej Szwed Committed by Tomasz Zawadzki
Browse files

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



!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: default avatarMaciej Szwed <maciej.szwed@intel.com>
Change-Id: Ie13ff102ddf627026013dcb8b41cb3ee205eaaeb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6761


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent f046750c

doc/blobfs.md

+4 −4
Original line number Diff line number Diff line
@@ -14,24 +14,24 @@ make 
~~~



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}

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.



~~~{.sh}

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`).



~~~{.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.

test/common/config/pkgdep/git

+2 −2
Original line number Diff line number Diff line
@@ -192,10 +192,10 @@ function install_rocksdb() { 
	# Rocksdb is installed for use with the blobfs tests.

	if [ ! -d /usr/src/rocksdb ]; then

		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/

	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"

	fi

}