RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15721 from majianpeng/bluestore-nodevice-nosymlink

Browse Source 
os/bluestore/BlueStore: no device no symlink.

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-06-16 16:11:14 -05:00 committed by GitHub
commit 0ed708a105
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/os/bluestore/BlueStore.cc
View File

@ -4327,8 +4327,13 @@ int BlueStore::_open_db(bool create)
} }
bluefs_shared_bdev = BlueFS::BDEV_SLOW; bluefs_shared_bdev = BlueFS::BDEV_SLOW;
bluefs_single_shared_device = false; bluefs_single_shared_device = false;
} else { } else if (::lstat(bfn.c_str(), &st) == -1) {
bluefs_shared_bdev = BlueFS::BDEV_DB; bluefs_shared_bdev = BlueFS::BDEV_DB;
} else {
//symlink exist is bug
derr << __func__ << " " << bfn << " link target doesn't exist" << dendl;
r = -errno;
goto free_bluefs;
} }
// shared device // shared device
@ -4383,8 +4388,13 @@ int BlueStore::_open_db(bool create)
} }
cct->_conf->set_val("rocksdb_separate_wal_dir", "true"); cct->_conf->set_val("rocksdb_separate_wal_dir", "true");
bluefs_single_shared_device = false; bluefs_single_shared_device = false;
} else { } else if (::lstat(bfn.c_str(), &st) == -1) {
cct->_conf->set_val("rocksdb_separate_wal_dir", "false"); cct->_conf->set_val("rocksdb_separate_wal_dir", "false");
} else {
//symlink exist is bug
derr << __func__ << " " << bfn << " link target doesn't exist" << dendl;
r = -errno;
goto free_bluefs;
} }
if (create) { if (create) {