2

acelyc111 · Jun 4, 2023 · 0105cfc · 0105cfc
1 parent fa0389b
commit 0105cfc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/common/fs_manager.cpp b/src/common/fs_manager.cpp
@@ -315,7 +315,7 @@ void fs_manager::specify_dir_for_new_replica_for_test(dir_node *specified_dn,
         }
     }
     CHECK(dn_found, "dir_node({}) is not exist", specified_dn->tag);
-    CHECK_EQ(disk_status::NORMAL, dn_found->status);
+    CHECK_EQ(disk_status::NORMAL, specified_dn->status);
     const auto dir = specified_dn->replica_dir(app_type, pid);
     CHECK_TRUE(dsn::utils::filesystem::create_directory(dir));
     specified_dn->holding_replicas[pid.get_app_id()].emplace(pid);
@@ -567,7 +567,9 @@ fs_manager::validate_migrate_task(gpid pid,
             if (dn->status == disk_status::SPACE_INSUFFICIENT ||
                 dn->status == disk_status::IO_ERROR) {
                 err_msg = fmt::format("replica({}) target disk({}) is {}",
-                                      pid, origin_disk, enum_to_string(dn->status));
+                                      pid,
+                                      origin_disk,
+                                      enum_to_string(dn->status));
                 return disk_migrate_validation::kDiskIOError;
             }
 

diff --git a/src/replica/replica_2pc.cpp b/src/replica/replica_2pc.cpp
@@ -179,8 +179,7 @@ void replica::on_client_write(dsn::message_ex *request, bool ignore_throttling)
     }
 
     if (FLAGS_reject_write_when_disk_insufficient &&
-        (_dir_node->status != disk_status::NORMAL ||
-         _primary_states.secondary_disk_abnormal())) {
+        (_dir_node->status != disk_status::NORMAL || _primary_states.secondary_disk_abnormal())) {
         response_client_write(request, ERR_DISK_INSUFFICIENT);
         return;
     }

diff --git a/src/utils/error_code.h b/src/utils/error_code.h
@@ -175,4 +175,6 @@ DEFINE_ERR_CODE(ERR_RANGER_POLICIES_NO_NEED_UPDATE)
 
 DEFINE_ERR_CODE(ERR_RDB_CORRUPTION)
 DEFINE_ERR_CODE(ERR_RDB_IO_ERROR)
+
+DEFINE_ERR_CODE(ERR_DISK_IO_ERROR)
 } // namespace dsn