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

Use correct sequence number when creating memtable

Browse Source 
Summary:
copied from: 5ebfd2623a

Opening existing RocksDB attempts recovery from log files, which uses
wrong sequence number to create the memtable. This is a regression
introduced in change a400336.

This change includes a test demonstrating the problem, without the fix
the test fails with "Operation failed. Try again.: Transaction could not
check for conflicts for operation at SequenceNumber 1 as the MemTable
only contains changes newer than SequenceNumber 2.  Increasing the value
of the max_write_buffer_number_to_maintain option could reduce the
frequency of this error"

This change is a joint effort by Peter 'Stig' Edwards thatsafunnyname
and me.
Closes https://github.com/facebook/rocksdb/pull/1458

Differential Revision: D4143791

Pulled By: reidHoruff

fbshipit-source-id: 5a25033
This commit is contained in:
Reid Horuff 2016-11-09 12:12:40 -08:00 committed by Facebook Github Bot
parent 144cdb8f16
commit d133b08f68
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db_impl.cc
View File

@ -1721,7 +1721,7 @@ Status DBImpl::RecoverLogFiles(const std::vector<uint64_t>& log_numbers,
flushed = true; flushed = true;
cfd->CreateNewMemtable(*cfd->GetLatestMutableCFOptions(), cfd->CreateNewMemtable(*cfd->GetLatestMutableCFOptions(),
*next_sequence); versions_->LastSequence());
} }
} }

43
utilities/transactions/optimistic_transaction_test.cc
View File

@ -34,14 +34,24 @@ class OptimisticTransactionTest : public testing::Test {
dbname = test::TmpDir() + "/optimistic_transaction_testdb"; dbname = test::TmpDir() + "/optimistic_transaction_testdb";
DestroyDB(dbname, options); DestroyDB(dbname, options);
Status s = OptimisticTransactionDB::Open(options, dbname, &txn_db); Open();
assert(s.ok());
db = txn_db->GetBaseDB();
} }
~OptimisticTransactionTest() { ~OptimisticTransactionTest() {
delete txn_db; delete txn_db;
DestroyDB(dbname, options); DestroyDB(dbname, options);
} }
void Reopen() {
delete txn_db;
Open();
}
private:
void Open() {
Status s = OptimisticTransactionDB::Open(options, dbname, &txn_db);
assert(s.ok());
db = txn_db->GetBaseDB();
}
}; };
TEST_F(OptimisticTransactionTest, SuccessTest) { TEST_F(OptimisticTransactionTest, SuccessTest) {
@ -1338,6 +1348,33 @@ TEST_F(OptimisticTransactionTest, OptimisticTransactionStressTest) {
ASSERT_OK(s); ASSERT_OK(s);
} }
TEST_F(OptimisticTransactionTest, SequenceNumberAfterRecoverTest) {
WriteOptions write_options;
OptimisticTransactionOptions transaction_options;
Transaction* transaction(txn_db->BeginTransaction(write_options, transaction_options));
Status s = transaction->Put("foo", "val");
ASSERT_OK(s);
s = transaction->Put("foo2", "val");
ASSERT_OK(s);
s = transaction->Put("foo3", "val");
ASSERT_OK(s);
s = transaction->Commit();
ASSERT_OK(s);
delete transaction;
Reopen();
transaction = txn_db->BeginTransaction(write_options, transaction_options);
s = transaction->Put("bar", "val");
ASSERT_OK(s);
s = transaction->Put("bar2", "val");
ASSERT_OK(s);
s = transaction->Commit();
ASSERT_OK(s);
delete transaction;
}
} // namespace rocksdb } // namespace rocksdb
int main(int argc, char** argv) { int main(int argc, char** argv) {