Merge pull request #20226 from ClickHouse/fix_race_in_system_parts

alesapin · web-flow · commit 9179fc8d9600 · 2021-02-10T12:45:51.000+03:00
Fix benign race in system.parts
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
@@ -193,8 +193,9 @@ void StorageSystemParts::processNextStorage(MutableColumns & columns_, const Sto
         add_ttl_info_map(part->ttl_infos.rows_where_ttl);
 
         /// _state column should be the latest.
+        /// Do not use part->getState*, it can be changed from different thread
         if (has_state_column)
-            columns_[i++]->insert(part->stateString());
+            columns_[i++]->insert(IMergeTreeDataPart::stateToString(part_state));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,9 @@ void StorageSystemParts::processNextStorage(MutableColumns & columns_, const Sto`
`193`	`193`	`add_ttl_info_map(part->ttl_infos.rows_where_ttl);`
`194`	`194`
`195`	`195`	`/// _state column should be the latest.`
	`196`	`+ /// Do not use part->getState*, it can be changed from different thread`
`196`	`197`	`if (has_state_column)`
`197`		`- columns_[i++]->insert(part->stateString());`
	`198`	`+ columns_[i++]->insert(IMergeTreeDataPart::stateToString(part_state));`
`198`	`199`	`}`
`199`	`200`	`}`
`200`	`201`