diff options
| author | David Zafman <david.zafman@inktank.com> | 2013-08-30 17:33:37 -0700 |
|---|---|---|
| committer | David Zafman <david.zafman@inktank.com> | 2013-09-23 13:12:41 -0700 |
| commit | 362dba1086c3e625705278ae3de5004ca81d1dd0 (patch) | |
| tree | 14986668716f1abd87b433f66e8c196431d3b455 | |
| parent | 7b7e004611770080fcd3d5164380c23b48e28a1c (diff) | |
| download | ceph-362dba1086c3e625705278ae3de5004ca81d1dd0.tar.gz | |
os, ceph_osd: Rename on_disk_version to target_version
Signed-off-by: David Zafman <david.zafman@inktank.com>
| -rw-r--r-- | src/ceph_osd.cc | 2 | ||||
| -rw-r--r-- | src/os/FileStore.cc | 10 | ||||
| -rw-r--r-- | src/os/FileStore.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 3d517da1f89..2388762f1df 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -423,7 +423,7 @@ int main(int argc, const char **argv) global_init_daemonize(g_ceph_context, 0); common_init_finish(g_ceph_context); - if (g_conf->filestore_update_to >= (int)FileStore::on_disk_version) { + if (g_conf->filestore_update_to >= (int)FileStore::target_version) { int err = OSD::convertfs(g_conf->osd_data, g_conf->osd_journal); if (err < 0) { derr << TEXT_RED << " ** ERROR: error converting store " << g_conf->osd_data diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index ac51f95006f..b8d099ae73d 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -124,7 +124,7 @@ int FileStore::init_index(coll_t cid) { char path[PATH_MAX]; get_cdir(cid, path, sizeof(path)); - int r = index_manager.init_index(cid, path, on_disk_version); + int r = index_manager.init_index(cid, path, target_version); assert(!m_filestore_fail_eio || r != -EIO); return r; } @@ -942,7 +942,7 @@ int FileStore::version_stamp_is_valid(uint32_t *version) bl.push_back(bp); bufferlist::iterator i = bl.begin(); ::decode(*version, i); - if (*version == on_disk_version) + if (*version == target_version) return 1; else return 0; @@ -956,7 +956,7 @@ int FileStore::write_version_stamp() if (fd < 0) return -errno; bufferlist bl; - ::encode(on_disk_version, bl); + ::encode(target_version, bl); int ret = safe_write(fd, bl.c_str(), bl.length()); TEMP_FAILURE_RETRY(::close(fd)); @@ -1058,7 +1058,7 @@ int FileStore::mount() ret = -EINVAL; derr << "FileStore::mount : stale version stamp " << version_stamp << ". Please run the FileStore update script before starting the " - << "OSD, or set filestore_update_to to " << on_disk_version + << "OSD, or set filestore_update_to to " << target_version << dendl; goto close_fsid_fd; } @@ -3777,7 +3777,7 @@ int FileStore::collection_version_current(coll_t c, uint32_t *version) if (r < 0) return r; *version = index->collection_version(); - if (*version == on_disk_version) + if (*version == target_version) return 1; else return 0; diff --git a/src/os/FileStore.h b/src/os/FileStore.h index 4f58df4d698..885fb025150 100644 --- a/src/os/FileStore.h +++ b/src/os/FileStore.h @@ -89,7 +89,7 @@ public: return perf_tracker.get_cur_stats(); } - static const uint32_t on_disk_version = 3; + static const uint32_t target_version = 3; private: string internal_name; ///< internal name, used to name the perfcounter instance string basedir, journalpath; |