HDFS-15660. StorageTypeProto is not compatiable between 3.x and 2.6. Contributed by Ryan Wu.

linyiqun · linyiqun · commit b46ec6190968 · 2020-12-07T18:54:32.000+08:00
(cherry picked from commit da1ea25)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto
@@ -182,7 +182,7 @@ message StorageTypeQuotaInfosProto {
 }
 
 message StorageTypeQuotaInfoProto {
-  required StorageTypeProto type = 1;
+  optional StorageTypeProto type = 1 [default = DISK];
   required uint64 quota = 2;
   required uint64 consumed = 3;
 }

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ message StorageTypeQuotaInfosProto {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`message StorageTypeQuotaInfoProto {`
`185`		`- required StorageTypeProto type = 1;`
	`185`	`+ optional StorageTypeProto type = 1 [default = DISK];`
`186`	`186`	`required uint64 quota = 2;`
`187`	`187`	`required uint64 consumed = 3;`
`188`	`188`	`}`