Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-10853 NPE in RSRpcServices.get on trunk 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1582553 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2014-03-27 23:53:46 +00:00
parent 325fcaf4e1
commit a0415141f9
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
View File

@ -404,8 +404,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
region.getCoprocessorHost().postAppend(append, r); region.getCoprocessorHost().postAppend(append, r);
} }
} }
regionServer.metricsRegionServer.updateAppend( if (regionServer.metricsRegionServer != null) {
EnvironmentEdgeManager.currentTimeMillis() - before); regionServer.metricsRegionServer.updateAppend(
EnvironmentEdgeManager.currentTimeMillis() - before);
}
return r; return r;
} }
@ -438,8 +440,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
r = region.getCoprocessorHost().postIncrement(increment, r); r = region.getCoprocessorHost().postIncrement(increment, r);
} }
} }
regionServer.metricsRegionServer.updateIncrement( if (regionServer.metricsRegionServer != null) {
EnvironmentEdgeManager.currentTimeMillis() - before); regionServer.metricsRegionServer.updateIncrement(
EnvironmentEdgeManager.currentTimeMillis() - before);
}
return r; return r;
} }
@ -609,12 +613,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
builder.addResultOrException(getResultOrException(ie, mutations.get(i).getIndex())); builder.addResultOrException(getResultOrException(ie, mutations.get(i).getIndex()));
} }
} }
long after = EnvironmentEdgeManager.currentTimeMillis(); if (regionServer.metricsRegionServer != null) {
if (batchContainsPuts) { long after = EnvironmentEdgeManager.currentTimeMillis();
regionServer.metricsRegionServer.updatePut(after - before); if (batchContainsPuts) {
} regionServer.metricsRegionServer.updatePut(after - before);
if (batchContainsDelete) { }
regionServer.metricsRegionServer.updateDelete(after - before); if (batchContainsDelete) {
regionServer.metricsRegionServer.updateDelete(after - before);
}
} }
} }
@ -649,12 +655,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
} }
return region.batchReplay(mArray); return region.batchReplay(mArray);
} finally { } finally {
long after = EnvironmentEdgeManager.currentTimeMillis(); if (regionServer.metricsRegionServer != null) {
if (batchContainsPuts) { long after = EnvironmentEdgeManager.currentTimeMillis();
regionServer.metricsRegionServer.updatePut(after - before); if (batchContainsPuts) {
} regionServer.metricsRegionServer.updatePut(after - before);
if (batchContainsDelete) { }
regionServer.metricsRegionServer.updateDelete(after - before); if (batchContainsDelete) {
regionServer.metricsRegionServer.updateDelete(after - before);
}
} }
} }
} }
@ -1334,8 +1342,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
} catch (IOException ie) { } catch (IOException ie) {
throw new ServiceException(ie); throw new ServiceException(ie);
} finally { } finally {
regionServer.metricsRegionServer.updateReplay( if (regionServer.metricsRegionServer != null) {
EnvironmentEdgeManager.currentTimeMillis() - before); regionServer.metricsRegionServer.updateReplay(
EnvironmentEdgeManager.currentTimeMillis() - before);
}
} }
} }
@ -1574,8 +1584,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
} catch (IOException ie) { } catch (IOException ie) {
throw new ServiceException(ie); throw new ServiceException(ie);
} finally { } finally {
regionServer.metricsRegionServer.updateGet( if (regionServer.metricsRegionServer != null) {
EnvironmentEdgeManager.currentTimeMillis() - before); regionServer.metricsRegionServer.updateGet(
EnvironmentEdgeManager.currentTimeMillis() - before);
}
} }
} }