Add Check::Fatality

Signed-off-by: Tim Serong <[email protected]>

src/checks.cc

@@ -43,17 +43,24 @@ bool run_checks(const std::filesystem::path& path, bool should_fix) {
   bool all_checks_passed = true;
 
   std::vector<std::shared_ptr<Check>> checks;
-  // TODO: consider which of these checks should abort the entire process.
-  // I'm thinking in particular here of the metadata schema version check
-  // because if that fails, subsequent checks might not be valid.
   checks.emplace_back(std::make_shared<MetadataSchemaVersionCheck>(path));
   checks.emplace_back(std::make_shared<OrphanedObjectsCheck>(path));
   checks.emplace_back(std::make_shared<OrphanedMetadataCheck>(path));
   checks.emplace_back(std::make_shared<ObjectIntegrityCheck>(path));
 
   for (std::shared_ptr<Check> check : checks) {
-    all_checks_passed = check->check() ? all_checks_passed : false;
+    bool this_check_passed = check->check();
     check->show();
+    if (!this_check_passed) {
+      all_checks_passed = false;
+      if (check->is_fatal()) {
+        // Don't do any more checks if this check failure is fatal.
+        // TODO: integrate check->fix() here (try the fix, re-run the
+        // check, reset the failure state) otherwise you're basically
+        // screwed if there's a fatal failure.
+        break;
+      }
+    }
     if (should_fix) {
       check->fix();
     }

src/checks.h

@@ -44,12 +44,15 @@ class Fix {
 class Check {
  protected:
   std::vector<std::shared_ptr<Fix>> fixes;
+  enum Fatality { FATAL, NONFATAL } fatality;
   const std::filesystem::path& root_path;
 
  public:
-  Check(const std::filesystem::path& path) : root_path(path) {}
+  Check(Fatality f, const std::filesystem::path& path)
+      : fatality(f), root_path(path) {}
   virtual ~Check(){};
   virtual bool check() = 0;
+  bool is_fatal() { return fatality == FATAL; }
   void fix();
   void show();
 };

src/checks/metadata_schema_version.cc

@@ -36,7 +36,7 @@ std::string MetadataSchemaVersionFix::to_string() const {
 MetadataSchemaVersionCheck::MetadataSchemaVersionCheck(
     const std::filesystem::path& path
 )
-    : Check(path) {
+    : Check(FATAL, path) {
   metadata = std::make_unique<Database>(root_path / "s3gw.db");
 }
 

src/checks/object_integrity.cc

@@ -34,7 +34,7 @@ std::string ObjectIntegrityFix::to_string() const {
 }
 
 ObjectIntegrityCheck::ObjectIntegrityCheck(const std::filesystem::path& path)
-    : Check(path) {
+    : Check(NONFATAL, path) {
   metadata = std::make_unique<Database>(root_path / "s3gw.db");
 }
 

src/checks/orphaned_metadata.cc

@@ -37,7 +37,7 @@ std::string OrphanedMetadataFix::to_string() const {
 }
 
 OrphanedMetadataCheck::OrphanedMetadataCheck(const std::filesystem::path& path)
-    : Check(path) {
+    : Check(NONFATAL, path) {
   metadata = std::make_unique<Database>(root_path / "s3gw.db");
 }
 

src/checks/orphaned_objects.cc

@@ -77,7 +77,7 @@ std::string UnexpectedFileFix::to_string() const {
 }
 
 OrphanedObjectsCheck::OrphanedObjectsCheck(const std::filesystem::path& path)
-    : Check(path) {
+    : Check(NONFATAL, path) {
   metadata = std::make_unique<Database>(root_path / "s3gw.db");
 }