From 4f253b37c27b865c76915321285d471593f7c32d Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Wed, 10 Aug 2011 21:36:57 +0000 Subject: [PATCH] HBASE-4184 CatalogJanitor doesn't work properly when fs.default.name isn't set in config file. git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1156377 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 ++ .../java/org/apache/hadoop/hbase/master/CatalogJanitor.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 81899f99798..611d9d9d75f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -197,6 +197,8 @@ Release 0.91.0 - Unreleased HBASE-4181 HConnectionManager can't find cached HRegionInterface and makes clients work very slow (Jia Liu) HBASE-4156 ZKConfig defaults clientPort improperly (Michajlo Matijkiw) + HBASE-4184 CatalogJanitor doesn't work properly when "fs.default.name" isn't + set in config file (Ming Ma) IMPROVEMENTS diff --git a/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java b/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java index 0692375c178..b53e9a03508 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java +++ b/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java @@ -115,8 +115,8 @@ class CatalogJanitor extends Chore { if (left == null) return -1; if (right == null) return 1; // Same table name. - int result = Bytes.compareTo(left.getTableDesc().getName(), - right.getTableDesc().getName()); + int result = Bytes.compareTo(left.getTableName(), + right.getTableName()); if (result != 0) return result; // Compare start keys. result = Bytes.compareTo(left.getStartKey(), right.getStartKey());