RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11366 from xiexingguo/xxg-wip-bluestore-1007

Browse Source 
os/bluestore: simplify blob status checking for small writes

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-10-07 08:41:35 -05:00 committed by GitHub
commit d834a6d318
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@
#include "FreelistManager.h"
#include "BlueFS.h"
#include "BlueRocksEnv.h"
#include "auth/Crypto.h"
#define dout_subsys ceph_subsys_bluestore
@ -3698,7 +3699,19 @@ int BlueStore::mkfs()
r = read_meta("mkfs_done", &done);
if (r == 0) {
dout(1) << __func__ << " already created" << dendl;
return 0; // idempotent
if (g_conf->bluestore_fsck_on_mkfs) {
r = fsck();
if (r < 0) {
derr << __func__ << " fsck found fatal error: " << cpp_strerror(r)
<< dendl;
return r;
}
if (r > 0) {
derr << __func__ << " fsck found " << r << " errors" << dendl;
r = -EIO;
}
}
return r; // idempotent
}
}
@ -3707,7 +3720,7 @@ int BlueStore::mkfs()
r = read_meta("type", &type);
if (r == 0) {
if (type != "bluestore") {
dout(1) << __func__ << " expected bluestore, but type is " << type << dendl;
derr << __func__ << " expected bluestore, but type is " << type << dendl;
return -EIO;
}
} else {
@ -3817,11 +3830,10 @@ int BlueStore::mkfs()
unsigned n = g_conf->bluestore_precondition_bluefs /
g_conf->bluestore_precondition_bluefs_block;
bufferlist bl;
bufferptr bp(g_conf->bluestore_precondition_bluefs_block);
for (unsigned i=0; i < g_conf->bluestore_precondition_bluefs_block; ++i) {
bp[i] = rand();
}
bl.append(bp);
int len = g_conf->bluestore_precondition_bluefs_block;
char buf[len];
get_random_bytes(buf, len);
bl.append(buf, len);
string key1("a");
string key2("b");
for (unsigned i=0; i < n; ++i) {
@ -7265,7 +7277,8 @@ void BlueStore::_do_write_small(
if (ep != o->extent_map.extent_map.begin()) {
--ep;
b = ep->blob;
if (ep->logical_offset - ep->blob_offset + b->get_blob().get_ondisk_length() <= offset) {
if (ep->logical_offset - ep->blob_offset +
b->get_blob().get_ondisk_length() <= offset) {
++ep;
}
}
@ -7274,7 +7287,7 @@ void BlueStore::_do_write_small(
break;
}
b = ep->blob;
if (!b->get_blob().is_mutable() || b->get_blob().is_compressed()) {
if (!b->get_blob().is_mutable()) {
dout(20) << __func__ << " ignoring immutable " << *b << dendl;
++ep;
continue;

5
src/os/bluestore/BlueStore.h
View File

@ -240,6 +240,7 @@ public:
_rm_buffer(buffer_map.find(b->offset));
}
void _rm_buffer(map<uint64_t,std::unique_ptr<Buffer>>::iterator p) {
assert(p != buffer_map.end());
cache->_audit("_rm_buffer start");
if (p->second->is_writing()) {
writing.erase(writing.iterator_to(*p->second));
@ -320,7 +321,7 @@ public:
std::atomic_int nref = {0}; ///< reference count
// these are defined/set if the shared_blob is 'loaded'
bool loaded = false; ///< whether shared_blob_t is loaded
bool loaded = false; ///< whether shared_blob is loaded
bluestore_shared_blob_t shared_blob; ///< the actual shared state
// these are defined/set if the blob is marked 'shared'
@ -514,7 +515,7 @@ public:
uint32_t logical_offset = 0; ///< logical offset
uint32_t blob_offset = 0; ///< blob offset
uint32_t length = 0; ///< length
uint8_t blob_depth = 0; /// blob overlapping count
uint8_t blob_depth = 0; ///< blob overlapping count
BlobRef blob; ///< the blob with our data
/// ctor for lookup only