You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2014/09/09 07:42:45 UTC
[1/2] git commit: HBASE-11445
TestZKProcedure#testMultiCohortWithMemberTimeoutDuringPrepare is flaky
(Jeffrey Zhong)
Repository: hbase
Updated Branches:
refs/heads/0.98 605bc083c -> 2ed1f8f78
HBASE-11445 TestZKProcedure#testMultiCohortWithMemberTimeoutDuringPrepare is flaky (Jeffrey Zhong)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/98594939
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/98594939
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/98594939
Branch: refs/heads/0.98
Commit: 985949399fd6a0b118acbe6606845fa9735d8068
Parents: 605bc08
Author: Enis Soztutar <en...@apache.org>
Authored: Mon Sep 8 20:57:55 2014 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Mon Sep 8 21:00:02 2014 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/procedure/TestZKProcedure.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/98594939/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java
index 2c13181..b55a6ea 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java
@@ -266,17 +266,15 @@ public class TestZKProcedure {
}
// pass out a task per member
- final int[] i = new int[] { 0 };
+ final AtomicInteger taskIndex = new AtomicInteger();
Mockito.when(
subprocFactory.buildSubprocedure(Mockito.eq(opName),
(byte[]) Mockito.argThat(new ArrayEquals(data)))).thenAnswer(
new Answer<Subprocedure>() {
@Override
public Subprocedure answer(InvocationOnMock invocation) throws Throwable {
- int index = i[0];
+ int index = taskIndex.getAndIncrement();
Subprocedure commit = cohortTasks.get(index);
- index++;
- i[0] = index;
return commit;
}
});
[2/2] git commit: HBASE-9473 Change UI to list 'system tables' rather
than 'catalog tables' (Stack)
Posted by en...@apache.org.
HBASE-9473 Change UI to list 'system tables' rather than 'catalog tables' (Stack)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2ed1f8f7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2ed1f8f7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2ed1f8f7
Branch: refs/heads/0.98
Commit: 2ed1f8f787b88a851e6050a46123d15911198850
Parents: 9859493
Author: Enis Soztutar <en...@apache.org>
Authored: Mon Sep 8 22:38:32 2014 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Mon Sep 8 22:41:50 2014 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2ed1f8f7/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index de39251..d51ac6e 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -178,7 +178,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<a href="#tab_userTables" data-toggle="tab">User Tables</a>
</li>
<li class="">
- <a href="#tab_catalogTables" data-toggle="tab">Catalog Tables</a>
+ <a href="#tab_catalogTables" data-toggle="tab">System Tables</a>
</li>
<li class="">
<a href="#tab_userSnapshots" data-toggle="tab">Snapshots</a>