Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8635218E5B for ; Wed, 2 Mar 2016 08:50:07 +0000 (UTC) Received: (qmail 90498 invoked by uid 500); 2 Mar 2016 08:50:07 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 90458 invoked by uid 500); 2 Mar 2016 08:50:07 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 90447 invoked by uid 99); 2 Mar 2016 08:50:07 -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, 02 Mar 2016 08:50:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2E4D3DFDE2; Wed, 2 Mar 2016 08:50:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: <441b9b07da1b4f53ac5f841d1e176d0c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15291 Revert due to the bug Haitao discovered Date: Wed, 2 Mar 2016 08:50:07 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 d0c818630 -> 77c3c61b3 HBASE-15291 Revert due to the bug Haitao discovered Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/77c3c61b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/77c3c61b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/77c3c61b Branch: refs/heads/branch-1 Commit: 77c3c61b347e8d3da4487c0b5b828b2b8cc5d45a Parents: d0c8186 Author: tedyu Authored: Wed Mar 2 00:49:59 2016 -0800 Committer: tedyu Committed: Wed Mar 2 00:49:59 2016 -0800 ---------------------------------------------------------------------- .../hbase/security/access/SecureBulkLoadEndpoint.java | 10 ---------- 1 file changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/77c3c61b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java index a460b93..6c92a66 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java @@ -291,16 +291,6 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService new SecureBulkLoadListener(fs, bulkToken, conf)); } catch (Exception e) { LOG.error("Failed to complete bulk load", e); - } finally { - if (fs != null) { - try { - if(!UserGroupInformation.getCurrentUser().equals(ugi)) { - FileSystem.closeAllForUGI(ugi); - } - } catch (IOException e) { - LOG.error("Failed to close FileSystem for " + ugi.getUserName(), e); - } - } } return false; }