summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2012-05-01 13:46:09 -0700
committerSage Weil <sage@newdream.net>2012-05-01 13:47:27 -0700
commit4d095e9549b1067f1cc19ef8463282f2c5deca2a (patch)
treecdcc39082240237ca4d1f17dd6f62140049c0bc3
parent29399eec5f91a6796ee0084eaf839ade4beff245 (diff)
downloadceph-4d095e9549b1067f1cc19ef8463282f2c5deca2a.tar.gz
osd: create a 'ready' file on mkfs completion
Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--src/osd/OSD.cc21
1 files changed, 15 insertions, 6 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index be9d0998c98..3e90c17e3d3 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -287,12 +287,6 @@ int OSD::mkfs(const std::string &dev, const std::string &jdev, uuid_d fsid, int
derr << "OSD::mkfs: couldn't mount FileStore: error " << ret << dendl;
goto free_store;
}
- store->sync_and_flush();
- ret = write_meta(dev, sb.cluster_fsid, sb.osd_fsid, whoami);
- if (ret) {
- derr << "OSD::mkfs: failed to write fsid file: error " << ret << dendl;
- goto umount_store;
- }
// age?
if (g_conf->osd_age_time != 0) {
@@ -352,6 +346,21 @@ int OSD::mkfs(const std::string &dev, const std::string &jdev, uuid_d fsid, int
goto umount_store;
}
}
+
+ store->sync_and_flush();
+
+ ret = write_meta(dev, sb.cluster_fsid, sb.osd_fsid, whoami);
+ if (ret) {
+ derr << "OSD::mkfs: failed to write fsid file: error " << ret << dendl;
+ goto umount_store;
+ }
+
+ ret = write_meta(dev, "ready", "ready\n", 6);
+ if (ret) {
+ derr << "OSD::mkfs: failed to write ready file: error " << ret << dendl;
+ goto umount_store;
+ }
+
}
catch (const std::exception &se) {
derr << "OSD::mkfs: caught exception " << se.what() << dendl;