andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hardcoding temp file name for Identity file to 000000.dbtmp just like it's done for CURRENT file

Browse Source 
Summary: as per Dhruba's suggestion

Test Plan: make all check; Seen the Id getting generated properly in db_repl_stress

Reviewers: dhruba, kailiu

Reviewed By: dhruba

CC: leveldb

Differential Revision: https://reviews.facebook.net/D13635
This commit is contained in:
Mayank Agarwal 2013-10-23 10:59:08 -07:00
parent b37fda842d
commit e56ce03691
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
db/filename.cc
View File

@ -92,7 +92,7 @@ std::string LockFileName(const std::string& dbname) {
} }
std::string TempFileName(const std::string& dbname, uint64_t number) { std::string TempFileName(const std::string& dbname, uint64_t number) {
assert(number > 0); assert(number >= 0);
return MakeFileName(dbname, number, "dbtmp"); return MakeFileName(dbname, number, "dbtmp");
} }
@ -234,7 +234,8 @@ Status SetCurrentFile(Env* env, const std::string& dbname,
Status SetIdentityFile(Env* env, const std::string& dbname) { Status SetIdentityFile(Env* env, const std::string& dbname) {
std::string id = env->GenerateUniqueId(); std::string id = env->GenerateUniqueId();
assert(!id.empty()); assert(!id.empty());
std::string tmp = TempFileName(dbname, id.size()); // Reserve the filename dbname/000000.dbtmp for the temporary identity file
std::string tmp = TempFileName(dbname, 0);
Status s = WriteStringToFileSync(env, id, tmp); Status s = WriteStringToFileSync(env, id, tmp);
if (s.ok()) { if (s.ok()) {
s = env->RenameFile(tmp, IdentityFileName(dbname)); s = env->RenameFile(tmp, IdentityFileName(dbname));