From 58ce0711eb009cce55863c3d461e1bffd610688f Mon Sep 17 00:00:00 2001 From: GangCao Date: Mon, 14 Aug 2017 23:11:34 -0400 Subject: [PATCH] rocksdb: remove the hard-coded reactor mask Change-Id: I20cf909058a008435b80066ea4d18345081cf0c0 Signed-off-by: GangCao Reviewed-on: https://review.gerrithub.io/374245 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- etc/spdk/rocksdb.conf.in | 9 ++------- lib/rocksdb/env_spdk.cc | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/etc/spdk/rocksdb.conf.in b/etc/spdk/rocksdb.conf.in index cbe7e92de..e5bfa2965 100644 --- a/etc/spdk/rocksdb.conf.in +++ b/etc/spdk/rocksdb.conf.in @@ -12,14 +12,9 @@ # Ex. [TargetNode1] = TargetNode section key with tag number 1 [Global] # Users can restrict work items to only run on certain cores by - # specifying a WorkerMask. Default is to allow work items to run + # specifying a ReactorMask. Default is to allow work items to run # on all cores. - #WorkerMask 0xFFFF - - # Event mask for ids history buffers - # Default: 0x0 (all events disabled) - # Set to 0xFFFFFFFFFFFFFFFF to enable all events. - #EventMask 0x0 + #ReactorMask 0x1 [Rpc] # Defines whether spdk will enable configuration via RPC. diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc index 515d83a18..ced717297 100644 --- a/lib/rocksdb/env_spdk.cc +++ b/lib/rocksdb/env_spdk.cc @@ -532,7 +532,6 @@ SpdkEnv::SpdkEnv(Env *base_env, const std::string &dir, const std::string &conf, spdk_app_opts_init(opts); opts->name = "rocksdb"; opts->config_file = mConfig.c_str(); - opts->reactor_mask = "0x1"; opts->mem_size = 1024 + cache_size_in_mb; opts->shutdown_cb = spdk_rocksdb_shutdown;