Skip to content

Commit 6f0835d

Browse files
committed
fix
1 parent 9efa595 commit 6f0835d

4 files changed

Lines changed: 7 additions & 9 deletions

File tree

java-client/src/main/java/org/apache/pegasus/base/error_code.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ public enum error_types {
125125
ERR_CHILD_NOT_READY,
126126
ERR_DISK_INSUFFICIENT,
127127
ERR_DISK_IO_ERROR,
128-
ERR_SECONDARY_DISK_ABNORMAL,
129128

130129
// ERROR_CODE defined by client
131130
ERR_SESSION_RESET,

java-client/src/main/java/org/apache/pegasus/client/PegasusTable.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2259,11 +2259,7 @@ public void handleReplicaException(
22592259
message = " The replica server disk space is insufficient";
22602260
break;
22612261
case ERR_DISK_IO_ERROR:
2262-
message = " The replica server disk I/O error";
2263-
break;
2264-
case ERR_SECONDARY_DISK_ABNORMAL:
2265-
message =
2266-
" Write rejected: secondary replica disk is abnormal (insufficient space or I/O error)";
2262+
message = " The replica server encountered a disk I/O error";
22672263
break;
22682264
default:
22692265
message = " Unknown error!";

src/replica/replica_2pc.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,12 @@ void replica::on_client_write(dsn::message_ex *request, bool ignore_throttling)
188188
response_client_write(request, disk_status_to_error_code(_dir_node->status));
189189
} else {
190190
// Secondary replica disk is abnormal but primary is OK
191-
response_client_write(request, ERR_SECONDARY_DISK_ABNORMAL);
191+
for (const auto &kv : _primary_states.secondary_disk_abnormal) {
192+
if (kv.second != disk_status::NORMAL) {
193+
response_client_write(request, disk_status_to_error_code(kv.second));
194+
break;
195+
}
196+
}
192197
}
193198
return;
194199
}

src/utils/error_code.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,6 @@ DEFINE_ERR_CODE(ERR_HTTP_ERROR)
189189

190190
DEFINE_ERR_CODE(ERR_NOT_MATCHED)
191191

192-
DEFINE_ERR_CODE(ERR_SECONDARY_DISK_ABNORMAL)
193-
194192
} // namespace dsn
195193

196194
USER_DEFINED_STRUCTURE_FORMATTER(::dsn::error_code);

0 commit comments

Comments
 (0)