提交 3d358a7e 编写于 作者: P Peter Dillinger 提交者: Facebook GitHub Bot

Fix handling of accidental truncation of IDENTITY file (#10173)

Summary:
A consequence of https://github.com/facebook/rocksdb/issues/9990 was requiring a non-empty DB ID to generate
new SST files. But if the DB ID is not tracked in the manifest and the IDENTITY file
is somehow truncated to 0 bytes, then an empty DB ID would be assigned, leading
to crash. This change ensures a non-empty DB ID is assigned and set in the
IDENTITY file.

Also,
* Some light refactoring to clean up the logic
* (I/O efficiency) If the ID is tracked in the manifest and already matches the
IDENTITY file, don't needlessly overwrite the file.
* (Debugging) Log the DB ID to info log on open, because sometimes IDENTITY
can change if DB is moved around (though it would be unusual for info log to
be copied/moved without IDENTITY file)

Pull Request resolved: https://github.com/facebook/rocksdb/pull/10173

Test Plan: unit tests expanded/updated

Reviewed By: ajkr

Differential Revision: D37176545

Pulled By: pdillinger

fbshipit-source-id: a9b414cd35bfa33de48af322a36c24538d50bef1
上级 94329ae4
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* Fix a bug in WAL tracking. Before this PR (#10087), calling `SyncWAL()` on the only WAL file of the db will not log the event in MANIFEST, thus allowing a subsequent `DB::Open` even if the WAL file is missing or corrupted. * Fix a bug in WAL tracking. Before this PR (#10087), calling `SyncWAL()` on the only WAL file of the db will not log the event in MANIFEST, thus allowing a subsequent `DB::Open` even if the WAL file is missing or corrupted.
* Fix a bug that could return wrong results with `index_type=kHashSearch` and using `SetOptions` to change the `prefix_extractor`. * Fix a bug that could return wrong results with `index_type=kHashSearch` and using `SetOptions` to change the `prefix_extractor`.
* Fixed a bug in WAL tracking with wal_compression. WAL compression writes a kSetCompressionType record which is not associated with any sequence number. As result, WalManager::GetSortedWalsOfType() will skip these WALs and not return them to caller, e.g. Checkpoint, Backup, causing the operations to fail. * Fixed a bug in WAL tracking with wal_compression. WAL compression writes a kSetCompressionType record which is not associated with any sequence number. As result, WalManager::GetSortedWalsOfType() will skip these WALs and not return them to caller, e.g. Checkpoint, Backup, causing the operations to fail.
* Avoid a crash if the IDENTITY file is accidentally truncated to empty. A new DB ID will be written and generated on Open.
### Public API changes ### Public API changes
* Add new API GetUnixTime in Snapshot class which returns the unix time at which Snapshot is taken. * Add new API GetUnixTime in Snapshot class which returns the unix time at which Snapshot is taken.
......
...@@ -579,55 +579,84 @@ TEST_F(DBBasicTest, ManifestRollOver) { ...@@ -579,55 +579,84 @@ TEST_F(DBBasicTest, ManifestRollOver) {
} while (ChangeCompactOptions()); } while (ChangeCompactOptions());
} }
TEST_F(DBBasicTest, IdentityAcrossRestarts1) { TEST_F(DBBasicTest, IdentityAcrossRestarts) {
constexpr size_t kMinIdSize = 10;
do { do {
std::string id1; for (bool with_manifest : {false, true}) {
ASSERT_OK(db_->GetDbIdentity(id1)); std::string idfilename = IdentityFileName(dbname_);
std::string id1, tmp;
Options options = CurrentOptions(); ASSERT_OK(db_->GetDbIdentity(id1));
Reopen(options); ASSERT_GE(id1.size(), kMinIdSize);
std::string id2;
ASSERT_OK(db_->GetDbIdentity(id2)); Options options = CurrentOptions();
// id1 should match id2 because identity was not regenerated options.write_dbid_to_manifest = with_manifest;
ASSERT_EQ(id1.compare(id2), 0); Reopen(options);
std::string id2;
std::string idfilename = IdentityFileName(dbname_); ASSERT_OK(db_->GetDbIdentity(id2));
ASSERT_OK(env_->DeleteFile(idfilename)); // id2 should match id1 because identity was not regenerated
Reopen(options); ASSERT_EQ(id1, id2);
std::string id3; ASSERT_OK(ReadFileToString(env_, idfilename, &tmp));
ASSERT_OK(db_->GetDbIdentity(id3)); ASSERT_EQ(tmp, id2);
if (options.write_dbid_to_manifest) {
ASSERT_EQ(id1.compare(id3), 0); // Recover from deleted/missing IDENTITY
} else { ASSERT_OK(env_->DeleteFile(idfilename));
// id1 should NOT match id3 because identity was regenerated Reopen(options);
ASSERT_NE(id1.compare(id3), 0); std::string id3;
ASSERT_OK(db_->GetDbIdentity(id3));
if (with_manifest) {
// id3 should match id1 because identity was restored from manifest
ASSERT_EQ(id1, id3);
} else {
// id3 should NOT match id1 because identity was regenerated
ASSERT_NE(id1, id3);
ASSERT_GE(id3.size(), kMinIdSize);
}
ASSERT_OK(ReadFileToString(env_, idfilename, &tmp));
ASSERT_EQ(tmp, id3);
// Recover from truncated IDENTITY
{
std::unique_ptr<WritableFile> w;
ASSERT_OK(env_->NewWritableFile(idfilename, &w, EnvOptions()));
ASSERT_OK(w->Close());
}
Reopen(options);
std::string id4;
ASSERT_OK(db_->GetDbIdentity(id4));
if (with_manifest) {
// id4 should match id1 because identity was restored from manifest
ASSERT_EQ(id1, id4);
} else {
// id4 should NOT match id1 because identity was regenerated
ASSERT_NE(id1, id4);
ASSERT_GE(id4.size(), kMinIdSize);
}
ASSERT_OK(ReadFileToString(env_, idfilename, &tmp));
ASSERT_EQ(tmp, id4);
// Recover from overwritten IDENTITY
std::string silly_id = "asdf123456789";
{
std::unique_ptr<WritableFile> w;
ASSERT_OK(env_->NewWritableFile(idfilename, &w, EnvOptions()));
ASSERT_OK(w->Append(silly_id));
ASSERT_OK(w->Close());
}
Reopen(options);
std::string id5;
ASSERT_OK(db_->GetDbIdentity(id5));
if (with_manifest) {
// id4 should match id1 because identity was restored from manifest
ASSERT_EQ(id1, id5);
} else {
ASSERT_EQ(id5, silly_id);
}
ASSERT_OK(ReadFileToString(env_, idfilename, &tmp));
ASSERT_EQ(tmp, id5);
} }
} while (ChangeCompactOptions()); } while (ChangeCompactOptions());
} }
TEST_F(DBBasicTest, IdentityAcrossRestarts2) {
do {
std::string id1;
ASSERT_OK(db_->GetDbIdentity(id1));
Options options = CurrentOptions();
options.write_dbid_to_manifest = true;
Reopen(options);
std::string id2;
ASSERT_OK(db_->GetDbIdentity(id2));
// id1 should match id2 because identity was not regenerated
ASSERT_EQ(id1.compare(id2), 0);
std::string idfilename = IdentityFileName(dbname_);
ASSERT_OK(env_->DeleteFile(idfilename));
Reopen(options);
std::string id3;
ASSERT_OK(db_->GetDbIdentity(id3));
// id1 should NOT match id3 because identity was regenerated
ASSERT_EQ(id1, id3);
} while (ChangeCompactOptions());
}
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
TEST_F(DBBasicTest, Snapshot) { TEST_F(DBBasicTest, Snapshot) {
env_->SetMockSleep(); env_->SetMockSleep();
......
...@@ -1479,8 +1479,10 @@ class DBImpl : public DB { ...@@ -1479,8 +1479,10 @@ class DBImpl : public DB {
virtual bool OwnTablesAndLogs() const { return true; } virtual bool OwnTablesAndLogs() const { return true; }
// Set DB identity file, and write DB ID to manifest if necessary. // Setup DB identity file, and write DB ID to manifest if necessary.
Status SetDBId(bool read_only, RecoveryContext* recovery_ctx); Status SetupDBId(bool read_only, RecoveryContext* recovery_ctx);
// Assign db_id_ and write DB ID to manifest if necessary.
void SetDBId(std::string&& id, bool read_only, RecoveryContext* recovery_ctx);
// REQUIRES: db mutex held when calling this function, but the db mutex can // REQUIRES: db mutex held when calling this function, but the db mutex can
// be released and re-acquired. Db mutex will be held when the function // be released and re-acquired. Db mutex will be held when the function
......
...@@ -873,43 +873,55 @@ uint64_t PrecomputeMinLogNumberToKeep2PC( ...@@ -873,43 +873,55 @@ uint64_t PrecomputeMinLogNumberToKeep2PC(
return min_log_number_to_keep; return min_log_number_to_keep;
} }
Status DBImpl::SetDBId(bool read_only, RecoveryContext* recovery_ctx) { void DBImpl::SetDBId(std::string&& id, bool read_only,
RecoveryContext* recovery_ctx) {
assert(db_id_.empty());
assert(!id.empty());
db_id_ = std::move(id);
if (!read_only && immutable_db_options_.write_dbid_to_manifest) {
assert(recovery_ctx != nullptr);
assert(versions_->GetColumnFamilySet() != nullptr);
VersionEdit edit;
edit.SetDBId(db_id_);
versions_->db_id_ = db_id_;
recovery_ctx->UpdateVersionEdits(
versions_->GetColumnFamilySet()->GetDefault(), edit);
}
}
Status DBImpl::SetupDBId(bool read_only, RecoveryContext* recovery_ctx) {
Status s; Status s;
// Happens when immutable_db_options_.write_dbid_to_manifest is set to true // Check for the IDENTITY file and create it if not there or
// the very first time. // broken or not matching manifest
if (db_id_.empty()) { std::string db_id_in_file;
// Check for the IDENTITY file and create it if not there. s = fs_->FileExists(IdentityFileName(dbname_), IOOptions(), nullptr);
s = fs_->FileExists(IdentityFileName(dbname_), IOOptions(), nullptr); if (s.ok()) {
// Typically Identity file is created in NewDB() and for some reason if s = GetDbIdentityFromIdentityFile(&db_id_in_file);
// it is no longer available then at this point DB ID is not in Identity if (s.ok() && !db_id_in_file.empty()) {
// file or Manifest. if (db_id_.empty()) {
if (s.IsNotFound()) { // Loaded from file and wasn't already known from manifest
// Create a new DB ID, saving to file only if allowed SetDBId(std::move(db_id_in_file), read_only, recovery_ctx);
if (read_only) { return s;
db_id_ = env_->GenerateUniqueId(); } else if (db_id_ == db_id_in_file) {
return Status::OK(); // Loaded from file and matches manifest
} else { return s;
s = SetIdentityFile(env_, dbname_);
if (!s.ok()) {
return s;
}
} }
} else if (!s.ok()) { }
assert(s.IsIOError()); }
return s; if (s.IsNotFound()) {
} s = Status::OK();
s = GetDbIdentityFromIdentityFile(&db_id_); }
if (immutable_db_options_.write_dbid_to_manifest && s.ok()) { if (!s.ok()) {
assert(!read_only); assert(s.IsIOError());
assert(recovery_ctx != nullptr); return s;
assert(versions_->GetColumnFamilySet() != nullptr); }
VersionEdit edit; // Otherwise IDENTITY file is missing or no good.
edit.SetDBId(db_id_); // Generate new id if needed
versions_->db_id_ = db_id_; if (db_id_.empty()) {
recovery_ctx->UpdateVersionEdits( SetDBId(env_->GenerateUniqueId(), read_only, recovery_ctx);
versions_->GetColumnFamilySet()->GetDefault(), edit); }
} // Persist it to IDENTITY file if allowed
} else if (!read_only) { if (!read_only) {
s = SetIdentityFile(env_, dbname_, db_id_); s = SetIdentityFile(env_, dbname_, db_id_);
} }
return s; return s;
......
...@@ -524,7 +524,8 @@ Status DBImpl::Recover( ...@@ -524,7 +524,8 @@ Status DBImpl::Recover(
return s; return s;
} }
} }
s = SetDBId(read_only, recovery_ctx); s = SetupDBId(read_only, recovery_ctx);
ROCKS_LOG_INFO(immutable_db_options_.info_log, "DB ID: %s\n", db_id_.c_str());
if (s.ok() && !read_only) { if (s.ok() && !read_only) {
s = DeleteUnreferencedSstFiles(recovery_ctx); s = DeleteUnreferencedSstFiles(recovery_ctx);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册