]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: use the type file for bluestore 7218/head
authorLoic Dachary <ldachary@redhat.com>
Sun, 24 Jan 2016 10:07:58 +0000 (17:07 +0700)
committerLoic Dachary <ldachary@redhat.com>
Thu, 4 Feb 2016 10:01:47 +0000 (17:01 +0700)
commit2591f6371e6ccaa247aff43c56b49a553471a1b7
tree848a1cbfc35ed424a5b70e971609f3bc09a39299
parent36656c8dc98deb8da10f3300bd627d31c785f865
ceph-disk: use the type file for bluestore

The type file in the OSD bluestore data exists and contains the
bluestore string. ceph-disk activate should use it instead of
the "osd objectstore" configuration value. It is better in case the
configuration file changes between prepare and activate.

The fsid file cannot be used by bluestore to signify that ceph-osd
--mkfs has completed successfully because it is pre-populated by
ceph-disk. Introduce the mkfs_done file, dedicated to this, instead of
overloading an existing file.

Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
src/ceph-disk/ceph_disk/main.py
src/os/bluestore/BlueStore.cc