Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

os/bluestore: allow multiple SPDK BlueStore OSD instances #12604

Merged
merged 2 commits into from Dec 22, 2016
Merged

os/bluestore: allow multiple SPDK BlueStore OSD instances #12604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d548d5a
os/bluestore: allow multiple SPDK BlueStore OSD instances
Dec 19, 2016
6c05702
Added "bluestore" prefix to new config options
Dec 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/common/config_opts.h
View file
Open in desktop
Expand Up @@ -999,6 +999,11 @@ OPTION(bluestore_bluefs_reclaim_ratio, OPT_FLOAT, .20) // how much to reclaim at
// get the serial number of Intel(R) Fultondale NVMe controllers.
// Example:
// bluestore_block_path = spdk:55cd2e404bd73932
// If you want to run multiple SPDK instances per node, you must specify the
// amount of memory per socket each instance will use.
OPTION(bluestore_spdk_socket_mem, OPT_STR, "512,512")
// A hexadecimal bit mask of the cores to run on. Note the core numbering can change between platforms and should be determined beforehand.
OPTION(bluestore_spdk_coremask, OPT_STR, "0x3")
OPTION(bluestore_block_path, OPT_STR, "")
OPTION(bluestore_block_size, OPT_U64, 10 * 1024*1024*1024) // 10gb for testing
OPTION(bluestore_block_create, OPT_BOOL, true)
Expand Down
17 changes: 15 additions & 2 deletions src/os/bluestore/NVMEDevice.cc
View file
Open in desktop
Expand Up @@ -626,6 +626,17 @@ int NVMEManager::try_get(const string &sn_tag, SharedDriverData **driver)
{
Mutex::Locker l(lock);
int r = 0;

string prefix = "--file-prefix=";
string sock_mem = "--socket-mem=";
string coremask = "-c ";
prefix += sn_tag;
sock_mem += g_conf->bluestore_spdk_socket_mem;
coremask += g_conf->bluestore_spdk_coremask;
char *prefix_arg = (char *)prefix.c_str();
char *sock_mem_arg = (char *)sock_mem.c_str();
char *coremask_arg = (char *)coremask.c_str();

if (sn_tag.empty()) {
r = -ENOENT;
derr << __func__ << " empty serial number: " << cpp_strerror(r) << dendl;
Expand All @@ -642,11 +653,13 @@ int NVMEManager::try_get(const string &sn_tag, SharedDriverData **driver)
if (!init) {
init = true;
dpdk_thread = std::thread(
[this]() {
[this, prefix_arg, sock_mem_arg, coremask_arg]() {
static const char *ealargs[] = {
"ceph-osd",
"-c 0x3", /* This must be the second parameter. It is overwritten by index in main(). */
coremask_arg, /* This must be the second parameter. It is overwritten by index in main(). */
"-n 4",
socket_mem_arg,
prefix_arg
};

int r = rte_eal_init(sizeof(ealargs) / sizeof(ealargs[0]), (char **)(void *)(uintptr_t)ealargs);
Expand Down