RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #26720 into master

Browse Source 
* refs/pull/26720/head:
	ceph-osd: infer objectstore type of 'type' file is missing

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Sage Weil 2019-03-02 08:31:54 -06:00
commit 5de132944a
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ceph_osd.cc
View File

@ -267,7 +267,7 @@ int main(int argc, const char **argv)
} }
// the store // the store
std::string store_type = g_conf().get_val<std::string>("osd_objectstore"); std::string store_type;
{ {
char fn[PATH_MAX]; char fn[PATH_MAX];
snprintf(fn, sizeof(fn), "%s/type", data_path.c_str()); snprintf(fn, sizeof(fn), "%s/type", data_path.c_str());
@ -280,6 +280,29 @@ int main(int argc, const char **argv)
dout(5) << "object store type is " << store_type << dendl; dout(5) << "object store type is " << store_type << dendl;
} }
::close(fd); ::close(fd);
} else if (mkfs) {
store_type = g_conf().get_val<std::string>("osd_objectstore");
} else {
// hrm, infer the type
snprintf(fn, sizeof(fn), "%s/current", data_path.c_str());
struct stat st;
if (::stat(fn, &st) == 0 &&
S_ISDIR(st.st_mode)) {
derr << "missing 'type' file, inferring filestore from current/ dir"
<< dendl;
store_type = "filestore";
} else {
snprintf(fn, sizeof(fn), "%s/block", data_path.c_str());
if (::stat(fn, &st) == 0 &&
S_ISLNK(st.st_mode)) {
derr << "missing 'type' file, inferring bluestore from block symlink"
<< dendl;
store_type = "bluestore";
} else {
derr << "missing 'type' file and unable to infer osd type" << dendl;
forker.exit(1);
}
}
} }
} }