https://tracker.ceph.com/
https://tracker.ceph.com/favicon.ico
2018-06-26T11:17:55Z
Ceph
Ceph - Bug #24661: os/bluestore: don't store/use path_block.{db,wal} from meta
https://tracker.ceph.com/issues/24661?journal_id=115695
2018-06-26T11:17:55Z
Alfredo Deza
adeza@redhat.com
<ul></ul><p>The PR didn't have an issue attached to it.</p>
<p>(merged) Master PR <a class="external" href="https://github.com/ceph/ceph/pull/22462">https://github.com/ceph/ceph/pull/22462</a><br />(merged) Backport to Mimic <a class="external" href="https://github.com/ceph/ceph/pull/22477">https://github.com/ceph/ceph/pull/22477</a></p>
<p>I was unable to backport to Luminous as it has conflicts I couldn't resolve on the C++ side.</p>
<pre>
diff --cc src/os/bluestore/BlueStore.cc
index 55a8351e67,9228a9da52..0000000000
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -4557,11 -4725,10 +4557,9 @@@ int BlueStore::_open_db(bool create
string bfn;
struct stat st;
- if (read_meta("path_block.db", &bfn) < 0) {
- bfn = path + "/block.db";
- }
+ bfn = path + "/block.db";
if (::stat(bfn.c_str(), &st) == 0) {
- r = bluefs->add_block_device(BlueFS::BDEV_DB, bfn,
- create && cct->_conf->bdev_enable_discard);
+ r = bluefs->add_block_device(BlueFS::BDEV_DB, bfn);
if (r < 0) {
derr << __func__ << " add block device(" << bfn << ") returned: "
<< cpp_strerror(r) << dendl;
@@@ -4598,10 -4765,9 +4596,22 @@@
}
// shared device
++<<<<<<< HEAD
+ if (read_meta("path_block", &bfn) < 0) {
+ bfn = path + "/block";
+ }
+ r = bluefs->add_block_device(bluefs_shared_bdev, bfn);
++||||||| parent of ef510e43f0... os/bluestore: don't store/use path_block.{db,wal} from meta
++ if (read_meta("path_block", &bfn) < 0) {
++ bfn = path + "/block";
++ }
++ // never trim here
++ r = bluefs->add_block_device(bluefs_shared_bdev, bfn, false);
++=======
+ bfn = path + "/block";
+ // never trim here
+ r = bluefs->add_block_device(bluefs_shared_bdev, bfn, false);
++>>>>>>> ef510e43f0... os/bluestore: don't store/use path_block.{db,wal} from meta
if (r < 0) {
derr << __func__ << " add block device(" << bfn << ") returned: "
<< cpp_strerror(r) << dendl;
@@@ -4629,11 -4795,10 +4639,9 @@@
bluefs_extents.insert(start, initial);
}
- if (read_meta("path_block.wal", &bfn) < 0) {
- bfn = path + "/block.wal";
- }
+ bfn = path + "/block.wal";
if (::stat(bfn.c_str(), &st) == 0) {
- r = bluefs->add_block_device(BlueFS::BDEV_WAL, bfn,
- create && cct->_conf->bdev_enable_discard);
+ r = bluefs->add_block_device(BlueFS::BDEV_WAL, bfn);
if (r < 0) {
derr << __func__ << " add block device(" << bfn << ") returned: "
<< cpp_strerror(r) << dendl;
</pre>
Ceph - Bug #24661: os/bluestore: don't store/use path_block.{db,wal} from meta
https://tracker.ceph.com/issues/24661?journal_id=115696
2018-06-26T11:43:30Z
Sage Weil
sage@newdream.net
<ul><li><strong>Status</strong> changed from <i>New</i> to <i>Fix Under Review</i></li></ul><p><a class="external" href="https://github.com/ceph/ceph/pull/22716">https://github.com/ceph/ceph/pull/22716</a></p>
Ceph - Bug #24661: os/bluestore: don't store/use path_block.{db,wal} from meta
https://tracker.ceph.com/issues/24661?journal_id=115709
2018-06-26T15:02:34Z
Alfredo Deza
adeza@redhat.com
<ul><li><strong>Status</strong> changed from <i>Fix Under Review</i> to <i>Resolved</i></li></ul>
Ceph - Bug #24661: os/bluestore: don't store/use path_block.{db,wal} from meta
https://tracker.ceph.com/issues/24661?journal_id=116058
2018-07-03T07:55:19Z
Nathan Cutler
ncutler@suse.cz
<ul><li><strong>Status</strong> changed from <i>Resolved</i> to <i>Pending Backport</i></li><li><strong>Backport</strong> changed from <i>luminous</i> to <i>mimic,luminous</i></li></ul>
Ceph - Bug #24661: os/bluestore: don't store/use path_block.{db,wal} from meta
https://tracker.ceph.com/issues/24661?journal_id=116063
2018-07-03T07:55:34Z
Nathan Cutler
ncutler@suse.cz
<ul><li><strong>Copied to</strong> <i><a class="issue tracker-9 status-3 priority-4 priority-default closed" href="/issues/24749">Backport #24749</a>: mimic: os/bluestore: don't store/use path_block.{db,wal} from meta </i> added</li></ul>
Ceph - Bug #24661: os/bluestore: don't store/use path_block.{db,wal} from meta
https://tracker.ceph.com/issues/24661?journal_id=116065
2018-07-03T07:55:36Z
Nathan Cutler
ncutler@suse.cz
<ul><li><strong>Copied to</strong> <i><a class="issue tracker-9 status-3 priority-4 priority-default closed" href="/issues/24750">Backport #24750</a>: luminous: os/bluestore: don't store/use path_block.{db,wal} from meta </i> added</li></ul>
Ceph - Bug #24661: os/bluestore: don't store/use path_block.{db,wal} from meta
https://tracker.ceph.com/issues/24661?journal_id=116069
2018-07-03T07:58:19Z
Nathan Cutler
ncutler@suse.cz
<ul><li><strong>Status</strong> changed from <i>Pending Backport</i> to <i>Resolved</i></li></ul>