Repository: hadoop Updated Branches: refs/heads/branch-2.8.0 fefe4f27a -> 141837fbc
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) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/141837fb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/141837fb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/141837fb Branch: refs/heads/branch-2.8.0 Commit: 141837fbc41718b7231fc1b3eb982da24dfa48cc Parents: fefe4f2 Author: Andrew Wang <w...@apache.org> Authored: Wed Jan 11 15:13:27 2017 -0800 Committer: Junping Du <junping...@apache.org> Committed: Wed Jan 11 16:11:56 2017 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/141837fb/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto ---------------------------------------------------------------------- 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 index 451e2ab..7e2eb9e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto +++ b/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; } /** --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
