HDFS-11312. Fix incompatible tag number change for nonDfsUsed in DatanodeInfoProto. Contributed by Sean Mackrory.

(cherry picked from commit d51f8ba80816c20cd97ba5aa839a84b0bb6a7291)
(cherry picked from commit b089e122b1b01c3d877566d1f5ede5e338170432)
(cherry picked from commit b7b8671c0e71fb95d959746d9ebf7fce6cc20af2)

hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto

@@ -88,6 +88,7 @@ message DatanodeInfoProto {
   optional uint64 lastUpdate = 6 [default = 0];
   optional uint32 xceiverCount = 7 [default = 0];
   optional string location = 8;
+  optional uint64 nonDfsUsed = 9;
   enum AdminState {
     NORMAL = 0;
     DECOMMISSION_INPROGRESS = 1;
@@ -99,7 +100,6 @@ message DatanodeInfoProto {
   optional uint64 cacheUsed = 12 [default = 0];
   optional uint64 lastUpdateMonotonic = 13 [default = 0];
   optional string upgradeDomain = 14;
-  optional uint64 nonDfsUsed = 15;
 }
 
 /**