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:22:11 -0700 |
| commit | fdc822f19acd1135b8819934df46112edb621eea (patch) | |
| tree | 37a93654e536a74580badde00c53cb00635a6336 /src/osd/OSD.h | |
| parent | 35e0f56d97b99778d905291be18da10908381494 (diff) | |
| download | ceph-wip-compat-dumpling.tar.gz | |
os, osd, tools: Add backportable compatibility checking for sharded objectswip-compat-dumpling
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
Diffstat (limited to 'src/osd/OSD.h')
| -rw-r--r-- | src/osd/OSD.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h index c6ee04fd710..d50dbbf0fe5 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -666,6 +666,8 @@ public: return oid; } static void recursive_remove_collection(ObjectStore *store, coll_t tmp); + static CompatSet get_osd_initial_compat_set(); + static CompatSet get_osd_compat_set(); private: |