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 58637D226 for ; Wed, 7 Nov 2012 20:15:44 +0000 (UTC) Received: (qmail 27434 invoked by uid 500); 7 Nov 2012 20:15:44 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 27393 invoked by uid 500); 7 Nov 2012 20:15:44 -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 27386 invoked by uid 99); 7 Nov 2012 20:15:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Nov 2012 20:15:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Nov 2012 20:15:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 10E1D23889D5 for ; Wed, 7 Nov 2012 20:15:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1406786 - /hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java Date: Wed, 07 Nov 2012 20:15:20 -0000 To: commits@hbase.apache.org From: liyin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121107201521.10E1D23889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: liyin Date: Wed Nov 7 20:15:20 2012 New Revision: 1406786 URL: http://svn.apache.org/viewvc?rev=1406786&view=rev Log: [HBASE-7105] RS throws NPE on forcing compaction from HBase shell on a single bulk imported file. Author: kranganathan Summary: In StoreFile, we have: private AtomicBoolean majorCompaction = null; In StoreFile.open(), we do: b = metadataMap.get(MAJOR_COMPACTION_KEY); if (b != null) { // init majorCompaction variable } Because the file was bulk imported, this is never initialized. Any subsequent call to isMajorCompaction() NPE's. Fix is to initialize it to false. Test Plan: Ran unit tests, re-ran the test case that broke it. Reviewers: kannan Reviewed By: kannan CC: hbase-eng@ Differential Revision: https://phabricator.fb.com/D622348 Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java?rev=1406786&r1=1406785&r2=1406786&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java Wed Nov 7 20:15:20 2012 @@ -175,7 +175,7 @@ public class StoreFile extends SchemaCon // If true, this file was product of a major compaction. Its then set // whenever you get a Reader. - private AtomicBoolean majorCompaction = null; + private AtomicBoolean majorCompaction = new AtomicBoolean(false); /** Meta key set when store file is a result of a bulk load */ public static final byte[] BULKLOAD_TASK_KEY =