You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/07/03 00:46:26 UTC
svn commit: r1499138 - in /hbase/trunk:
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase-server/src/main/ruby/shell/commands.rb
Author: tedyu
Date: Tue Jul 2 22:46:25 2013
New Revision: 1499138
URL: http://svn.apache.org/r1499138
Log:
HBASE-8798 Fix a minor bug in shell command with clone_snapshot table error
Modified:
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1499138&r1=1499137&r2=1499138&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Tue Jul 2 22:46:25 2013
@@ -2462,7 +2462,7 @@ public class HBaseAdmin implements Abort
public void cloneSnapshot(final String snapshotName, final String tableName)
throws IOException, TableExistsException, RestoreSnapshotException, InterruptedException {
if (tableExists(tableName)) {
- throw new TableExistsException("Table '" + tableName + " already exists");
+ throw new TableExistsException(tableName);
}
internalRestoreSnapshot(snapshotName, tableName);
waitUntilTableIsEnabled(Bytes.toBytes(tableName));
Modified: hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb?rev=1499138&r1=1499137&r2=1499138&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb (original)
+++ hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb Tue Jul 2 22:46:25 2013
@@ -86,8 +86,8 @@ module Shell
rescue org.apache.hadoop.hbase.exceptions.NoSuchColumnFamilyException
valid_cols = table(args.first).get_all_columns.map { |c| c + '*' }
raise "Unknown column family! Valid column names: #{valid_cols.join(", ")}"
- rescue org.apache.hadoop.hbase.exceptions.TableExistsException
- raise "Table already exists: #{args.first}!"
+ rescue org.apache.hadoop.hbase.exceptions.TableExistsException => e
+ raise "Table already exists: #{e.message}!"
end
end
end