From e5a2edd6417086b59889a7c1b7ac287cd8f3c164 Mon Sep 17 00:00:00 2001 From: John Sully Date: Fri, 26 Feb 2021 06:06:58 +0000 Subject: [PATCH] Don't complain about unclean shutdowns with an empty database Former-commit-id: 99f5c02e87062552eaa2f26e960eb7c9dd977c84 --- src/storage/rocksdbfactory.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/storage/rocksdbfactory.cpp b/src/storage/rocksdbfactory.cpp index 70f655ecc..080d86ce6 100644 --- a/src/storage/rocksdbfactory.cpp +++ b/src/storage/rocksdbfactory.cpp @@ -149,12 +149,15 @@ IStorage *RocksDBStorageFactory::create(int db, key_load_iterator iter, void *pr if (fUnclean || iter != nullptr) { count = 0; - if (fUnclean) - printf("\tDatabase was not shutdown cleanly, recomputing metrics\n"); auto opts = rocksdb::ReadOptions(); opts.tailing = true; std::unique_ptr it = std::unique_ptr(m_spdb->NewIterator(opts, spcolfamily.get())); - for (it->SeekToFirst(); it->Valid(); it->Next()) { + + it->SeekToFirst(); + if (fUnclean && it->Valid()) + printf("\tDatabase was not shutdown cleanly, recomputing metrics\n"); + + for (;it->Valid(); it->Next()) { if (FInternalKey(it->key().data(), it->key().size())) continue; if (iter != nullptr)