feat: Multiple errcodes returned.

Author: huerni

internal/cacctmgr/cacctmgr.go

@@ -476,7 +476,10 @@ func DeleteAccount(value string) util.CraneCmdError {
 		fmt.Printf("Delete account %s succeeded.\n", value)
 		return util.ErrorSuccess
 	} else {
-		fmt.Printf("Delete account %s failed: %s.\n", value, util.ErrMsg(reply.GetReason()))
+		fmt.Printf("Delete account failed: \n")
+		for _, errRecode := range reply.ErrRecodeList {
+			fmt.Printf("%s: %s \n", errRecode.ErrValue, util.ErrMsg(errRecode.ErrCode))
+		}
 		return util.ErrorBackend
 	}
 }
@@ -508,7 +511,10 @@ func DeleteUser(value string, account string) util.CraneCmdError {
 		fmt.Printf("Remove user %s succeeded.\n", value)
 		return util.ErrorSuccess
 	} else {
-		fmt.Printf("Remove user %s failed: %s.\n", value, util.ErrMsg(reply.GetReason()))
+		fmt.Printf("Remove user failed: \n")
+		for _, errRecode := range reply.ErrRecodeList {
+			fmt.Printf("%s: %s \n", errRecode.ErrValue, util.ErrMsg(errRecode.ErrCode))
+		}
 		return util.ErrorBackend
 	}
 }
@@ -540,7 +546,10 @@ func DeleteQos(value string) util.CraneCmdError {
 		fmt.Printf("Delete QoS %s succeeded.\n", value)
 		return util.ErrorSuccess
 	} else {
-		fmt.Printf("Delete QoS %s failed: %s.\n", value, util.ErrMsg(reply.GetReason()))
+		fmt.Printf("Delete QoS failed: \n")
+		for _, errRecode := range reply.ErrRecodeList {
+			fmt.Printf("%s: %s \n", errRecode.ErrValue, util.ErrMsg(errRecode.ErrCode))
+		}
 		return util.ErrorBackend
 	}
 }
@@ -605,7 +614,10 @@ func ModifyAccount(modifyField protos.ModifyField, newValue string, name string,
 		fmt.Println("Modify information succeeded.")
 		return util.ErrorSuccess
 	} else {
-		fmt.Printf("Modify information failed: %s.\n", util.ErrMsg(reply.GetReason()))
+		fmt.Printf("Modify information failed:\n")
+		for _, errRecode := range reply.ErrRecodeList {
+			fmt.Printf("%s: %s \n", errRecode.ErrValue, util.ErrMsg(errRecode.ErrCode))
+		}
 		return util.ErrorBackend
 	}
 }
@@ -663,7 +675,10 @@ func ModifyUser(modifyField protos.ModifyField, newValue string, name string, ac
 		fmt.Println("Modify information succeeded.")
 		return util.ErrorSuccess
 	} else {
-		fmt.Printf("Modify information failed: %s.\n", util.ErrMsg(reply.GetReason()))
+		fmt.Printf("Modify information failed: \n")
+		for _, errRecode := range reply.ErrRecodeList {
+			fmt.Printf("%s: %s \n", errRecode.ErrValue, util.ErrMsg(errRecode.ErrCode))
+		}
 		return util.ErrorBackend
 	}
 }
@@ -864,7 +879,9 @@ func BlockAccountOrUser(value string, entityType protos.EntityType, account stri
 		fmt.Printf("Block %s succeeded.\n", value)
 		return util.ErrorSuccess
 	} else {
-		fmt.Println(util.ErrMsg(reply.Reason))
+		for _, errRecode := range reply.ErrRecodeList {
+			fmt.Printf("%s: %s \n", errRecode.ErrValue, util.ErrMsg(errRecode.ErrCode))
+		}
 		return util.ErrorBackend
 	}
 }
@@ -900,7 +917,9 @@ func UnblockAccountOrUser(value string, entityType protos.EntityType, account st
 		fmt.Printf("Unblock %s succeeded.\n", value)
 		return util.ErrorSuccess
 	} else {
-		fmt.Println(util.ErrMsg(reply.Reason))
+		for _, errRecode := range reply.ErrRecodeList {
+			fmt.Printf("%s: %s \n", errRecode.ErrValue, util.ErrMsg(errRecode.ErrCode))
+		}
 		return util.ErrorBackend
 	}
 }

protos/Crane.proto

@@ -274,6 +274,7 @@ message DeleteAccountRequest {
 message DeleteAccountReply {
   bool ok = 1;
   ErrCode reason = 2;
+  repeated ErrorRecord err_recode_list = 3;
 }
 
 message DeleteUserRequest {
@@ -285,6 +286,7 @@ message DeleteUserRequest {
 message DeleteUserReply {
   bool ok = 1;
   ErrCode reason = 2;
+  repeated ErrorRecord err_recode_list = 3;
 }
 
 message DeleteQosRequest {
@@ -295,6 +297,7 @@ message DeleteQosRequest {
 message DeleteQosReply {
   bool ok = 1;
   ErrCode reason = 2;
+  repeated ErrorRecord err_recode_list = 3;
 }
 
 message ModifyAccountRequest {
@@ -309,6 +312,7 @@ message ModifyAccountRequest {
 message ModifyAccountReply {
   bool ok = 1;
   ErrCode reason = 2;
+  repeated ErrorRecord err_recode_list = 3;
 }
 
 message ModifyUserRequest {
@@ -325,6 +329,7 @@ message ModifyUserRequest {
 message ModifyUserReply {
   bool ok = 1;
   ErrCode reason = 2;
+repeated ErrorRecord err_recode_list = 3;
 }
 
 message ModifyQosRequest {
@@ -384,6 +389,7 @@ message BlockAccountOrUserRequest {
 message BlockAccountOrUserReply {
   bool ok = 1;
   ErrCode reason = 2;
+  repeated ErrorRecord err_recode_list = 3;
 }
 
 message MigrateSshProcToCgroupRequest {
@@ -831,4 +837,4 @@ service CraneForeD {
   rpc CrunStream(stream StreamCrunRequest) returns(stream StreamCforedCrunReply);
   rpc TaskIOStream(stream StreamCforedTaskIORequest) returns(stream StreamCforedTaskIOReply);
   rpc QueryTaskIdFromPort(QueryTaskIdFromPortRequest) returns (QueryTaskIdFromPortReply);
-}
+}

protos/PublicDefs.proto

@@ -319,6 +319,11 @@ message TrimmedPartitionInfo {
   repeated TrimmedCranedInfo craned_lists = 3;
 }
 
+message ErrorRecord {
+  string err_value = 1;
+  ErrCode err_code = 2;
+}
+
 enum ErrCode {
   SUCCESS = 0;  // Success
 
@@ -481,4 +486,4 @@ message CranedRemoteMeta {
   string craned_version = 3;
   google.protobuf.Timestamp craned_start_time = 4;
   google.protobuf.Timestamp system_boot_time = 5;
-}
+}