From e78068f3957571a4eac61902ad80f182958a5657 Mon Sep 17 00:00:00 2001 From: Rahul Gidwani Date: Thu, 9 Mar 2017 09:31:37 -0800 Subject: [PATCH] HBASE-17762 - Add logging to HBaseAdmin for user initiated tasks --- .../java/org/apache/hadoop/hbase/client/HBaseAdmin.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index 1f143b5..02dd34b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -1098,6 +1098,7 @@ public class HBaseAdmin implements Admin { LOG.info("Table is disabled: " + tableName.getNameAsString()); return; } + LOG.info("Flush initiated on table: " + tableName.getNameAsString()); execProcedure("flush-table-proc", tableName.getNameAsString(), new HashMap<>()); } @@ -1110,6 +1111,7 @@ public class HBaseAdmin implements Admin { if (regionServerPair.getSecond() == null) { throw new NoServerForRegionException(Bytes.toStringBinary(regionName)); } + LOG.info("Flush initiated on region: " + Bytes.toStringBinary(regionName)); final HRegionInfo hRegionInfo = regionServerPair.getFirst(); ServerName serverName = regionServerPair.getSecond(); final AdminService.BlockingInterface admin = this.connection.getAdmin(serverName); @@ -1133,12 +1135,14 @@ public class HBaseAdmin implements Admin { @Override public void compact(final TableName tableName) throws IOException { + LOG.info("Compaction initiated on table: " + Bytes.toStringBinary(tableName.getNameAsString())); compact(tableName, null, false, CompactType.NORMAL); } @Override public void compactRegion(final byte[] regionName) throws IOException { + LOG.info("Compaction initiated on region: " + Bytes.toStringBinary(regionName)); compactRegion(regionName, null, false); } @@ -1148,6 +1152,8 @@ public class HBaseAdmin implements Admin { @Override public void compact(final TableName tableName, final byte[] columnFamily) throws IOException { + LOG.info("Compaction initiated on table: " + tableName.getNameAsString() + + " cf: " + Bytes.toStringBinary(columnFamily)); compact(tableName, columnFamily, false, CompactType.NORMAL); } @@ -1157,6 +1163,8 @@ public class HBaseAdmin implements Admin { @Override public void compactRegion(final byte[] regionName, final byte[] columnFamily) throws IOException { + LOG.info("Compaction initiated on region: " + Bytes.toStringBinary(regionName) + + " cf: " + Bytes.toStringBinary(columnFamily)); compactRegion(regionName, columnFamily, false); } @@ -1166,6 +1174,8 @@ public class HBaseAdmin implements Admin { @Override public void compactRegionServer(final ServerName sn, boolean major) throws IOException, InterruptedException { + LOG.info("Compaction initiated on Region Server: " + sn.getServerName()); + for (HRegionInfo region : getOnlineRegions(sn)) { compact(sn, region, major, null); } @@ -1174,12 +1184,14 @@ public class HBaseAdmin implements Admin { @Override public void majorCompact(final TableName tableName) throws IOException { + LOG.info("Major compaction initiated on table: " + tableName.getNameAsString()); compact(tableName, null, true, CompactType.NORMAL); } @Override public void majorCompactRegion(final byte[] regionName) throws IOException { + LOG.info("Major compaction initiated on region : " + Bytes.toStringBinary(regionName)); compactRegion(regionName, null, true); } @@ -1189,12 +1201,16 @@ public class HBaseAdmin implements Admin { @Override public void majorCompact(final TableName tableName, final byte[] columnFamily) throws IOException { + LOG.info("Major compaction initiated on table: " + tableName.getNameAsString() + + " cf: " + Bytes.toStringBinary(columnFamily)); compact(tableName, columnFamily, true, CompactType.NORMAL); } @Override public void majorCompactRegion(final byte[] regionName, final byte[] columnFamily) throws IOException { + LOG.info("Major compaction initiated on region: " + Bytes.toStringBinary(regionName) + + " cf: " + Bytes.toStringBinary(columnFamily)); compactRegion(regionName, columnFamily, true); } -- 2.10.1 (Apple Git-78)