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

os: do not attempt to detect discard by default

Browse Source 
If the journal_discard option is false, the journal should no try to
guess if the device has discard capabilities.

http://tracker.ceph.com/issues/10296 Refs: #10296

Signed-off-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
Loic Dachary 2014-12-11 18:30:07 +01:00
parent cdb110539f
commit 9c5fd8c20a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/os/FileJournal.cc
View File

@ -156,8 +156,10 @@ int FileJournal::_open_block_device()
/* block devices have to write in blocks of CEPH_PAGE_SIZE */
block_size = CEPH_PAGE_SIZE;
discard = block_device_support_discard(fn.c_str());
dout(10) << fn << " support discard: " << (int)discard << dendl;
if (g_conf->journal_discard) {
discard = block_device_support_discard(fn.c_str());
dout(10) << fn << " support discard: " << (int)discard << dendl;
}
_check_disk_write_cache();
return 0;
}
@ -1586,7 +1588,7 @@ void FileJournal::committed_thru(uint64_t seq)
header.start_seq = seq + 1;
}
if (g_conf->journal_discard && discard) {
if (discard) {
dout(10) << __func__ << " will trim (" << old_start << ", " << header.start << ")" << dendl;
if (old_start < header.start)
do_discard(old_start, header.start - 1);