From 7fee4b5fb646ad0a8b972edfcf4799b8eddb72bc Mon Sep 17 00:00:00 2001 From: Toshihiro Suzuki Date: Thu, 25 Jun 2020 09:52:44 +0900 Subject: [PATCH] HBASE-24600 Empty RegionAction added to MultiRequest in case of RowMutations/CheckAndMutate batch (#1938) Signed-off-by: Guanghao Zhang --- .../apache/hadoop/hbase/shaded/protobuf/RequestConverter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java index 46dc98443f4..601dcc58f47 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java @@ -590,7 +590,9 @@ public final class RequestConverter { if (!multiRequestBuilder.hasNonceGroup() && hasNonce) { multiRequestBuilder.setNonceGroup(nonceGroup); } - multiRequestBuilder.addRegionAction(builder.build()); + if (builder.getActionCount() > 0) { + multiRequestBuilder.addRegionAction(builder.build()); + } // Process RowMutations here. We can not process it in the big loop above because // it will corrupt the sequence order maintained in cells.