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 2017/11/27 19:26:55 UTC

hbase git commit: HBASE-19300 TestMultithreadedTableMapper fails in branch-1.4

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 b4c2066e7 -> 36fae801a


HBASE-19300 TestMultithreadedTableMapper fails in branch-1.4


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

Branch: refs/heads/branch-1.4
Commit: 36fae801a88556fa95f867ffb0e12129ede18f61
Parents: b4c2066
Author: tedyu <yu...@gmail.com>
Authored: Mon Nov 27 11:27:05 2017 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Mon Nov 27 11:27:05 2017 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/36fae801/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java
index ca5ef01..0b377ab 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java
@@ -166,7 +166,7 @@ public class MultithreadedTableMapper<K2, V2> extends TableMapper<K2, V2> {
 
     @Override
     public boolean nextKeyValue() throws IOException, InterruptedException {
-      synchronized (this) {
+      synchronized (outer) {
         if (!outer.nextKeyValue()) {
           return false;
         }
@@ -198,7 +198,7 @@ public class MultithreadedTableMapper<K2, V2> extends TableMapper<K2, V2> {
     @Override
     public void write(K2 key, V2 value) throws IOException,
     InterruptedException {
-      synchronized (this) {
+      synchronized (outer) {
         outer.write(key, value);
       }
     }