You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2015/12/16 17:50:54 UTC
[09/51] [partial] hbase-site git commit: Published site at
60d33ce34191533bb858852584bd9bddfeb16a23.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html
index d15c216..bf5e0a0 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html
@@ -101,9 +101,9 @@
<span class="sourceLineNo">093</span><a name="line.93"></a>
<span class="sourceLineNo">094</span>import com.google.common.base.Objects;<a name="line.94"></a>
<span class="sourceLineNo">095</span>import com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>import com.yammer.metrics.core.Histogram;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>import com.yammer.metrics.stats.Snapshot;<a name="line.97"></a>
-<span class="sourceLineNo">098</span>import com.yammer.metrics.stats.UniformSample;<a name="line.98"></a>
+<span class="sourceLineNo">096</span>import com.codahale.metrics.Histogram;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>import com.codahale.metrics.Snapshot;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>import com.codahale.metrics.UniformReservoir;<a name="line.98"></a>
<span class="sourceLineNo">099</span><a name="line.99"></a>
<span class="sourceLineNo">100</span>/**<a name="line.100"></a>
<span class="sourceLineNo">101</span> * Script used evaluating HBase performance and scalability. Runs a HBase<a name="line.101"></a>
@@ -1062,8 +1062,8 @@
<span class="sourceLineNo">1054</span> this.connection = ConnectionFactory.createConnection(conf);<a name="line.1054"></a>
<span class="sourceLineNo">1055</span> }<a name="line.1055"></a>
<span class="sourceLineNo">1056</span> onStartup();<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span> latency = YammerHistogramUtils.newHistogram(new UniformSample(1024 * 500));<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span> valueSize = YammerHistogramUtils.newHistogram(new UniformSample(1024 * 500));<a name="line.1058"></a>
+<span class="sourceLineNo">1057</span> latency = YammerHistogramUtils.newHistogram(new UniformReservoir(1024 * 500));<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span> valueSize = YammerHistogramUtils.newHistogram(new UniformReservoir(1024 * 500));<a name="line.1058"></a>
<span class="sourceLineNo">1059</span> }<a name="line.1059"></a>
<span class="sourceLineNo">1060</span><a name="line.1060"></a>
<span class="sourceLineNo">1061</span> abstract void onStartup() throws IOException;<a name="line.1061"></a>
@@ -1129,21 +1129,21 @@
<span class="sourceLineNo">1121</span> */<a name="line.1121"></a>
<span class="sourceLineNo">1122</span> private void reportLatency() throws IOException {<a name="line.1122"></a>
<span class="sourceLineNo">1123</span> status.setStatus(testName + " latency log (microseconds), on " +<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span> latency.count() + " measures");<a name="line.1124"></a>
+<span class="sourceLineNo">1124</span> latency.getCount() + " measures");<a name="line.1124"></a>
<span class="sourceLineNo">1125</span> reportHistogram(this.latency);<a name="line.1125"></a>
<span class="sourceLineNo">1126</span> }<a name="line.1126"></a>
<span class="sourceLineNo">1127</span><a name="line.1127"></a>
<span class="sourceLineNo">1128</span> private void reportValueSize() throws IOException {<a name="line.1128"></a>
<span class="sourceLineNo">1129</span> status.setStatus(testName + " valueSize after " +<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span> valueSize.count() + " measures");<a name="line.1130"></a>
+<span class="sourceLineNo">1130</span> valueSize.getCount() + " measures");<a name="line.1130"></a>
<span class="sourceLineNo">1131</span> reportHistogram(this.valueSize);<a name="line.1131"></a>
<span class="sourceLineNo">1132</span> }<a name="line.1132"></a>
<span class="sourceLineNo">1133</span><a name="line.1133"></a>
<span class="sourceLineNo">1134</span> private void reportHistogram(final Histogram h) throws IOException {<a name="line.1134"></a>
<span class="sourceLineNo">1135</span> Snapshot sn = h.getSnapshot();<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span> status.setStatus(testName + " Min = " + h.min());<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span> status.setStatus(testName + " Avg = " + h.mean());<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span> status.setStatus(testName + " StdDev = " + h.stdDev());<a name="line.1138"></a>
+<span class="sourceLineNo">1136</span> status.setStatus(testName + " Min = " + sn.getMin());<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span> status.setStatus(testName + " Avg = " + sn.getMean());<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span> status.setStatus(testName + " StdDev = " + sn.getStdDev());<a name="line.1138"></a>
<span class="sourceLineNo">1139</span> status.setStatus(testName + " 50th = " + sn.getMedian());<a name="line.1139"></a>
<span class="sourceLineNo">1140</span> status.setStatus(testName + " 75th = " + sn.get75thPercentile());<a name="line.1140"></a>
<span class="sourceLineNo">1141</span> status.setStatus(testName + " 95th = " + sn.get95thPercentile());<a name="line.1141"></a>
@@ -1151,7 +1151,7 @@
<span class="sourceLineNo">1143</span> status.setStatus(testName + " 99.9th = " + sn.get999thPercentile());<a name="line.1143"></a>
<span class="sourceLineNo">1144</span> status.setStatus(testName + " 99.99th = " + sn.getValue(0.9999));<a name="line.1144"></a>
<span class="sourceLineNo">1145</span> status.setStatus(testName + " 99.999th = " + sn.getValue(0.99999));<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span> status.setStatus(testName + " Max = " + h.max());<a name="line.1146"></a>
+<span class="sourceLineNo">1146</span> status.setStatus(testName + " Max = " + sn.getMax());<a name="line.1146"></a>
<span class="sourceLineNo">1147</span> }<a name="line.1147"></a>
<span class="sourceLineNo">1148</span><a name="line.1148"></a>
<span class="sourceLineNo">1149</span> /**<a name="line.1149"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html
index d15c216..bf5e0a0 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html
@@ -101,9 +101,9 @@
<span class="sourceLineNo">093</span><a name="line.93"></a>
<span class="sourceLineNo">094</span>import com.google.common.base.Objects;<a name="line.94"></a>
<span class="sourceLineNo">095</span>import com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>import com.yammer.metrics.core.Histogram;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>import com.yammer.metrics.stats.Snapshot;<a name="line.97"></a>
-<span class="sourceLineNo">098</span>import com.yammer.metrics.stats.UniformSample;<a name="line.98"></a>
+<span class="sourceLineNo">096</span>import com.codahale.metrics.Histogram;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>import com.codahale.metrics.Snapshot;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>import com.codahale.metrics.UniformReservoir;<a name="line.98"></a>
<span class="sourceLineNo">099</span><a name="line.99"></a>
<span class="sourceLineNo">100</span>/**<a name="line.100"></a>
<span class="sourceLineNo">101</span> * Script used evaluating HBase performance and scalability. Runs a HBase<a name="line.101"></a>
@@ -1062,8 +1062,8 @@
<span class="sourceLineNo">1054</span> this.connection = ConnectionFactory.createConnection(conf);<a name="line.1054"></a>
<span class="sourceLineNo">1055</span> }<a name="line.1055"></a>
<span class="sourceLineNo">1056</span> onStartup();<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span> latency = YammerHistogramUtils.newHistogram(new UniformSample(1024 * 500));<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span> valueSize = YammerHistogramUtils.newHistogram(new UniformSample(1024 * 500));<a name="line.1058"></a>
+<span class="sourceLineNo">1057</span> latency = YammerHistogramUtils.newHistogram(new UniformReservoir(1024 * 500));<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span> valueSize = YammerHistogramUtils.newHistogram(new UniformReservoir(1024 * 500));<a name="line.1058"></a>
<span class="sourceLineNo">1059</span> }<a name="line.1059"></a>
<span class="sourceLineNo">1060</span><a name="line.1060"></a>
<span class="sourceLineNo">1061</span> abstract void onStartup() throws IOException;<a name="line.1061"></a>
@@ -1129,21 +1129,21 @@
<span class="sourceLineNo">1121</span> */<a name="line.1121"></a>
<span class="sourceLineNo">1122</span> private void reportLatency() throws IOException {<a name="line.1122"></a>
<span class="sourceLineNo">1123</span> status.setStatus(testName + " latency log (microseconds), on " +<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span> latency.count() + " measures");<a name="line.1124"></a>
+<span class="sourceLineNo">1124</span> latency.getCount() + " measures");<a name="line.1124"></a>
<span class="sourceLineNo">1125</span> reportHistogram(this.latency);<a name="line.1125"></a>
<span class="sourceLineNo">1126</span> }<a name="line.1126"></a>
<span class="sourceLineNo">1127</span><a name="line.1127"></a>
<span class="sourceLineNo">1128</span> private void reportValueSize() throws IOException {<a name="line.1128"></a>
<span class="sourceLineNo">1129</span> status.setStatus(testName + " valueSize after " +<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span> valueSize.count() + " measures");<a name="line.1130"></a>
+<span class="sourceLineNo">1130</span> valueSize.getCount() + " measures");<a name="line.1130"></a>
<span class="sourceLineNo">1131</span> reportHistogram(this.valueSize);<a name="line.1131"></a>
<span class="sourceLineNo">1132</span> }<a name="line.1132"></a>
<span class="sourceLineNo">1133</span><a name="line.1133"></a>
<span class="sourceLineNo">1134</span> private void reportHistogram(final Histogram h) throws IOException {<a name="line.1134"></a>
<span class="sourceLineNo">1135</span> Snapshot sn = h.getSnapshot();<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span> status.setStatus(testName + " Min = " + h.min());<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span> status.setStatus(testName + " Avg = " + h.mean());<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span> status.setStatus(testName + " StdDev = " + h.stdDev());<a name="line.1138"></a>
+<span class="sourceLineNo">1136</span> status.setStatus(testName + " Min = " + sn.getMin());<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span> status.setStatus(testName + " Avg = " + sn.getMean());<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span> status.setStatus(testName + " StdDev = " + sn.getStdDev());<a name="line.1138"></a>
<span class="sourceLineNo">1139</span> status.setStatus(testName + " 50th = " + sn.getMedian());<a name="line.1139"></a>
<span class="sourceLineNo">1140</span> status.setStatus(testName + " 75th = " + sn.get75thPercentile());<a name="line.1140"></a>
<span class="sourceLineNo">1141</span> status.setStatus(testName + " 95th = " + sn.get95thPercentile());<a name="line.1141"></a>
@@ -1151,7 +1151,7 @@
<span class="sourceLineNo">1143</span> status.setStatus(testName + " 99.9th = " + sn.get999thPercentile());<a name="line.1143"></a>
<span class="sourceLineNo">1144</span> status.setStatus(testName + " 99.99th = " + sn.getValue(0.9999));<a name="line.1144"></a>
<span class="sourceLineNo">1145</span> status.setStatus(testName + " 99.999th = " + sn.getValue(0.99999));<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span> status.setStatus(testName + " Max = " + h.max());<a name="line.1146"></a>
+<span class="sourceLineNo">1146</span> status.setStatus(testName + " Max = " + sn.getMax());<a name="line.1146"></a>
<span class="sourceLineNo">1147</span> }<a name="line.1147"></a>
<span class="sourceLineNo">1148</span><a name="line.1148"></a>
<span class="sourceLineNo">1149</span> /**<a name="line.1149"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html
index d15c216..bf5e0a0 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html
@@ -101,9 +101,9 @@
<span class="sourceLineNo">093</span><a name="line.93"></a>
<span class="sourceLineNo">094</span>import com.google.common.base.Objects;<a name="line.94"></a>
<span class="sourceLineNo">095</span>import com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>import com.yammer.metrics.core.Histogram;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>import com.yammer.metrics.stats.Snapshot;<a name="line.97"></a>
-<span class="sourceLineNo">098</span>import com.yammer.metrics.stats.UniformSample;<a name="line.98"></a>
+<span class="sourceLineNo">096</span>import com.codahale.metrics.Histogram;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>import com.codahale.metrics.Snapshot;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>import com.codahale.metrics.UniformReservoir;<a name="line.98"></a>
<span class="sourceLineNo">099</span><a name="line.99"></a>
<span class="sourceLineNo">100</span>/**<a name="line.100"></a>
<span class="sourceLineNo">101</span> * Script used evaluating HBase performance and scalability. Runs a HBase<a name="line.101"></a>
@@ -1062,8 +1062,8 @@
<span class="sourceLineNo">1054</span> this.connection = ConnectionFactory.createConnection(conf);<a name="line.1054"></a>
<span class="sourceLineNo">1055</span> }<a name="line.1055"></a>
<span class="sourceLineNo">1056</span> onStartup();<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span> latency = YammerHistogramUtils.newHistogram(new UniformSample(1024 * 500));<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span> valueSize = YammerHistogramUtils.newHistogram(new UniformSample(1024 * 500));<a name="line.1058"></a>
+<span class="sourceLineNo">1057</span> latency = YammerHistogramUtils.newHistogram(new UniformReservoir(1024 * 500));<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span> valueSize = YammerHistogramUtils.newHistogram(new UniformReservoir(1024 * 500));<a name="line.1058"></a>
<span class="sourceLineNo">1059</span> }<a name="line.1059"></a>
<span class="sourceLineNo">1060</span><a name="line.1060"></a>
<span class="sourceLineNo">1061</span> abstract void onStartup() throws IOException;<a name="line.1061"></a>
@@ -1129,21 +1129,21 @@
<span class="sourceLineNo">1121</span> */<a name="line.1121"></a>
<span class="sourceLineNo">1122</span> private void reportLatency() throws IOException {<a name="line.1122"></a>
<span class="sourceLineNo">1123</span> status.setStatus(testName + " latency log (microseconds), on " +<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span> latency.count() + " measures");<a name="line.1124"></a>
+<span class="sourceLineNo">1124</span> latency.getCount() + " measures");<a name="line.1124"></a>
<span class="sourceLineNo">1125</span> reportHistogram(this.latency);<a name="line.1125"></a>
<span class="sourceLineNo">1126</span> }<a name="line.1126"></a>
<span class="sourceLineNo">1127</span><a name="line.1127"></a>
<span class="sourceLineNo">1128</span> private void reportValueSize() throws IOException {<a name="line.1128"></a>
<span class="sourceLineNo">1129</span> status.setStatus(testName + " valueSize after " +<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span> valueSize.count() + " measures");<a name="line.1130"></a>
+<span class="sourceLineNo">1130</span> valueSize.getCount() + " measures");<a name="line.1130"></a>
<span class="sourceLineNo">1131</span> reportHistogram(this.valueSize);<a name="line.1131"></a>
<span class="sourceLineNo">1132</span> }<a name="line.1132"></a>
<span class="sourceLineNo">1133</span><a name="line.1133"></a>
<span class="sourceLineNo">1134</span> private void reportHistogram(final Histogram h) throws IOException {<a name="line.1134"></a>
<span class="sourceLineNo">1135</span> Snapshot sn = h.getSnapshot();<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span> status.setStatus(testName + " Min = " + h.min());<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span> status.setStatus(testName + " Avg = " + h.mean());<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span> status.setStatus(testName + " StdDev = " + h.stdDev());<a name="line.1138"></a>
+<span class="sourceLineNo">1136</span> status.setStatus(testName + " Min = " + sn.getMin());<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span> status.setStatus(testName + " Avg = " + sn.getMean());<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span> status.setStatus(testName + " StdDev = " + sn.getStdDev());<a name="line.1138"></a>
<span class="sourceLineNo">1139</span> status.setStatus(testName + " 50th = " + sn.getMedian());<a name="line.1139"></a>
<span class="sourceLineNo">1140</span> status.setStatus(testName + " 75th = " + sn.get75thPercentile());<a name="line.1140"></a>
<span class="sourceLineNo">1141</span> status.setStatus(testName + " 95th = " + sn.get95thPercentile());<a name="line.1141"></a>
@@ -1151,7 +1151,7 @@
<span class="sourceLineNo">1143</span> status.setStatus(testName + " 99.9th = " + sn.get999thPercentile());<a name="line.1143"></a>
<span class="sourceLineNo">1144</span> status.setStatus(testName + " 99.99th = " + sn.getValue(0.9999));<a name="line.1144"></a>
<span class="sourceLineNo">1145</span> status.setStatus(testName + " 99.999th = " + sn.getValue(0.99999));<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span> status.setStatus(testName + " Max = " + h.max());<a name="line.1146"></a>
+<span class="sourceLineNo">1146</span> status.setStatus(testName + " Max = " + sn.getMax());<a name="line.1146"></a>
<span class="sourceLineNo">1147</span> }<a name="line.1147"></a>
<span class="sourceLineNo">1148</span><a name="line.1148"></a>
<span class="sourceLineNo">1149</span> /**<a name="line.1149"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/TestPerformanceEvaluation.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestPerformanceEvaluation.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestPerformanceEvaluation.html
index ea4314f..5f91578 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestPerformanceEvaluation.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestPerformanceEvaluation.html
@@ -48,9 +48,9 @@
<span class="sourceLineNo">040</span>import org.junit.Test;<a name="line.40"></a>
<span class="sourceLineNo">041</span>import org.junit.experimental.categories.Category;<a name="line.41"></a>
<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>import com.yammer.metrics.core.Histogram;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import com.yammer.metrics.stats.Snapshot;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import com.yammer.metrics.stats.UniformSample;<a name="line.45"></a>
+<span class="sourceLineNo">043</span>import com.codahale.metrics.Histogram;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import com.codahale.metrics.Snapshot;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import com.codahale.metrics.UniformReservoir;<a name="line.45"></a>
<span class="sourceLineNo">046</span><a name="line.46"></a>
<span class="sourceLineNo">047</span>@Category({MiscTests.class, SmallTests.class})<a name="line.47"></a>
<span class="sourceLineNo">048</span>public class TestPerformanceEvaluation {<a name="line.48"></a>
@@ -133,16 +133,16 @@
<span class="sourceLineNo">125</span> opts.setValueSize(valueSize);<a name="line.125"></a>
<span class="sourceLineNo">126</span> RandomReadTest rrt = new RandomReadTest(null, opts, null);<a name="line.126"></a>
<span class="sourceLineNo">127</span> Constructor<?> ctor =<a name="line.127"></a>
-<span class="sourceLineNo">128</span> Histogram.class.getDeclaredConstructor(com.yammer.metrics.stats.Sample.class);<a name="line.128"></a>
+<span class="sourceLineNo">128</span> Histogram.class.getDeclaredConstructor(com.codahale.metrics.Reservoir.class);<a name="line.128"></a>
<span class="sourceLineNo">129</span> ctor.setAccessible(true);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> Histogram histogram = (Histogram)ctor.newInstance(new UniformSample(1024 * 500));<a name="line.130"></a>
+<span class="sourceLineNo">130</span> Histogram histogram = (Histogram)ctor.newInstance(new UniformReservoir(1024 * 500));<a name="line.130"></a>
<span class="sourceLineNo">131</span> for (int i = 0; i < 100; i++) {<a name="line.131"></a>
<span class="sourceLineNo">132</span> histogram.update(rrt.getValueLength(null));<a name="line.132"></a>
<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> double stddev = histogram.stdDev();<a name="line.134"></a>
-<span class="sourceLineNo">135</span> assertTrue(stddev != 0 && stddev != 1.0);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> assertTrue(histogram.stdDev() != 0);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> Snapshot snapshot = histogram.getSnapshot();<a name="line.137"></a>
+<span class="sourceLineNo">134</span> Snapshot snapshot = histogram.getSnapshot();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> double stddev = snapshot.getStdDev();<a name="line.135"></a>
+<span class="sourceLineNo">136</span> assertTrue(stddev != 0 && stddev != 1.0);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> assertTrue(snapshot.getStdDev() != 0);<a name="line.137"></a>
<span class="sourceLineNo">138</span> double median = snapshot.getMedian();<a name="line.138"></a>
<span class="sourceLineNo">139</span> assertTrue(median != 0 && median != 1 && median != valueSize);<a name="line.139"></a>
<span class="sourceLineNo">140</span> }<a name="line.140"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestClientPushback.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestClientPushback.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestClientPushback.html
index 782bd09..7d83c24 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestClientPushback.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestClientPushback.html
@@ -158,22 +158,23 @@
<span class="sourceLineNo">150</span> MetricsConnection.RegionStats rsStats = conn.getConnectionMetrics().<a name="line.150"></a>
<span class="sourceLineNo">151</span> serverStats.get(server).get(regionName);<a name="line.151"></a>
<span class="sourceLineNo">152</span> assertEquals(name, rsStats.name);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> assertEquals(rsStats.heapOccupancyHist.mean(),<a name="line.153"></a>
+<span class="sourceLineNo">153</span> assertEquals(rsStats.heapOccupancyHist.getSnapshot().getMean(),<a name="line.153"></a>
<span class="sourceLineNo">154</span> (double)regionStats.getHeapOccupancyPercent(), 0.1 );<a name="line.154"></a>
-<span class="sourceLineNo">155</span> assertEquals(rsStats.memstoreLoadHist.mean(),<a name="line.155"></a>
+<span class="sourceLineNo">155</span> assertEquals(rsStats.memstoreLoadHist.getSnapshot().getMean(),<a name="line.155"></a>
<span class="sourceLineNo">156</span> (double)regionStats.getMemstoreLoadPercent(), 0.1);<a name="line.156"></a>
<span class="sourceLineNo">157</span><a name="line.157"></a>
<span class="sourceLineNo">158</span> MetricsConnection.RunnerStats runnerStats = conn.getConnectionMetrics().runnerStats;<a name="line.158"></a>
<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertEquals(runnerStats.delayRunners.count(), 1);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> assertEquals(runnerStats.normalRunners.count(), 1);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> assertEquals("", runnerStats.delayIntevalHist.mean(), (double)backoffTime, 0.1);<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> latch.await(backoffTime * 2, TimeUnit.MILLISECONDS);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> assertNotEquals("AsyncProcess did not submit the work time", endTime.get(), 0);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> assertTrue("AsyncProcess did not delay long enough", endTime.get() - startTime >= backoffTime);<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>}<a name="line.168"></a>
+<span class="sourceLineNo">160</span> assertEquals(runnerStats.delayRunners.getCount(), 1);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> assertEquals(runnerStats.normalRunners.getCount(), 1);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> assertEquals("", runnerStats.delayIntevalHist.getSnapshot().getMean(),<a name="line.162"></a>
+<span class="sourceLineNo">163</span> (double)backoffTime, 0.1);<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> latch.await(backoffTime * 2, TimeUnit.MILLISECONDS);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> assertNotEquals("AsyncProcess did not submit the work time", endTime.get(), 0);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> assertTrue("AsyncProcess did not delay long enough", endTime.get() - startTime >= backoffTime);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span>}<a name="line.169"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetricsConnection.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetricsConnection.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetricsConnection.html
index 0df08ad..a54292e 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetricsConnection.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetricsConnection.html
@@ -120,9 +120,9 @@
<span class="sourceLineNo">112</span> METRICS.getTracker, METRICS.scanTracker, METRICS.multiTracker, METRICS.appendTracker,<a name="line.112"></a>
<span class="sourceLineNo">113</span> METRICS.deleteTracker, METRICS.incrementTracker, METRICS.putTracker<a name="line.113"></a>
<span class="sourceLineNo">114</span> }) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> Assert.assertEquals("Failed to invoke callTimer on " + t, loop, t.callTimer.count());<a name="line.115"></a>
-<span class="sourceLineNo">116</span> Assert.assertEquals("Failed to invoke reqHist on " + t, loop, t.reqHist.count());<a name="line.116"></a>
-<span class="sourceLineNo">117</span> Assert.assertEquals("Failed to invoke respHist on " + t, loop, t.respHist.count());<a name="line.117"></a>
+<span class="sourceLineNo">115</span> Assert.assertEquals("Failed to invoke callTimer on " + t, loop, t.callTimer.getCount());<a name="line.115"></a>
+<span class="sourceLineNo">116</span> Assert.assertEquals("Failed to invoke reqHist on " + t, loop, t.reqHist.getCount());<a name="line.116"></a>
+<span class="sourceLineNo">117</span> Assert.assertEquals("Failed to invoke respHist on " + t, loop, t.respHist.getCount());<a name="line.117"></a>
<span class="sourceLineNo">118</span> }<a name="line.118"></a>
<span class="sourceLineNo">119</span> }<a name="line.119"></a>
<span class="sourceLineNo">120</span>}<a name="line.120"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.TestEventHandler.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.TestEventHandler.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.TestEventHandler.html
index a737e1d..c21f298 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.TestEventHandler.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.TestEventHandler.html
@@ -27,17 +27,17 @@
<span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.executor;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
<span class="sourceLineNo">021</span>import static org.junit.Assert.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static org.junit.Assert.assertEquals;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.io.IOException;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.io.StringWriter;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.concurrent.ThreadPoolExecutor;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.concurrent.atomic.AtomicBoolean;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.commons.logging.Log;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.commons.logging.LogFactory;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.*;<a name="line.32"></a>
+<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.io.StringWriter;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.concurrent.ThreadPoolExecutor;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.concurrent.atomic.AtomicBoolean;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.commons.logging.Log;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.commons.logging.LogFactory;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.Waiter.Predicate;<a name="line.32"></a>
<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.executor.ExecutorService.Executor;<a name="line.33"></a>
<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.executor.ExecutorService.ExecutorStatus;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.35"></a>
@@ -98,8 +98,8 @@
<span class="sourceLineNo">090</span> assertTrue(status.queuedEvents.isEmpty());<a name="line.90"></a>
<span class="sourceLineNo">091</span> assertEquals(5, status.running.size());<a name="line.91"></a>
<span class="sourceLineNo">092</span> checkStatusDump(status);<a name="line.92"></a>
-<span class="sourceLineNo">093</span> <a name="line.93"></a>
-<span class="sourceLineNo">094</span> <a name="line.94"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
<span class="sourceLineNo">095</span> // Now interrupt the running Executor<a name="line.95"></a>
<span class="sourceLineNo">096</span> synchronized (lock) {<a name="line.96"></a>
<span class="sourceLineNo">097</span> lock.set(false);<a name="line.97"></a>
@@ -148,7 +148,7 @@
<span class="sourceLineNo">140</span> status.dumpTo(sw, "");<a name="line.140"></a>
<span class="sourceLineNo">141</span> String dump = sw.toString();<a name="line.141"></a>
<span class="sourceLineNo">142</span> LOG.info("Got status dump:\n" + dump);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> <a name="line.143"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
<span class="sourceLineNo">144</span> assertTrue(dump.contains("Waiting on java.util.concurrent.atomic.AtomicBoolean"));<a name="line.144"></a>
<span class="sourceLineNo">145</span> }<a name="line.145"></a>
<span class="sourceLineNo">146</span><a name="line.146"></a>
@@ -181,8 +181,41 @@
<span class="sourceLineNo">173</span> }<a name="line.173"></a>
<span class="sourceLineNo">174</span> }<a name="line.174"></a>
<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>}<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">176</span> @Test<a name="line.176"></a>
+<span class="sourceLineNo">177</span> public void testAborting() throws Exception {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> final Configuration conf = HBaseConfiguration.create();<a name="line.178"></a>
+<span class="sourceLineNo">179</span> final Server server = mock(Server.class);<a name="line.179"></a>
+<span class="sourceLineNo">180</span> when(server.getConfiguration()).thenReturn(conf);<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> ExecutorService executorService = new ExecutorService("unit_test");<a name="line.182"></a>
+<span class="sourceLineNo">183</span> executorService.startExecutorService(<a name="line.183"></a>
+<span class="sourceLineNo">184</span> ExecutorType.MASTER_SERVER_OPERATIONS, 1);<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span> executorService.submit(new EventHandler(server, EventType.M_SERVER_SHUTDOWN) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> @Override<a name="line.188"></a>
+<span class="sourceLineNo">189</span> public void process() throws IOException {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> throw new RuntimeException("Should cause abort");<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> });<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> Waiter.waitFor(conf, 30000, new Predicate<Exception>() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public boolean evaluate() throws Exception {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> try {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> verify(server, times(1)).abort(anyString(), (Throwable) anyObject());<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return true;<a name="line.199"></a>
+<span class="sourceLineNo">200</span> } catch (Throwable t) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return false;<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span> });<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> executorService.shutdown();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span>}<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.html
index a737e1d..c21f298 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/executor/TestExecutorService.html
@@ -27,17 +27,17 @@
<span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.executor;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
<span class="sourceLineNo">021</span>import static org.junit.Assert.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static org.junit.Assert.assertEquals;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.io.IOException;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.io.StringWriter;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.concurrent.ThreadPoolExecutor;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.concurrent.atomic.AtomicBoolean;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.commons.logging.Log;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.commons.logging.LogFactory;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.*;<a name="line.32"></a>
+<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.io.StringWriter;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.concurrent.ThreadPoolExecutor;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.concurrent.atomic.AtomicBoolean;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.commons.logging.Log;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.commons.logging.LogFactory;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.Waiter.Predicate;<a name="line.32"></a>
<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.executor.ExecutorService.Executor;<a name="line.33"></a>
<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.executor.ExecutorService.ExecutorStatus;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.35"></a>
@@ -98,8 +98,8 @@
<span class="sourceLineNo">090</span> assertTrue(status.queuedEvents.isEmpty());<a name="line.90"></a>
<span class="sourceLineNo">091</span> assertEquals(5, status.running.size());<a name="line.91"></a>
<span class="sourceLineNo">092</span> checkStatusDump(status);<a name="line.92"></a>
-<span class="sourceLineNo">093</span> <a name="line.93"></a>
-<span class="sourceLineNo">094</span> <a name="line.94"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
<span class="sourceLineNo">095</span> // Now interrupt the running Executor<a name="line.95"></a>
<span class="sourceLineNo">096</span> synchronized (lock) {<a name="line.96"></a>
<span class="sourceLineNo">097</span> lock.set(false);<a name="line.97"></a>
@@ -148,7 +148,7 @@
<span class="sourceLineNo">140</span> status.dumpTo(sw, "");<a name="line.140"></a>
<span class="sourceLineNo">141</span> String dump = sw.toString();<a name="line.141"></a>
<span class="sourceLineNo">142</span> LOG.info("Got status dump:\n" + dump);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> <a name="line.143"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
<span class="sourceLineNo">144</span> assertTrue(dump.contains("Waiting on java.util.concurrent.atomic.AtomicBoolean"));<a name="line.144"></a>
<span class="sourceLineNo">145</span> }<a name="line.145"></a>
<span class="sourceLineNo">146</span><a name="line.146"></a>
@@ -181,8 +181,41 @@
<span class="sourceLineNo">173</span> }<a name="line.173"></a>
<span class="sourceLineNo">174</span> }<a name="line.174"></a>
<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>}<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">176</span> @Test<a name="line.176"></a>
+<span class="sourceLineNo">177</span> public void testAborting() throws Exception {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> final Configuration conf = HBaseConfiguration.create();<a name="line.178"></a>
+<span class="sourceLineNo">179</span> final Server server = mock(Server.class);<a name="line.179"></a>
+<span class="sourceLineNo">180</span> when(server.getConfiguration()).thenReturn(conf);<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> ExecutorService executorService = new ExecutorService("unit_test");<a name="line.182"></a>
+<span class="sourceLineNo">183</span> executorService.startExecutorService(<a name="line.183"></a>
+<span class="sourceLineNo">184</span> ExecutorType.MASTER_SERVER_OPERATIONS, 1);<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span> executorService.submit(new EventHandler(server, EventType.M_SERVER_SHUTDOWN) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> @Override<a name="line.188"></a>
+<span class="sourceLineNo">189</span> public void process() throws IOException {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> throw new RuntimeException("Should cause abort");<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> });<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> Waiter.waitFor(conf, 30000, new Predicate<Exception>() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public boolean evaluate() throws Exception {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> try {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> verify(server, times(1)).abort(anyString(), (Throwable) anyObject());<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return true;<a name="line.199"></a>
+<span class="sourceLineNo">200</span> } catch (Throwable t) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return false;<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span> });<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> executorService.shutdown();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span>}<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.BaseTestStepProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.BaseTestStepProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.BaseTestStepProcedure.html
index 53fe897..9fdc021 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.BaseTestStepProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.BaseTestStepProcedure.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> public void testRunningProcWithSameNonce() throws Exception {<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long nonceGroup = 456;<a name="line.314"></a>
<span class="sourceLineNo">315</span> final long nonce = 33333;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Procedure proc = new TestMultiStepProcedure();<a name="line.316"></a>
+<span class="sourceLineNo">316</span> Procedure proc = new TestSingleStepProcedure();<a name="line.316"></a>
<span class="sourceLineNo">317</span> long procId = ProcedureTestingUtility.submitAndWait(procExecutor, proc, nonceGroup, nonce);<a name="line.317"></a>
<span class="sourceLineNo">318</span><a name="line.318"></a>
<span class="sourceLineNo">319</span> // Restart (use a latch to prevent the step execution until we submitted proc2)<a name="line.319"></a>
@@ -329,7 +329,7 @@
<span class="sourceLineNo">321</span> procEnv.setWaitLatch(latch);<a name="line.321"></a>
<span class="sourceLineNo">322</span> restart();<a name="line.322"></a>
<span class="sourceLineNo">323</span> // Submit a procedure with the same nonce and expect the same procedure would return.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Procedure proc2 = new TestMultiStepProcedure();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> Procedure proc2 = new TestSingleStepProcedure();<a name="line.324"></a>
<span class="sourceLineNo">325</span> long procId2 = procExecutor.submitProcedure(proc2, nonceGroup, nonce);<a name="line.325"></a>
<span class="sourceLineNo">326</span> latch.countDown();<a name="line.326"></a>
<span class="sourceLineNo">327</span> procEnv.setWaitLatch(null);<a name="line.327"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step1Procedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step1Procedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step1Procedure.html
index 53fe897..9fdc021 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step1Procedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step1Procedure.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> public void testRunningProcWithSameNonce() throws Exception {<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long nonceGroup = 456;<a name="line.314"></a>
<span class="sourceLineNo">315</span> final long nonce = 33333;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Procedure proc = new TestMultiStepProcedure();<a name="line.316"></a>
+<span class="sourceLineNo">316</span> Procedure proc = new TestSingleStepProcedure();<a name="line.316"></a>
<span class="sourceLineNo">317</span> long procId = ProcedureTestingUtility.submitAndWait(procExecutor, proc, nonceGroup, nonce);<a name="line.317"></a>
<span class="sourceLineNo">318</span><a name="line.318"></a>
<span class="sourceLineNo">319</span> // Restart (use a latch to prevent the step execution until we submitted proc2)<a name="line.319"></a>
@@ -329,7 +329,7 @@
<span class="sourceLineNo">321</span> procEnv.setWaitLatch(latch);<a name="line.321"></a>
<span class="sourceLineNo">322</span> restart();<a name="line.322"></a>
<span class="sourceLineNo">323</span> // Submit a procedure with the same nonce and expect the same procedure would return.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Procedure proc2 = new TestMultiStepProcedure();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> Procedure proc2 = new TestSingleStepProcedure();<a name="line.324"></a>
<span class="sourceLineNo">325</span> long procId2 = procExecutor.submitProcedure(proc2, nonceGroup, nonce);<a name="line.325"></a>
<span class="sourceLineNo">326</span> latch.countDown();<a name="line.326"></a>
<span class="sourceLineNo">327</span> procEnv.setWaitLatch(null);<a name="line.327"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step2Procedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step2Procedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step2Procedure.html
index 53fe897..9fdc021 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step2Procedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.Step2Procedure.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> public void testRunningProcWithSameNonce() throws Exception {<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long nonceGroup = 456;<a name="line.314"></a>
<span class="sourceLineNo">315</span> final long nonce = 33333;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Procedure proc = new TestMultiStepProcedure();<a name="line.316"></a>
+<span class="sourceLineNo">316</span> Procedure proc = new TestSingleStepProcedure();<a name="line.316"></a>
<span class="sourceLineNo">317</span> long procId = ProcedureTestingUtility.submitAndWait(procExecutor, proc, nonceGroup, nonce);<a name="line.317"></a>
<span class="sourceLineNo">318</span><a name="line.318"></a>
<span class="sourceLineNo">319</span> // Restart (use a latch to prevent the step execution until we submitted proc2)<a name="line.319"></a>
@@ -329,7 +329,7 @@
<span class="sourceLineNo">321</span> procEnv.setWaitLatch(latch);<a name="line.321"></a>
<span class="sourceLineNo">322</span> restart();<a name="line.322"></a>
<span class="sourceLineNo">323</span> // Submit a procedure with the same nonce and expect the same procedure would return.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Procedure proc2 = new TestMultiStepProcedure();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> Procedure proc2 = new TestSingleStepProcedure();<a name="line.324"></a>
<span class="sourceLineNo">325</span> long procId2 = procExecutor.submitProcedure(proc2, nonceGroup, nonce);<a name="line.325"></a>
<span class="sourceLineNo">326</span> latch.countDown();<a name="line.326"></a>
<span class="sourceLineNo">327</span> procEnv.setWaitLatch(null);<a name="line.327"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.html
index 53fe897..9fdc021 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestMultiStepProcedure.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> public void testRunningProcWithSameNonce() throws Exception {<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long nonceGroup = 456;<a name="line.314"></a>
<span class="sourceLineNo">315</span> final long nonce = 33333;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Procedure proc = new TestMultiStepProcedure();<a name="line.316"></a>
+<span class="sourceLineNo">316</span> Procedure proc = new TestSingleStepProcedure();<a name="line.316"></a>
<span class="sourceLineNo">317</span> long procId = ProcedureTestingUtility.submitAndWait(procExecutor, proc, nonceGroup, nonce);<a name="line.317"></a>
<span class="sourceLineNo">318</span><a name="line.318"></a>
<span class="sourceLineNo">319</span> // Restart (use a latch to prevent the step execution until we submitted proc2)<a name="line.319"></a>
@@ -329,7 +329,7 @@
<span class="sourceLineNo">321</span> procEnv.setWaitLatch(latch);<a name="line.321"></a>
<span class="sourceLineNo">322</span> restart();<a name="line.322"></a>
<span class="sourceLineNo">323</span> // Submit a procedure with the same nonce and expect the same procedure would return.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Procedure proc2 = new TestMultiStepProcedure();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> Procedure proc2 = new TestSingleStepProcedure();<a name="line.324"></a>
<span class="sourceLineNo">325</span> long procId2 = procExecutor.submitProcedure(proc2, nonceGroup, nonce);<a name="line.325"></a>
<span class="sourceLineNo">326</span> latch.countDown();<a name="line.326"></a>
<span class="sourceLineNo">327</span> procEnv.setWaitLatch(null);<a name="line.327"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestProcEnv.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestProcEnv.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestProcEnv.html
index 53fe897..9fdc021 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestProcEnv.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestProcEnv.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> public void testRunningProcWithSameNonce() throws Exception {<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long nonceGroup = 456;<a name="line.314"></a>
<span class="sourceLineNo">315</span> final long nonce = 33333;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Procedure proc = new TestMultiStepProcedure();<a name="line.316"></a>
+<span class="sourceLineNo">316</span> Procedure proc = new TestSingleStepProcedure();<a name="line.316"></a>
<span class="sourceLineNo">317</span> long procId = ProcedureTestingUtility.submitAndWait(procExecutor, proc, nonceGroup, nonce);<a name="line.317"></a>
<span class="sourceLineNo">318</span><a name="line.318"></a>
<span class="sourceLineNo">319</span> // Restart (use a latch to prevent the step execution until we submitted proc2)<a name="line.319"></a>
@@ -329,7 +329,7 @@
<span class="sourceLineNo">321</span> procEnv.setWaitLatch(latch);<a name="line.321"></a>
<span class="sourceLineNo">322</span> restart();<a name="line.322"></a>
<span class="sourceLineNo">323</span> // Submit a procedure with the same nonce and expect the same procedure would return.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Procedure proc2 = new TestMultiStepProcedure();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> Procedure proc2 = new TestSingleStepProcedure();<a name="line.324"></a>
<span class="sourceLineNo">325</span> long procId2 = procExecutor.submitProcedure(proc2, nonceGroup, nonce);<a name="line.325"></a>
<span class="sourceLineNo">326</span> latch.countDown();<a name="line.326"></a>
<span class="sourceLineNo">327</span> procEnv.setWaitLatch(null);<a name="line.327"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestSingleStepProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestSingleStepProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestSingleStepProcedure.html
index 53fe897..9fdc021 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestSingleStepProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestSingleStepProcedure.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> public void testRunningProcWithSameNonce() throws Exception {<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long nonceGroup = 456;<a name="line.314"></a>
<span class="sourceLineNo">315</span> final long nonce = 33333;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Procedure proc = new TestMultiStepProcedure();<a name="line.316"></a>
+<span class="sourceLineNo">316</span> Procedure proc = new TestSingleStepProcedure();<a name="line.316"></a>
<span class="sourceLineNo">317</span> long procId = ProcedureTestingUtility.submitAndWait(procExecutor, proc, nonceGroup, nonce);<a name="line.317"></a>
<span class="sourceLineNo">318</span><a name="line.318"></a>
<span class="sourceLineNo">319</span> // Restart (use a latch to prevent the step execution until we submitted proc2)<a name="line.319"></a>
@@ -329,7 +329,7 @@
<span class="sourceLineNo">321</span> procEnv.setWaitLatch(latch);<a name="line.321"></a>
<span class="sourceLineNo">322</span> restart();<a name="line.322"></a>
<span class="sourceLineNo">323</span> // Submit a procedure with the same nonce and expect the same procedure would return.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Procedure proc2 = new TestMultiStepProcedure();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> Procedure proc2 = new TestSingleStepProcedure();<a name="line.324"></a>
<span class="sourceLineNo">325</span> long procId2 = procExecutor.submitProcedure(proc2, nonceGroup, nonce);<a name="line.325"></a>
<span class="sourceLineNo">326</span> latch.countDown();<a name="line.326"></a>
<span class="sourceLineNo">327</span> procEnv.setWaitLatch(null);<a name="line.327"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html
index 53fe897..9fdc021 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> public void testRunningProcWithSameNonce() throws Exception {<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long nonceGroup = 456;<a name="line.314"></a>
<span class="sourceLineNo">315</span> final long nonce = 33333;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Procedure proc = new TestMultiStepProcedure();<a name="line.316"></a>
+<span class="sourceLineNo">316</span> Procedure proc = new TestSingleStepProcedure();<a name="line.316"></a>
<span class="sourceLineNo">317</span> long procId = ProcedureTestingUtility.submitAndWait(procExecutor, proc, nonceGroup, nonce);<a name="line.317"></a>
<span class="sourceLineNo">318</span><a name="line.318"></a>
<span class="sourceLineNo">319</span> // Restart (use a latch to prevent the step execution until we submitted proc2)<a name="line.319"></a>
@@ -329,7 +329,7 @@
<span class="sourceLineNo">321</span> procEnv.setWaitLatch(latch);<a name="line.321"></a>
<span class="sourceLineNo">322</span> restart();<a name="line.322"></a>
<span class="sourceLineNo">323</span> // Submit a procedure with the same nonce and expect the same procedure would return.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Procedure proc2 = new TestMultiStepProcedure();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> Procedure proc2 = new TestSingleStepProcedure();<a name="line.324"></a>
<span class="sourceLineNo">325</span> long procId2 = procExecutor.submitProcedure(proc2, nonceGroup, nonce);<a name="line.325"></a>
<span class="sourceLineNo">326</span> latch.countDown();<a name="line.326"></a>
<span class="sourceLineNo">327</span> procEnv.setWaitLatch(null);<a name="line.327"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.html
index 53fe897..9fdc021 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> public void testRunningProcWithSameNonce() throws Exception {<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long nonceGroup = 456;<a name="line.314"></a>
<span class="sourceLineNo">315</span> final long nonce = 33333;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Procedure proc = new TestMultiStepProcedure();<a name="line.316"></a>
+<span class="sourceLineNo">316</span> Procedure proc = new TestSingleStepProcedure();<a name="line.316"></a>
<span class="sourceLineNo">317</span> long procId = ProcedureTestingUtility.submitAndWait(procExecutor, proc, nonceGroup, nonce);<a name="line.317"></a>
<span class="sourceLineNo">318</span><a name="line.318"></a>
<span class="sourceLineNo">319</span> // Restart (use a latch to prevent the step execution until we submitted proc2)<a name="line.319"></a>
@@ -329,7 +329,7 @@
<span class="sourceLineNo">321</span> procEnv.setWaitLatch(latch);<a name="line.321"></a>
<span class="sourceLineNo">322</span> restart();<a name="line.322"></a>
<span class="sourceLineNo">323</span> // Submit a procedure with the same nonce and expect the same procedure would return.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Procedure proc2 = new TestMultiStepProcedure();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> Procedure proc2 = new TestSingleStepProcedure();<a name="line.324"></a>
<span class="sourceLineNo">325</span> long procId2 = procExecutor.submitProcedure(proc2, nonceGroup, nonce);<a name="line.325"></a>
<span class="sourceLineNo">326</span> latch.countDown();<a name="line.326"></a>
<span class="sourceLineNo">327</span> procEnv.setWaitLatch(null);<a name="line.327"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.html
index 53fe897..9fdc021 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> public void testRunningProcWithSameNonce() throws Exception {<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long nonceGroup = 456;<a name="line.314"></a>
<span class="sourceLineNo">315</span> final long nonce = 33333;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Procedure proc = new TestMultiStepProcedure();<a name="line.316"></a>
+<span class="sourceLineNo">316</span> Procedure proc = new TestSingleStepProcedure();<a name="line.316"></a>
<span class="sourceLineNo">317</span> long procId = ProcedureTestingUtility.submitAndWait(procExecutor, proc, nonceGroup, nonce);<a name="line.317"></a>
<span class="sourceLineNo">318</span><a name="line.318"></a>
<span class="sourceLineNo">319</span> // Restart (use a latch to prevent the step execution until we submitted proc2)<a name="line.319"></a>
@@ -329,7 +329,7 @@
<span class="sourceLineNo">321</span> procEnv.setWaitLatch(latch);<a name="line.321"></a>
<span class="sourceLineNo">322</span> restart();<a name="line.322"></a>
<span class="sourceLineNo">323</span> // Submit a procedure with the same nonce and expect the same procedure would return.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Procedure proc2 = new TestMultiStepProcedure();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> Procedure proc2 = new TestSingleStepProcedure();<a name="line.324"></a>
<span class="sourceLineNo">325</span> long procId2 = procExecutor.submitProcedure(proc2, nonceGroup, nonce);<a name="line.325"></a>
<span class="sourceLineNo">326</span> latch.countDown();<a name="line.326"></a>
<span class="sourceLineNo">327</span> procEnv.setWaitLatch(null);<a name="line.327"></a>