You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2012/10/04 23:17:16 UTC
svn commit: r1394271 - in /hbase/branches/0.92: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
src/test/ruby/hbase/admin_test.rb
Author: jdcryans
Date: Thu Oct 4 21:17:16 2012
New Revision: 1394271
URL: http://svn.apache.org/viewvc?rev=1394271&view=rev
Log:
HBASE-6916 HBA logs at info level errors that won't show in the shell
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase/branches/0.92/src/test/ruby/hbase/admin_test.rb
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1394271&r1=1394270&r2=1394271&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Thu Oct 4 21:17:16 2012
@@ -5,6 +5,7 @@ Release 0.92.3 - Unreleased
(Devaraj Das via Stack)
HBASE-6847 HBASE-6649 broke replication (Devaraj Das via JD)
HBASE-6906 TestHBaseFsck#testQuarantine* tests are flakey due to TableNotEnabledException
+ HBASE-6916 HBA logs at info level errors that won't show in the shell
IMPROVEMENTS
HBASE-6914 Scans/Gets/Mutations don't give a good error if the table is disabled.
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1394271&r1=1394270&r2=1394271&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Thu Oct 4 21:17:16 2012
@@ -1048,16 +1048,16 @@ public class HBaseAdmin implements Abort
if (serverName != null) {
Pair<HRegionInfo, ServerName> pair = MetaReader.getRegion(ct, regionname);
if (pair == null || pair.getFirst() == null) {
- LOG.info("No region in .META. for " +
- Bytes.toStringBinary(regionname) + "; pair=" + pair);
+ throw new UnknownRegionException(Bytes.toStringBinary(regionname));
} else {
closeRegion(new ServerName(serverName), pair.getFirst());
}
} else {
Pair<HRegionInfo, ServerName> pair = MetaReader.getRegion(ct, regionname);
- if (pair == null || pair.getSecond() == null) {
- LOG.info("No server in .META. for " +
- Bytes.toStringBinary(regionname) + "; pair=" + pair);
+ if (pair == null) {
+ throw new UnknownRegionException(Bytes.toStringBinary(regionname));
+ } else if (pair.getSecond() == null) {
+ throw new NoServerForRegionException(Bytes.toStringBinary(regionname));
} else {
closeRegion(pair.getSecond(), pair.getFirst());
}
@@ -1151,8 +1151,7 @@ public class HBaseAdmin implements Abort
Pair<HRegionInfo, ServerName> pair =
MetaReader.getRegion(ct, tableNameOrRegionName);
if (pair == null || pair.getSecond() == null) {
- LOG.info("No server in .META. for " +
- Bytes.toStringBinary(tableNameOrRegionName) + "; pair=" + pair);
+ throw new NoServerForRegionException(Bytes.toStringBinary(tableNameOrRegionName));
} else {
flush(pair.getSecond(), pair.getFirst());
}
@@ -1255,8 +1254,7 @@ public class HBaseAdmin implements Abort
Pair<HRegionInfo, ServerName> pair =
MetaReader.getRegion(ct, tableNameOrRegionName);
if (pair == null || pair.getSecond() == null) {
- LOG.info("No server in .META. for " +
- Bytes.toStringBinary(tableNameOrRegionName) + "; pair=" + pair);
+ throw new NoServerForRegionException(Bytes.toStringBinary(tableNameOrRegionName));
} else {
compact(pair.getSecond(), pair.getFirst(), major);
}
@@ -1413,8 +1411,7 @@ public class HBaseAdmin implements Abort
Pair<HRegionInfo, ServerName> pair =
MetaReader.getRegion(ct, tableNameOrRegionName);
if (pair == null || pair.getSecond() == null) {
- LOG.info("No server in .META. for " +
- Bytes.toStringBinary(tableNameOrRegionName) + "; pair=" + pair);
+ throw new NoServerForRegionException(Bytes.toStringBinary(tableNameOrRegionName));
} else {
split(pair.getSecond(), pair.getFirst(), splitPoint);
}
@@ -1685,8 +1682,7 @@ public class HBaseAdmin implements Abort
Pair<HRegionInfo, ServerName> pair =
MetaReader.getRegion(ct, tableNameOrRegionName);
if (pair == null || pair.getSecond() == null) {
- LOG.info("No server in .META. for " +
- Bytes.toStringBinary(tableNameOrRegionName) + "; pair=" + pair);
+ throw new NoServerForRegionException(Bytes.toStringBinary(tableNameOrRegionName));
} else {
ServerName sn = pair.getSecond();
HRegionInterface rs =
Modified: hbase/branches/0.92/src/test/ruby/hbase/admin_test.rb
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/ruby/hbase/admin_test.rb?rev=1394271&r1=1394270&r2=1394271&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/ruby/hbase/admin_test.rb (original)
+++ hbase/branches/0.92/src/test/ruby/hbase/admin_test.rb Thu Oct 4 21:17:16 2012
@@ -160,17 +160,6 @@ module Hbase
#-------------------------------------------------------------------------------
- define_test "close should work without region server name" do
- if admin.exists?(@create_test_name)
- admin.disable(@create_test_name)
- admin.drop(@create_test_name)
- end
- admin.create(@create_test_name, 'foo')
- admin.close_region(@create_test_name + ',,0', nil)
- end
-
- #-------------------------------------------------------------------------------
-
define_test "describe should fail for non-existent tables" do
assert_raise(ArgumentError) do
admin.describe('.NOT.EXISTS.')