HBASE-21179 Fix the number of actions in responseTooSlow log
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e1548d33 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e1548d33 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e1548d33 Branch: refs/heads/branch-2 Commit: e1548d3349779c4089aa01e790512b6d32eca1eb Parents: 45cd6ae Author: Guangxu Cheng <guangxuch...@gmail.com> Authored: Mon Sep 10 20:32:20 2018 +0800 Committer: Guangxu Cheng <guangxuch...@gmail.com> Committed: Wed Sep 12 10:45:55 2018 +0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e1548d33/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java index 8163b04..87eff00 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java @@ -2186,6 +2186,13 @@ public final class ProtobufUtil { ", row=" + getStringForByteString(r.getGet().getRow()); } else if (m instanceof ClientProtos.MultiRequest) { ClientProtos.MultiRequest r = (ClientProtos.MultiRequest) m; + + // Get the number of Actions + int actionsCount = r.getRegionActionList() + .stream() + .mapToInt(ClientProtos.RegionAction::getActionCount) + .sum(); + // Get first set of Actions. ClientProtos.RegionAction actions = r.getRegionActionList().get(0); String row = actions.getActionCount() <= 0? "": @@ -2193,8 +2200,7 @@ public final class ProtobufUtil { actions.getAction(0).getGet().getRow(): actions.getAction(0).getMutation().getRow()); return "region= " + getStringForByteString(actions.getRegion().getValue()) + - ", for " + r.getRegionActionCount() + - " actions and 1st row key=" + row; + ", for " + actionsCount + " action(s) and 1st row key=" + row; } else if (m instanceof ClientProtos.MutateRequest) { ClientProtos.MutateRequest r = (ClientProtos.MutateRequest) m; return "region= " + getStringForByteString(r.getRegion().getValue()) +
