Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 96188200C08 for ; Thu, 12 Jan 2017 00:13:50 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 94BD4160B50; Wed, 11 Jan 2017 23:13:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DE97A160B4E for ; Thu, 12 Jan 2017 00:13:49 +0100 (CET) Received: (qmail 2850 invoked by uid 500); 11 Jan 2017 23:13:49 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 2840 invoked by uid 99); 11 Jan 2017 23:13:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jan 2017 23:13:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EAE41DFAF2; Wed, 11 Jan 2017 23:13:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wang@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-11312. Fix incompatible tag number change for nonDfsUsed in DatanodeInfoProto. Contributed by Sean Mackrory. Date: Wed, 11 Jan 2017 23:13:48 +0000 (UTC) archived-at: Wed, 11 Jan 2017 23:13:50 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 797993942 -> d51f8ba80 HDFS-11312. Fix incompatible tag number change for nonDfsUsed in DatanodeInfoProto. Contributed by Sean Mackrory. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d51f8ba8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d51f8ba8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d51f8ba8 Branch: refs/heads/trunk Commit: d51f8ba80816c20cd97ba5aa839a84b0bb6a7291 Parents: 7979939 Author: Andrew Wang Authored: Wed Jan 11 15:13:27 2017 -0800 Committer: Andrew Wang Committed: Wed Jan 11 15:13:27 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/d51f8ba8/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 1141fcf..7cb0461 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; @@ -101,7 +102,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-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org