Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@minotaur.apache.org Received: (qmail 98366 invoked from network); 29 Apr 2009 23:45:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Apr 2009 23:45:11 -0000 Received: (qmail 22056 invoked by uid 500); 29 Apr 2009 23:45:11 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 22011 invoked by uid 500); 29 Apr 2009 23:45:11 -0000 Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hbase-dev@hadoop.apache.org Delivered-To: mailing list hbase-commits@hadoop.apache.org Received: (qmail 22002 invoked by uid 99); 29 Apr 2009 23:45:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2009 23:45:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 29 Apr 2009 23:45:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F1AE72388886; Wed, 29 Apr 2009 23:44:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r770006 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/HConstants.java src/java/org/apache/hadoop/hbase/regionserver/HLog.java Date: Wed, 29 Apr 2009 23:44:47 -0000 To: hbase-commits@hadoop.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090429234447.F1AE72388886@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Wed Apr 29 23:44:47 2009 New Revision: 770006 URL: http://svn.apache.org/viewvc?rev=770006&view=rev Log: HBASE-1112 we will lose data if the table name happens to be the logs' dir name Modified: hadoop/hbase/trunk/CHANGES.txt hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConstants.java hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java Modified: hadoop/hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=770006&r1=770005&r2=770006&view=diff ============================================================================== --- hadoop/hbase/trunk/CHANGES.txt (original) +++ hadoop/hbase/trunk/CHANGES.txt Wed Apr 29 23:44:47 2009 @@ -180,6 +180,8 @@ regions in a table (Vimal Mathew via Stack) HBASE-1271 Allow multiple tests to run on one machine (Evgeny Ryabitskiy via Stack) + HBASE-1112 we will lose data if the table name happens to be the logs' dir + name (Samuel Guo via Stack) Release 0.19.0 - 01/21/2009 INCOMPATIBLE CHANGES Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConstants.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConstants.java?rev=770006&r1=770005&r2=770006&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConstants.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConstants.java Wed Apr 29 23:44:47 2009 @@ -117,8 +117,9 @@ /** Parameter name for HBase instance root directory */ static final String HBASE_DIR = "hbase.rootdir"; - /** Used to construct the name of the log directory for a region server */ - static final String HREGION_LOGDIR_NAME = "log"; + /** Used to construct the name of the log directory for a region server + * Use '@' as a special character to seperate the log files from table data */ + static final String HREGION_LOGDIR_NAME = "@LOGS@"; /** Name of old log file for reconstruction */ static final String HREGION_OLDLOGFILE_NAME = "oldlogfile.log"; @@ -284,4 +285,4 @@ public static final int MODIFY_TABLE_FLUSH = MODIFY_CLOSE_REGION + 1; public static final int MODIFY_TABLE_MAJOR_COMPACT = MODIFY_TABLE_FLUSH + 1; -} \ No newline at end of file +} Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java?rev=770006&r1=770005&r2=770006&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java Wed Apr 29 23:44:47 2009 @@ -870,7 +870,7 @@ */ public static String getHLogDirectoryName(String serverName) { StringBuilder dirName = new StringBuilder(HConstants.HREGION_LOGDIR_NAME); - dirName.append("_"); + dirName.append("/"); dirName.append(serverName); return dirName.toString(); }