You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/02/24 06:48:13 UTC
svn commit: r1293093 - in /hbase/trunk/src/main/java/org/apache/hadoop/hbase:
regionserver/HRegionThriftServer.java thrift/ThriftServerRunner.java
Author: stack
Date: Fri Feb 24 05:48:13 2012
New Revision: 1293093
URL: http://svn.apache.org/viewvc?rev=1293093&view=rev
Log:
HBASE-5464 Log warning message when thrift calls throw exceptions
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java?rev=1293093&r1=1293092&r2=1293093&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java Fri Feb 24 05:48:13 2012
@@ -144,12 +144,14 @@ public class HRegionThriftServer extends
return ThriftUtilities.rowResultFromHBase(result);
} catch (NotServingRegionException e) {
if (!redirect) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
LOG.debug("ThriftServer redirecting getRowWithColumnsTs");
return super.getRowWithColumnsTs(tableName, rowb, columns, timestamp,
attributes);
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java?rev=1293093&r1=1293092&r2=1293093&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java Fri Feb 24 05:48:13 2012
@@ -500,6 +500,7 @@ public class ThriftServerRunner implemen
try{
admin.enableTable(getBytes(tableName));
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -509,6 +510,7 @@ public class ThriftServerRunner implemen
try{
admin.disableTable(getBytes(tableName));
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -518,6 +520,7 @@ public class ThriftServerRunner implemen
try {
return HTable.isTableEnabled(this.conf, getBytes(tableName));
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -529,6 +532,7 @@ public class ThriftServerRunner implemen
} catch (InterruptedException e) {
throw new IOError(e.getMessage());
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -538,8 +542,10 @@ public class ThriftServerRunner implemen
try{
admin.majorCompact(getBytes(tableNameOrRegionName));
} catch (InterruptedException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -554,6 +560,7 @@ public class ThriftServerRunner implemen
}
return list;
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -578,6 +585,7 @@ public class ThriftServerRunner implemen
}
return regions;
} catch (IOException e){
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -612,6 +620,7 @@ public class ThriftServerRunner implemen
Result result = table.get(get);
return ThriftUtilities.cellFromHBase(result.raw());
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -643,6 +652,7 @@ public class ThriftServerRunner implemen
Result result = table.get(get);
return ThriftUtilities.cellFromHBase(result.raw());
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -678,6 +688,7 @@ public class ThriftServerRunner implemen
Result result = table.get(get);
return ThriftUtilities.cellFromHBase(result.raw());
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -734,6 +745,7 @@ public class ThriftServerRunner implemen
Result result = table.get(get);
return ThriftUtilities.rowResultFromHBase(result);
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -798,6 +810,7 @@ public class ThriftServerRunner implemen
Result[] result = table.get(gets);
return ThriftUtilities.rowResultFromHBase(result);
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -829,6 +842,7 @@ public class ThriftServerRunner implemen
table.delete(delete);
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -850,6 +864,7 @@ public class ThriftServerRunner implemen
addAttributes(delete, attributes);
table.delete(delete);
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -870,8 +885,10 @@ public class ThriftServerRunner implemen
}
admin.createTable(desc);
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
} catch (IllegalArgumentException e) {
+ LOG.warn(e.getMessage(), e);
throw new IllegalArgument(e.getMessage());
}
}
@@ -884,10 +901,11 @@ public class ThriftServerRunner implemen
}
try {
if (!admin.tableExists(tableName)) {
- throw new IOError("table does not exist");
+ throw new IOException("table does not exist");
}
admin.deleteTable(tableName);
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -945,8 +963,10 @@ public class ThriftServerRunner implemen
if (!put.isEmpty())
table.put(put);
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
} catch (IllegalArgumentException e) {
+ LOG.warn(e.getMessage(), e);
throw new IllegalArgument(e.getMessage());
}
}
@@ -1011,8 +1031,10 @@ public class ThriftServerRunner implemen
table.delete(del);
}
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
} catch (IllegalArgumentException e) {
+ LOG.warn(e.getMessage(), e);
throw new IllegalArgument(e.getMessage());
}
}
@@ -1039,6 +1061,7 @@ public class ThriftServerRunner implemen
return table.incrementColumnValue(
getBytes(row), family, qualifier, amount);
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -1047,6 +1070,8 @@ public class ThriftServerRunner implemen
LOG.debug("scannerClose: id=" + id);
ResultScanner scanner = getScanner(id);
if (scanner == null) {
+ String message = "scanner ID is invalid";
+ LOG.warn(message);
throw new IllegalArgument("scanner ID is invalid");
}
scanner.close();
@@ -1059,6 +1084,8 @@ public class ThriftServerRunner implemen
LOG.debug("scannerGetList: id=" + id);
ResultScanner scanner = getScanner(id);
if (null == scanner) {
+ String message = "scanner ID is invalid";
+ LOG.warn(message);
throw new IllegalArgument("scanner ID is invalid");
}
@@ -1069,6 +1096,7 @@ public class ThriftServerRunner implemen
return new ArrayList<TRowResult>();
}
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
return ThriftUtilities.rowResultFromHBase(results);
@@ -1115,6 +1143,7 @@ public class ThriftServerRunner implemen
}
return addScanner(table.getScanner(scan));
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -1139,6 +1168,7 @@ public class ThriftServerRunner implemen
}
return addScanner(table.getScanner(scan));
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -1164,6 +1194,7 @@ public class ThriftServerRunner implemen
}
return addScanner(table.getScanner(scan));
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -1193,6 +1224,7 @@ public class ThriftServerRunner implemen
}
return addScanner(table.getScanner(scan));
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -1218,6 +1250,7 @@ public class ThriftServerRunner implemen
}
return addScanner(table.getScanner(scan));
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -1245,6 +1278,7 @@ public class ThriftServerRunner implemen
scan.setTimeRange(Long.MIN_VALUE, timestamp);
return addScanner(table.getScanner(scan));
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -1265,6 +1299,7 @@ public class ThriftServerRunner implemen
}
return columns;
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -1277,6 +1312,7 @@ public class ThriftServerRunner implemen
Result result = table.getRowOrBefore(getBytes(row), getBytes(family));
return ThriftUtilities.cellFromHBase(result.raw());
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}
@@ -1320,6 +1356,7 @@ public class ThriftServerRunner implemen
}
return region;
} catch (IOException e) {
+ LOG.warn(e.getMessage(), e);
throw new IOError(e.getMessage());
}
}