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 DF01D200B76 for ; Tue, 30 Aug 2016 19:57:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DBC76160ABA; Tue, 30 Aug 2016 17:57:37 +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 2E7E5160AAF for ; Tue, 30 Aug 2016 19:57:37 +0200 (CEST) Received: (qmail 97937 invoked by uid 500); 30 Aug 2016 17:57:36 -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 97926 invoked by uid 99); 30 Aug 2016 17:57:36 -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; Tue, 30 Aug 2016 17:57:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2CA9CE01C1; Tue, 30 Aug 2016 17:57:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: weichiu@apache.org To: common-commits@hadoop.apache.org Message-Id: <64b39d2e621d458bb1c9b2d59e6aecd9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-10760. DataXceiver#run() should not log InvalidToken exception as an error. Contributed by Pan Yuxuan. Date: Tue, 30 Aug 2016 17:57:36 +0000 (UTC) archived-at: Tue, 30 Aug 2016 17:57:38 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 f70f522e8 -> abbd95b79 HDFS-10760. DataXceiver#run() should not log InvalidToken exception as an error. Contributed by Pan Yuxuan. (cherry picked from commit c4ee6915a14e00342755d7cdcbf2d61518f306aa) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/abbd95b7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/abbd95b7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/abbd95b7 Branch: refs/heads/branch-2 Commit: abbd95b790c1a7adcd94f6a8527cbcb879289269 Parents: f70f522 Author: Wei-Chiu Chuang Authored: Tue Aug 30 10:43:20 2016 -0700 Committer: Wei-Chiu Chuang Committed: Tue Aug 30 10:44:27 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/datanode/DataXceiver.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/abbd95b7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java index c5cc36c..7c36ab1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java @@ -311,6 +311,12 @@ class DataXceiver extends Receiver implements Runnable { } else { LOG.info(s1 + "; " + t); } + } else if (t instanceof InvalidToken) { + // The InvalidToken exception has already been logged in + // checkAccess() method and this is not a server error. + if (LOG.isTraceEnabled()) { + LOG.trace(s, t); + } } else { LOG.error(s, t); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org