hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject [16/50] hbase git commit: HBASE-15939 Two shell test failures on master (Talat and Ted)
Date Sat, 11 Jun 2016 04:56:02 GMT
HBASE-15939 Two shell test failures on master (Talat and Ted)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/72d3f2a8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/72d3f2a8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/72d3f2a8

Branch: refs/heads/hbase-12439
Commit: 72d3f2a86825808af879ed77a9fafe4c42daed6a
Parents: fc890a2
Author: tedyu <yuzhihong@gmail.com>
Authored: Thu Jun 2 15:44:18 2016 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Thu Jun 2 15:44:18 2016 -0700

----------------------------------------------------------------------
 hbase-shell/src/main/ruby/hbase/hbase.rb                         | 2 +-
 .../java/org/apache/hadoop/hbase/client/AbstractTestShell.java   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/72d3f2a8/hbase-shell/src/main/ruby/hbase/hbase.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/hbase.rb b/hbase-shell/src/main/ruby/hbase/hbase.rb
index 797d784..852f349 100644
--- a/hbase-shell/src/main/ruby/hbase/hbase.rb
+++ b/hbase-shell/src/main/ruby/hbase/hbase.rb
@@ -58,7 +58,7 @@ module Hbase
 
     # Create new one each time
     def table(table, shell)
-      ::Hbase::Table.new(@connection.getTable(table), shell)
+      ::Hbase::Table.new(@connection.getTable(TableName.valueOf(table)), shell)
     end
 
     def replication_admin(formatter)

http://git-wip-us.apache.org/repos/asf/hbase/blob/72d3f2a8/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
----------------------------------------------------------------------
diff --git a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
index ddcc1ea..87d14dd 100644
--- a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
+++ b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
@@ -44,6 +44,10 @@ public abstract class AbstractTestShell {
     TEST_UTIL.getConfiguration().setBoolean(CoprocessorHost.ABORT_ON_ERROR_KEY, false);
     TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
 
+    // Below settings are necessary for task monitor test.
+    TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, 0);
+    TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, 0);
+    TEST_UTIL.getConfiguration().setBoolean(HConstants.REGIONSERVER_INFO_PORT_AUTO, true);
     // Security setup configuration
     SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration());
     VisibilityTestUtil.enableVisiblityLabels(TEST_UTIL.getConfiguration());


Mime
View raw message