diff options
| author | xie xingguo <xie.xingguo@zte.com.cn> | 2016-03-04 17:50:05 +0100 |
|---|---|---|
| committer | xie xingguo <xie.xingguo@zte.com.cn> | 2016-03-15 12:05:40 +0100 |
| commit | a835b0ed51c1ad77828d8e48d09f82616ab59ad8 (patch) | |
| tree | 2dede969a9b06382583740c8873dfc6fac344c18 /src/ceph_osd.cc | |
| parent | osd: pg: drop assert_locked() method (diff) | |
| download | ceph-a835b0ed51c1ad77828d8e48d09f82616ab59ad8.tar.xz ceph-a835b0ed51c1ad77828d8e48d09f82616ab59ad8.zip | |
osd: make os_flags an option
In one of our test environments an osd is unable to back to work
due to the journal is totally unrecoverable. The os_flags field
is introduced to handle such a case but never be made an option
and visible to normal user.
This commit tries to make os_flags field a configurable option and
no flags is enabled by default and thus shall cause no compatibility
relevant issues.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Diffstat (limited to 'src/ceph_osd.cc')
| -rw-r--r-- | src/ceph_osd.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 3b98242b7ba..db2ae0980a6 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -257,7 +257,8 @@ int main(int argc, const char **argv) ObjectStore *store = ObjectStore::create(g_ceph_context, store_type, g_conf->osd_data, - g_conf->osd_journal); + g_conf->osd_journal, + g_conf->osd_os_flags); if (!store) { derr << "unable to create object store" << dendl; return -ENODEV; |