ceph-objectstore-tool: mount an ObjectStore via fuse

Currently only read-only.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-01-06 17:53:43 -05:00
parent f5d106ff1e
commit 96643e9cc3
7 changed files with 935 additions and 5 deletions

View File

@ -461,7 +461,7 @@ add_executable(ceph-objectstore-tool
tools/RadosDump.cc
$<TARGET_OBJECTS:common_util_obj>
$<TARGET_OBJECTS:heap_profiler_objs>)
target_link_libraries(ceph-objectstore-tool tcmalloc osd os global ${Boost_PROGRAM_OPTIONS_LIBRARY} dl)
target_link_libraries(ceph-objectstore-tool tcmalloc osd os global ${Boost_PROGRAM_OPTIONS_LIBRARY} fuse dl)
install(TARGETS ceph-objectstore-tool DESTINATION bin)
@ -625,6 +625,7 @@ if(${HAVE_XFS})
os/fs/XFS.cc)
endif(${HAVE_XFS})
set(libos_srcs
os/FuseStore.cc
os/ObjectStore.cc
os/Transaction.cc
os/filestore/chain_xattr.cc

View File

@ -274,7 +274,7 @@ LIBKV += -llz4
endif
endif # WITH_SLIBROCKSDB
LIBKV += -lz -lleveldb -lsnappy
LIBOS += $(LIBOS_TYPES) $(LIBKV)
LIBOS += $(LIBOS_TYPES) $(LIBKV) $(LIBFUSE_LIBS)
LIBMON += $(LIBMON_TYPES)

View File

@ -144,6 +144,7 @@ SUBSYS(kstore, 1, 5)
SUBSYS(rocksdb, 4, 5)
SUBSYS(leveldb, 4, 5)
SUBSYS(kinetic, 1, 5)
SUBSYS(fuse, 1, 5)
OPTION(key, OPT_STR, "")
OPTION(keyfile, OPT_STR, "")

871
src/os/FuseStore.cc Normal file
View File

@ -0,0 +1,871 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab
#include "FuseStore.h"
#include "include/stringify.h"
#include "common/errno.h"
#define FUSE_USE_VERSION 30
#include <fuse/fuse.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h> /* Definition of AT_* constants */
#include <sys/stat.h>
#define dout_subsys ceph_subsys_fuse
#include "common/debug.h"
#undef dout_prefix
#define dout_prefix *_dout << "fuse "
// some fuse-y bits of state
struct fs_info {
struct fuse_args args;
struct fuse *f;
struct fuse_chan *ch;
char *mountpoint;
};
FuseStore::FuseStore(ObjectStore *s, string p)
: store(s),
mount_point(p),
fuse_thread(this)
{
info = new fs_info;
}
FuseStore::~FuseStore()
{
delete info;
}
/*
* / - root directory
* $cid/
* $cid/bitwise_hash_start = lowest hash value
* $cid/bitwise_hash_end = highest hash value
* $cid/pgmeta/ - pgmeta object
* $cid/all/ - all objects
* $cid/all/$obj/
* $cid/all/$obj/bitwise_hash
* $cid/all/$obj/data
* $cid/all/$obj/omap/$key
* $cid/all/$obj/attr/$name
* $cid/by_bitwise_hash/$hash/$bits/$obj - all objects with this (bitwise) hash (prefix)
*/
enum {
FN_ROOT = 1,
FN_COLLECTION,
FN_HASH_START,
//FN_HASH_END,
FN_OBJECT,
FN_OBJECT_HASH,
FN_OBJECT_DATA,
FN_OBJECT_OMAP_HEADER,
FN_OBJECT_OMAP,
FN_OBJECT_OMAP_VAL,
FN_OBJECT_ATTR,
FN_OBJECT_ATTR_VAL,
FN_ALL,
FN_HASH_DIR,
FN_HASH_VAL,
};
static int parse_fn(const char *path, coll_t *cid, ghobject_t *oid, string *key,
uint32_t *hash, uint32_t *hash_bits)
{
list<string> v;
for (const char *p = path; *p; ++p) {
if (*p == '/')
continue;
const char *e;
for (e = p + 1; *e && *e != '/'; e++) ;
string c(p, e-p);
v.push_back(c);
p = e;
if (!*p)
break;
}
dout(10) << __func__ << " path " << path << " -> " << v << dendl;
if (v.empty())
return FN_ROOT;
if (!cid->parse(v.front())) {
return -ENOENT;
}
if (v.size() == 1)
return FN_COLLECTION;
v.pop_front();
if (v.front() == "bitwise_hash_start")
return FN_HASH_START;
//if (v.front() == "bitwise_hash_end")
//return FN_HASH_END;
if (v.front() == "pgmeta") {
spg_t pgid;
if (cid->is_pg(&pgid)) {
*oid = pgid.make_pgmeta_oid();
v.pop_front();
if (v.empty())
return FN_OBJECT;
goto do_object;
}
return -ENOENT;
}
if (v.front() == "all") {
v.pop_front();
if (v.empty())
return FN_ALL;
goto do_dir;
}
if (v.front() == "by_bitwise_hash") {
v.pop_front();
if (v.empty())
return FN_HASH_DIR;
unsigned long hv, hm;
int r = sscanf(v.front().c_str(), "%lx", &hv);
if (r != 1)
return -ENOENT;
int shift = 32 - v.front().length() * 4;
v.pop_front();
if (v.empty())
return FN_HASH_DIR;
r = sscanf(v.front().c_str(), "%ld", &hm);
if (r != 1)
return -ENOENT;
if (hm < 1 || hm > 32)
return -ENOENT;
v.pop_front();
*hash = hv << shift;//hobject_t::_reverse_bits(hv << shift);
*hash_bits = hm;
if (v.empty())
return FN_HASH_VAL;
goto do_dir;
}
return -ENOENT;
do_dir:
{
string o = v.front();
if (!oid->parse(o)) {
return -ENOENT;
}
v.pop_front();
if (v.empty())
return FN_OBJECT;
}
do_object:
if (v.front() == "data")
return FN_OBJECT_DATA;
if (v.front() == "omap_header")
return FN_OBJECT_OMAP_HEADER;
if (v.front() == "omap") {
v.pop_front();
if (v.empty())
return FN_OBJECT_OMAP;
*key = v.front();
v.pop_front();
if (v.empty())
return FN_OBJECT_OMAP_VAL;
return -ENOENT;
}
if (v.front() == "attr") {
v.pop_front();
if (v.empty())
return FN_OBJECT_ATTR;
*key = v.front();
v.pop_front();
if (v.empty())
return FN_OBJECT_ATTR_VAL;
return -ENOENT;
}
if (v.front() == "bitwise_hash")
return FN_OBJECT_HASH;
return -ENOENT;
}
static int os_getattr(const char *path, struct stat *stbuf)
{
coll_t cid;
ghobject_t oid;
string key;
uint32_t hash_value, hash_bits;
int t = parse_fn(path, &cid, &oid, &key, &hash_value, &hash_bits);
if (t < 0)
return t;
fuse_context *fc = fuse_get_context();
FuseStore *fs = static_cast<FuseStore*>(fc->private_data);
stbuf->st_size = 0;
stbuf->st_uid = 0;
stbuf->st_gid = 0;
stbuf->st_mode = S_IFREG | 0700;
switch (t) {
case FN_OBJECT:
case FN_OBJECT_OMAP:
case FN_OBJECT_ATTR:
case FN_ALL:
case FN_HASH_DIR:
case FN_HASH_VAL:
case FN_ROOT:
case FN_COLLECTION:
stbuf->st_mode = S_IFDIR | 0700;
return 0;
case FN_HASH_START:
//case FN_HASH_END:
case FN_OBJECT_HASH:
stbuf->st_size = 9;
return 0;
case FN_OBJECT_DATA:
{
int r = fs->store->stat(cid, oid, stbuf);
if (r < 0)
return r;
}
break;
case FN_OBJECT_OMAP_HEADER:
{
bufferlist bl;
fs->store->omap_get_header(cid, oid, &bl);
stbuf->st_size = bl.length();
}
break;
case FN_OBJECT_OMAP_VAL:
{
set<string> k;
k.insert(key);
map<string,bufferlist> v;
fs->store->omap_get_values(cid, oid, k, &v);
if (!v.count(key)) {
return -ENOENT;
}
stbuf->st_size = v[key].length();
}
break;
case FN_OBJECT_ATTR_VAL:
{
bufferptr v;
int r = fs->store->getattr(cid, oid, key.c_str(), v);
if (r == -ENODATA)
r = -ENOENT;
if (r < 0)
return r;
stbuf->st_size = v.length();
}
break;
default:
return -ENOENT;
}
return 0;
}
static int os_readdir(const char *path,
void *buf,
fuse_fill_dir_t filler,
off_t offset,
struct fuse_file_info *fi)
{
coll_t cid;
ghobject_t oid;
string key;
uint32_t hash_value, hash_bits;
int t = parse_fn(path, &cid, &oid, &key, &hash_value, &hash_bits);
if (t < 0)
return t;
fuse_context *fc = fuse_get_context();
FuseStore *fs = static_cast<FuseStore*>(fc->private_data);
switch (t) {
case FN_ROOT:
{
vector<coll_t> cls;
fs->store->list_collections(cls);
for (auto c : cls) {
int r = filler(buf, stringify(c).c_str(), NULL, 0);
if (r > 0)
break;
}
}
break;
case FN_COLLECTION:
{
filler(buf, "bitwise_hash_start", NULL, 0);
//filler(buf, "bitwise_hash_end", NULL, 0);
filler(buf, "all", NULL, 0);
filler(buf, "by_bitwise_hash", NULL, 0);
spg_t pgid;
if (cid.is_pg(&pgid) &&
fs->store->exists(cid, pgid.make_pgmeta_oid())) {
filler(buf, "pgmeta", NULL, 0);
}
}
break;
case FN_OBJECT:
{
filler(buf, "bitwise_hash", NULL, 0);
filler(buf, "data", NULL, 0);
filler(buf, "omap", NULL, 0);
filler(buf, "attr", NULL, 0);
filler(buf, "omap_header", NULL, 0);
}
break;
case FN_ALL:
{
ghobject_t next;
while (true) {
vector<ghobject_t> ls;
int r = fs->store->collection_list(
cid, next, ghobject_t::get_max(), true, 1000, &ls, &next);
if (r < 0)
break;
for (auto p : ls) {
string s = stringify(p);
filler(buf, s.c_str(), NULL, 0);
}
if (next == ghobject_t::get_max())
break;
}
}
break;
case FN_HASH_VAL:
{
ghobject_t next = cid.get_min_hobj();
next.hobj.set_hash(hobject_t::_reverse_bits(hash_value));
ghobject_t last = next;
uint64_t rev_end = (hash_value | (0xffffffff >> hash_bits)) + 1;
if (rev_end >= 0x100000000)
last = ghobject_t::get_max();
else
last.hobj.set_hash(hobject_t::_reverse_bits(rev_end));
dout(10) << __func__ << " hash " << std::hex
<< hobject_t::_reverse_bits(hash_value) << std::dec
<< "/" << hash_bits << " first " << next << " last " << last
<< dendl;
while (true) {
vector<ghobject_t> ls;
int r = fs->store->collection_list(
cid, next, last, true, 1000, &ls, &next);
if (r < 0)
break;
for (auto p : ls) {
string s = stringify(p);
filler(buf, s.c_str(), NULL, 0);
}
if (next == ghobject_t::get_max() || next == last)
break;
}
}
break;
case FN_OBJECT_OMAP:
{
set<string> keys;
fs->store->omap_get_keys(cid, oid, &keys);
for (auto k : keys) {
filler(buf, k.c_str(), NULL, 0);
}
}
break;
case FN_OBJECT_ATTR:
{
map<string,bufferptr> aset;
fs->store->getattrs(cid, oid, aset);
for (auto a : aset) {
filler(buf, a.first.c_str(), NULL, 0);
}
}
break;
}
return 0;
}
static int os_open(const char *path, struct fuse_file_info *fi)
{
coll_t cid;
ghobject_t oid;
string key;
uint32_t hash_value, hash_bits;
int t = parse_fn(path, &cid, &oid, &key, &hash_value, &hash_bits);
if (t < 0)
return t;
fuse_context *fc = fuse_get_context();
FuseStore *fs = static_cast<FuseStore*>(fc->private_data);
bufferlist *pbl = 0;
switch (t) {
case FN_HASH_START:
{
pbl = new bufferlist;
spg_t pgid;
if (cid.is_pg(&pgid)) {
unsigned long h;
h = hobject_t::_reverse_bits(pgid.ps());
char buf[10];
snprintf(buf, sizeof(buf), "%08lX\n", h);
pbl->append(buf);
} else {
pbl->append("00000000\n");
}
}
break;
case FN_OBJECT_HASH:
{
pbl = new bufferlist;
char buf[10];
snprintf(buf, sizeof(buf), "%08X\n",
(unsigned)oid.hobj.get_bitwise_key_u32());
pbl->append(buf);
}
break;
case FN_OBJECT_DATA:
{
pbl = new bufferlist;
fs->store->read(cid, oid, 0, 0, *pbl);
}
break;
case FN_OBJECT_ATTR_VAL:
{
bufferptr bp;
fs->store->getattr(cid, oid, key.c_str(), bp);
pbl = new bufferlist;
pbl->append(bp);
}
break;
case FN_OBJECT_OMAP_VAL:
{
set<string> k;
k.insert(key);
map<string,bufferlist> v;
fs->store->omap_get_values(cid, oid, k, &v);
pbl = new bufferlist;
*pbl = v[key];
}
break;
case FN_OBJECT_OMAP_HEADER:
{
bufferlist bl;
fs->store->omap_get_header(cid, oid, &bl);
pbl = new bufferlist;
pbl->claim(bl);
}
break;
}
if (pbl) {
fi->fh = reinterpret_cast<uint64_t>(pbl);
}
return 0;
}
static int os_create(const char *path, mode_t mode, struct fuse_file_info *fi)
{
coll_t cid;
ghobject_t oid;
string key;
uint32_t hash_value, hash_bits;
int f = parse_fn(path, &cid, &oid, &key, &hash_value, &hash_bits);
if (f < 0)
return f;
fuse_context *fc = fuse_get_context();
FuseStore *fs = static_cast<FuseStore*>(fc->private_data);
ObjectStore::Transaction t;
bufferlist *pbl = 0;
switch (f) {
case FN_OBJECT_DATA:
{
pbl = new bufferlist;
fs->store->read(cid, oid, 0, 0, *pbl);
}
break;
case FN_OBJECT_ATTR_VAL:
{
pbl = new bufferlist;
bufferptr bp;
int r = fs->store->getattr(cid, oid, key.c_str(), bp);
if (r == -ENODATA) {
bufferlist empty;
t.setattr(cid, oid, key.c_str(), empty);
}
pbl->append(bp);
}
break;
case FN_OBJECT_OMAP_VAL:
{
pbl = new bufferlist;
set<string> k;
k.insert(key);
map<string,bufferlist> v;
fs->store->omap_get_values(cid, oid, k, &v);
if (v.count(key) == 0) {
map<string,bufferlist> aset;
aset[key] = bufferlist();
t.omap_setkeys(cid, oid, aset);
} else {
*pbl = v[key];
}
}
break;
}
if (!t.empty()) {
ceph::shared_ptr<ObjectStore::Sequencer> osr(
new ObjectStore::Sequencer("fuse"));
fs->store->apply_transaction(&*osr, t);
osr->flush();
}
if (pbl) {
fi->fh = reinterpret_cast<uint64_t>(pbl);
}
return 0;
}
static int os_release(const char *path, struct fuse_file_info *fi)
{
bufferlist *pbl = reinterpret_cast<bufferlist*>(fi->fh);
delete pbl;
return 0;
}
static int os_read(const char *path, char *buf, size_t size, off_t offset,
struct fuse_file_info *fi)
{
bufferlist *pbl = reinterpret_cast<bufferlist*>(fi->fh);
if (!pbl)
return 0;
if (offset >= pbl->length())
return 0;
if (offset + size > pbl->length())
size = pbl->length() - offset;
bufferlist r;
r.substr_of(*pbl, offset, size);
memcpy(buf, r.c_str(), r.length());
return r.length();
}
static int os_write(const char *path, const char *buf, size_t size,
off_t offset, struct fuse_file_info *fi)
{
bufferlist *pbl = reinterpret_cast<bufferlist*>(fi->fh);
if (!pbl)
return 0;
bufferlist final;
if (offset) {
if (offset > pbl->length()) {
final.substr_of(*pbl, 0, offset);
} else {
final.claim_append(*pbl);
size_t zlen = offset - final.length();
bufferptr z(zlen);
z.zero();
final.append(z);
}
}
final.append(buf, size);
if (offset + size < pbl->length()) {
bufferlist rest;
rest.substr_of(*pbl, offset + size, pbl->length() - offset - size);
final.claim_append(rest);
}
*pbl = final;
return size;
}
int os_flush(const char *path, struct fuse_file_info *fi)
{
coll_t cid;
ghobject_t oid;
string key;
uint32_t hash_value, hash_bits;
int f = parse_fn(path, &cid, &oid, &key, &hash_value, &hash_bits);
if (f < 0)
return f;
fuse_context *fc = fuse_get_context();
FuseStore *fs = static_cast<FuseStore*>(fc->private_data);
bufferlist *pbl = reinterpret_cast<bufferlist*>(fi->fh);
if (!pbl)
return 0;
ObjectStore::Transaction t;
switch (f) {
case FN_OBJECT_DATA:
t.write(cid, oid, 0, pbl->length(), *pbl);
break;
case FN_OBJECT_ATTR_VAL:
t.setattr(cid, oid, key.c_str(), *pbl);
break;
case FN_OBJECT_OMAP_VAL:
{
map<string,bufferlist> aset;
aset[key] = *pbl;
t.omap_setkeys(cid, oid, aset);
break;
}
case FN_OBJECT_OMAP_HEADER:
t.omap_setheader(cid, oid, *pbl);
break;
default:
return -EPERM;
}
ceph::shared_ptr<ObjectStore::Sequencer> osr(
new ObjectStore::Sequencer("fuse"));
fs->store->apply_transaction(&*osr, t);
osr->flush();
return 0;
}
static int os_unlink(const char *path)
{
coll_t cid;
ghobject_t oid;
string key;
uint32_t hash_value, hash_bits;
int f = parse_fn(path, &cid, &oid, &key, &hash_value, &hash_bits);
if (f < 0)
return f;
fuse_context *fc = fuse_get_context();
FuseStore *fs = static_cast<FuseStore*>(fc->private_data);
ObjectStore::Transaction t;
switch (f) {
case FN_OBJECT_OMAP_VAL:
{
set<string> keys;
keys.insert(key);
t.omap_rmkeys(cid, oid, keys);
}
break;
case FN_OBJECT_ATTR_VAL:
t.rmattr(cid, oid, key.c_str());
break;
case FN_OBJECT_OMAP_HEADER:
{
bufferlist empty;
t.omap_setheader(cid, oid, empty);
}
break;
case FN_OBJECT:
t.remove(cid, oid);
break;
case FN_COLLECTION:
if (!fs->store->collection_empty(cid))
return -ENOTEMPTY;
t.remove_collection(cid);
break;
case FN_OBJECT_DATA:
t.truncate(cid, oid, 0);
break;
default:
return -EPERM;
}
ceph::shared_ptr<ObjectStore::Sequencer> osr(
new ObjectStore::Sequencer("fuse"));
fs->store->apply_transaction(&*osr, t);
osr->flush();
return 0;
}
static int os_truncate(const char *path, off_t size)
{
coll_t cid;
ghobject_t oid;
string key;
uint32_t hash_value, hash_bits;
int f = parse_fn(path, &cid, &oid, &key, &hash_value, &hash_bits);
if (f < 0)
return f;
if (f == FN_OBJECT_OMAP_VAL ||
f == FN_OBJECT_ATTR_VAL ||
f == FN_OBJECT_OMAP_HEADER) {
if (size)
return -EPERM;
return 0;
}
if (f != FN_OBJECT_DATA)
return -EPERM;
fuse_context *fc = fuse_get_context();
FuseStore *fs = static_cast<FuseStore*>(fc->private_data);
ObjectStore::Transaction t;
t.truncate(cid, oid, size);
ceph::shared_ptr<ObjectStore::Sequencer> osr(
new ObjectStore::Sequencer("fuse"));
fs->store->apply_transaction(&*osr, t);
osr->flush();
return 0;
}
static int os_statfs(const char *path, struct statvfs *stbuf)
{
fuse_context *fc = fuse_get_context();
FuseStore *fs = static_cast<FuseStore*>(fc->private_data);
struct statfs s;
int r = fs->store->statfs(&s);
if (r < 0)
return r;
stbuf->f_bsize = s.f_bsize;
stbuf->f_blocks = s.f_blocks;
stbuf->f_bfree = s.f_bfree;
stbuf->f_bavail = s.f_bavail;
stbuf->f_files = s.f_files;
stbuf->f_ffree = s.f_ffree;
return 0;
}
static struct fuse_operations fs_oper = {
getattr: os_getattr,
readlink: 0,
getdir: 0,
mknod: 0,
mkdir: 0,
unlink: os_unlink,
rmdir: os_unlink,
symlink: 0,
rename: 0,
link: 0,
chmod: 0,
chown: 0,
truncate: os_truncate,
utime: 0,
open: os_open,
read: os_read,
write: os_write,
statfs: os_statfs,
flush: os_flush,
release: os_release,
fsync: 0,
setxattr: 0,
getxattr: 0,
listxattr: 0,
removexattr: 0,
opendir: 0,
readdir: os_readdir,
releasedir: 0,
fsyncdir: 0,
init: 0,
destroy: 0,
access: 0,
create: os_create,
};
int FuseStore::main()
{
const char *v[] = {
"foo",
mount_point.c_str(),
"-f",
"-d", // debug
};
int c = 3;
if (g_conf->fuse_debug)
++c;
return fuse_main(c, (char**)v, &fs_oper, (void*)this);
}
int FuseStore::start()
{
dout(10) << __func__ << dendl;
memset(&info->args, 0, sizeof(info->args));
const char *v[] = {
"foo",
mount_point.c_str(),
"-f", // foreground
"-d", // debug
};
fuse_args a = FUSE_ARGS_INIT(4, (char**)v);
info->args = a;
if (fuse_parse_cmdline(&info->args, &info->mountpoint, NULL, NULL) == -1) {
derr << __func__ << " failed to parse args" << dendl;
return -EINVAL;
}
info->ch = fuse_mount(info->mountpoint, &info->args);
if (!info->ch) {
derr << __func__ << " fuse_mount failed" << dendl;
return -EIO;
}
info->f = fuse_new(info->ch, &info->args, &fs_oper, sizeof(fs_oper),
(void*)this);
if (!info->f) {
derr << __func__ << " fuse_new failed" << dendl;
return -EIO;
}
fuse_thread.create("fusestore");
dout(10) << __func__ << " done" << dendl;
return 0;
}
int FuseStore::loop()
{
dout(10) << __func__ << " enter" << dendl;
int r = fuse_loop(info->f);
if (r)
derr << __func__ << " got " << cpp_strerror(r) << dendl;
dout(10) << __func__ << " exit" << dendl;
return r;
}
int FuseStore::stop()
{
dout(10) << __func__ << " enter" << dendl;
fuse_unmount(info->mountpoint, info->ch);
fuse_thread.join();
fuse_destroy(info->f);
dout(10) << __func__ << " exit" << dendl;
return 0;
}

35
src/os/FuseStore.h Normal file
View File

@ -0,0 +1,35 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab
#ifndef CEPH_OS_FUSESTORE_H
#define CEPH_OS_FUSESTORE_H
#include "common/Thread.h"
#include "os/ObjectStore.h"
class FuseStore {
public:
ObjectStore *store;
string mount_point;
struct fs_info *info;
class FuseThread : public Thread {
FuseStore *fs;
public:
FuseThread(FuseStore *f) : fs(f) {}
void *entry() {
fs->loop();
return NULL;
}
} fuse_thread;
FuseStore(ObjectStore *s, string p);
~FuseStore();
int main();
int start();
int loop();
int stop();
};
#endif

View File

@ -27,6 +27,7 @@ libos_a_SOURCES = \
os/kstore/kv.cc \
os/kstore/KStore.cc \
os/memstore/MemStore.cc \
os/FuseStore.cc \
os/ObjectStore.cc
if WITH_LIBAIO
@ -89,6 +90,7 @@ noinst_HEADERS += \
os/kstore/kv.h \
os/memstore/MemStore.h \
os/memstore/PageSet.h \
os/FuseStore.h \
os/ObjectMap.h \
os/ObjectStore.h

View File

@ -26,6 +26,7 @@
#include "os/ObjectStore.h"
#include "os/filestore/FileJournal.h"
#include "os/FuseStore.h"
#include "osd/PGLog.h"
#include "osd/OSD.h"
@ -2207,7 +2208,7 @@ int mydump_journal(Formatter *f, string journalpath, bool m_journal_dio)
int main(int argc, char **argv)
{
string dpath, jpath, pgidstr, op, file, object, objcmd, arg1, arg2, type, format;
string dpath, jpath, pgidstr, op, file, mountpoint, object, objcmd, arg1, arg2, type, format;
spg_t pgid;
unsigned epoch = 0;
ghobject_t ghobj;
@ -2228,12 +2229,14 @@ int main(int argc, char **argv)
("pgid", po::value<string>(&pgidstr),
"PG id, mandatory for info, log, remove, export, rm-past-intervals, mark-complete")
("op", po::value<string>(&op),
"Arg is one of [info, log, remove, fsck, export, import, list, fix-lost, list-pgs, rm-past-intervals, dump-journal, dump-super, meta-list, "
"Arg is one of [info, log, remove, fsck, fuse, export, import, list, fix-lost, list-pgs, rm-past-intervals, dump-journal, dump-super, meta-list, "
"get-osdmap, set-osdmap, get-inc-osdmap, set-inc-osdmap, mark-complete]")
("epoch", po::value<unsigned>(&epoch),
"epoch# for get-osdmap and get-inc-osdmap, the current epoch in use if not specified")
("file", po::value<string>(&file),
"path of file to export, import, get-osdmap, set-osdmap, get-inc-osdmap or set-inc-osdmap")
("mountpoint", po::value<string>(&mountpoint),
"fuse mountpoint")
("format", po::value<string>(&format)->default_value("json-pretty"),
"Output format which may be json, json-pretty, xml, xml-pretty")
("debug", "Enable diagnostic output to stderr")
@ -2342,7 +2345,8 @@ int main(int argc, char **argv)
usage(desc);
myexit(1);
}
if (op != "list" && op != "fsck" && vm.count("op") && vm.count("object")) {
if (op != "list" && op != "fsck" &&
vm.count("op") && vm.count("object")) {
cerr << "Can't specify both --op and object command syntax" << std::endl;
usage(desc);
myexit(1);
@ -2352,6 +2356,11 @@ int main(int argc, char **argv)
usage(desc);
myexit(1);
}
if (op == "fuse" && mountpoint.length() == 0) {
cerr << "Missing fuse mountpoint" << std::endl;
usage(desc);
myexit(1);
}
outistty = isatty(STDOUT_FILENO);
file_fd = fd_none;
@ -2495,6 +2504,17 @@ int main(int argc, char **argv)
myexit(1);
}
if (op == "fuse") {
FuseStore fuse(fs, mountpoint);
cout << "mounting fuse at " << mountpoint << " ..." << std::endl;
int r = fuse.main();
if (r < 0) {
cerr << "failed to mount fuse: " << cpp_strerror(r) << std::endl;
myexit(1);
}
myexit(0);
}
vector<coll_t> ls;
vector<coll_t>::iterator it;
CompatSet supported;