Skip to content

Commit f92646c

Browse files
committed
Move logging outside of mutex
1 parent 1d52589 commit f92646c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

db/db_impl.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4232,6 +4232,9 @@ Status DBImpl::SetNewMemtableAndNewLogFile(ColumnFamilyData* cfd,
42324232
new_superversion = new SuperVersion();
42334233
}
42344234
}
4235+
Log(db_options_.info_log,
4236+
"[%s] New memtable created with log file: #%" PRIu64 "\n",
4237+
cfd->GetName().c_str(), new_log_number);
42354238
mutex_.Lock();
42364239
if (!s.ok()) {
42374240
// how do we fail if we're not creating new log?
@@ -4264,9 +4267,6 @@ Status DBImpl::SetNewMemtableAndNewLogFile(ColumnFamilyData* cfd,
42644267
cfd->imm()->Add(cfd->mem());
42654268
new_mem->Ref();
42664269
cfd->SetMemtable(new_mem);
4267-
Log(db_options_.info_log,
4268-
"[%s] New memtable created with log file: #%" PRIu64 "\n",
4269-
cfd->GetName().c_str(), logfile_number_);
42704270
context->superversions_to_free_.push_back(
42714271
cfd->InstallSuperVersion(new_superversion, &mutex_, mutable_cf_options));
42724272
return s;

include/rocksdb/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#define ROCKSDB_MAJOR 3
88
#define ROCKSDB_MINOR 6
9-
#define ROCKSDB_PATCH 0
9+
#define ROCKSDB_PATCH 1
1010

1111
// Do not use these. We made the mistake of declaring macros starting with
1212
// double underscore. Now we have to live with our choice. We'll deprecate these

0 commit comments

Comments
 (0)