diff options
| author | David Zafman <david.zafman@inktank.com> | 2013-09-25 09:19:16 -0700 |
|---|---|---|
| committer | David Zafman <david.zafman@inktank.com> | 2013-09-25 11:25:21 -0700 |
| commit | fed06a7d038879bb39d9634dfa4d866b65f5a1d1 (patch) | |
| tree | e665b3e247cd040b0e4fdb0b9837e1430ee34d73 /src/os/ObjectStore.h | |
| parent | a0379725851c92b0ea9bb56990a1a62f43cdbdba (diff) | |
| download | ceph-wip-compat-cuttlefish.tar.gz | |
os, osd, tools: Add backportable compatibility checking for sharded objectswip-compat-cuttlefish
OSD
New CEPH_OSD_FEATURE_INCOMPAT_SHARDS
FileStore
NEW CEPH_FS_FEATURE_INCOMPAT_SHARDS
Add FSSuperblock with feature CompatSet in it
Store sharded_objects state using CompatSet
Add set_allow_sharded_objects() and get_allow_sharded_objects() to FileStore/ObjectStore
Add read_superblock()/write_superblock() internal filestore functions
ceph_filestore_dump
Add OSDsuperblock to export format
Use CompatSet from OSD code itself in filestore-dump tool
Always check compatibility of OSD features with on-disk features
On import verify compatibility of on-disk features with export data
Bump super_ver due to export format change
Backport: dumpling, cuttlefish
Signed-off-by: David Zafman <david.zafman@inktank.com>
(cherry picked from commit 5b70c2b0108f744c171364f26475fb7baaa8b6fe)
Conflicts:
src/os/FileStore.cc
src/os/FileStore.h
src/osd/OSD.cc
src/osd/OSD.h
Diffstat (limited to 'src/os/ObjectStore.h')
| -rw-r--r-- | src/os/ObjectStore.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h index 9f112647f82..aa105d33aa8 100644 --- a/src/os/ObjectStore.h +++ b/src/os/ObjectStore.h @@ -798,6 +798,8 @@ public: virtual int get_max_object_name_length() = 0; virtual int mkfs() = 0; // wipe virtual int mkjournal() = 0; // journal only + virtual void set_allow_sharded_objects() = 0; + virtual bool get_allow_sharded_objects() = 0; virtual int statfs(struct statfs *buf) = 0; |