Fix possible data-race between FileChecker and StorageLog/StorageStripeLog

azat · azat · commit e4db862d85fb · 2021-10-14T00:16:58.000+03:00
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
@@ -24,6 +24,7 @@
 #include <Parsers/ASTLiteral.h>
 #include "StorageLogSettings.h"
 #include <Processors/Sources/SourceWithProgress.h>
+#include <Processors/Sources/NullSource.h>
 #include <Processors/Pipe.h>
 #include <Processors/Sinks/SinkToStorage.h>
 
@@ -122,9 +123,6 @@ Chunk LogSource::generate()
     if (rows_read == rows_limit)
         return {};
 
-    if (storage.file_checker.empty())
-        return {};
-
     /// How many rows to read for the next block.
     size_t max_rows_to_read = std::min(block_size, rows_limit - rows_read);
     std::unordered_map<String, ISerialization::SubstreamsCache> caches;
@@ -672,6 +670,9 @@ Pipe StorageLog::read(
     if (!lock)
         throw Exception("Lock timeout exceeded", ErrorCodes::TIMEOUT_EXCEEDED);
 
+    if (file_checker.empty())
+        return Pipe(std::make_shared<NullSource>(metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID())));
+
     Pipes pipes;
 
     const Marks & marks = getMarksWithRealRowCount(metadata_snapshot);
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
@@ -98,9 +98,6 @@ class StripeLogSource final : public SourceWithProgress
 protected:
     Chunk generate() override
     {
-        if (storage.file_checker.empty())
-            return {};
-
         Block res;
         start();
 
@@ -337,7 +334,7 @@ Pipe StorageStripeLog::read(
     Pipes pipes;
 
     String index_file = table_path + "index.mrk";
-    if (!disk->exists(index_file))
+    if (file_checker.empty() || !disk->exists(index_file))
     {
         return Pipe(std::make_shared<NullSource>(metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID())));
     }

Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,6 @@ class StripeLogSource final : public SourceWithProgress`
`98`	`98`	`protected:`
`99`	`99`	`Chunk generate() override`
`100`	`100`	`{`
`101`		`- if (storage.file_checker.empty())`
`102`		`- return {};`
`103`		`-`
`104`	`101`	`Block res;`
`105`	`102`	`start();`
`106`	`103`
`@@ -337,7 +334,7 @@ Pipe StorageStripeLog::read(`
`337`	`334`	`Pipes pipes;`
`338`	`335`
`339`	`336`	`String index_file = table_path + "index.mrk";`
`340`		`- if (!disk->exists(index_file))`
	`337`	`+ if (file_checker.empty() \|\| !disk->exists(index_file))`
`341`	`338`	`{`
`342`	`339`	`return Pipe(std::make_shared<NullSource>(metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID())));`
`343`	`340`	`}`