Merge branch 'master' into xuelei_dev

xiedeyantu · Jul 7, 2023 · 5f523e8 · 5f523e8
2 parents dd87269 + 8da8b79
commit 5f523e8
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Disks/StoragePolicy.cpp b/src/Disks/StoragePolicy.cpp
@@ -302,15 +302,23 @@ void StoragePolicy::checkCompatibleWith(const StoragePolicyPtr & new_storage_pol
  for (const auto & volume : getVolumes())
  {
  if (!new_volume_names.contains(volume->getName()))
- throw Exception(ErrorCodes::BAD_ARGUMENTS, "New storage policy {} shall contain volumes of the old storage policy {}", backQuote(new_storage_policy->getName()),backQuote(name));
+ throw Exception(
+ ErrorCodes::BAD_ARGUMENTS,
+ "New storage policy {} shall contain volumes of the old storage policy {}",
+ backQuote(new_storage_policy->getName()),
+ backQuote(name));
 
  std::unordered_set<String> new_disk_names;
  for (const auto & disk : new_storage_policy->getVolumeByName(volume->getName())->getDisks())
  new_disk_names.insert(disk->getName());
 
  for (const auto & disk : volume->getDisks())
  if (!new_disk_names.contains(disk->getName()))
- throw Exception(ErrorCodes::BAD_ARGUMENTS, "New storage policy {} shall contain disks of the old storage policy {}", backQuote(new_storage_policy->getName()),backQuote(name));
+ throw Exception(
+ ErrorCodes::BAD_ARGUMENTS,
+ "New storage policy {} shall contain disks of the old storage policy {}",
+ backQuote(new_storage_policy->getName()),
+ backQuote(name));
  }
 }